Explorar o código

Update dependencies

Thomas Rabaix %!s(int64=13) %!d(string=hai) anos
pai
achega
510778ef17
Modificáronse 3 ficheiros con 6 adicións e 6 borrados
  1. 2 2
      .travis.yml
  2. 1 1
      Tests/tests/vendors.php
  3. 3 3
      composer.json

+ 2 - 2
.travis.yml

@@ -4,8 +4,8 @@ php:
   # - 5.4
   # - 5.4
 
 
 env:
 env:
-  - SYMFONY_VERSION=v2.0.6
-  - SYMFONY_VERSION=origin/master
+  - SYMFONY_VERSION=v2.0.12
+  - SYMFONY_VERSION=origin/2.0
 
 
 before_script: php Tests/tests/vendors.php
 before_script: php Tests/tests/vendors.php
 script: phpunit
 script: phpunit

+ 1 - 1
Tests/tests/vendors.php

@@ -11,7 +11,7 @@ if (!is_dir($vendorDir)) {
 
 
 $deps = array(
 $deps = array(
     array('symfony', 'git://github.com/symfony/symfony.git', isset($_SERVER['SYMFONY_VERSION']) ? $_SERVER['SYMFONY_VERSION'] : 'origin/master'),
     array('symfony', 'git://github.com/symfony/symfony.git', isset($_SERVER['SYMFONY_VERSION']) ? $_SERVER['SYMFONY_VERSION'] : 'origin/master'),
-    array('Sonata/AdminBundle', 'git://github.com/sonata-project/SonataAdminBundle.git', 'origin/master'),
+    array('Sonata/AdminBundle', 'git://github.com/sonata-project/SonataAdminBundle.git', 'origin/2.0'),
     array('doctrine', 'git://github.com/doctrine/doctrine2.git', 'origin/master'),
     array('doctrine', 'git://github.com/doctrine/doctrine2.git', 'origin/master'),
     array('doctrine-common', 'git://github.com/doctrine/common.git', 'origin/master'),
     array('doctrine-common', 'git://github.com/doctrine/common.git', 'origin/master'),
     array('knpmenu', 'git://github.com/KnpLabs/KnpMenu.git', 'origin/master')
     array('knpmenu', 'git://github.com/KnpLabs/KnpMenu.git', 'origin/master')

+ 3 - 3
composer.json

@@ -18,9 +18,9 @@
     ],
     ],
     "require": {
     "require": {
         "php": ">=5.3.2",
         "php": ">=5.3.2",
-        "sonata-project/admin-bundle": "*",
-        "symfony/framework-bundle": "2.*",
-        "symfony/security-bundle": "2.*"
+        "sonata-project/admin-bundle": "2.0.*",
+        "symfony/framework-bundle": "2.0.*",
+        "symfony/security-bundle": "2.0.*"
     },
     },
     "autoload": {
     "autoload": {
         "psr-0": { "Sonata\\DoctrineORMAdminBundle": "" }
         "psr-0": { "Sonata\\DoctrineORMAdminBundle": "" }