Merge pull request #1459 from garak/fix-tests

💚 fix tests

.github/workflows/build.yaml

@@ -72,7 +72,7 @@ jobs:
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.3'
-                      symfony: '7.0.*'
+                      symfony: '7.1.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false

composer.json

@@ -17,14 +17,14 @@
     "require": {
         "php": "^8.1",
         "ext-simplexml": "*",
-        "doctrine/persistence": "^3",
+        "doctrine/persistence": "^3.0",
         "jms/metadata": "^2.4",
         "symfony/config": "^5.4 || ^6.0 || ^7.0",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
         "symfony/event-dispatcher-contracts": "^3.1",
         "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.0, !=6.4.9 || ^7.0, !=7.1.2",
         "symfony/mime": "^5.4 || ^6.0 || ^7.0",
         "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
         "symfony/string": "^5.4 || ^6.0 || ^7.0"

docker/Dockerfile81

@@ -38,7 +38,11 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
-	composer install --prefer-dist --ignore-platform-reqs; \
+    composer global config --no-plugins allow-plugins.symfony/flex true; \
+    composer global require --no-interaction --no-progress symfony/flex:^2.2; \
+    composer config extra.symfony.require "^6.4"; \
+    composer require --no-update doctrine/annotations:^1.14; \
+	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 
 CMD ["/init"]

docker/Dockerfile82

@@ -38,6 +38,7 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
+    composer require --no-update doctrine/annotations:^1.14; \
 	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 

docker/Dockerfile83

@@ -38,6 +38,7 @@ WORKDIR /srv/vich-uploader
 COPY . ./
 
 RUN set -eux; \
+    composer require --no-update doctrine/annotations:^1.14; \
 	composer update --prefer-dist --ignore-platform-reqs; \
 	composer clear-cache
 

src/Metadata/ClassMetadata.php

@@ -13,18 +13,12 @@ final class ClassMetadata extends BaseClassMetadata
 
     public function serialize(): string
     {
-        return \serialize([
-            $this->fields,
-            parent::serialize(),
-        ]);
+        return \serialize([$this->fields, parent::serialize()]);
     }
 
     public function unserialize($str): void
     {
-        [
-            $this->fields,
-            $parentStr
-            ] = \unserialize($str);
+        [$this->fields, $parentStr] = \unserialize($str);
 
         parent::unserialize($parentStr);
     }

tests/DummyFile.php

@@ -13,7 +13,9 @@ class DummyFile
 {
     /**
      * @ORM\Id
+     *
      * @ORM\Column(type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      *
      * @var int

tests/DummyImageFile.php

@@ -7,6 +7,7 @@
 
 /**
  * @ORM\Entity
+ *
  * @Vich\Uploadable
  */
 class DummyImageFile

tests/VichUploaderBundleTest.php

@@ -89,7 +89,7 @@ public function testFlysystemOfficialKernel(): void
     public function testFlysystemOneUpKernel(): void
     {
         if (!\class_exists(OneupFlysystemBundle::class)) {
-            $this->markTestSkipped('OneupFlysystemBundle supports only PHP > 7.4');
+            $this->markTestSkipped('OneupFlysystemBundle not installed');
         }
 
         $kernel = new FlysystemOneUpAppKernel('test', true);