diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'symfony/2.3' into lowest-25

Browse Source 
* symfony/2.3:
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
This commit is contained in:
Nicolas Grekas 2014-12-15 19:38:14 +01:00
commit 88d524e541
20 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -13,7 +13,9 @@ matrix:
- php: hhvm-nightly
include:
- php: 5.5
env: components=yes
env: components=high
- php: 5.3.3
env: components=low
services: mongodb
@ -23,6 +25,7 @@ env:
before_install:
- travis_retry sudo apt-get install parallel
- composer self-update
- 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 "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
@ -37,4 +40,5 @@ install:
script:
- sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark,intl-data {};'\''"; fi;'
- 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,intl-data;'\''"; fi;'
- sh -c 'if [ "$components" = "high" ]; 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,intl-data;'\''"; fi;'
- sh -c 'if [ "$components" = "low" ]; 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 --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'\''"; fi;'

8
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -17,16 +17,18 @@
],
"require": {
"php": ">=5.3.3",
"doctrine/common": "~2.2"
"doctrine/common": "~2.3"
},
"require-dev": {
"symfony/stopwatch": "~2.2",
"symfony/dependency-injection": "~2.0",
"symfony/form": "~2.2",
"symfony/dependency-injection": "~2.0,>=2.0.5",
"symfony/form": "~2.3,>=2.3.8",
"symfony/http-kernel": "~2.2",
"symfony/property-access": "~2.3",
"symfony/security": "~2.2",
"symfony/expression-language": "~2.2",
"symfony/validator": "~2.4",
"symfony/translation": "~2.0,>=2.0.5",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.2",
"doctrine/orm": "~2.2,>=2.2.3"

9
src/Symfony/Bridge/Propel1/composer.json
View File

@ -17,10 +17,11 @@
],
"require": {
"php": ">=5.3.3",
"symfony/http-foundation": "~2.0",
"symfony/http-kernel": "~2.0",
"symfony/form": "~2.2",
"propel/propel1": "~1.6"
"symfony/http-foundation": "~2.0,>=2.0.5",
"symfony/http-kernel": "~2.0,>=2.0.5",
"symfony/form": "~2.3,>=2.3.8",
"symfony/property-access": "~2.3",
"propel/propel1": "~1.6,>=1.6.5"
},
"require-dev": {
"symfony/stopwatch": "~2.2"

9
src/Symfony/Bridge/Twig/composer.json
View File

@ -18,16 +18,17 @@
"require": {
"php": ">=5.3.3",
"symfony/security-csrf": "~2.4",
"twig/twig": "~1.12"
"twig/twig": "~1.12,>=1.12.3"
},
"require-dev": {
"symfony/finder": "~2.3",
"symfony/form": "~2.5,<2.6.0",
"symfony/http-kernel": "~2.2",
"symfony/form": "2.5.*",
"symfony/http-kernel": "~2.3",
"symfony/locale": "~2.0,>=2.0.5",
"symfony/routing": "~2.2",
"symfony/templating": "~2.1",
"symfony/translation": "~2.2",
"symfony/yaml": "~2.0",
"symfony/yaml": "~2.0,>=2.0.5",
"symfony/security": "~2.4",
"symfony/stopwatch": "~2.2",
"symfony/console": "~2.2",

16
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"symfony/dependency-injection" : "~2.2",
"symfony/dependency-injection" : "~2.3",
"symfony/config" : "~2.4",
"symfony/event-dispatcher": "~2.5",
"symfony/http-foundation": "~2.4",
@ -28,20 +28,24 @@
"symfony/security-csrf": "~2.4",
"symfony/stopwatch": "~2.3",
"symfony/templating": "~2.1",
"symfony/translation": "~2.3",
"symfony/translation": "~2.3,>=2.3.19",
"doctrine/annotations": "~1.0"
},
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/console": "~2.0",
"symfony/finder": "~2.0",
"symfony/console": "~2.3",
"symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dom-crawler": "~2.0,>=2.0.5",
"symfony/finder": "~2.0,>=2.0.5",
"symfony/locale": "~2.0,>=2.0.5",
"symfony/security": "~2.4",
"symfony/form": "2.5.*",
"symfony/class-loader": "~2.1",
"symfony/expression-language": "~2.4",
"symfony/process": "~2.0",
"symfony/process": "~2.0,>=2.0.5",
"symfony/validator": "~2.5",
"symfony/yaml": "~2.0"
"symfony/yaml": "~2.0,>=2.0.5"
"doctrine/common": "~2.2"
},
"suggest": {
"symfony/console": "For using the console commands",

13
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -22,13 +22,20 @@
},
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.3",
"symfony/dom-crawler": "~2.0,>=2.0.5",
"symfony/form": "~2.3",
"symfony/framework-bundle": "~2.2,<2.6.0",
"symfony/http-foundation": "~2.3",
"symfony/twig-bundle": "~2.2",
"symfony/process": "~2.0",
"symfony/twig-bridge": "~2.2,>=2.2.6",
"symfony/form": "~2.3",
"symfony/process": "~2.0,>=2.0.5",
"symfony/validator": "~2.2",
"symfony/yaml": "~2.0",
"symfony/expression-language": "~2.4"
"symfony/yaml": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.4",
"twig/twig": "~1.12"
},
"autoload": {
"psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" }

