AgnosticRouter

ProklUng · Jul 25, 2021 · 930d125 · 930d125
1 parent 96412a1
commit 930d125
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/Services/Utils/BitrixRouteConvertor.php b/Services/Utils/BitrixRouteConvertor.php
@@ -162,7 +162,14 @@ private function parseControllerString(string $name, $controller) : array
             }
         }
 
-        if (is_array($controller)) {
+        if (is_array($controller) && count($controller) > 0) {
+            if (!array_key_exists(1, $controller)) {
+                // Invoke controller (не поддерживается).
+                throw new LogicException(
+                    sprintf('Route %s. Invokable controller %s not supporting.', $name, $controller[0])
+                );
+            }
+
             if (strpos($controller[1], 'Action') === false) {
                 // В методе контроллера обязательно должно содержаться Action
                 // (особенность битриксовых контроллеров)

diff --git a/Tests/Cases/BitrixRouteConvertorTest.php b/Tests/Cases/BitrixRouteConvertorTest.php
@@ -104,6 +104,40 @@ public function testParseControllerStringInvalidArray() : void
         );
     }
 
+    /**
+     * parseControllerString(). Пустой массив.
+     *
+     * @return void
+     * @throws ReflectionException
+     */
+    public function testParseControllerStringEmptyArray() : void
+    {
+        $this->expectException(LogicException::class);
+
+        PHPUnitUtils::callMethod(
+            $this->obTestObject,
+            'parseControllerString',
+            ['fooName', []]
+        );
+    }
+
+    /**
+     * parseControllerString(). Массив. Invokable.
+     *
+     * @return void
+     * @throws ReflectionException
+     */
+    public function testParseControllerStringArrayInvokable() : void
+    {
+        $this->expectException(LogicException::class);
+
+        PHPUnitUtils::callMethod(
+            $this->obTestObject,
+            'parseControllerString',
+            ['fooName', ['Controller']]
+        );
+    }
+
     /**
      * parseControllerString(). Массив.
      *