Merge pull request #1496 from garak/upgrade-phpunit

⬆️  upgrade PHPUnit

Author: garak

.github/workflows/build.yaml

@@ -15,10 +15,9 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.1
+                  php-version: 8.3
             - run: |
-                 composer require --no-update doctrine/annotations:"^2.0" liip/imagine-bundle:"^2.8" phpstan/extension-installer phpstan/phpstan-phpunit:1.3.* phpstan/phpstan:1.9.* 
-                  composer config --no-plugins allow-plugins.phpstan/extension-installer true
+                  composer require --no-update doctrine/annotations:"^2.0" liip/imagine-bundle:"^2.13" phpstan/phpstan:"^1.12" 
                   composer install --ignore-platform-reqs
                   XDEBUG_MODE=off vendor/bin/phpstan
     cs-fixer:
@@ -38,7 +37,7 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v4
             - name: Require the vendor
-              run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^3.1
+              run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^3.5
             - name: Update
               run: composer update --no-interaction --no-progress
             - name: Run
@@ -86,13 +85,13 @@ jobs:
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.3'
-                      symfony: '7.1.*'
+                      symfony: '7.2.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.4'
-                      symfony: '7.2.*@dev'
+                      symfony: '7.3.*@dev'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false

composer.json

@@ -31,7 +31,7 @@
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "dg/bypass-finals": "^1.8",
+        "dg/bypass-finals": "^1.9",
         "doctrine/common": "^3.0",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/mongodb-odm": "^2.4",
@@ -41,23 +41,22 @@
         "league/flysystem-memory": "^2.0 || ^3.0",
         "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "mikey179/vfsstream": "^1.6.11",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.0",
         "symfony/asset": "^5.4 || ^6.0 || ^7.0",
         "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
         "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
         "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
         "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
         "symfony/form": "^5.4 || ^6.0 || ^7.0",
         "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^7.0",
+        "symfony/phpunit-bridge": "^7.2",
         "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0",
         "symfony/translation": "^5.4 || ^6.0 || ^7.0",
         "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
         "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
         "symfony/validator": "^5.4 || ^6.0 || ^7.0",
         "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
-        "yoast/phpunit-polyfills": "^2.0"
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "For integration with Doctrine",

phpstan-baseline.neon

@@ -65,16 +65,6 @@ parameters:
 			count: 1
 			path: tests/Injector/FileInjectorTest.php
 
-		-
-			message: "#^Trying to mock an undefined method findOneBySlug\\(\\) on class Doctrine\\\\ORM\\\\EntityRepository\\.$#"
-			count: 1
-			path: tests/Naming/SlugNamerTest.php
-
-		-
-			message: "#^Trying to mock an undefined method getFilesystem\\(\\) on class League\\\\Flysystem\\\\MountManager\\.$#"
-			count: 1
-			path: tests/Storage/Flysystem/MountManagerFlysystemStorageTest.php
-
 		-
 			message: "#^Return type of call to method PHPUnit\\\\Framework\\\\TestCase\\:\\:createMock\\(\\) contains unresolvable type\\.$#"
 			count: 4

phpunit.xml.dist

@@ -17,17 +17,14 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
     </php>
 
-    <coverage>
+    <source>
         <include>
             <directory>./src</directory>
         </include>
-    </coverage>
+    </source>
 
     <extensions>
-        <extension class="Vich\UploaderBundle\Tests\BypassFinalHook"/>
+        <bootstrap class="Vich\UploaderBundle\Tests\BypassFinalExtension"/>
+        <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
     </extensions>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
 </phpunit>

tests/BypassFinalExtension.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Vich\UploaderBundle\Tests;
+
+use DG\BypassFinals;
+use PHPUnit\Runner\Extension\Extension;
+use PHPUnit\Runner\Extension\Facade;
+use PHPUnit\Runner\Extension\ParameterCollection;
+use PHPUnit\TextUI\Configuration\Configuration;
+
+final class BypassFinalExtension implements Extension
+{
+    public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
+    {
+        BypassFinals::enable();
+    }
+}

tests/BypassFinalHook.php

@@ -42,7 +42,7 @@ public function testComplete(array $input, array $expectedSuggestions): void
         $this->assertEqualsCanonicalizing($expectedSuggestions, $tester->complete($input));
     }
 
