Merge branch 'release/3.0.2'

terramar-labs · Dec 17, 2014 · 54ad942 · 54ad942
2 parents 786057c + aacbac5
commit 54ad942
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "3.0-dev"
+      "dev-develop": "3.0-dev",
+      "dev-2-1-develop": "2.1-dev"
     }
   },
   "minimum-stability": "beta",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Application.php b/src/Application.php
@@ -15,7 +15,6 @@
 use Nice\Extension\SessionExtension;
 use Nice\Extension\TwigExtension;
 use Symfony\Component\Yaml\Yaml;
-use Terramar\Packages\DependencyInjection\Compiler\TwigExtensionPass;
 use Terramar\Packages\DependencyInjection\PackagesExtension;
 use Terramar\Packages\Plugin\GitLab\Plugin as GitLabPlugin;
 use Terramar\Packages\Plugin\Satis\Plugin as SatisPlugin;
@@ -61,8 +60,6 @@ protected function registerDefaultExtensions()
                 'firewall' => '^/manage',
                 'success_path' => '/manage'
             )));
-
-        $this->addCompilerPass(new TwigExtensionPass());
     }
 
     /**

diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
@@ -20,7 +20,11 @@ class DefaultController
     public function indexAction(Application $app, Request $request)
     {
         $rootDir = $app->getRootDir();
-        $mtime = new \DateTime('@' . filemtime($rootDir . '/web/packages.json'));
+        $packagesJson = $rootDir . '/web/packages.json';
+        $mtime = null;
+        if (file_exists($packagesJson)) {
+            $mtime = new \DateTime('@' . filemtime($packagesJson));
+        }
 
         return new Response(
             $app->get('twig')->render('Default/index.html.twig', array(

diff --git a/src/DependencyInjection/Compiler/TwigExtensionPass.php b/src/DependencyInjection/Compiler/TwigExtensionPass.php
diff --git a/src/DependencyInjection/PackagesExtension.php b/src/DependencyInjection/PackagesExtension.php
@@ -107,7 +107,8 @@ public function load(array $configs, ContainerBuilder $container)
                     'request',
                     ContainerInterface::NULL_ON_INVALID_REFERENCE,
                     false
-                )));
+                )))
+            ->addTag('twig.extension');
 
         $container->register('packages.fragment_handler.uri_signer', 'Symfony\Component\HttpKernel\UriSigner')
             ->addArgument('');

diff --git a/src/Version.php b/src/Version.php
@@ -11,5 +11,5 @@
 
 class Version
 {
-    const VERSION = '3.0.1';
+    const VERSION = '3.0.2';
 }