2
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -23,7 +23,7 @@
},
"require-dev": {
"symfony/stopwatch": "~2.2",
"symfony/dependency-injection": "~2.0",
"symfony/dependency-injection": "~2.2",
"symfony/expression-language": "~2.4",
"symfony/config": "~2.2",
"symfony/routing": "~2.1",

2
src/Symfony/Bundle/WebProfilerBundle/composer.json
View File

@ -24,7 +24,7 @@
"require-dev": {
"symfony/config": "~2.2",
"symfony/console": "~2.3",
"symfony/dependency-injection": "~2.0",
"symfony/dependency-injection": "~2.2",
"symfony/stopwatch": "~2.2"
},
"autoload": {

6
src/Symfony/Component/BrowserKit/composer.json
View File

@ -17,11 +17,11 @@
],
"require": {
"php": ">=5.3.3",
"symfony/dom-crawler": "~2.0"
"symfony/dom-crawler": "~2.0,>=2.0.5"
},
"require-dev": {
"symfony/process": "~2.0",
"symfony/css-selector": "~2.0"
"symfony/process": "~2.0,>=2.0.5",
"symfony/css-selector": "~2.0,>=2.0.5"
},
"suggest": {
"symfony/process": ""

2
src/Symfony/Component/ClassLoader/composer.json
View File

@ -20,7 +20,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/finder": "~2.0"
"symfony/finder": "~2.0,>=2.0.5"
},
"autoload": {
"psr-0": { "Symfony\\Component\\ClassLoader\\": "" }

2
src/Symfony/Component/Debug/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/http-kernel": "~2.1",
"symfony/http-kernel": "~2.2",
"symfony/http-foundation": "~2.1"
},
"suggest": {

2
src/Symfony/Component/DependencyInjection/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/yaml": "~2.0",
"symfony/yaml": "~2.1",
"symfony/config": "~2.2",
"symfony/expression-language": "~2.4"
},

2
src/Symfony/Component/DomCrawler/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/css-selector": "~2.0"
"symfony/css-selector": "~2.0,>=2.0.5"
},
"suggest": {
"symfony/css-selector": ""

4
src/Symfony/Component/EventDispatcher/composer.json
View File

@ -19,8 +19,8 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/dependency-injection": "~2.0,<2.6.0",
"symfony/config": "~2.0",
"symfony/dependency-injection": "~2.0,>=2.0.5,<2.6.0",
"symfony/config": "~2.0,>=2.0.5",
"symfony/stopwatch": "~2.2",
"psr/log": "~1.0"
},

3
src/Symfony/Component/Form/composer.json
View File

@ -23,11 +23,12 @@
"symfony/property-access": "~2.3"
},
"require-dev": {
"doctrine/collections": "~1.0",
"symfony/validator": "~2.5",
"symfony/http-foundation": "~2.2",
"symfony/http-kernel": "~2.4",
"symfony/security-csrf": "~2.4",
"doctrine/collections": "~1.0"
"symfony/translation": "~2.0,>=2.0.5"
},
"suggest": {
"symfony/validator": "For form validation.",

14
src/Symfony/Component/HttpKernel/composer.json
View File

@ -23,16 +23,18 @@
"psr/log": "~1.0"
},
"require-dev": {
"symfony/browser-kit": "~2.2",
"symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.1",
"symfony/config": "~2.0",
"symfony/config": "~2.0,>=2.0.5",
"symfony/console": "~2.2",
"symfony/dependency-injection": "~2.0",
"symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.2",
"symfony/dom-crawler": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.4",
"symfony/finder": "~2.0",
"symfony/process": "~2.0",
"symfony/finder": "~2.0,>=2.0.5",
"symfony/process": "~2.0,>=2.0.5",
"symfony/routing": "~2.2",
"symfony/stopwatch": "~2.2",
"symfony/stopwatch": "~2.3",
"symfony/templating": "~2.2"
},
"suggest": {

3
src/Symfony/Component/Routing/composer.json
View File

@ -21,9 +21,10 @@
"require-dev": {
"symfony/config": "~2.2",
"symfony/http-foundation": "~2.3",
"symfony/yaml": "~2.0",
"symfony/yaml": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.4",
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0"
},
"suggest": {

3
src/Symfony/Component/Security/composer.json
View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"symfony/event-dispatcher": "~2.1",
"symfony/event-dispatcher": "~2.2",
"symfony/http-foundation": "~2.1",
"symfony/http-kernel": "~2.4"
},
@ -28,6 +28,7 @@
"symfony/security-http": "self.version"
},
"require-dev": {
"symfony/locale": "~2.0,>=2.0.5",
"symfony/routing": "~2.2",
"symfony/validator": "~2.2,<2.5.0",
"doctrine/common": "~2.2",

2
src/Symfony/Component/Translation/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/config": "~2.0",
"symfony/config": "~2.3,>=2.3.12",
"symfony/intl": "~2.3",
"symfony/yaml": "~2.2"
},

7
src/Symfony/Component/Validator/composer.json
View File

@ -17,19 +17,18 @@
],
"require": {
"php": ">=5.3.3",
"symfony/translation": "~2.0"
"symfony/translation": "~2.0,>=2.0.5"
},
"require-dev": {
"symfony/http-foundation": "~2.1",
"symfony/intl": "~2.3",
"symfony/yaml": "~2.0",
"symfony/yaml": "~2.0,>=2.0.5",
"symfony/config": "~2.2",
"symfony/property-access": "~2.2",
"symfony/expression-language": "~2.4",
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"egulias/email-validator": "~1.0",
"symfony/expression-language": "~2.4"
"egulias/email-validator": "~1.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",