Merge pull request #268 from FriendsOfSymfony/symfony-3

Symfony 3
FriendsOfSymfony · Dec 11, 2015 · 49e9fa1 · 49e9fa1
2 parents 3ac674a + 6381252
commit 49e9fa1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,15 +53,21 @@ matrix:
         - FRAMEWORK_EXTRA_VERSION='~3.0'
     - php: 5.6
       env:
-        - SYMFONY_VERSION='2.8.*@dev'
+        - SYMFONY_VERSION='2.8.*'
+        - FRAMEWORK_EXTRA_VERSION='~3.0'
+    - php: 5.6
+      env:
+        - SYMFONY_VERSION='3.0.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
 
 install:
   - pip install -qr Resources/doc/requirements.txt --user
 
-before_script:
+before_install:
   - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
   - sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi;'
+
+before_script:
   - composer update $COMPOSER_FLAGS
 
 script:

diff --git a/Tests/Functional/Fixtures/app/AppKernel.php b/Tests/Functional/Fixtures/app/AppKernel.php
@@ -1,6 +1,7 @@
 <?php
 
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
@@ -26,6 +27,12 @@ public function registerBundles()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/config.yml');
+
+        if (class_exists('Symfony\Component\Asset\Package')) {
+            $loader->load(function (ContainerBuilder $container) {
+                $container->loadFromExtension('framework', array('assets' => array()));
+            });
+        }
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -23,17 +23,17 @@
     "require": {
         "php": ">=5.3.3",
         "friendsofsymfony/http-cache": "~1.4",
-        "symfony/framework-bundle": "~2.3"
+        "symfony/framework-bundle": "^2.3||^3.0"
     },
     "require-dev": {
         "mockery/mockery": "0.9.*",
         "monolog/monolog": "*",
-        "sensio/framework-extra-bundle": "~2.3",
-        "symfony/symfony": "~2.3",
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/expression-language": "~2.4",
-        "symfony/monolog-bundle": "~2.3",
-        "polishsymfonycommunity/symfony-mocker-container": "~1.0",
+        "sensio/framework-extra-bundle": "^2.3||^3.0",
+        "symfony/symfony": "^2.3||^3.0",
+        "symfony/phpunit-bridge": "^2.7||^3.0",
+        "symfony/expression-language": "^2.4||^3.0",
+        "symfony/monolog-bundle": "^2.3||^3.0",
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "matthiasnoback/symfony-dependency-injection-test": "^0.7.4"
     },
     "suggest": {