-    public function provideCompletionSuggestions(): \Generator
+    public static function provideCompletionSuggestions(): \Generator
     {
         yield 'fqcn' => [
             [''],

tests/Command/MappingDebugClassCommandTest.php

@@ -43,7 +43,7 @@ public function testComplete(array $input, array $expectedSuggestions): void
         $this->assertEqualsCanonicalizing($expectedSuggestions, $tester->complete($input));
     }
 
-    public function provideCompletionSuggestions(): \Generator
+    public static function provideCompletionSuggestions(): \Generator
     {
         yield 'mapping' => [
             [''],

tests/Command/MappingDebugCommandTest.php

@@ -5,15 +5,12 @@
 use Vich\UploaderBundle\Mapping\Annotation as Vich;
 
 /**
- * @Vich\Uploadable
- *
  * @author Dustin Dobervich <ddobervich@gmail.com>
  */
+#[Vich\Uploadable]
 class DummyEntity
 {
-    /**
-     * @Vich\UploadableField(mapping="dummy_file", fileNameProperty="fileName")
-     */
+    #[Vich\UploadableField(mapping: 'dummy_file', fileNameProperty: 'fileName')]
     protected ?object $file = null;
 
     protected ?string $fileName = null;

tests/DummyEntity.php

@@ -28,12 +28,12 @@ protected function setUp(): void
 
     public function testPreRemove(): void
     {
-        $this->object = $this->getEntityProxyMock();
+        $this->object = $this->getEntityProxyMock('One');
 
         $this->metadata
             ->expects(self::once())
             ->method('isUploadable')
-            ->with('VichUploaderEntityProxy')
+            ->with('VichUploaderEntityProxyOne')
             ->willReturn(true);
 
         $this->object
@@ -48,15 +48,15 @@ public function testPreRemove(): void
 
     public function testPreRemoveSkipNonUploadable(): void
     {
-        $this->object = $this->getEntityProxyMock();
+        $this->object = $this->getEntityProxyMock('Two');
         $this->object
             ->expects($this->never())
             ->method('__load');
 
         $this->metadata
             ->expects(self::once())
             ->method('isUploadable')
-            ->with('VichUploaderEntityProxy')
+            ->with('VichUploaderEntityProxyTwo')
             ->willReturn(false);
 
         $this->event = $this->getEventMock();
@@ -122,10 +122,10 @@ public function testPostFlushSkipsNonUploadable(): void
         $this->listener->postFlush();
     }
 
-    protected function getEntityProxyMock(): Proxy|MockObject
+    private function getEntityProxyMock(string $postfix): Proxy|MockObject
     {
         return $this->getMockBuilder(Proxy::class)
-            ->setMockClassName('VichUploaderEntityProxy')
+            ->setMockClassName('VichUploaderEntityProxy'.$postfix)
             ->getMock();
     }
 }

tests/EventListener/Doctrine/RemoveListenerTest.php

@@ -5,22 +5,17 @@
 use Vich\UploaderBundle\Mapping\Annotation as Vich;
 
 /**
- * @Vich\Uploadable
- *
  * @author Dustin Dobervich <ddobervich@gmail.com>
  */
+#[Vich\Uploadable]
 class Article
 {
-    /**
-     * @Vich\UploadableField(mapping="dummy_file", fileNameProperty="fileName")
-     */
+    #[Vich\UploadableField(mapping: 'dummy_file', fileNameProperty: 'fileName')]
     protected ?object $attachment = null;
 
     protected ?string $attachmentName = null;
 
-    /**
-     * @Vich\UploadableField(mapping="dummy_image", fileNameProperty="imageName", originalName="originalNameField", mimeType="mimeTypeField", size="sizeField")
-     */
+    #[Vich\UploadableField(mapping: 'dummy_image', fileNameProperty: 'imageName', size: 'sizeField', mimeType: 'mimeTypeField', originalName: 'originalNameField')]
     protected ?object $image = null;
 
     protected ?string $imageName = null;

tests/Fixtures/TestBundle/src/Entity/Article.php

@@ -3,12 +3,9 @@
 namespace Vich\TestBundle\Entity;
 
 use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Vich\UploaderBundle\Mapping\Annotation as Vich;
 
-/**
- * @Vich\Uploadable
- */
+#[Vich\Uploadable]
 class Image
 {
     protected ?int $id = null;
@@ -17,9 +14,7 @@ class Image
 
     protected ?\DateTime $updatedAt = null;
 
-    /**
-     * @Vich\UploadableField(mapping="image_mapping", fileNameProperty="imageName")
-     */
+    #[Vich\UploadableField(mapping: 'image_mapping', fileNameProperty: 'imageName')]
     protected ?File $imageFile = null;
 
     protected ?string $imageName = null;

tests/Fixtures/TestBundle/src/Entity/Image.php

@@ -219,7 +219,7 @@ public function testLiipImagineBundleIntegration(
         self::assertEquals($vars, $view->vars);
     }
 
-    public function getLiipImagineBundleIntegrationData(): array
+    public static function getLiipImagineBundleIntegrationData(): array
     {
         $field = 'image';
         $object = new Product();

tests/Form/Type/VichImageTypeTest.php

@@ -14,7 +14,6 @@
 use Vich\UploaderBundle\Metadata\Driver\AnnotationDriver;
 use Vich\UploaderBundle\Tests\DummyEntity;
 use Vich\UploaderBundle\Tests\DummyFile;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty;
 
 /**
  * AnnotationDriverTest.
@@ -25,8 +24,6 @@
  */
 final class AnnotationDriverTest extends TestCase
 {
-    use AssertObjectProperty;
-
     private Connection|MockObject $connection;
 
     private EntityManagerInterface|MockObject $entityManager;

tests/Metadata/Driver/AnnotationDriverTest.php

@@ -8,12 +8,9 @@
 use Vich\TestBundle\Entity\Article;
 use Vich\TestBundle\Entity\Product;
 use Vich\UploaderBundle\Metadata\ClassMetadata;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty;
 
 abstract class FileDriverTestCase extends TestCase
 {
-    use AssertObjectProperty;
-
     /**
      * @dataProvider classesProvider
      */

tests/Metadata/Driver/FileDriverTestCase.php

@@ -18,7 +18,7 @@ abstract class TestCase extends BaseTestCase
     protected function getUploadedFileMock(): UploadedFile|MockObject
     {
         return $this->getMockBuilder(UploadedFile::class)
-            ->setConstructorArgs(['lala', 'lala', $mimeType = null, $error = 9, $test = true])
+            ->setConstructorArgs(['lala', 'lala', null, 9, true])
             ->getMock();
     }