Skip to content

Commit 22dfea0

Browse files
authored
Merge pull request #582 from webimpress/feature/doctrine-migrations-v2-support
Added support for doctrine/migrations v2
2 parents a1da341 + 074eaad commit 22dfea0

13 files changed

+907
-1073
lines changed

.travis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: false
2-
31
language: php
42

53
cache:
@@ -10,7 +8,6 @@ cache:
108
env:
119
global:
1210
- COMPOSER_ARGS="--no-interaction"
13-
- LEGACY_DEPS="phpunit/phpunit"
1411

1512
matrix:
1613
fast_finish: true
@@ -41,6 +38,18 @@ matrix:
4138
- php: 7.2
4239
env:
4340
- DEPS=dev
41+
- php: 7.3
42+
env:
43+
- DEPS=lowest
44+
- php: 7.3
45+
env:
46+
- DEPS=locked
47+
- php: 7.3
48+
env:
49+
- DEPS=latest
50+
- php: 7.3
51+
env:
52+
- DEPS=dev
4453
- php: nightly
4554
env:
4655
- DEPS=lowest
@@ -53,13 +62,9 @@ matrix:
5362
allow_failures:
5463
- php: nightly
5564

56-
before_install:
57-
- travis_retry composer self-update
58-
5965
install:
6066
- if [[ $DEPS == 'dev' ]]; then travis_retry composer config minimum-stability dev ; fi
6167
- travis_retry composer install $COMPOSER_ARGS
62-
- travis_retry composer require --dev --no-update $COMPOSER_ARGS zendframework/zend-mvc-console
6368
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
6469
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
6570
- composer show

.travis/Version20120714005702.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
namespace TravisDoctrineMigrations;
2121

22-
use Doctrine\DBAL\Migrations\AbstractMigration,
23-
Doctrine\DBAL\Schema\Schema;
22+
use Doctrine\DBAL\Schema\Schema,
23+
Doctrine\Migrations\AbstractMigration;
2424

2525
/**
2626
* Empty test migration used for testing

composer.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,25 @@
3939
"require": {
4040
"php": "^7.1",
4141
"doctrine/doctrine-module": "^2.1.3",
42-
"doctrine/orm": "^2.6.0",
42+
"doctrine/orm": "^2.6.3",
4343
"doctrine/dbal": "^2.6.0",
44-
"symfony/console": "^2.3 || ^3.0 || ^4.0",
45-
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
46-
"zendframework/zend-hydrator": "^1.1 || ^2.2.1",
47-
"zendframework/zend-mvc": "^2.7.13 || ^3.0.1",
48-
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1"
44+
"symfony/console": "^3.3 || ^4.0",
45+
"zendframework/zend-stdlib": "^3.2.1",
46+
"zendframework/zend-hydrator": "^2.3",
47+
"zendframework/zend-mvc": "^3.1",
48+
"zendframework/zend-servicemanager": "^3.3"
4949
},
5050
"require-dev": {
5151
"phpunit/phpunit": "^7.0.3",
5252
"squizlabs/php_codesniffer": "^2.7",
5353
"doctrine/data-fixtures": "^1.2.1",
54-
"doctrine/migrations": "^1.4.1",
54+
"doctrine/migrations": "^1.5 || ^2.0",
5555
"zendframework/zend-console": "^2.6",
5656
"zendframework/zend-developer-tools": "^1.1",
5757
"zendframework/zend-i18n": "^2.7.3",
5858
"zendframework/zend-log": "^2.9",
5959
"zendframework/zend-modulemanager": "^2.7.2",
60+
"zendframework/zend-mvc-console": "^1.2",
6061
"zendframework/zend-serializer": "^2.8"
6162
},
6263
"suggest": {
@@ -65,6 +66,9 @@
6566
"doctrine/migrations": "doctrine migrations if you want to keep your schema definitions versioned"
6667
},
6768
"autoload": {
69+
"files": [
70+
"src/autoload.php"
71+
],
6872
"psr-0": {
6973
"DoctrineORMModule\\": "src/"
7074
}

0 commit comments

Comments
 (0)