Skip to content
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

Jump to bottom

Compatible with Symfony3 #373

Merged
merged 1 commit into from
Feb 14, 2016
Merged

Compatible with Symfony3 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,13 @@ matrix:

allow_failures:
- php: hhvm
- env: SYMFONY_VERSION="^3.0.0"
- env: SYMFONY_VERSION="^3.0.0" COMPOSER_FLAGS="--prefer-lowest"
- env: SYMFONY_VERSION="dev-master"
Copy link
Contributor

Choose a reason for hiding this comment

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

SYMFONY_VERSION="dev-master" is not in build matrix, so it does not make sense to allow failures for that.

exclude:
# Symfony 3.x requires PHP 5.5
- php: 5.4
env: SYMFONY_VERSION="~3.0.0"
- php: 5.4
env: SYMFONY_VERSION="dev-master"
Copy link
Contributor

Choose a reason for hiding this comment

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

unneeded exclude part, we do not test php 5.4, because propel 2 requires php 5.5


before_install:
- phpenv config-rm xdebug.ini
Expand Down
4 changes: 4 additions & 0 deletions Tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<?php

require_once __DIR__ . '/../vendor/autoload.php';

if(!class_exists('Symfony\\Component\\Form\\Test\\TypeTestCase')) {
class_alias('Symfony\\Component\\Form\\Tests\\Extension\\Core\\Type\\TypeTestCase', 'Symfony\\Component\\Form\\Test\\TypeTestCase');
}
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

"require": {
"propel/propel": "dev-master",
"symfony/symfony": "^2.8"
"symfony/symfony": "~2.5||~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.

PropelBundle 2.0 is not compatible to symfony < 2.8

},
"require-dev": {
"phpunit/phpunit": "^4.8.21|^5.0.10",
Expand Down