Merge branch 'release/0.13.1'

Author: koriym

composer.json

@@ -62,7 +62,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.12.x-dev"
+            "dev-master": "0.13.x-dev"
         }
     }
 }

composer.lock

@@ -12,15 +12,9 @@
 use Doctrine\Common\Cache\ApcCache;
 use Doctrine\Common\Cache\FilesystemCache;
 use BEAR\Package\Module\Di\DiCompilerProvider;
-use Ray\Aop\Matcher;
-use Ray\Di\AbstractModule;
-use Ray\Di\Injector;
-use Ray\Di\CacheableModule;
 use Doctrine\Common\Cache\Cache;
-use Ray\Di\CacheInjector;
-use Ray\Di\ModuleCacheInjector;
 
-class Bootstrap
+final class Bootstrap
 {
     /**
      * @param ClassLoader $loader
@@ -37,26 +31,6 @@ public static function registerLoader(ClassLoader $loader, $appName, $appDir)
         AnnotationReader::addGlobalIgnoredName('returns');
     }
 
-    /**
-     * Return compiled application instance
-     *
-     * (experimental)
-     *
-     * @param $appName
-     * @param $context
-     * @param $tmpDir
-     *
-     * @return \BEAR\Sunday\Extension\Application\AppInterface
-     */
-    public static function getCompiledApp($appName, $context, $tmpDir, Cache $cache = null)
-    {
-        $diCompiler = (new DiCompilerProvider($appName, $context, $tmpDir, $cache))->get();
-        $app = $diCompiler->getInstance('BEAR\Sunday\Extension\Application\AppInterface');
-        /** $app \BEAR\Sunday\Extension\Application\AppInterface */
-
-        return $app;
-    }
-
     /**
      * @param string $appName
      * @param string $context
@@ -67,44 +41,10 @@ public static function getCompiledApp($appName, $context, $tmpDir, Cache $cache
      */
     public static function getApp($appName, $context, $tmpDir, Cache $cache = null)
     {
-        $appModule = $appName . '\Module\AppModule';
-        $cache = $cache ?: (function_exists('apc_fetch') ? new ApcCache : new FilesystemCache($tmpDir));
-        $cacheKey = 'module-' . $appName . $context;
-        $moduleProvider = function () use ($appModule, $context) {return new $appModule($context);};
-        $injector = ModuleCacheInjector::create($moduleProvider, $cache, $cacheKey, $tmpDir);
-        $app = $injector->getInstance('BEAR\Sunday\Extension\Application\AppInterface');
-
+        $diCompiler = (new DiCompilerProvider($appName, $context, $tmpDir, $cache))->get();
+        $app = $diCompiler->getInstance('BEAR\Sunday\Extension\Application\AppInterface');
         /** $app \BEAR\Sunday\Extension\Application\AppInterface */
-        return $app;
-    }
 
-    /**
-     * Return cached application instance
-     *
-     * (experimental)
-     *
-     * @param string $appName
-     * @param string $context
-     * @param string $tmpDir
-     * @param Cache $cache
-     *
-     * @return \BEAR\Sunday\Extension\Application\AppInterface
-     */
-    public static function getCachedApp($appName, $context, $tmpDir, Cache $cache = null)
-    {
-        $appModule = $appName . '\Module\AppModule';
-        $cache = $cache ?: function_exists('apc_fetch') ? new ApcCache : new FilesystemCache($tmpDir);
-        $cacheKey = $appName . $context;
-        $initialization = function () {
-            // initialize per system startup (not per each request)
-        };
-        $injector = function () use ($appModule, $cache) {
-            return Injector::create([new $appModule], $cache,  __DIR__ . '/tmp');
-        };
-        $injector = new CacheInjector($injector, $initialization, $cacheKey, $cache);
-        $app = $injector->getInstance('BEAR\Sunday\Extension\Application\AppInterface');
-
-        /** $app \BEAR\Sunday\Extension\Application\AppInterface */
         return $app;
     }