fix Twig extension (#1370)

.github/workflows/build.yaml

@@ -17,10 +17,10 @@ jobs:
               with:
                   php-version: 8.1
             - run: |
-                  composer require --no-update liip/imagine-bundle:"^2.8" phpstan/extension-installer phpstan/phpstan-phpunit 
+                  composer require --no-update liip/imagine-bundle:"^2.8" phpstan/extension-installer phpstan/phpstan-phpunit phpstan/phpstan:1.9.* 
                   composer config --no-plugins allow-plugins.phpstan/extension-installer true
                   composer install --ignore-platform-reqs
-                  vendor/bin/phpstan
+                  XDEBUG_MODE=off vendor/bin/phpstan
     cs-fixer:
         runs-on: ubuntu-22.04
         name: PHP-CS-Fixer

config/twig.xml

@@ -13,7 +13,11 @@
 
         <service id="Vich\UploaderBundle\Twig\Extension\UploaderExtension" public="false">
             <tag name="twig.extension" />
+        </service>
+
+        <service id="Vich\UploaderBundle\Twig\Extension\UploaderExtensionRuntime" public="false">
             <argument type="service" id="Vich\UploaderBundle\Templating\Helper\UploaderHelper" />
+            <tag name="twig.runtime" />
         </service>
 
     </services>

docs/usage.md

@@ -172,42 +172,34 @@ class Product
 {
     /**
      * @ORM\Id
-     * @ORM\Column(type="integer")
+     * @ORM\Column()
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     // ... other fields
 
     /**
      * NOTE: This is not a mapped field of entity metadata, just a simple property.
      *
      * @Vich\UploadableField(mapping="products", fileNameProperty="imageName", size="imageSize")
-     *
-     * @var File|null
      */
-    private $imageFile;
+    private ?File $imageFile;
 
     /**
      * @ORM\Column(nullable="true")
-     *
-     * @var string|null
      */
-    private $imageName;
+    private ?string $imageName = null;
 
     /**
      * @ORM\Column(nullable="true")
-     *
-     * @var int|null
      */
-    private $imageSize;
+    private ?int $imageSize = null;
 
     /**
      * @ORM\Column(nullable="true")
-     *
-     * @var \DateTimeImmutable|null
      */
-    private $updatedAt;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * If manually uploading a file (i.e. not using Symfony Form) ensure an instance

phpstan-baseline.neon

@@ -55,8 +55,3 @@ parameters:
 			count: 4
 			path: tests/TestCase.php
 
-		-
-			message: "#^Return type of call to method PHPUnit\\\\Framework\\\\TestCase\\:\\:createMock\\(\\) contains unresolvable type\\.$#"
-			count: 1
-			path: tests/Twig/Extension/UploaderExtensionTest.php
-

tests/Fixtures/App/templates/default/edit.html.twig

@@ -2,4 +2,6 @@
 
 {% block body %}
 {{ form(form, {'action': path('upload_edit', {'formType': formType, 'imageId': imageId}), 'method': 'POST'}) }}
+
+{{ vich_uploader_asset(image) }}
 {% endblock %}

tests/Fixtures/TestBundle/src/Controller/DefaultController.php

@@ -45,6 +45,7 @@ public function editAction(string $formType, ?int $imageId): Response
             'imageId' => $imageId,
             'formType' => $formType,
             'form' => $form->createView(),
+            'image' => $this->getImage($imageId),
         ]);
     }
 
@@ -70,10 +71,10 @@ public function submitAction(Request $request, string $formType, ?int $imageId =
             $em->persist($image);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('view', [
+            return $this->redirectToRoute('view', [
                 'formType' => $formType,
                 'imageId' => $image->getId(),
-            ]));
+            ]);
         }
 
         return $this->render('default/upload.html.twig', [
@@ -93,10 +94,10 @@ public function submitWithPropertyPathAction(Request $request, string $formType,
             $em->persist($image);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('view_with_property_path', [
+            return $this->redirectToRoute('view_with_property_path', [
                 'formType' => $formType,
                 'imageId' => $image->getId(),
-            ]));
+            ]);
         }
 
         return $this->render('default/upload_with_property_path.html.twig', [

tests/Functional/UploadTest.php

@@ -9,7 +9,7 @@ final class UploadTest extends WebTestCase
      */
     public function testFileIsUploadedWithFileType(string $uploadType, string $imageFieldName): void
     {
-        $client = static::createClient();
+        $client = self::createClient();
         $this->loadFixtures($client);
 
         $crawler = $client->request('GET', \sprintf('/%s/vich_file', $uploadType));
@@ -50,7 +50,7 @@ public function testFileIsUploadedWithFileType(string $uploadType, string $image
      */
     public function testFileIsUploadedWithImageType(string $uploadType, string $imageFieldName): void
     {
-        $client = static::createClient();
+        $client = self::createClient();
         $this->loadFixtures($client);
 
         $crawler = $client->request('GET', \sprintf('/%s/vich_image', $uploadType));
@@ -59,7 +59,7 @@ public function testFileIsUploadedWithImageType(string $uploadType, string $imag
         $form = $crawler->selectButton('form_save')->form();
         $image = $this->getUploadedFile($client, 'symfony_black_03.png');
 
-        $crawler = $client->submit($form, [
+        $client->submit($form, [
             'form' => [
                 'title' => 'Test image',
                 $imageFieldName => ['file' => $image],
@@ -89,7 +89,7 @@ public function testFileIsUploadedWithImageType(string $uploadType, string $imag
     /**
      * @return array<array{string, string}>
      */
-    public function uploadTypeDataProvider(): array
+    public static function uploadTypeDataProvider(): array
     {
         return [
             ['upload', 'imageFile'],

tests/Functional/WebTestCase.php

@@ -25,7 +25,7 @@ protected function getUploadedFile(KernelBrowser $client, string $name, string $
         return new UploadedFile(
             $this->getImagesDir($client).\DIRECTORY_SEPARATOR.$name,
             $name,
-            $mimeType
+            $mimeType,
         );
     }
 
@@ -62,12 +62,12 @@ protected function loadFixtures(KernelBrowser $client): void
             throw new \InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be dropped.");
         }
 
-        $metadatas = $om->getMetadataFactory()->getAllMetadata();
+        $metadata = $om->getMetadataFactory()->getAllMetadata();
 
         $schemaTool = new SchemaTool($om);
         $schemaTool->dropDatabase();
-        if (!empty($metadatas)) {
-            $schemaTool->createSchema($metadatas);
+        if (!empty($metadata)) {
+            $schemaTool->createSchema($metadata);
         }
     }
 

tests/Twig/Extension/UploaderExtensionTest.php

@@ -2,7 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Twig\Extension;
 
-use Vich\UploaderBundle\Templating\Helper\UploaderHelper;
+use Vich\UploaderBundle\Templating\Helper\UploaderHelperInterface;
 use Vich\UploaderBundle\Tests\TestCase;
 use Vich\UploaderBundle\Twig\Extension\UploaderExtension;
 use Vich\UploaderBundle\Twig\Extension\UploaderExtensionRuntime;
@@ -23,7 +23,7 @@ public function testAssetIsRegistered(): void
 
     public function testAssetForwardsCallsToTheHelper(): void
     {
-        $helper = $this->createMock(UploaderHelper::class);
+        $helper = $this->createMock(UploaderHelperInterface::class);
         $extension = new UploaderExtensionRuntime($helper);
         $object = new \stdClass();