PHP 8.1 compatibility

b2pweb · Feb 25, 2022 · c22582c · c22582c
1 parent 0f9a2eb
commit c22582c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
     name: PHP ${{ matrix.php-versions }}
 
     steps:

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": "~7.1 || ~8.0.0",
+        "php": "~7.1 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
         "b2pweb/bdf-prime": "~1.0|~2.0",
         "b2pweb/bdf-collections": "~1.1.2"

diff --git a/src/AnalyzerCompilerAdapter.php b/src/AnalyzerCompilerAdapter.php
@@ -101,7 +101,7 @@ public function quoteIdentifier(CompilableClause $query, $column): string
      *
      * @return mixed
      */
-    public function getBindings(CompilableClause $query)
+    public function getBindings(CompilableClause $query): array
     {
         return $this->compiler->getBindings($query);
     }

diff --git a/tests/BulkInsertQuery/InsertValuesAnalyzerTest.php b/tests/BulkInsertQuery/InsertValuesAnalyzerTest.php
@@ -118,12 +118,12 @@ class EntityWithTypes extends Model
 
 class EntityWithTypesMapper extends Mapper
 {
-    public function schema()
+    public function schema(): array
     {
         return ['connection' => 'test', 'table' => 'with_types'];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->boolean('bool')

diff --git a/tests/KeyValueQuery/UpdateValuesAnalyzerTest.php b/tests/KeyValueQuery/UpdateValuesAnalyzerTest.php
@@ -105,12 +105,12 @@ class EntityWithTypes extends Model
 
 class EntityWithTypesMapper extends Mapper
 {
-    public function schema()
+    public function schema(): array
     {
-        return [];
+        return ['table' => 'EntityWithTypes'];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->boolean('bool')

diff --git a/tests/Query/SqlQueryAnalyzerTest.php b/tests/Query/SqlQueryAnalyzerTest.php
@@ -250,7 +250,7 @@ class TestEntityWithIgnore extends TestEntity
  */
 class TestEntityWithIgnoreMapper extends TestEntityMapper
 {
-    public function schema()
+    public function schema(): array
     {
         return ['table' => 'with_ignore'] + parent::schema();
     }

diff --git a/tests/Query/WriteAttributesAnalyzerTest.php b/tests/Query/WriteAttributesAnalyzerTest.php
@@ -105,12 +105,12 @@ class EntityWithTypes extends Model
 
 class EntityWithTypesMapper extends Mapper
 {
-    public function schema()
+    public function schema(): array
     {
         return [];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->boolean('bool')

diff --git a/tests/_files/RelationEntityMapper.php b/tests/_files/RelationEntityMapper.php
@@ -13,15 +13,15 @@ class RelationEntityMapper extends Mapper
     /**
      * @return array|void|null
      */
-    public function schema()
+    public function schema(): array
     {
         return [
             'connection' => 'test',
             'table' => 'relation_entity',
         ];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->string('key')->primary()

diff --git a/tests/_files/TestEntity.php b/tests/_files/TestEntity.php
@@ -41,7 +41,7 @@ public function __construct(array $data = [])
         $this->import($data);
     }
 
-    public function initialize()
+    public function initialize(): void
     {
         $this->embeddedRelation = new RelationEntity();
     }

diff --git a/tests/_files/TestEntityMapper.php b/tests/_files/TestEntityMapper.php
@@ -8,15 +8,15 @@
 
 class TestEntityMapper extends Mapper
 {
-    public function schema()
+    public function schema(): array
     {
         return [
             'connection' => 'test',
             'table' => 'test_entity',
         ];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->bigint('id')->autoincrement()
@@ -28,12 +28,12 @@ public function buildFields($builder)
         ;
     }
 
-    public function buildIndexes(IndexBuilder $builder)
+    public function buildIndexes(IndexBuilder $builder): void
     {
         $builder->add()->on('key');
     }
 
-    public function buildRelations($builder)
+    public function buildRelations($builder): void
     {
         $builder
             ->on('relationEntity')

diff --git a/tests/_files/TestEntityOtherConnectionMapper.php b/tests/_files/TestEntityOtherConnectionMapper.php
@@ -6,15 +6,15 @@
 
 class TestEntityOtherConnectionMapper extends Mapper
 {
-    public function schema()
+    public function schema(): array
     {
         return [
             'connection' => 'other',
             'table' => 'test_entity',
         ];
     }
 
-    public function buildFields($builder)
+    public function buildFields($builder): void
     {
         $builder
             ->bigint('id')->autoincrement()