8000 Merge branch '2.6' into 2.7 · symfony/symfony@176b175 · GitHub
[go: up one dir, main page]
Skip to content

Commit 176b175

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.6' into 2.7
* 2.6: [2.6] Test lowest versions of dependencies Test lowest versions of dependencies Fix placeholder date format Test components using their lowest possible deps
2 parents 5fc4f27 + ef83a6c commit 176b175

File tree

24 files changed

+99
-76
lines changed

24 files changed

+99
-76
lines changed

‎.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ matrix:
1313
- php: hhvm-nightly
1414
include:
1515
- php: 5.5
16-
env: components=yes
16+
env: components=high
17+
- php: 5.3.3
18+
env: components=low
1719

1820
services: mongodb
1921

@@ -23,6 +25,7 @@ env:
2325

2426
before_install:
2527
- travis_retry sudo apt-get install parallel
28+
- composer self-update
2629
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
2730
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2831
- 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:
3740
script:
3841
- 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;'
3942
- sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;'
40-
- 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;'
43+
- 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;'
44+
- 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;'

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"doctrine/common": "~2.2"
20+
"doctrine/common": "~2.3"
2121
},
2222
"require-dev": {
2323
"symfony/stopwatch": "~2.2",
24-
"symfony/dependency-injection": "~2.0",
25-
"symfony/form": "~2.2",
24+
"symfony/dependency-injection": "~2.2",
25+
"symfony/form": "~2.3,>=2.3.8",
2626
"symfony/http-kernel": "~2.2",
27+
"symfony/property-access": "~2.3",
2728
"symfony/security": "~2.2",
2829
"symfony/expression-language": "~2.2",
29-
"symfony/validator": "~2.4",
30+
"symfony/validator": "~2.5,>=2.5.5",
31+
"symfony/translation": "~2.0,>=2.0.5",
3032
"doctrine/data-fixtures": "1.0.*",
3133
"doctrine/dbal": "~2.2",
3234
"doctrine/orm": "~2.2,>=2.2.3"

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"monolog/monolog": "~1.11"
2121
},
2222
"require-dev": {
23-
"symfony/http-kernel": "~2.2",
24-
"symfony/console": "~2.3",
23+
"symfony/http-kernel": "~2.4",
24+
"symfony/console": "~2.4",
2525
"symfony/event-dispatcher": "~2.2"
2626
},
2727
"suggest": {

‎src/Symfony/Bridge/Propel1/composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/http-foundation": "~2.0",
21-
"symfony/http-kernel": "~2.0",
22-
"symfony/form": "~2.2",
23-
"propel/propel1": "~1.6"
20+
"symfony/http-foundation": "~2.0,>=2.0.5",
21+
"symfony/http-kernel": "~2.0,>=2.0.5",
22+
"symfony/form": "~2.3,>=2.3.8",
23+
"symfony/property-access": "~2.3",
24+
"propel/propel1": "~1.6,>=1.6.5"
2425
},
2526
"require-dev": {
2627
"symfony/stopwatch": "~2.2"

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818
"require": {
1919
"php": ">=5.3.3",
2020
"symfony/security-csrf": "~2.4",
21-
"twig/twig": "~1.12"
21+
"twig/twig": "~1.13,>=1.13.1"
2222
},
2323
"require-dev": {
2424
"symfony/finder": "~2.3",
2525
"symfony/form": "~2.6",
26-
"symfony/http-kernel": "~2.2",
26+
"symfony/http-kernel": "~2.3",
27+
"symfony/locale": "~2.0,>=2.0.5",
2728
"symfony/routing": "~2.2",
2829
"symfony/templating": "~2.1",
2930
"symfony/translation": "~2.2",
30-
"symfony/yaml": "~2.0",
31+
"symfony/yaml": "~2.0,>=2.0.5",
3132
"symfony/security": "~2.4",
3233
"symfony/stopwatch": "~2.2",
33-
"symfony/console": "~2.2",
34+
"symfony/console": "~2.4",
3435
"symfony/var-dumper": "~2.6",
3536
"symfony/expression-language": "~2.4"
3637
},

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,34 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/dependency-injection" : "~2.2",
20+
"symfony/dependency-injection" : "~2.5,>=2.5.3",
2121
"symfony/config" : "~2.4",
2222
"symfony/event-dispatcher": "~2.5",
23-
"symfony/http-foundation": "~2.4",
23+
"symfony/http-foundation": "~2.4,>=2.4.9",
2424
"symfony/http-kernel": "~2.6",
2525
"symfony/filesystem": "~2.3",
2626
"symfony/routing": "~2.2",
27-
"symfony/security-core": "~2.4",
28-
"symfony/security-csrf": "~2.4",
27+
"symfony/security-core": "~2.6",
28+
"symfony/security-csrf": "~2.6",
2929
"symfony/stopwatch": "~2.3",
3030
"symfony/templating": "~2.1",
31-
"symfony/translation": "~2.3",
31+
"symfony/translation": "~2.6",
3232
"doctrine/annotations": "~1.0"
3333
},
3434
"require-dev": {
35-
"symfony/browser-kit": "~2.3",
36-
"symfony/console": "~2.0",
37-
"symfony/finder": "~2.0",
38-
"symfony/security": "~2.4",
35+
"symfony/browser-kit": "~2.4",
36+
"symfony/console": "~2.4,>=2.4.8",
37+
"symfony/css-selector": "~2.0,>=2.0.5",
38+
"symfony/dom-crawler": "~2.0,>=2.0.5",
39+
"symfony/finder": "~2.0,>=2.0.5",
40+
"symfony/locale": "~2.0,>=2.0.5",
41+
"symfony/security": "~2.6",
3942
"symfony/form": "~2.6",
4043
"symfony/class-loader": "~2.1",
4144
"symfony/expression-language": "~2.4",
42-
"symfony/process": "~2.0",
45+
"symfony/process": "~2.0,>=2.0.5",
4346
"symfony/validator": "~2.5",
44-
"symfony/yaml": "~2.0"
47+
"symfony/yaml": "~2.0,>=2.0.5"
4548
},
4649
"suggest": {
4750
"symfony/console": "For using the console commands",

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,22 @@
2121
"symfony/http-kernel": "~2.2"
2222
},
2323
"require-dev": {
24-
"symfony/browser-kit": "~2.3",
24+
"symfony/browser-kit": "~2.4",
2525
"symfony/console": "~2.3",
26-
"symfony/form": "~2.3",
27-
"symfony/framework-bundle": "~2.2,<2.6.0",
26+
"symfony/css-selector": "~2.0,>=2.0.5",
27+
"symfony/dependency-injection": "~2.3",
28+
"symfony/dom-crawler": "~2.0,>=2.0.5",
29+
"symfony/form": "~2.4",
30+
"symfony/framework-bundle": "~2.6",
31+
"symfony/http-foundation": "~2.3",
2832
"symfony/twig-bundle": "~2.2",
29-
"symfony/process": "~2.0",
30-
"symfony/validator": "~2.2",
31-
"symfony/yaml": "~2.0",
32-
"symfony/expression-language": "~2.4",
33-
"doctrine/doctrine-bundle": "~1.2"
33+
"symfony/twig-bridge": "~2.2,>=2.2.6",
34+
"symfony/process": "~2.0,>=2.0.5",
35+
"symfony/validator": "~2.5",
36+
"symfony/yaml": "~2.0,>=2.0.5",
37+
"symfony/expression-language": "~2.6",
38+
"doctrine/doctrine-bundle": "~1.2",
39+
"twig/twig": "~1.12"
3440
},
3541
"autoload": {
3642
"psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" }

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/twig-bridge": "~2.5",
20+
"symfony/twig-bridge": "~2.6",
2121
"symfony/http-foundation": "~2.5",
2222
"symfony/http-kernel": "~2.1"
2323
},
2424
"require-dev": {
2525
"symfony/stopwatch": "~2.2",
26-
"symfony/dependency-injection": "~2.0",
26+
"symfony/dependency-injection": "~2.2",
2727
"symfony/expression-language": "~2.4",
2828
"symfony/config": "~2.2",
2929
"symfony/routing": "~2.1",

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<input type="text" name="token" id="token" value="{{ token }}" placeholder="e.g. 1f321b">
2222
<div class="clear-fix"></div>
2323
<label for="start">From</label>
24-
<input type="date" name="start" id="start" value="{{ start }}" placeholder="e.g. {{ '-2days'|date('dd.mm.YYYY') }}">
24+
<input type="date" name="start" id="start" value="{{ start }}" placeholder="e.g. {{ '-2days'|date('d.m.Y') }}">
2525
<div class="clear-fix"></div>
2626
<label for="end">Until</label>
27-
<input type="date" name="end" id="end" value="{{ end }}" placeholder="e.g. {{ 'now'|date('dd.mm.YYYY') }}">
27+
<input type="date" name="end" id="end" value="{{ end }}" placeholder="e.g. {{ 'now'|date('d.m.Y') }}">
2828
<div class="clear-fix"></div>
2929
<label for="limit">Limit</label>
3030
<select name="limit" id="limit">

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/http-kernel": "~2.3",
20+
"symfony/http-kernel": "~2.4",
2121
"symfony/routing": "~2.2",
2222
"symfony/twig-bridge": "~2.2"
2323
},
2424
"require-dev": {
2525
"symfony/config": "~2.2",
2626
"symfony/console": "~2.3",
27-
"symfony/dependency-injection": "~2.0",
27+
"symfony/dependency-injection": "~2.2",
2828
"symfony/stopwatch": "~2.2"
2929
},
3030
"autoload": {

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/dom-crawler": "~2.0"
20+
"symfony/dom-crawler": "~2.0,>=2.0.5"
2121
},
2222
"require-dev": {
23-
"symfony/process": "~2.0",
24-
"symfony/css-selector": "~2.0"
23+
"symfony/process": "~2.0,>=2.0.5",
24+
"symfony/css-selector": "~2.0,>=2.0.5"
2525
},
2626
"suggest": {
2727
"symfony/process": ""

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": ">=5.3.3"
2121
},
2222
"require-dev": {
23-
"symfony/finder": "~2.0"
23+
"symfony/finder": "~2.0,>=2.0.5"
2424
},
2525
"autoload": {
2626
"psr-0": { "Symfony\\Component\\ClassLoader\\": "" }

‎src/Symfony/Component/Debug/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"psr/log": "~1.0"
2121
},
2222
"require-dev": {
23-
"symfony/http-kernel": "~2.1",
23+
"symfony/http-kernel": "~2.2",
2424
"symfony/http-foundation": "~2.1"
2525
},
2626
"suggest": {

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/yaml": "~2.0",
22+
"symfony/yaml": "~2.1",
2323
"symfony/config": "~2.2",
24-
"symfony/expression-language": "~2.4"
24+
"symfony/expression-language": "~2.6"
2525
},
2626
"suggest": {
2727
"symfony/yaml": "",

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22-
"symfony/css-selector": "~2.0"
22+
"symfony/css-selector": "~2.3"
2323
},
2424
"suggest": {
2525
"symfony/css-selector": ""

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"require-dev": {
2222
"symfony/dependency-injection": "~2.6",
2323
"symfony/expression-language": "~2.6",
24-
"symfony/config": "~2.0",
25-
"symfony/stopwatch": "~2.2",
24+
"symfony/config": "~2.0,>=2.0.5",
25+
"symfony/stopwatch": "~2.3",
2626
"psr/log": "~1.0"
2727
},
2828
"suggest": {

‎src/Symfony/Component/Form/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
"symfony/property-access": "~2.3"
2424
},
2525
"require-dev": {
26-
"symfony/validator": "~2.5",
26+
"doctrine/collections": "~1.0",
27+
"symfony/validator": "~2.6",
2728
"symfony/http-foundation": "~2.2",
2829
"symfony/http-kernel": "~2.4",
2930
"symfony/security-csrf": "~2.4",
30-
"doctrine/collections": "~1.0"
31+
"symfony/translation": "~2.0,>=2.0.5"
3132
},
3233
"suggest": {
3334
"symfony/validator": "For form validation.",

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,26 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/event-dispatcher": "~2.5",
21-
"symfony/http-foundation": "~2.5",
20+
"symfony/event-dispatcher": "2.5.*,>2.5.8|~2.6,>2.6.1",
21+
"symfony/http-foundation": "~2.5,>=2.5.4",
2222
"symfony/debug": "~2.6",
2323
"psr/log": "~1.0"
2424
},
2525
"require-dev": {
26-
"symfony/browser-kit": "~2.2",
26+
"symfony/browser-kit": "~2.3",
2727
"symfony/class-loader": "~2.1",
28-
"symfony/config": "~2.0",
29-
"symfony/console": "~2.2",
30-
"symfony/dependency-injection": "~2.0",
28+
"symfony/config": "~2.0,>=2.0.5",
29+
"symfony/console": "~2.3",
30+
"symfony/css-selector": "~2.0,>=2.0.5",
31+
"symfony/dependency-injection": "~2.2",
32+
"symfony/dom-crawler": "~2.0,>=2.0.5",
3133
"symfony/expression-language": "~2.4",
32-
"symfony/finder": "~2.0",
33-
"symfony/process": "~2.0",
34+
"symfony/finder": "~2.0,>=2.0.5",
35+
"symfony/process": "~2.0,>=2.0.5",
3436
"symfony/routing": "~2.2",
35-
"symfony/stopwatch": "~2.2",
37+
"symfony/stopwatch": "~2.3",
3638
"symfony/templating": "~2.2",
37-
"symfony/translation": "~2.0",
39+
"symfony/translation": "~2.0,>=2.0.5",
3840
"symfony/var-dumper": "~2.6"
3941
},
4042
"suggest": {

‎src/Symfony/Component/Routing/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
"require-dev": {
2222
"symfony/config": "~2.2",
2323
"symfony/http-foundation": "~2.3",
24-
"symfony/yaml": "~2.0",
24+
"symfony/yaml": "~2.0,>=2.0.5",
2525
"symfony/expression-language": "~2.4",
2626
"doctrine/annotations": "~1.0",
27+
"doctrine/common": "~2.2",
2728
"psr/log": "~1.0"
2829
},
2930
"suggest": {

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020
},
2121
"require-dev": {
2222
"symfony/event-dispatcher": "~2.1",
23-
"symfony/expression-language": "~2.4",
23+
"symfony/expression-language": "~2.6",
2424
"symfony/http-foundation": "~2.4",
25-
"symfony/validator": "~2.5",
25+
"symfony/translation": "~2.0,>=2.0.5",
26+
"symfony/validator" 9822 : "~2.5,>=2.5.5",
2627
"psr/log": "~1.0",
2728
"ircmaxell/password-compat": "1.0.*"
2829
},

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/security-core": "~2.4",
20+
"symfony/security-core": "~2.6",
2121
"symfony/event-dispatcher": "~2.1",
2222
"symfony/http-foundation": "~2.4",
2323
"symfony/http-kernel": "~2.4"

0 commit comments

Comments
 (0)
0