Make Action Reference be VO

* Use ~4.1 for http-kernel to fix lower-deps test passing
symfony · scaytrase · Dec 10, 2017 · Dec 10, 2017 · Dec 10, 2017 · Dec 11, 2017
commit 85ece54ef8be849b0478522c1b701865cad52053
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -92,6 +92,6 @@ public function build($controller)
    {
        $reference = $this->layout->parse($controller);

-        return sprintf('%s:%s:%s', $reference->bundle->getName(), $reference->controller, $reference->action);
+        return sprintf('%s:%s:%s', $reference->getBundle()->getName(), $reference->getController(), $reference->getAction());
    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -23,7 +23,7 @@
        "symfony/config": "~3.4|~4.0",
        "symfony/event-dispatcher": "~3.4|~4.0",
        "symfony/http-foundation": "~3.4|~4.0",
-        "symfony/http-kernel": "~3.4|~4.0",
+        "symfony/http-kernel": "~3.4|~4.1",
        "symfony/polyfill-mbstring": "~1.0",
        "symfony/filesystem": "~3.4|~4.0",
        "symfony/finder": "~3.4|~4.0",

diff --git a/src/Symfony/Component/HttpKernel/Controller/ActionReference.php b/src/Symfony/Component/HttpKernel/Controller/ActionReference.php
@@ -18,19 +18,34 @@
 *
 * @author Pavel Batanov <pavel@batanov.me>
 */
-class ActionReference
+final class ActionReference
 {
    /** @var BundleInterface */
-    public $bundle;
+    private $bundle;
    /** @var string */
-    public $controller;
+    private $controller;
    /** @var string */
-    public $action;
+    private $action;

    public function __construct(BundleInterface $bundle, string $controller, string $action)
    {
        $this->bundle = $bundle;
        $this->controller = $controller;
        $this->action = $action;
    }
+
+    public function getBundle(): BundleInterface
+    {
+        return $this->bundle;
+    }
+
+    public function getController(): string
+    {
+        return $this->controller;
+    }
+
+    public function getAction(): string
+    {
+        return $this->action;
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/Layout/GenericControllerLayout.php b/src/Symfony/Component/HttpKernel/Controller/Layout/GenericControllerLayout.php
@@ -62,12 +62,12 @@ public function parse(string $controller): ActionReference
    /** {@inheritdoc} */
    public function build(ActionReference $reference): string
    {
-        $try = $reference->bundle->getNamespace().'\\Controller\\'.$reference->controller.'Controller';
+        $try = $reference->getBundle()->getNamespace().'\\Controller\\'.$reference->getController().'Controller';

        if (!class_exists($try)) {
            throw ControllerLayoutException::unknownControllerClass($reference, $try);
        }

-        return $try.'::'.$reference->action.'Action';
+        return $try.'::'.$reference->getAction().'Action';
    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Exception/ControllerLayoutException.php b/src/Symfony/Component/HttpKernel/Exception/ControllerLayoutException.php
@@ -23,9 +23,9 @@ public static function unknownControllerClass(ActionReference $reference, string
        throw new static(
            sprintf(
                'The _controller value "%s:%s:%s" maps to a "%s" class, but this class was not found. Create this class or check the spelling of the class and its namespace.',
-                $reference->bundle->getName(),
-                $reference->controller,
-                $reference->action,
+                $reference->getBundle()->getName(),
+                $reference->getController(),
+                $reference->getAction(),
                $try
            )
        );