#61 tests added and fix more bugs (ViewRenderer#extractControllerName) (

#63)

src/ViewRenderer.php

@@ -529,7 +529,7 @@ private function extractControllerName(object $controller): string
             return $cache[$class];
         }
 
-        $regexp = '/((?<=controller\\\|controllers\\\)(?:[\w\\\]+)|(?:[a-z]+))controller/iuU';
+        $regexp = '/((?<=controller\\\|controllers\\\)(?:[\w\\\]+)|(?:[a-z\d]+))controller$/iU';
         if (!preg_match($regexp, $class, $m) || empty($m[1])) {
             throw new RuntimeException('Cannot detect controller name.');
         }

tests/Support/Controller/Sub8Namespace/FakeController.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\View\Tests\Support\Controller\Sub8Namespace;
+
+final class FakeController
+{
+}

tests/Support/Controller/SubNamespace/SubController/FakeCntrl.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\View\Tests\Support\Controller\SubNamespace\SubController;
+
+final class FakeCntrl
+{
+}

tests/Support/Controllers/FakeCntrl.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\View\Tests\Support\Controllers;
+
+final class FakeCntrl
+{
+}

tests/Support/FakeCntrl.php

@@ -4,6 +4,6 @@
 
 namespace Yiisoft\Yii\View\Tests\Support;
 
-final class FakeCntrl
+class FakeCntrl
 {
 }

tests/ViewRendererTest.php

@@ -203,6 +203,18 @@ public function dataWithController(): array
                 new Support\NotCntrls\SubNamespace\FakeController(),
                 '/fake',
             ],
+            'controller name with root namespace' => [
+                $this->getMockBuilder('\stdClass')->setMockClassName('FakeController')->getMock(),
+                '/fake',
+            ],
+            'controller class contains number' => [
+                $this->getMockBuilder('\stdClass')->setMockClassName('Fake8Controller')->getMock(),
+                '/fake8',
+            ],
+            'namespace contains number' => [
+                new Support\Controller\Sub8Namespace\FakeController(),
+                '/sub8namespace/fake',
+            ],
         ];
     }
 
@@ -231,8 +243,12 @@ public function testTwiceWithController(): void
     public function dataWithIncorrectController(): array
     {
         return [
-            'stdClass' => [new stdClass()],
-            'withNamespace' => [new FakeCntrl()],
+            'root namespace' => [new stdClass()],
+            'with namespace' => [new FakeCntrl()],
+            'with controllers namespace' => [new Support\Controllers\FakeCntrl()],
+            'with controller namespace and subnamespace, classname not ends with "Controller"' => [
+                new Support\Controller\SubNamespace\SubController\FakeCntrl(),
+            ],
         ];
     }