Fix in $context->get() when no appDir is specified.

bearframework · May 31, 2018 · 9aa2dcf · 9aa2dcf
1 parent 354974e
commit 9aa2dcf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/App/ContextsRepository.php b/src/App/ContextsRepository.php
@@ -44,7 +44,7 @@ public function get(string $filename)
         $matchedDir = null;
         for ($i = 0; $i < 2; $i++) { // first try - check cache, second try - update cache and check again
             foreach (self::$dirsCache as $dir) {
-                if (substr($filename, 0, $dir[1]) === $dir[0] || $dir[0] === $filename . DIRECTORY_SEPARATOR) {
+                if ($dir[1] > 0 && (substr($filename, 0, $dir[1]) === $dir[0] || $dir[0] === $filename . DIRECTORY_SEPARATOR)) {
                     $matchedDir = $dir[0];
                     break;
                 }

diff --git a/tests/ContextTest.php b/tests/ContextTest.php
@@ -96,6 +96,26 @@ public function testAddonContext()
 //        $this->assertTrue($content === 'data:image/svg+xml;base64,c2FtcGxlLXN2Zy1jb250ZW50');
     }
 
+    /**
+     * 
+     */
+    public function testAddonContextWithNoAppContext()
+    {
+        $app = $this->getApp(['appDir' => null]);
+        $addonDir = $app->config->addonsDir . DIRECTORY_SEPARATOR . 'tempaddon' . uniqid() . DIRECTORY_SEPARATOR;
+
+        $this->createFile($addonDir . 'index.php', '<?php ');
+
+        BearFramework\Addons::register('tempaddon', $addonDir);
+        $app->addons->add('tempaddon');
+
+        $context = $app->context->get($addonDir . 'index.php');
+        $this->assertTrue($context->dir === rtrim($addonDir, DIRECTORY_SEPARATOR));
+
+        $context = $app->context->get($addonDir);
+        $this->assertTrue($context->dir === rtrim($addonDir, DIRECTORY_SEPARATOR));
+    }
+
     /**
      * 
      */