copy changes of 1.x to 2.x #397
Conversation
gharlan
commented
Feb 11, 2016
gharlan
commented
- updated travis.yml
- updated composer.json
- changed namespace to "Propel\Bundle\PropelBundle"
| - SYMFONY_VERSION="dev-master" | ||
| - COMPOSER_FLAGS="--prefer-lowest" | ||
| - SYMFONY_VERSION="^2.8.2" | ||
| - SYMFONY_VERSION="^2.8.2" COMPOSER_FLAGS="--prefer-lowest" |
There was a problem hiding this comment.
The 2.0 branch should be tested on Symfony 3.0, too.
There was a problem hiding this comment.
Should I change last line, or add new one?
There was a problem hiding this comment.
Add the two for ^3.0.0 (one with and without --prefer-lowest).
|
You missed the |
|
Just read the diff, you got the schema, but Travis fails. |
| use Propel\PropelBundle\Tests\Fixtures\Model\Map\BookTableMap; | ||
| use \Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book as ChildBook; | ||
| use \Propel\Bundle\PropelBundle\Tests\Fixtures\Model\BookQuery as ChildBookQuery; | ||
| use \Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Map\BookTableMap; |
There was a problem hiding this comment.
There are some more (\) hidden among the files.
gharlan
force-pushed
the
changes-of-1.x
branch
from
faf56cd
to
893c85c
Compare
|
I had to change the required propel version in composer.json to "dev-master". Otherwise I got 2.0.0-alpha1 when testing with |
|
The remaining failures on travis are unrelated to the changes of this PR. They are introduced by this change: propelorm/Propel2#1097 |
|
Are you sure on the remaining failures? The build passes on |
|
The build was done before the change was made. Or did you rebuild? |
|
Ah, now I get it, the changes in Propel make the bundle fail on its current version. Building bundle 2.0 now. |
|
|
|
Looks good to me, anything left to do? |
|
from my side it is ready. |
|
Thank you very much! |
