Skip to content

Commit aefee54

Browse files
Use composer/composer 1.10.0-RC (#49)
* Use composer/comper 1.10.0-RC This fixes compability issues with Voyager and Laravel 7. This is only temporary until `composer/composer` released a version with `symfony/console >= 5.0` support and should then be removed again. * Apply fixes from StyleCI Co-authored-by: Mark Topper <[email protected]>
1 parent 91bc4de commit aefee54

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"composer/composer": ">=1.4"
18+
"composer/composer": ">=1.4|1.10.0-RC"
1919
},
2020
"require-dev": {
2121
"orchestra/testbench": ">=3.0",

src/Migrator.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public function runFiles(array $files, array $options = [])
1919
$this->notes = [];
2020

2121
$this->requireFiles($migrations = $this->pendingMigrations(
22-
$files, $this->repository->getRan()
22+
$files,
23+
$this->repository->getRan()
2324
));
2425

2526
// Once we have all these migrations that are outstanding we are ready to run
@@ -62,7 +63,9 @@ protected function resetMigrationsByFiles(array $migrations, array $files, $pret
6263
})->all();
6364

6465
return $this->rollbackMigrationsByFiles(
65-
$migrations, $files, compact('pretend')
66+
$migrations,
67+
$files,
68+
compact('pretend')
6669
);
6770
}
6871

@@ -87,7 +90,8 @@ protected function rollbackMigrationsByFiles(array $migrations, $files, array $o
8790
$rolledBack[] = $file;
8891

8992
$this->runDown(
90-
$file, $migration,
93+
$file,
94+
$migration,
9195
Arr::get($options, 'pretend', false)
9296
);
9397
}

0 commit comments

Comments
 (0)