set minimal version of PHP to 8.0

efureev · Apr 28, 2021 · b5713bf · b5713bf
1 parent fa2ece2
commit b5713bf
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 24 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         setup: [ 'basic', 'lowest' ]
-        php: [ '7.4' ]
+        php: [ '8.0' ]
 
     services:
       postgres:
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Use PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v1 # Action page: <https://github.com/shivammathur/setup-php>
+        uses: shivammathur/setup-php@v2 # Action page: <https://github.com/shivammathur/setup-php>
         with:
           php-version: ${{ matrix.php }}
           extensions: mbstring

diff --git a/Readme.md b/Readme.md
@@ -54,8 +54,8 @@ categories for shop.
 Requirements
 ------------
 
-- PHP >= 7.4
-- Laravel >= 7.30
+- PHP >= 8.0
+- Laravel >= 8.38
 
 It is highly suggested to use database that supports transactions (like MySql's InnoDb, Postgres)
 to secure a tree from possible corruption.

diff --git a/composer.json b/composer.json
@@ -9,14 +9,14 @@
     }
   ],
   "require": {
-    "php": "^7.4|^8.0",
-    "illuminate/database": "^7.30|^8.38",
-    "illuminate/events": "^7.30|^8.38",
-    "efureev/support": "^3.1"
+    "php": "^8.0",
+    "illuminate/database": "^8.38",
+    "illuminate/events": "^8.38",
+    "efureev/support": "^4.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
-    "orchestra/testbench": "^5.18",
+    "orchestra/testbench": "^6.17",
     "fakerphp/faker": "^1.14",
     "symfony/var-dumper": "^5.2",
     "squizlabs/php_codesniffer": "^3.6"

diff --git a/src/Config/Base.php b/src/Config/Base.php
@@ -91,7 +91,7 @@ public function setAttribute(string $name, AbstractAttribute $attribute): self
     /**
      * Get a list of default columns.
      *
-     * @param bool $names
+     * @param  bool  $names
      *
      * @return array
      */
@@ -115,7 +115,7 @@ public function columns($names = true): array
 
         return array_map(
             static function (AbstractAttribute $item) {
-                return (string)$item;
+                return (string) $item;
             },
             $list
         );
@@ -133,8 +133,10 @@ public function setMultiTree($treeAttribute = null): self
     {
         if ($treeAttribute === false) {
             $treeAttribute = null;
-        } else if ($treeAttribute === null || $treeAttribute === true) {
-            $treeAttribute = new TreeAttribute();
+        } else {
+            if ($treeAttribute === null || $treeAttribute === true) {
+                $treeAttribute = new TreeAttribute();
+            }
         }
 
         $this->tree = $treeAttribute;
@@ -144,7 +146,7 @@ public function setMultiTree($treeAttribute = null): self
 
 
     /**
-     * @param Model $model
+     * @param  Model  $model
      *
      * @return bool
      */
@@ -155,7 +157,7 @@ public static function isNode($model): bool
 
 
     /**
-     * @param string $attributeType
+     * @param  string  $attributeType
      *
      * @return string|null
      */
@@ -168,14 +170,14 @@ public static function getCastForCustomAttribute(string $attributeType): ?string
                 return 'integer';
             case 'string':
             case 'uuid':
-                return 'uuid';
+                return 'string';
         }
 
         return null;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getCastForParentAttribute(): ?string
     {
@@ -194,7 +196,7 @@ public function getCastForTreeAttribute(): ?string
     /**
      * Generate function
      *
-     * @param Model|NestedSetTrait $model
+     * @param  Model|NestedSetTrait  $model
      *
      * @return mixed
      */
@@ -204,7 +206,7 @@ public function generateTreeId(Model $model)
             return $model->generateTreeId();
         }
 
-        return (((int)$model->max($this->tree())) + 1);
+        return (((int) $model->max($this->tree())) + 1);
     }
 
     /**

diff --git a/tests/Unit/BaseConfigTest.php b/tests/Unit/BaseConfigTest.php
@@ -58,11 +58,11 @@ public function testMultiCustomColumns(): void
 
         static::assertEquals('_pid', (string)$config->parent());
         static::assertEquals('_pid', $config->parent()->name());
-        static::assertEquals('uuid', $config->parent()->type());
+        static::assertEquals('string', $config->parent()->type());
 
         static::assertEquals('_tree', (string)$config->tree());
         static::assertEquals('_tree', $config->tree()->name());
-        static::assertEquals('uuid', $config->tree()->type());
+        static::assertEquals('string', $config->tree()->type());
 
         $config = new Base();
         static::assertNull($config->tree());

diff --git a/tests/Unit/MigrateTest.php b/tests/Unit/MigrateTest.php
@@ -69,7 +69,7 @@ public function testMultiCustomGetColumns(): void
             /** @var ColumnDefinition $col */
             static::assertContains($column->getAttributes()['name'], $multiColumns);
             if ($column->getAttributes()['name'] === 'tid') {
-                static::assertEquals('uuid', $column->getAttributes()['type']);
+                static::assertEquals('string', $column->getAttributes()['type']);
                 static::assertTrue($column->getAttributes()['nullable']);
                 static::assertNull($column->getAttributes()['default']);
             }

diff --git a/tests/models/PageUuid.php b/tests/models/PageUuid.php
@@ -15,7 +15,7 @@
  */
 class PageUuid extends Page
 {
-    protected $keyType = 'uuid';
+    protected $keyType = 'string';
 
     protected $table = 'pages_uuid';
 

diff --git a/tests/models/Structure.php b/tests/models/Structure.php
@@ -16,7 +16,7 @@
  */
 class Structure extends Page
 {
-    protected $keyType = 'uuid';
+    protected $keyType = 'string';
 
     protected $hidden = ['_setRoot'];