Merge pull request #104 from chives/dev

rn0 · web-flow · commit 227eb38bc92b · 2026-04-14T10:51:13.000+02:00
Allowed doctrine/dbal ^4.0 and prepare for doctrine/orm ^4.0
diff --git a/composer.json b/composer.json
@@ -45,24 +45,24 @@
         "codeception/module-rest": "^3.4",
         "codeception/module-symfony": "^3.4",
         "codeception/stub": "^4.1.3",
-        "doctrine/dbal": "^3.0",
+        "doctrine/dbal": "^3.0|^4.0",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/orm": "^2.13|^3.0",
-        "doctrine/persistence": "^3.0",
+        "doctrine/persistence": "^3.0|^4.0",
         "guzzlehttp/psr7": "^2.0",
         "league/flysystem-aws-s3-v3": "^2.0|^3.10",
         "league/flysystem-memory": "^2.0|^3.3",
         "monolog/monolog": "^2.8",
         "nyholm/psr7": "^1.5",
         "oneup/flysystem-bundle": "^4.4",
-        "phpstan/phpstan": "^1.10.19",
-        "phpstan/phpstan-beberlei-assert": "^1.1",
-        "phpstan/phpstan-doctrine": "^1.3.60",
-        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan": "^2.1.46",
+        "phpstan/phpstan-beberlei-assert": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^10.5.21",
         "psr/clock": "^1.0",
         "psr/clock-implementation": "*",
-        "squizlabs/php_codesniffer": "^3.7",
+        "squizlabs/php_codesniffer": "^4.0",
         "symfony/clock": "^6.0|^7.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0",
@@ -112,7 +112,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev",
+            "dev-master": "3.1-dev",
+            "3.0": "3.0-dev",
             "2.1": "2.1-dev",
             "2.0": "2.0-dev",
             "1.x": "1.x-dev"
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,6 +4,7 @@ includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
 parameters:
     reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
     bootstrapFiles:
         - '%currentWorkingDirectory%/vendor/codeception/codeception/autoload.php'
     level: 8
@@ -18,6 +19,9 @@ parameters:
         - '%currentWorkingDirectory%/tests/unit/Entity/UnionTestEntity.php'
         - '%currentWorkingDirectory%/tests/unit/FileUnionPropertyConfigurationTest.php'
     ignoreErrors:
+        -
+            message: '#Parameter \#3 \$headers of class FSi\\Component\\Files\\DirectUpload\\Controller\\Response\\Params constructor expects array\<string, list\<string\>\|string\>, array\<array\<string\>\> given\.#'
+            path: '%currentWorkingDirectory%/src/Integration/FlySystem/DirectUpload/S3Adapter.php'
         -
             message: '#Strict comparison using === between null and string will always evaluate to false\.#'
             path: '%currentWorkingDirectory%/src/Integration/Symfony/Form/Transformer/SymfonyFileToWebFileTransformer.php'
@@ -33,6 +37,18 @@ parameters:
         -
             message: '#PHPDoc tag \@param for parameter \$event contains generic type Doctrine\\Persistence\\Event\\LifecycleEventArgs<Doctrine\\Persistence\\ObjectManager> but class Doctrine\\Persistence\\Event\\LifecycleEventArgs is not generic\.#'
             path: '%currentWorkingDirectory%/src/Integration/Doctrine/ORM/EntityFileSubscriber.php'
+        -
+            message: '#(unknown class |invalid type )?Doctrine\\ORM\\Mapping\\EmbeddedClassMapping( not found)?#'
+            path: '%currentWorkingDirectory%/src/Integration/Doctrine/ORM/EntityFileSubscriber.php'
+        -
+            message: '#(Result of && is always false\.|Strict comparison using === between true and false will always evaluate to false\.)#'
+            path: '%currentWorkingDirectory%/src/Integration/Doctrine/ORM/EntityFileSubscriber.php'
+        -
+            message: '#(Result of && is always false\.|Strict comparison using === between true and true will always evaluate to true\.)#'
+            path: '%currentWorkingDirectory%/src/Integration/Doctrine/ORM/EntityFileSubscriber.php'
+        -
+            identifier: 'trait.unused'
+            path: '%currentWorkingDirectory%/src/Integration/Doctrine/ORM/ProxyTrait.php'
         -
             message: '#Method Tests\\FSi\\Module\\UploadModule::grabClient\(\) return type with generic class Symfony\\Component\\BrowserKit\\AbstractBrowser does not specify its types: TRequest, TResponse#'
             path: '%currentWorkingDirectory%/tests/_support/Module/UploadModule'
