Merge branch 'v2.x-php82' into v2.x

wakebit · Apr 24, 2023 · a970f48 · a970f48
2 parents e088211 + 675e0c6
commit a970f48
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           coverage: none
           tools: none
 

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           coverage: none
           tools: none
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.0, 8.1]
+        php: [8.0, 8.1, 8.2]
 
     name: PHP ${{ matrix.php }}
 

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "php": "^8.0|^8.1",
+        "php": "^8.0|^8.1|^8.2",
         "cycle/annotated": "^3.0",
         "cycle/database": "^2.0",
         "cycle/migrations": "^3.0",

diff --git a/tests/config/container.php b/tests/config/container.php
@@ -29,6 +29,7 @@
 use Wakebit\CycleBridge\Schema\Config\SchemaConfig;
 use Wakebit\CycleBridge\Schema\GeneratorQueue;
 use Wakebit\CycleBridge\Schema\SchemaFactory;
+
 use function DI\autowire;
 use function DI\factory;
 use function DI\get;

diff --git a/tests/config/cycle.php b/tests/config/cycle.php
@@ -5,6 +5,7 @@
 use Psr\Container\ContainerInterface;
 use Spiral\Tokenizer\Config\TokenizerConfig;
 use Wakebit\CycleBridge\Schema\Config\SchemaConfig;
+
 use function DI\create;
 
 /**

diff --git a/tests/src/Console/Command/Schema/RenderCommandTest.php b/tests/src/Console/Command/Schema/RenderCommandTest.php
@@ -22,25 +22,28 @@ public function testRender(): void
         $commandTester = new CommandTester($this->container->get(RenderCommand::class));
         $exitCode = $commandTester->execute(['-nc' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
         $realOutput = $commandTester->getDisplay();
-        $expectedOutput = [
-            '[customer] :: default.customers',
-            'Entity:', Customer::class,
+        $articlesOutput = [
+            '[article] :: default.articles',
+            'Entity:', Article::class,
             'Mapper:', Mapper::class,
             'Repository:', Repository::class,
             'Primary key:', 'id',
-            'Fields', '(property -> db.field -> typecast)', 'id -> id -> int', 'name -> name',
+            'Fields', '(property -> db.field -> typecast)', 'id -> id -> int', 'title -> title', 'description -> description',
             'Relations:', 'not defined',
+        ];
 
-            '[article] :: default.articles',
-            'Entity:', Article::class,
+        $customersOutput = [
+            '[customer] :: default.customers',
+            'Entity:', Customer::class,
             'Mapper:', Mapper::class,
             'Repository:', Repository::class,
             'Primary key:', 'id',
-            'Fields', '(property -> db.field -> typecast)', 'id -> id -> int', 'title -> title', 'description -> description',
+            'Fields', '(property -> db.field -> typecast)', 'id -> id -> int', 'name -> name',
             'Relations:', 'not defined',
         ];
 
         $this->assertSame(Command::SUCCESS, $exitCode);
-        $this->assertThat($expectedOutput, new SeeInOrder($realOutput));
+        $this->assertThat($articlesOutput, new SeeInOrder($realOutput));
+        $this->assertThat($customersOutput, new SeeInOrder($realOutput));
     }
 }
diff --git a/tests/src/Constraints/SeeInOrder.php b/tests/src/Constraints/SeeInOrder.php
@@ -7,9 +7,6 @@
 namespace Wakebit\CycleBridge\Tests\Constraints;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use ReflectionClass;
-use function mb_strlen;
-use function mb_strpos;
 
 final class SeeInOrder extends Constraint
 {
@@ -42,15 +39,15 @@ public function matches($values): bool
                 continue;
             }
 
-            $valuePosition = mb_strpos($this->content, $value, $position);
+            $valuePosition = \mb_strpos($this->content, $value, $position);
 
             if ($valuePosition === false || $valuePosition < $position) {
                 $this->failedValue = $value;
 
                 return false;
             }
 
-            $position = $valuePosition + mb_strlen($value);
+            $position = $valuePosition + \mb_strlen($value);
         }
 
         return true;
@@ -75,6 +72,6 @@ public function failureDescription($values): string
      */
     public function toString(): string
     {
-        return (new ReflectionClass($this))->name;
+        return (new \ReflectionClass($this))->name;
     }
 }
diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -21,6 +21,7 @@ protected function setUp(): void
 
         /**
          * @var array $definitions
+         *
          * @psalm-suppress MissingFile
          */
         $definitions = require __DIR__ . '/../config/container.php';