tests added (ViewRenderer#extractControllerName) (#60)

* tests added (ViewRenderer#extractControllerName)

* fix tests

* fix

* .editorconfig

* changelog

* Update CHANGELOG.md

Co-authored-by: Alexander Makarov <[email protected]>

* Update tests/ViewRendererTest.php

* Update tests/ViewRendererTest.php

* Update tests/ViewRendererTest.php

* Update tests/ViewRendererTest.php

Co-authored-by: Sergei Predvoditelev <[email protected]>
Co-authored-by: Sergei Predvoditelev <[email protected]>
Co-authored-by: Alexander Makarov <[email protected]>
Co-authored-by: Alexey Rogachev <[email protected]>

Author: 4 people

.editorconfig

@@ -10,6 +10,10 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
+[*.php]
+ij_php_space_before_short_closure_left_parenthesis = true
+ij_php_space_after_type_cast = true
+
 [*.md]
 trim_trailing_whitespace = false
 

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 5.0.1 under development
 
-- no changes in this release.
+- Bug #61: Fixed getting incorrect controller name based on controller instance (@vjik, @kamarton)
 
 ## 5.0.0 July 23, 2022
 

src/ViewRenderer.php

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

tests/Support/Controller/SubNamespace/FakeController.php

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

tests/Support/Controller/SubNamespace/SubNamespace2/FakeController.php

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

tests/Support/Controllers/SubNamespace/FakeController.php

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

tests/Support/Controllers/SubNamespace/SubNamespace2/FakeController.php

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

tests/Support/FakeCntrl.php

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

tests/Support/NotCntrls/SubNamespace/FakeCntrl.php

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

tests/Support/NotCntrls/SubNamespace/FakeController.php

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