Merge branch '1.11' into 1.12

* 1.11:
  Generate changelog for v1.11.0-RC.2
  [Maintenance] Fix PHPStan errors related to class-string
  Generate changelog for v1.11.0-RC.1
  Add missing experimental tags for new routing system
  Move attributes operation route factory into sylius resource namespace
  Move some routing namespaces

Author: lchrusciel

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## CHANGELOG
 
+## v1.11.0-RC.2 (2024-07-12)
+
+#### Details
+
+- [#900](https://github.com/Sylius/SyliusResourceBundle/issues/900) [Maintenance] Fix PHPStan errors related to class-string ([@lchrusciel](https://github.com/lchrusciel))
+
+## v1.11.0-RC.1 (2024-07-11)
+
+#### Details
+
+- [#874](https://github.com/Sylius/SyliusResourceBundle/issues/874) Remove PHP 8.0 support & not maintained Symfony versions ([@loic425](https://github.com/loic425))
+- [#878](https://github.com/Sylius/SyliusResourceBundle/issues/878) Fix dependency injection namespace ([@loic425](https://github.com/loic425))
+- [#883](https://github.com/Sylius/SyliusResourceBundle/issues/883) Fix form parameter bags accesing in request handler ([@NoResponseMate](https://github.com/NoResponseMate))
+- [#895](https://github.com/Sylius/SyliusResourceBundle/issues/895) Move some routing factories into 2 sub-directories ([@loic425](https://github.com/loic425))
+- [#896](https://github.com/Sylius/SyliusResourceBundle/issues/896) Move attributes operation route factory into sylius resource namespace ([@loic425](https://github.com/loic425))
+- [#898](https://github.com/Sylius/SyliusResourceBundle/issues/898) [Maintenance] Fix builds ([@NoResponseMate](https://github.com/NoResponseMate))
+- [#899](https://github.com/Sylius/SyliusResourceBundle/issues/899) Add missing experimental tags for new routing system ([@loic425](https://github.com/loic425))
+
 ## v1.11.0-BETA.2 (2024-05-14)
 
 #### Details

phpstan.neon

@@ -5,8 +5,6 @@ includes:
     - vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
 
     excludePaths:
@@ -72,7 +70,7 @@ parameters:
         - '/Parameter \#1 \$maxPerPage of method Pagerfanta\\Pagerfanta<mixed>::setMaxPerPage\(\) expects int<1, max>, int given\./'
         - '/Parameter \#1 \$array[0-9]? of function array_multisort expects array, array\|int given\./'
         - '/Parameter \#2 \$class of static method Webmozart\\Assert\\Assert::isInstanceOf\(\) expects class-string<object>, string given./'
-        - '/Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<object>|object, object|string given./'
+        - '/Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<object>\|object, object\|string given./'
         - '/Parameter \#1 \$package of method Symfony\\Component\\DependencyInjection\\Alias::setDeprecated\(\)/'
         - '/Return typehint of method Sylius\\Bundle\\ResourceBundle\\Routing\\CrudRoutesAttributesLoader::getClassAttributes\(\) has invalid type ReflectionAttribute./'
         - '/Return typehint of method Sylius\\Bundle\\ResourceBundle\\Routing\\RoutesAttributesLoader::getClassAttributes\(\) has invalid type ReflectionAttribute./'
@@ -102,3 +100,7 @@ parameters:
         - '/Parameter #1 \$submittedData of method Symfony\\Component\\Form\\FormInterface::submit\(\) expects array\|string\|null, mixed given\./'
         - '/Parameter #2 \$callback of function preg_replace_callback expects callable\(array<int\|string, string>\): string, Closure\(array\): mixed given\./'
         - '/Unable to resolve the template type T in call to method Doctrine\\Persistence\\ObjectManager::getClassMetadata\(\)/'
+        -
+            identifier: missingType.generics
+        -
+            identifier: missingType.iterableValue

src/Bundle/Resources/config/services/routing.xml

@@ -39,56 +39,56 @@
         </service>
         <service id="Sylius\Bundle\ResourceBundle\Routing\RoutesAttributesLoader" alias="sylius.routing.loader.routes_attributes" public="false" />
 
-        <service id="sylius.routing.factory.operation_route_name_factory" class="Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory" public="false" />
-        <service id="Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactoryInterface" alias="sylius.routing.factory.operation_route_name_factory" />
+        <service id="sylius.routing.factory.operation_route_name_factory" class="Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory" public="false" />
+        <service id="Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactoryInterface" alias="sylius.routing.factory.operation_route_name_factory" />
 
-        <service id="sylius.routing.factory.operation_route_path_factory.default" class="Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactory" public="false" />
+        <service id="sylius.routing.factory.operation_route_path_factory.default" class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactory" public="false" />
 
         <service id="sylius.routing.factory.operation_route_path_factory" alias="sylius.routing.factory.operation_route_path_factory.default" />
-        <service id="Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface" alias="sylius.routing.factory.operation_route_path_factory" />
+        <service id="Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface" alias="sylius.routing.factory.operation_route_path_factory" />
 
         <service id="sylius.routing.factory.operation_route_path_factory.collection"
-                 class="Sylius\Resource\Symfony\Routing\Factory\CollectionOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\CollectionOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="60"
         >
             <argument type="service" id=".inner" />
         </service>
 
         <service id="sylius.routing.factory.operation_route_path_factory.create"
-                 class="Sylius\Resource\Symfony\Routing\Factory\CreateOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\CreateOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="-50"
         >
             <argument type="service" id=".inner" />
         </service>
 
         <service id="sylius.routing.factory.operation_route_path_factory.bulk_operation"
-                 class="Sylius\Resource\Symfony\Routing\Factory\BulkOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\BulkOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="-40"
         >
             <argument type="service" id=".inner" />
         </service>
 
         <service id="sylius.routing.factory.operation_route_path_factory.update"
-                 class="Sylius\Resource\Symfony\Routing\Factory\UpdateOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\UpdateOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="-30"
         >
             <argument type="service" id=".inner" />
         </service>
 
         <service id="sylius.routing.factory.operation_route_path_factory.delete"
-                 class="Sylius\Resource\Symfony\Routing\Factory\DeleteOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\DeleteOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="-20"
         >
             <argument type="service" id=".inner" />
         </service>
 
         <service id="sylius.routing.factory.operation_route_path_factory.show"
-                 class="Sylius\Resource\Symfony\Routing\Factory\ShowOperationRoutePathFactory"
+                 class="Sylius\Resource\Symfony\Routing\Factory\RoutePath\ShowOperationRoutePathFactory"
                  decorates="sylius.routing.factory.operation_route_path_factory.default"
                  decoration-priority="-10"
         >
@@ -98,12 +98,12 @@
         <service id="sylius.routing.factory.route_attributes" class="Sylius\Bundle\ResourceBundle\Routing\RouteAttributesFactory" public="false" />
         <service id="Sylius\Bundle\ResourceBundle\Routing\RouteAttributesFactoryInterface" alias="sylius.routing.factory.route_attributes" />
 
-        <service id="sylius.routing.factory.attributes_operation_route" class="Sylius\Bundle\ResourceBundle\Routing\AttributesOperationRouteFactory" public="false">
+        <service id="sylius.routing.factory.attributes_operation_route" class="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactory" public="false">
             <argument type="service" id="sylius.resource_registry" />
             <argument type="service" id="sylius.routing.factory.operation_route" />
             <argument type="service" id="sylius.resource_metadata_collection.factory.attributes" />
         </service>
-        <service id="Sylius\Bundle\ResourceBundle\Routing\AttributesOperationRouteFactoryInterface" alias="sylius.routing.factory.attributes_operation_route" />
+        <service id="Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface" alias="sylius.routing.factory.attributes_operation_route" />
 
         <service id="sylius.routing.factory.operation_route" class="Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactory" public="false">
             <argument type="service" id="sylius.routing.factory.operation_route_path_factory" />

src/Bundle/Routing/CrudRoutesAttributesLoader.php

@@ -39,14 +39,16 @@ public function __invoke(): RouteCollection
         $routeCollection = new RouteCollection();
         $paths = $this->mapping['paths'] ?? [];
 
-        /** @var string $className */
         foreach (ClassReflection::getResourcesByPaths($paths) as $className) {
             $this->addRoutesForSyliusCrudRoutesAttributes($routeCollection, $className);
         }
 
         return $routeCollection;
     }
 
+    /**
+     * @param class-string $className
+     */
     private function addRoutesForSyliusCrudRoutesAttributes(RouteCollection $routeCollection, string $className): void
     {
         $attributes = ClassReflection::getClassAttributes($className, SyliusCrudRoutes::class);

src/Bundle/Routing/RoutesAttributesLoader.php

@@ -14,6 +14,7 @@
 namespace Sylius\Bundle\ResourceBundle\Routing;
 
 use Sylius\Resource\Reflection\ClassReflection;
+use Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface;
 use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -31,7 +32,6 @@ public function __invoke(): RouteCollection
         $routeCollection = new RouteCollection();
         $paths = $this->mapping['paths'] ?? [];
 
-        /** @var string $className */
         foreach (ClassReflection::getResourcesByPaths($paths) as $className) {
             $this->routesAttributesFactory->createRouteForClass($routeCollection, $className);
             $this->attributesOperationRouteFactory->createRouteForClass($routeCollection, $className);

src/Bundle/spec/Routing/RoutesAttributesLoaderSpec.php

@@ -15,9 +15,9 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\ResourceBundle\Routing\AttributesOperationRouteFactoryInterface;
 use Sylius\Bundle\ResourceBundle\Routing\RouteAttributesFactoryInterface;
 use Sylius\Bundle\ResourceBundle\Routing\RoutesAttributesLoader;
+use Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactoryInterface;
 use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;
 use Symfony\Component\Routing\RouteCollection;
 

src/Component/legacy/tests/Reflection/ClassInfoTraitTest.php

@@ -28,18 +28,38 @@ private function getClassInfoTraitImplementation(): object
         };
     }
 
-    public function testDoctrineRealClassName(): void
+    /**
+     * @dataProvider getValidClasses
+     */
+    public function testRealClassName(string $class): void
     {
         $classInfo = $this->getClassInfoTraitImplementation();
 
-        $this->assertSame(Book::class, $classInfo->getRealClassName('Proxies\__CG__\App\Entity\Book'));
+        $this->assertSame(Book::class, $classInfo->getRealClassName($class));
     }
 
-    public function testProxyManagerRealClassName(): void
+    /**
+     * @dataProvider getInvalidClasses
+     */
+    public function testThrowsExceptionIfUnproxiedClassDoNotExist(string $class): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $classInfo = $this->getClassInfoTraitImplementation();
 
-        $this->assertSame(Book::class, $classInfo->getRealClassName('MongoDBODMProxies\__PM__\App\Entity\Book\Generated'));
+        $classInfo->getRealClassName($class);
+    }
+
+    public function getInvalidClasses(): Iterable
+    {
+        yield ['class' => 'Proxies\__CG__\App\Entity\Book1'];
+        yield ['class' => 'MongoDBODMProxies\__PM__\App\Entity\Book1\Generated'];
+    }
+
+    public function getValidClasses(): Iterable
+    {
+        yield ['class' => 'Proxies\__CG__\App\Entity\Book'];
+        yield ['class' => 'MongoDBODMProxies\__PM__\App\Entity\Book\Generated'];
     }
 
     public function testUnmarkedRealClassName(): void

src/Component/spec/Metadata/Resource/Factory/AttributesResourceMetadataCollectionFactorySpec.php

@@ -41,7 +41,7 @@
 use Sylius\Resource\Metadata\Show;
 use Sylius\Resource\Metadata\Update;
 use Sylius\Resource\Symfony\Request\State\Responder;
-use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
+use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
 
 final class AttributesResourceMetadataCollectionFactorySpec extends ObjectBehavior
 {

src/Component/spec/Metadata/Resource/Factory/RedirectResourceMetadataCollectionFactorySpec.php

@@ -24,7 +24,7 @@
 use Sylius\Resource\Metadata\ResourceMetadata;
 use Sylius\Resource\Metadata\Show;
 use Sylius\Resource\Metadata\Update;
-use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
+use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
 
 final class RedirectResourceMetadataCollectionFactorySpec extends ObjectBehavior
 {

…/AttributesOperationRouteFactorySpec.php …/AttributesOperationRouteFactorySpec.phpsrc/Bundle/spec/Routing/AttributesOperationRouteFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/AttributesOperationRouteFactorySpec.php src/Bundle/spec/Routing/AttributesOperationRouteFactorySpec.php renamed to src/Component/spec/Symfony/Routing/Factory/AttributesOperationRouteFactorySpec.php

@@ -11,11 +11,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\ResourceBundle\Routing;
+namespace spec\Sylius\Resource\Symfony\Routing\Factory;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\ResourceBundle\Routing\AttributesOperationRouteFactory;
 use Sylius\Component\Resource\Tests\Dummy\DummyResourceWithOperations;
 use Sylius\Resource\Metadata\Create;
 use Sylius\Resource\Metadata\Index;
@@ -24,9 +23,10 @@
 use Sylius\Resource\Metadata\Resource\Factory\AttributesResourceMetadataCollectionFactory;
 use Sylius\Resource\Metadata\Show;
 use Sylius\Resource\Metadata\Update;
+use Sylius\Resource\Symfony\Routing\Factory\AttributesOperationRouteFactory;
 use Sylius\Resource\Symfony\Routing\Factory\OperationRouteFactory;
-use Sylius\Resource\Symfony\Routing\Factory\OperationRouteNameFactory;
-use Sylius\Resource\Symfony\Routing\Factory\OperationRoutePathFactoryInterface;
+use Sylius\Resource\Symfony\Routing\Factory\RouteName\OperationRouteNameFactory;
+use Sylius\Resource\Symfony\Routing\Factory\RoutePath\OperationRoutePathFactoryInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Webmozart\Assert\Assert;