Merge pull request #71 from kbond/support-php8

PHP8 Support
zenstruck · Dec 7, 2020 · f3f89d9 · f3f89d9
2 parents e4d0a06 + 63c8eb7
commit f3f89d9
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     strategy:
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [7.2, 7.3, 7.4, 8.0]
         stability: [prefer-stable]
         include:
           - php: 7.2
@@ -281,27 +281,27 @@ jobs:
       - name: Check CS
         run: php php-cs-fixer.phar fix --dry-run --diff --diff-format=udiff
 
-  static-analysis:
-    name: Psalm Static Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2.3.3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@2.7.0
-        with:
-          php-version: 7.4
-          coverage: none
-
-      - name: Cache dependencies
-        uses: actions/cache@v2.1.2
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-7.4-prefer-stable-${{ hashFiles('composer.json') }}
-
-      - name: Install dependencies
-        run: composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
-
-      - name: Run static analysis
-        run: vendor/bin/psalm --output-format=github
+#  static-analysis:
+#    name: Psalm Static Analysis
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout code
+#        uses: actions/checkout@v2.3.3
+#
+#      - name: Setup PHP
+#        uses: shivammathur/setup-php@2.7.0
+#        with:
+#          php-version: 7.4
+#          coverage: none
+#
+#      - name: Cache dependencies
+#        uses: actions/cache@v2.1.2
+#        with:
+#          path: ~/.composer/cache/files
+#          key: dependencies-7.4-prefer-stable-${{ hashFiles('composer.json') }}
+#
+#      - name: Install dependencies
+#        run: composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
+#
+#      - name: Run static analysis
+#        run: vendor/bin/psalm --output-format=github
diff --git a/composer.json b/composer.json
@@ -26,9 +26,9 @@
         "psalm/plugin-symfony": "^1.5|^2.0",
         "symfony/framework-bundle": "^4.4|^5.0",
         "symfony/maker-bundle": "^1.13",
-        "symfony/phpunit-bridge": "^5.1",
+        "symfony/phpunit-bridge": "^5.2",
         "vimeo/psalm": "^3.18|^4.0",
-        "weirdan/doctrine-psalm-plugin": "^0.11.3"
+        "weirdan/doctrine-psalm-plugin": "^0.11.3|^1.0@dev"
     },
     "config": {
         "preferred-install": "dist",

diff --git a/src/RepositoryProxy.php b/src/RepositoryProxy.php
@@ -280,7 +280,7 @@ public function findOneBy(array $criteria, ?array $orderBy = null): ?Proxy
         if (\is_array($orderBy)) {
             $wrappedParams = (new \ReflectionClass($this->repository))->getMethod('findOneBy')->getParameters();
 
-            if (!isset($wrappedParams[1]) || 'orderBy' !== $wrappedParams[1]->getName() || !$wrappedParams[1]->isArray()) {
+            if (!isset($wrappedParams[1]) || 'orderBy' !== $wrappedParams[1]->getName() || !$wrappedParams[1]->getType() instanceof \ReflectionNamedType || 'array' !== $wrappedParams[1]->getType()->getName()) {
                 throw new \RuntimeException(\sprintf('Wrapped repository\'s (%s) findOneBy method does not have an $orderBy parameter.', \get_class($this->repository)));
             }
         }

diff --git a/tests/Functional/Bundle/Maker/MakeFactoryTest.php b/tests/Functional/Bundle/Maker/MakeFactoryTest.php
@@ -19,7 +19,7 @@ public function can_create_factory(): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:factory'));
 
-        $this->assertFileNotExists(self::tempFile('src/Factory/CategoryFactory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('src/Factory/CategoryFactory.php'));
 
         $tester->execute(['entity' => Category::class]);
 
@@ -83,7 +83,7 @@ public function can_create_factory_interactively(): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:factory'));
 
-        $this->assertFileNotExists(self::tempFile('src/Factory/CategoryFactory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('src/Factory/CategoryFactory.php'));
 
         $tester->setInputs([Category::class]);
         $tester->execute([]);
@@ -150,7 +150,7 @@ public function can_create_factory_in_test_dir(): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:factory'));
 
-        $this->assertFileNotExists(self::tempFile('tests/Factory/CategoryFactory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('tests/Factory/CategoryFactory.php'));
 
         $tester->execute(['entity' => Category::class, '--test' => true]);
 
@@ -214,7 +214,7 @@ public function can_create_factory_in_test_dir_interactively(): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:factory'));
 
-        $this->assertFileNotExists(self::tempFile('tests/Factory/CategoryFactory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('tests/Factory/CategoryFactory.php'));
 
         $tester->setInputs([Category::class]);
         $tester->execute(['--test' => true]);
@@ -281,13 +281,13 @@ public function invalid_entity_throws_exception(): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:factory'));
 
-        $this->assertFileNotExists(self::tempFile('src/Factory/InvalidFactory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('src/Factory/InvalidFactory.php'));
 
         try {
             $tester->execute(['entity' => 'Invalid']);
         } catch (RuntimeCommandException $e) {
             $this->assertSame('Entity "Invalid" not found.', $e->getMessage());
-            $this->assertFileNotExists(self::tempFile('src/Factory/InvalidFactory.php'));
+            $this->assertFileDoesNotExist(self::tempFile('src/Factory/InvalidFactory.php'));
 
             return;
         }

diff --git a/tests/Functional/Bundle/Maker/MakeStoryTest.php b/tests/Functional/Bundle/Maker/MakeStoryTest.php
@@ -18,7 +18,7 @@ public function can_create_story($name): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:story'));
 
-        $this->assertFileNotExists(self::tempFile('src/Story/FooBarStory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('src/Story/FooBarStory.php'));
 
         $tester->execute(['name' => $name]);
 
@@ -51,7 +51,7 @@ public function can_create_story_interactively($name): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:story'));
 
-        $this->assertFileNotExists(self::tempFile('src/Story/FooBarStory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('src/Story/FooBarStory.php'));
 
         $tester->setInputs([$name]);
         $tester->execute([]);
@@ -87,7 +87,7 @@ public function can_create_story_in_test_dir($name): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:story'));
 
-        $this->assertFileNotExists(self::tempFile('tests/Story/FooBarStory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('tests/Story/FooBarStory.php'));
 
         $tester->execute(['name' => $name, '--test' => true]);
 
@@ -120,7 +120,7 @@ public function can_create_story_in_test_dir_interactively($name): void
     {
         $tester = new CommandTester((new Application(self::bootKernel()))->find('make:story'));
 
-        $this->assertFileNotExists(self::tempFile('tests/Story/FooBarStory.php'));
+        $this->assertFileDoesNotExist(self::tempFile('tests/Story/FooBarStory.php'));
 
         $tester->setInputs([$name]);
         $tester->execute(['--test' => true]);