[2.3] Add missing development dependencies
This commit is contained in:
parent
f5d4515200
commit
3b02af9f79
14
.travis.yml
14
.travis.yml
|
@ -11,9 +11,16 @@ php:
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- php: hhvm-nightly
|
- php: hhvm-nightly
|
||||||
|
include:
|
||||||
|
- php: 5.5
|
||||||
|
env: components=yes
|
||||||
|
|
||||||
services: mongodb
|
services: mongodb
|
||||||
|
|
||||||
|
env:
|
||||||
|
global:
|
||||||
|
- components=no
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- travis_retry sudo apt-get install parallel
|
- travis_retry sudo apt-get install parallel
|
||||||
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
|
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
|
||||||
|
@ -25,8 +32,9 @@ before_install:
|
||||||
# - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
|
# - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source install
|
- sh -c 'if [ "$components" = "no" ]; then sh -c "COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install"; fi;'
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};'
|
- sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark {};'\''"; fi;'
|
||||||
- echo "Running tests requiring tty"; phpunit --group tty
|
- sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;'
|
||||||
|
- sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark;'\''"; fi;'
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
"symfony/form": "~2.2",
|
"symfony/form": "~2.2",
|
||||||
"symfony/http-kernel": "~2.2",
|
"symfony/http-kernel": "~2.2",
|
||||||
"symfony/security": "~2.2",
|
"symfony/security": "~2.2",
|
||||||
"symfony/validator": "~2.2",
|
"symfony/validator": "~2.3.0",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.2",
|
"doctrine/dbal": "~2.2",
|
||||||
"doctrine/orm": "~2.2,>=2.2.3"
|
"doctrine/orm": "~2.2,>=2.2.3"
|
||||||
|
|
|
@ -20,6 +20,9 @@
|
||||||
"symfony/dependency-injection": "~2.3",
|
"symfony/dependency-injection": "~2.3",
|
||||||
"ocramius/proxy-manager": ">=0.3.1,<0.4-dev"
|
"ocramius/proxy-manager": ">=0.3.1,<0.4-dev"
|
||||||
},
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"symfony/config": "2.3"
|
||||||
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-0": {
|
"psr-0": {
|
||||||
"Symfony\\Bridge\\ProxyManager\\": ""
|
"Symfony\\Bridge\\ProxyManager\\": ""
|
||||||
|
|
|
@ -29,11 +29,15 @@
|
||||||
"doctrine/common": "~2.2"
|
"doctrine/common": "~2.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"symfony/browser-kit": "~2.3",
|
||||||
|
"symfony/console": "~2.0",
|
||||||
"symfony/finder": "~2.0",
|
"symfony/finder": "~2.0",
|
||||||
"symfony/security": "~2.3",
|
"symfony/security": "~2.3",
|
||||||
"symfony/form": "~2.3",
|
"symfony/form": "~2.3.0",
|
||||||
"symfony/class-loader": "~2.1",
|
"symfony/class-loader": "~2.1",
|
||||||
"symfony/validator": "~2.1"
|
"symfony/process": "~2.0",
|
||||||
|
"symfony/validator": "~2.1",
|
||||||
|
"symfony/yaml": "~2.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/console": "",
|
"symfony/console": "",
|
||||||
|
|
|
@ -21,9 +21,12 @@
|
||||||
"symfony/http-kernel": "~2.2"
|
"symfony/http-kernel": "~2.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"symfony/browser-kit": "~2.3",
|
||||||
|
"symfony/form": "~2.3",
|
||||||
"symfony/framework-bundle": "~2.2",
|
"symfony/framework-bundle": "~2.2",
|
||||||
"symfony/twig-bundle": "~2.2",
|
"symfony/twig-bundle": "~2.2",
|
||||||
"symfony/form": "~2.1",
|
"symfony/form": "~2.1",
|
||||||
|
"symfony/process": "~2.0",
|
||||||
"symfony/validator": "~2.2",
|
"symfony/validator": "~2.2",
|
||||||
"symfony/yaml": "~2.0"
|
"symfony/yaml": "~2.0"
|
||||||
},
|
},
|
||||||
|
|
|
@ -11,12 +11,11 @@
|
||||||
|
|
||||||
namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
|
namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
|
||||||
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
|
|
||||||
use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
|
use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
|
||||||
use Symfony\Component\HttpKernel\Profiler\Profile;
|
use Symfony\Component\HttpKernel\Profiler\Profile;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
class ProfilerControllerTest extends TestCase
|
class ProfilerControllerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @dataProvider getEmptyTokenCases
|
* @dataProvider getEmptyTokenCases
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/config": "~2.2",
|
"symfony/config": "~2.2",
|
||||||
|
"symfony/console": "~2.3",
|
||||||
"symfony/dependency-injection": "~2.0",
|
"symfony/dependency-injection": "~2.0",
|
||||||
"symfony/stopwatch": "~2.2"
|
"symfony/stopwatch": "~2.2"
|
||||||
},
|
},
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
"symfony/property-access": "~2.3"
|
"symfony/property-access": "~2.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/validator": "~2.2",
|
"doctrine/collections": "~1.0",
|
||||||
|
"symfony/validator": "~2.3.0",
|
||||||
"symfony/http-foundation": "~2.2"
|
"symfony/http-foundation": "~2.2"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/config": "~2.2",
|
"symfony/config": "~2.2",
|
||||||
|
"symfony/http-foundation": "~2.3",
|
||||||
"symfony/yaml": "~2.0",
|
"symfony/yaml": "~2.0",
|
||||||
"doctrine/common": "~2.2",
|
"doctrine/common": "~2.2",
|
||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0"
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/config": "~2.0",
|
"symfony/config": "~2.0",
|
||||||
|
"symfony/intl": "~2.3",
|
||||||
"symfony/yaml": "~2.2"
|
"symfony/yaml": "~2.2"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
|
Reference in New Issue