Merge pull request #175 from bearsunday/cache

bootstrap application cache bearsunday/BEAR.Sunday#59
bearsunday · Feb 26, 2015 · 9fb49cd · 9fb49cd
2 parents 25dd2b8 + e36cd5d
commit 9fb49cd
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -8,37 +8,56 @@
 
 use BEAR\AppMeta\AbstractAppMeta;
 use BEAR\Sunday\Extension\Application\AppInterface;
+use Doctrine\Common\Cache\ApcCache;
 use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\Cache\FilesystemCache;
+use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
 
 final class Bootstrap
 {
-    const PACKAGE_MODULE_PATH = 'BEAR\Package\Context\\';
-
     /**
      * @param AbstractAppMeta $appMeta
      * @param string          $contexts
      * @param Cache           $cache
      *
      * @return AppInterface
      */
-    public function newApp(AbstractAppMeta $appMeta, $contexts, Cache $cache)
+    public function newApp(AbstractAppMeta $appMeta, $contexts, Cache $cache = null)
     {
+        if (is_null($cache)) {
+            $cache = function_exists('apc_fetch') ? new ApcCache : new FilesystemCache($appMeta->tmpDir);
+            $cache->setNamespace(filemtime($appMeta->appDir . '/src/.'));
+        }
         $app = $cache->fetch($contexts);
         if ($app) {
             return $app;
         }
-        $contextsArray = array_reverse(explode('-', $contexts));
+        $app = $this->createAppInstance($appMeta ,$contexts);
+        $cache->save($contexts, $app);
+
+        return $app;
+    }
+
+    /**
+     * @param AbstractAppMeta $appMeta
+     * @param string          $contexts
+     *
+     * @return AppInterface
+     */
+    private function createAppInstance(AbstractAppMeta $appMeta ,$contexts)
+    {
+        $contextsArray = array_reverse(explode('-' ,$contexts));
         $module = null;
         foreach ($contextsArray as $context) {
             $class = $appMeta->name . '\Module\\' . ucwords($context) . 'Module';
             if (! class_exists($class)) {
-                $class = self::PACKAGE_MODULE_PATH . ucwords($context) . 'Module';
+                $class = 'BEAR\Package\Context\\' . ucwords($context) . 'Module';
             }
-            $module =  new $class($module);
+            /** @var $module AbstractModule */
+            $module = new $class($module);
         }
-        $app = (new Injector($module, $appMeta->tmpDir))->getInstance(AppInterface::class);
-        $cache->save($contexts, $app);
+        $app = (new Injector($module ,$appMeta->tmpDir))->getInstance(AppInterface::class);
 
         return $app;
     }

diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php
@@ -5,6 +5,7 @@
 use BEAR\AppMeta\AppMeta;
 use BEAR\Sunday\Extension\Application\AppInterface;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\FilesystemCache;
 use FakeVendor\HelloWorld\Module\AppModule;
 
 class BootstrapTest extends \PHPUnit_Framework_TestCase
@@ -27,4 +28,17 @@ public function testBuiltInCliModule()
         $app = (new Bootstrap)->newApp(new AppMeta('FakeVendor\HelloWorld'), 'cli-app', new ArrayCache);
         $this->assertInstanceOf(AppInterface::class, $app);
     }
+
+    public function testContextCacheModule()
+    {
+        $app = (new Bootstrap)->newApp(new AppMeta('FakeVendor\HelloWorld'), 'app');
+        $this->assertInstanceOf(AppInterface::class, $app);
+    }
+
+    public function testCache()
+    {
+        $app1 = (new Bootstrap)->newApp(new AppMeta('FakeVendor\HelloWorld'), 'cli-app', new FilesystemCache(__DIR__ . '/tmp'));
+        $app2 = (new Bootstrap)->newApp(new AppMeta('FakeVendor\HelloWorld'), 'cli-app', new FilesystemCache(__DIR__ . '/tmp'));
+        $this->assertSame(serialize($app1), serialize($app2));
+    }
 }