diff --git a/src/DirectUpload/Controller/DirectUploadController.php b/src/DirectUpload/Controller/DirectUploadController.php
@@ -117,7 +117,12 @@ public function completeMultipart(ServerRequestInterface $request): ResponseInte
         $this->getAdapter($dto)->complete(
             $dto->getUploadId(),
             $dto->getKey(),
-            array_map(static fn(array $partData): Part => Part::fromArray($partData), $dto->body['parts'] ?? [])
+            array_values(
+                array_map(
+                    static fn(array $partData): Part => Part::fromArray($partData),
+                    $dto->body['parts'] ?? []
+                )
+            )
         );
 
         return $this->createJsonResponse([]);
diff --git a/src/FilePropertyConfiguration.php b/src/FilePropertyConfiguration.php
@@ -172,12 +172,7 @@ private function createPropertyReflection(string $entityClass, string $property)
             $checkedClass = $parentClass;
         }
 
-        $propertyReflection = new ReflectionProperty($checkedClass, $property);
-        if (PHP_VERSION_ID < 80500) {
-            $propertyReflection->setAccessible(true);
-        }
-
-        return $propertyReflection;
+        return new ReflectionProperty($checkedClass, $property);
     }
 
     /**
diff --git a/src/FilePropertyConfigurationResolver.php b/src/FilePropertyConfigurationResolver.php
@@ -63,8 +63,8 @@ public function resolveFileProperty(string $entityClass, string $filePropertyNam
         ) {
             throw new RuntimeException(sprintf(
                 'There is no file configuration for property "%s" of entity class "%s"',
-                $entityClass,
-                $filePropertyName
+                $filePropertyName,
+                $entityClass
             ));
         }
 
diff --git a/src/Integration/Doctrine/ORM/EntityFileSubscriber.php b/src/Integration/Doctrine/ORM/EntityFileSubscriber.php
@@ -15,6 +15,7 @@
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata as ORMClassMetadata;
+use Doctrine\ORM\Mapping\EmbeddedClassMapping;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
@@ -25,6 +26,7 @@
 
 use function array_walk;
 use function get_class;
+use function is_array;
 use function method_exists;
 
 final class EntityFileSubscriber
@@ -128,15 +130,27 @@ private function callIterativelyForObjectAndItsEmbbedables(
         array_walk(
             $metadata->embeddedClasses,
             function (
-                array|ArrayAccess $configuration,
+                EmbeddedClassMapping|array $embeddedClassMapping,
                 string $property,
                 callable $callable
             ) use (
                 $object,
                 $manager,
                 $metadata
             ): void {
-                if (null !== $configuration['declaredField'] || null !== $configuration['originalField']) {
+                if (
+                    true === $embeddedClassMapping instanceof EmbeddedClassMapping
+                    && (
+                        null !== $embeddedClassMapping->declaredField
+                        || null !== $embeddedClassMapping->originalField
+                    )
+                ) {
+                    return;
+                }
+                if (
+                    null !== $embeddedClassMapping['declaredField']
+                    || null !== $embeddedClassMapping['originalField']
+                ) {
                     return;
                 }
 
diff --git a/src/Integration/FlySystem/DirectUpload/S3Adapter.php b/src/Integration/FlySystem/DirectUpload/S3Adapter.php
@@ -83,7 +83,12 @@ public function parts(string $uploadId, string $key): array
         ]);
         $result = $this->client->execute($cmd);
 
-        return array_map(static fn(array $partData): Part => Part::fromArray($partData), $result->get('Parts'));
+        return array_values(
+            array_map(
+                static fn(array $partData): Part => Part::fromArray($partData),
+                $result->get('Parts')
+            )
+        );
     }
 
     public function part(string $uploadId, string $key, int $number): UriInterface
@@ -145,7 +150,7 @@ public function getOptions(): array
     }
 
     /**
-     * @return array<string, string>>
+     * @return array<string, string>
      */
     private function getObjectOptions(string $key): array
     {
diff --git a/src/Integration/Symfony/DependencyInjection/CompilerPass/BuildDirectUploadAdaptersPass.php b/src/Integration/Symfony/DependencyInjection/CompilerPass/BuildDirectUploadAdaptersPass.php
@@ -42,7 +42,6 @@ public function process(ContainerBuilder $container): void
         $flySystemExtension = $container->getExtension('oneup_flysystem');
         Assertion::isInstanceOf($flySystemExtension, OneupFlysystemExtension::class);
         $flySystemConfiguration = $flySystemExtension->getConfiguration($flySystemConfigs, $container);
-        Assertion::isInstanceOf($flySystemConfiguration, FlySystemConfiguration::class);
         $flySystemConfig = $processor->processConfiguration($flySystemConfiguration, $flySystemConfigs);
 
         $filesConfigs = $container->getExtensionConfig('fsi_files');
diff --git a/src/Integration/Symfony/FilesBundle.php b/src/Integration/Symfony/FilesBundle.php
@@ -58,7 +58,7 @@ private function loadExternalBundlesServices(ContainerBuilder $container): void
         }
     }
 
