AcceptableViewModelSelector notice fixed

InjectTemplateListener  to work with preferController routeMatch flag and controller_map
, so it can return proper template when using Apigility rest service

Author: nikolay

src/Controller/Plugin/AcceptableViewModelSelector.php

@@ -209,7 +209,7 @@ public function getDefaultMatchAgainst()
     protected function injectViewModelName($modelAcceptString, $modelName)
     {
         $modelName = str_replace('\\', '|', $modelName);
-        $modelAcceptString = (is_array($modelAcceptString ))
+        $modelAcceptString = (is_array($modelAcceptString))
             ? $modelAcceptString[key($modelAcceptString)]
             : $modelAcceptString;
         return $modelAcceptString . '; ' . self::INJECT_VIEWMODEL_NAME . '="' . $modelName . '", ';

src/View/Http/InjectTemplateListener.php

@@ -61,7 +61,7 @@ public function injectTemplate(MvcEvent $e)
         }
 
         $routeMatch = $e->getRouteMatch();
-        if($preferRouteMatchController = $routeMatch->getParam('prefer_route_match_controller', false)){
+        if ($preferRouteMatchController = $routeMatch->getParam('prefer_route_match_controller', false)) {
             $this->setPreferRouteMatchController($preferRouteMatchController);
         }
 

test/View/InjectTemplateListenerTest.php

@@ -340,4 +340,28 @@ public function testPrefersRouteMatchController()
 
         $this->assertEquals('some/other/service/namespace/sample', $myViewModel->getTemplate());
     }
+
+    public function testPrefersRouteMatchControllerWithRouteMatchAndControllerMap()
+    {
+        $this->assertFalse($this->listener->isPreferRouteMatchController());
+        $controllerMap = [
+            'Some\Other\Service\Namespace\Controller\Sample' => 'another/sample'
+        ];
+
+        $this->routeMatch->setParam('prefer_route_match_controller', true);
+        $this->routeMatch->setParam('controller', 'Some\Other\Service\Namespace\Controller\Sample');
+
+        $preferRouteMatchControllerRouteMatchConfig = $this->routeMatch->getParam('prefer_route_match_controller', false);
+        $this->listener->setPreferRouteMatchController($preferRouteMatchControllerRouteMatchConfig);
+        $this->listener->setControllerMap($controllerMap);
+
+        $myViewModel  = new ViewModel();
+        $myController = new \ZendTest\Mvc\Controller\TestAsset\SampleController();
+
+        $this->event->setTarget($myController);
+        $this->event->setResult($myViewModel);
+        $this->listener->injectTemplate($this->event);
+
+        $this->assertEquals('another/sample', $myViewModel->getTemplate());
+    }
 }