Skip to content

Commit

Permalink
Use composer/composer 1.10.0-RC (#49)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
emptynick and marktopper authored Mar 9, 2020
1 parent 91bc4de commit aefee54
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"composer/composer": ">=1.4"
"composer/composer": ">=1.4|1.10.0-RC"
},
"require-dev": {
"orchestra/testbench": ">=3.0",
Expand Down
10 changes: 7 additions & 3 deletions src/Migrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public function runFiles(array $files, array $options = [])
$this->notes = [];

$this->requireFiles($migrations = $this->pendingMigrations(
$files, $this->repository->getRan()
$files,
$this->repository->getRan()
));

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

return $this->rollbackMigrationsByFiles(
$migrations, $files, compact('pretend')
$migrations,
$files,
compact('pretend')
);
}

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

$this->runDown(
$file, $migration,
$file,
$migration,
Arr::get($options, 'pretend', false)
);
}
Expand Down

0 comments on commit aefee54

Please sign in to comment.