Skip to content

Commit d956e7e

Browse files
authored
Allow laravel-doctrine/orm 2 (#130)
1 parent 85c4a10 commit d956e7e

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ jobs:
2727
- name: Install Composer dependencies
2828
run: rm -f composer.lock
2929

30-
- name: Downgrade doctrine/dbal
31-
run: composer require --no-progress --no-scripts --no-plugins doctrine/dbal ^2 && rm composer.lock
32-
3330
- name: Install dependencies for Laravel ${{ matrix.laravel}}
3431
run: composer require --no-progress --no-scripts --no-plugins illuminate/config ^${{ matrix.laravel }} illuminate/contracts ^${{ matrix.laravel }} illuminate/console ^${{ matrix.laravel }} -v
3532

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"illuminate/config": "^6.0|^7.0|^8.0|^9.0",
2525
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
2626
"illuminate/console": "^6.0|^7.0|^8.0|^9.0",
27-
"laravel-doctrine/orm": "^1"
27+
"laravel-doctrine/orm": "^1 | ^2@dev"
2828
},
2929
"require-dev": {
3030
"phpunit/phpunit": "^7.0 | ^8.3 | ^9.3",

src/Console/MigrateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MigrateCommand extends BaseCommand
1919
{--dry-run : Execute the migration as a dry run. }
2020
{--query-time : Time all the queries individually. }
2121
{--allow-no-migration : Doesn\'t throw an exception if no migration is available. }
22-
{--all-or-nothing= : Wrap the entire migration in a transaction. }
22+
{--all-or-nothing=notprovided : Wrap the entire migration in a transaction. }
2323
';
2424

2525
/**

0 commit comments

Comments
 (0)