Ресолверы переехали в core.

Author: ProklUng

config/base.yaml

@@ -94,3 +94,71 @@ services:
   app.request.uri:
     class: Prokl\ServiceProvider\Services\AppRequest
     factory: ['@app.request', 'getRequestUri']
+
+
+  controller_resolver:
+    class: Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver
+    arguments: ['@service_container']
+
+  Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver: '@controller_resolver'
+
+  argument_metadata_factory:
+    class: Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory
+
+  Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory: '@argument_metadata_factory'
+
+  argument_resolver:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver
+    arguments:
+      - '@argument_metadata_factory'
+      - [
+        '@argument_resolver.request_attribute',
+        '@argument_resolver.session',
+        '@argument_resolver.service',
+        '@argument_resolver.default',
+        '@argument_resolver.variadic',
+      ]
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver: '@argument_resolver'
+
+  argument_resolver.request_attribute:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: 100}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver: '@argument_resolver.request_attribute'
+
+  argument_resolver.request:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: 50}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver: '@argument_resolver.request'
+
+  argument_resolver.session:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\SessionValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: 50}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\SessionValueResolver: '@argument_resolver.session'
+
+  argument_resolver.service:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: 50}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver: '@argument_resolver.service'
+
+  argument_resolver.default:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: -150}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver: '@argument_resolver.default'
+
+  argument_resolver.variadic:
+    class: Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver
+    tags:
+      - {name: controller.argument_value_resolver, priority: -150}
+
+  Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver: '@argument_resolver.variadic'

src/Framework/SymfonyCompilerPassBag.php

@@ -23,6 +23,12 @@ class SymfonyCompilerPassBag extends AbstractSymfonyCompilerPassBag
      * @var array $standartCompilerPasses Пассы Symfony.
      */
     protected $standartCompilerPasses = [
+        [
+            'pass' => ControllerArgumentValueResolverPass::class,
+        ],
+        [
+            'pass' => RegisterControllerArgumentLocatorsPass::class,
+        ],
         [
             'pass' => RoutingResolverPass::class,
         ],
@@ -32,6 +38,10 @@ class SymfonyCompilerPassBag extends AbstractSymfonyCompilerPassBag
         [
             'pass' => PropertyInfoPass::class,
         ],
+        [
+            'pass' => RemoveEmptyControllerArgumentLocatorsPass::class,
+            'phase' => PassConfig::TYPE_BEFORE_REMOVING,
+        ],
         [
             'pass' => AddConstraintValidatorsPass::class,
         ],

src/Framework/SymfonyCompilerPassBagLight.php

@@ -21,6 +21,12 @@ class SymfonyCompilerPassBagLight extends AbstractSymfonyCompilerPassBag
      * @var array $standartCompilerPasses Пассы Symfony.
      */
     protected $standartCompilerPasses = [
+        [
+            'pass' => ControllerArgumentValueResolverPass::class,
+        ],
+        [
+            'pass' => RegisterControllerArgumentLocatorsPass::class,
+        ],
         [
             'pass' => RoutingResolverPass::class,
         ],