8000 [2.3] Add missing development dependencies by romainneutron · Pull Request #11340 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[2.3] Add missing development dependencies #11340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[2.3] Add missing development dependencies #11340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b2e27
Add components tests to travis
romainneutron Jul 6, 2014
0ca153b
Add missing development dependencies
romainneutron Jul 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ php:
matrix:
allow_failures:
- php: hhvm-nightly
include:
- php: 5.5
env: components=yes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of using lots of excludes, I would use an include rule instead (you forgot to exclyde the HHVM builds here for instance)


services: mongodb

env:
global:
- components=no

before_install:
- 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;'
Expand All @@ -25,8 +32,9 @@ before_install:
# - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'

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:
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};'
- echo "Running tests requiring tty"; phpunit --group tty
- 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;'
- 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;'
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"symfony/form": "~2.2",
"symfony/http-kernel": "~2.2",
"symfony/security": "~2.2",
"symfony/validator": "~2.2",
"symfony/validator": "~2.3.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.2",
"doctrine/orm": "~2.2,>=2.2.3"
Expand Down
3 changes: 3 additions & 0 deletions src/Symfony/Bridge/ProxyManager/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"symfony/dependency-injection": "~2.3",
"ocramius/proxy-manager": ">=0.3.1,<0.4-dev"
},
"require-dev": {
"symfony/config": "2.3"
},
"autoload": {
"psr-0": {
"Symfony\\Bridge\\ProxyManager\\": ""
Expand Down
8 changes: 6 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@
"doctrine/common": "~2.2"
},
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/console": "~2.0",
"symfony/finder": "~2.0",
"symfony/security": "~2.3",
"symfony/form": "~2.3",
"symfony/form": "~2.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks wrong IMO, IIRC you will lock the FrameworkBundle with 2.3.x versions, and not allow any newer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually needed on branch 2.3 - latest versions of the form component are not compatible anymore. We'll have to update this dependency in other branches after merge

"symfony/class-loader": "~2.1",
"symfony/validator": "~2.1"
"symfony/process": "~2.0",
"symfony/validator": "~2.1",
"symfony/yaml": "~2.0"
},
"suggest": {
"symfony/console": "",
Expand Down
3 changes: 3 additions & 0 deletions src/Symfony/Bundle/SecurityBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
"symfony/http-kernel": "~2.2"
},
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/form": "~2.3",
"symfony/framework-bundle": "~2.2",
"symfony/twig-bundle": "~2.2",
"symfony/form": "~2.1",
"symfony/process": "~2.0",
"symfony/validator": "~2.2",
"symfony/yaml": "~2.0"
},
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@

namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;

use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
use Symfony\Component\HttpKernel\Profiler\Profile;
use Symfony\Component\HttpFoundation\Request;

class ProfilerControllerTest extends TestCase
class ProfilerControllerTest extends \PHPUnit_Framework_TestCase
{
/**
* @dataProvider getEmptyTokenCases
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/WebProfilerBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"require-dev": {
"symfony/config": "~2.2",
"symfony/console": "~2.3",
"symfony/dependency-injection": "~2.0",
"symfony/stopwatch": "~2.2"
},
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/Form/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"symfony/property-access": "~2.3"
},
"require-dev": {
"symfony/validator": "~2.2",
"doctrine/collections": "~1.0",
"symfony/validator": "~2.3.0",
"symfony/http-foundation": "~2.2"
},
"suggest": {
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Routing/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"require-dev": {
"symfony/config": "~2.2",
"symfony/http-foundation": "~2.3",
"symfony/yaml": "~2.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0"
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Translation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"require-dev": {
"symfony/config": "~2.0",
"symfony/intl": "~2.3",
"symfony/yaml": "~2.2"
},
"suggest": {
Expand Down
0