Merge pull request #84 from SURFnet/maintenance/symfony-2.7

Update to Symfony 2.7 LTS
OpenConext · Jun 3, 2015 · 914a38e · 914a38e
2 parents 1c8099a + ee3a4a1
commit 914a38e
Show file tree

Hide file tree

Showing 11 changed files with 164 additions and 249 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -29,7 +29,6 @@ public function registerBundles()
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Nelmio\SecurityBundle\NelmioSecurityBundle(),

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -52,19 +52,6 @@ services:
             - [] # Allowed properties
             - [] # Allowed functions
 
-# Assetic Configuration
-assetic:
-    debug:          "%kernel.debug%"
-    use_controller: false
-    bundles:        [ ]
-    #java: /usr/bin/java
-    filters:
-        cssrewrite: ~
-        #closure:
-        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
-        #yui_css:
-        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
-
 # Doctrine Configuration
 doctrine:
     dbal:

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -45,9 +45,6 @@ monolog:
             publisher: { hostname: %graylog_hostname% }
             formatter: surfnet_stepup.monolog.full_message_exception_gelf_message_formatter
 
-assetic:
-    use_controller: "%use_assetic_controller%"
-
 swiftmailer:
     port: 1025
 

diff --git a/app/console b/app/console
@@ -17,7 +17,7 @@ $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('-
     && $env !== 'build';
 
 if ($debug) {
-    Debug::enable();
+    Debug::enable(~E_USER_DEPRECATED);
 }
 
 $kernel = new AppKernel($env, $debug);

diff --git a/app_dev.php.dist b/app_dev.php.dist
@@ -4,7 +4,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Debug\Debug;
 
 $loader = require_once __DIR__.'/../app/bootstrap.php.cache';
-Debug::enable();
+Debug::enable(~E_USER_DEPRECATED);
 
 require_once __DIR__.'/../app/AppKernel.php';
 

diff --git a/composer.json b/composer.json
@@ -13,14 +13,13 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4",
-        "symfony/symfony": "~2.6,>=2.6.6",
+        "symfony/symfony": "^2.7",
         "doctrine/dbal": "~2.5",
         "doctrine/orm": "~2.5",
         "doctrine/doctrine-bundle": "~1.4",
         "doctrine/common": "~2.5",
         "doctrine/cache": "~1.4",
         "twig/extensions": "~1.0",
-        "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
         "sensio/distribution-bundle": "~3.0",