-    public function getContainerExtension(): ?ExtensionInterface
+    public function getContainerExtension(): ExtensionInterface
     {
         if (false === $this->extension instanceof FilesExtension) {
             $this->extension = new FilesExtension();
diff --git a/src/Integration/Symfony/Form/Transformer/CompoundWebFileTransformer.php b/src/Integration/Symfony/Form/Transformer/CompoundWebFileTransformer.php
@@ -29,7 +29,10 @@ public function __construct(string $fileField)
         $this->fileField = $fileField;
     }
 
-    public function transform(mixed $value): mixed
+    /**
+     * @return array<mixed>
+     */
+    public function transform(mixed $value): array
     {
         if (null === $value) {
             return [];
diff --git a/src/Integration/Symfony/Validator/Constraint/UploadedWebFileValidator.php b/src/Integration/Symfony/Validator/Constraint/UploadedWebFileValidator.php
@@ -142,7 +142,7 @@ private function factorizeSizes(int $size, int $limit, ?bool $binaryFormat): arr
             $sizeAsString = (string) round($size / $coef, 2);
         }
 
-        return [$sizeAsString, $limitAsString, self::$suffices[$coef]];
+        return [$sizeAsString, $limitAsString, self::$suffices[(int) $coef]];
     }
 
     private function validateUploadedWebFile(Files\UploadedWebFile $value, UploadedWebFile $constraint): void
diff --git a/tests/_support/Module/DbModule.php b/tests/_support/Module/DbModule.php
@@ -39,7 +39,7 @@ public function _beforeSuite($settings = []): void
         /** @var EntityManagerInterface $manager */
         $manager = $symfony->_getEntityManager();
 
-        (new SchemaTool($manager))->createSchema($manager->getMetadataFactory()->getAllMetadata());
+        (new SchemaTool($manager))->createSchema(array_values($manager->getMetadataFactory()->getAllMetadata()));
     }
 
     /**
diff --git a/tests/_support/Module/UploadModule.php b/tests/_support/Module/UploadModule.php
@@ -173,10 +173,10 @@ public function grabCrawler(): Crawler
     private function decodeParamsResponse(string $response): array
     {
         /** @var array{
-         *     url: string,
-         *     key: string,
-         *     publicUrl: string|null,
-         *     headers: array<string, string>
+         *     url?: string,
+         *     key?: string,
+         *     publicUrl?: string|null,
+         *     headers?: array<string, string>
          * } $responseData */
         $responseData = json_decode($response, true, 512, JSON_THROW_ON_ERROR);
         Assert::assertArrayHasKey('url', $responseData);
diff --git a/tests/_support/project/src/Controller/SymfonyFilesController.php b/tests/_support/project/src/Controller/SymfonyFilesController.php
@@ -75,10 +75,12 @@ public function __invoke(Request $request): Response
         );
     }
 
