Merge pull request #18 from Vectorface/fix-empty-needle

jdpanderson · web-flow · commit 2f2a1faaf42e · 2020-09-01T10:03:19.000-04:00
Fix for empty base path causing warnings
diff --git a/src/Vectorface/SnappyRouter/Handler/ControllerHandler.php b/src/Vectorface/SnappyRouter/Handler/ControllerHandler.php
@@ -158,7 +158,7 @@ public function setEncoder(EncoderInterface $encoder)
      */
     protected function extractPathFromBasePath($path, $options)
     {
-        if (isset($options[self::KEY_BASE_PATH])) {
+        if (!empty($options[self::KEY_BASE_PATH])) {
             $pos = strpos($path, $options[self::KEY_BASE_PATH]);
             if (false !== $pos) {
                 $path = substr($path, $pos + strlen($options[self::KEY_BASE_PATH]));

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function setEncoder(EncoderInterface $encoder)`
`158`	`158`	`*/`
`159`	`159`	`protected function extractPathFromBasePath($path, $options)`
`160`	`160`	`{`
`161`		`- if (isset($options[self::KEY_BASE_PATH])) {`
	`161`	`+ if (!empty($options[self::KEY_BASE_PATH])) {`
`162`	`162`	`$pos = strpos($path, $options[self::KEY_BASE_PATH]);`
`163`	`163`	`if (false !== $pos) {`
`164`	`164`	`$path = substr($path, $pos + strlen($options[self::KEY_BASE_PATH]));`