Merge branch 'release/3.0.0'

Author: matheus-santos-devsquad

.gitignore

@@ -1,2 +1,3 @@
 .idea
-vendor/
+vendor/
+.phpunit.result.cache

composer.json

@@ -22,20 +22,19 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Igrejanet\\Firebird\\Providers\\FirebirdServiceProvider"
             ]
         }
     },
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.4|^8.0",
         "ext-pdo": "*",
         "ext-pdo_firebird": "*",
         "illuminate/database": "^7.0|^8.0",
-        "harrygulliford/laravel-firebird": "^2.3"
+        "harrygulliford/laravel-firebird": "^2.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^9.3.3",
         "fzaninotto/faker": "^1.9",
-        "illuminate/config": "^7.0|^8.0",
+        "illuminate/config": "^7.0|^8.0"
     }
 }

composer.lock

@@ -15,10 +15,9 @@
  */
 class FirebirdModel extends Model
 {
-    /**
-     * @var null|string
-     */
-    protected $generator = null;
+    private const DRIVER_NAME = 'firebird';
+
+    protected ?string $generator = null;
 
     /**
      * @param Builder $query
@@ -49,7 +48,7 @@ protected function insertAndSetId(Builder $query, $attributes)
 
     public function runningFirebird() : bool
     {
-        return $this->getConnection()->getDriverName() == 'firebird';
+        return $this->getConnection()->getDriverName() == self::DRIVER_NAME;
     }
 
     /**

src/Database/FirebirdDatabaseManager.php

@@ -11,23 +11,14 @@
  */
 class IncreaseByGenerator
 {
-    /**
-     * @var string
-     */
-    protected $sql;
+    protected string $sql;
 
-    /**
-     * @param string $generator
-     */
     public function __construct(string $generator)
     {
         $this->sql = 'SELECT GEN_ID('. $generator .', 1) AS CODIGO FROM RDB$DATABASE';
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->sql;
     }

src/FirebirdModel.php

@@ -11,24 +11,14 @@
  */
 class IncreaseById
 {
-    /**
-     * @var string
-     */
-    protected $sql;
+    protected string $sql;
 
-    /**
-     * @param string $keyName
-     * @param string $tableName
-     */
     public function __construct(string $keyName, string $tableName)
     {
         $this->sql = 'SELECT COALESCE(MAX('. $keyName .'), 0) + 1 as CODIGO FROM ' . $tableName;
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->sql;
     }

src/Increasers/IncreaseByGenerator.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests;
+
+use Igrejanet\Firebird\Increasers\IncreaseByGenerator;
+use PHPUnit\Framework\TestCase;
+
+class IncreaseByGeneratorTest extends TestCase
+{
+    public function testIncreaseByGenerator()
+    {
+        $sql = (string) (new IncreaseByGenerator('GEN_USERS'));
+
+        $this->assertEquals('SELECT GEN_ID(GEN_USERS, 1) AS CODIGO FROM RDB$DATABASE', $sql);
+    }
+}

src/Increasers/IncreaseById.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests;
+
+use Igrejanet\Firebird\Increasers\IncreaseById;
+use PHPUnit\Framework\TestCase;
+
+class IncreaseByIdTest extends TestCase
+{
+    public function testIfSqlForIncreaserWillBeGenerated()
+    {
+        $sql = (string) (new IncreaseById('ID', 'USUARIOS'));
+
+        $this->assertEquals('SELECT COALESCE(MAX(ID), 0) + 1 as CODIGO FROM USUARIOS', $sql);
+    }
+}