+    /**
+     * @param FormErrorIterator<FormError> $errors
+     */
     private function formErrorsToMessage(FormErrorIterator $errors): string
     {
         $message = '';
-        /** @var FormError $error */
         foreach ($errors as $error) {
             /** @var FormInterface<FormInterface> $origin */
             $origin = $error->getOrigin();
diff --git a/tests/_support/project/src/Entity/EmbeddedFile.php b/tests/_support/project/src/Entity/EmbeddedFile.php
@@ -26,7 +26,7 @@ class EmbeddedFile
     public $filePath;
 
     /**
-     * @var TwiceEmbeddedFile
+     * @var TwiceEmbeddedFile|null
      */
     public $embeddedFile;
 }
diff --git a/tests/unit/Entity/FileRemoverTest.php b/tests/unit/Entity/FileRemoverTest.php
@@ -68,7 +68,6 @@ public function testRemoving(): void
                 return match ($matcher->numberOfInvocations()) {
                     1, 3, 4, 5 => true,
                     2, 6 => false,
-                    default => $this->fail('Unexpected invocation'),
                 };
             })
         ;
diff --git a/tests/unit/Integration/Symfony/Validator/Constraint/UploadedWebFileValidatorTest.php b/tests/unit/Integration/Symfony/Validator/Constraint/UploadedWebFileValidatorTest.php
@@ -370,9 +370,6 @@ public function provideUploadedFileError(): array
         // access FileValidator::factorizeSizes() private method to format max file size
         $reflection = new ReflectionClass(UploadedWebFileValidator::class);
         $method = $reflection->getMethod('factorizeSizes');
-        if (PHP_VERSION_ID < 80500) {
-            $method->setAccessible(true);
-        }
         [, $limit, $suffix] = $method->invokeArgs(
             new UploadedWebFileValidator($this->createMock(Files\FileManager::class)),
             [0, UploadedFile::getMaxFilesize(), false]

Original file line number	Diff line number	Diff line change
`@@ -172,12 +172,7 @@ private function createPropertyReflection(string $entityClass, string $property)`
`172`	`172`	`$checkedClass = $parentClass;`
`173`	`173`	`}`
`174`	`174`
`175`		`- $propertyReflection = new ReflectionProperty($checkedClass, $property);`
`176`		`- if (PHP_VERSION_ID < 80500) {`
`177`		`- $propertyReflection->setAccessible(true);`
`178`		`- }`
`179`		`-`
`180`		`- return $propertyReflection;`
	`175`	`+ return new ReflectionProperty($checkedClass, $property);`
`181`	`176`	`}`
`182`	`177`
`183`	`178`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,12 @@ public function parts(string $uploadId, string $key): array`
`83`	`83`	`]);`
`84`	`84`	`$result = $this->client->execute($cmd);`
`85`	`85`
`86`		`- return array_map(static fn(array $partData): Part => Part::fromArray($partData), $result->get('Parts'));`
	`86`	`+ return array_values(`
	`87`	`+ array_map(`
	`88`	`+ static fn(array $partData): Part => Part::fromArray($partData),`
	`89`	`+ $result->get('Parts')`
	`90`	`+ )`
	`91`	`+ );`
`87`	`92`	`}`
`88`	`93`
`89`	`94`	`public function part(string $uploadId, string $key, int $number): UriInterface`
`@@ -145,7 +150,7 @@ public function getOptions(): array`
`145`	`150`	`}`
`146`	`151`
`147`	`152`	`/**`
`148`		`- * @return array<string, string>>`
	`153`	`+ * @return array<string, string>`
`149`	`154`	`*/`
`150`	`155`	`private function getObjectOptions(string $key): array`
`151`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private function loadExternalBundlesServices(ContainerBuilder $container): void`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function getContainerExtension(): ?ExtensionInterface`
	`61`	`+ public function getContainerExtension(): ExtensionInterface`
`62`	`62`	`{`
`63`	`63`	`if (false === $this->extension instanceof FilesExtension) {`
`64`	`64`	`$this->extension = new FilesExtension();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ public function __construct(string $fileField)`
`29`	`29`	`$this->fileField = $fileField;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function transform(mixed $value): mixed`
	`32`	`+ /**`
	`33`	`+ * @return array<mixed>`
	`34`	`+ */`
	`35`	`+ public function transform(mixed $value): array`
`33`	`36`	`{`
`34`	`37`	`if (null === $value) {`
`35`	`38`	`return [];`