Merge branch '4.4' into 5.3

* 4.4:
  Add test for non-callable arrays as controllers

Author: derrabus

Loader/Configurator/Traits/RouteTrait.php

@@ -126,7 +126,7 @@ final public function methods(array $methods): self
     /**
      * Adds the "_controller" entry to defaults.
      *
-     * @param callable|string $controller a callable or parseable pseudo-callable
+     * @param callable|string|array $controller a callable or parseable pseudo-callable
      *
      * @return $this
      */

Tests/Fixtures/php_dsl.php

@@ -10,7 +10,9 @@
             ->options(['utf8' => true])
         ->add('buz', 'zub')
             ->controller('foo:act')
-            ->stateless(true);
+            ->stateless(true)
+        ->add('controller_class', '/controller')
+            ->controller(['Acme\MyApp\MyController', 'myAction']);
 
     $routes->import('php_dsl_sub.php')
         ->prefix('/sub')

Tests/Fixtures/php_object_dsl.php

@@ -12,7 +12,9 @@ public function __invoke(RoutingConfigurator $routes)
             ->options(['utf8' => true])
             ->add('buz', 'zub')
             ->controller('foo:act')
-            ->stateless(true);
+            ->stateless(true)
+            ->add('controller_class', '/controller')
+            ->controller(['Acme\MyApp\MyController', 'myAction']);
 
         $routes->import('php_dsl_sub.php')
             ->prefix('/sub')

Tests/Loader/PhpFileLoaderTest.php

@@ -177,6 +177,9 @@ public function testRoutingConfigurator()
         $expectedCollection->add('buz', (new Route('/zub'))
             ->setDefaults(['_controller' => 'foo:act', '_stateless' => true])
         );
+        $expectedCollection->add('controller_class', (new Route('/controller'))
+            ->setDefaults(['_controller' => ['Acme\MyApp\MyController', 'myAction']])
+        );
         $expectedCollection->add('c_root', (new Route('/sub/pub/'))
             ->setRequirements(['id' => '\d+'])
         );