Skip to content

Add a flag for turning off the recursive lookup #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add a flag for turning off the recursive lookup #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76c48b8
change package name in composer.json
sp-niemand Mar 10, 2015
15e4e0c
make migrations searchable in directories different from 'migrations'
sp-niemand Mar 10, 2015
18b99c4
fix composer.json
sp-niemand Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions controllers/MigrateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,20 @@
class MigrateController extends \yii\console\controllers\MigrateController
{
/**
* @var bool
* @var bool TRUE if migrations should be found in "migrationPaths"
*/
public $autoDiscover = false;

/**
* @var array
* @var array List of paths for migrations lookup. Aliases can be used.
*/
public $migrationPaths = [];

/**
* @var bool TRUE if the migrations lookup should be recursive
*/
public $recursiveDiscover = true;

/**
* @inheritdoc
*/
Expand Down Expand Up @@ -97,12 +102,17 @@ private function getMigrationPaths()

$migrations = [];

// Recursively iterate through each path
// Iterate through each path
foreach ($paths as $path) {
$recursiveDirectory = new \RecursiveDirectoryIterator(Yii::getAlias($path));
$recursiveIterator = new \RecursiveIteratorIterator($recursiveDirectory);
$recursiveRegex = new \RegexIterator($recursiveIterator, '/^.*[\\\\\\/]migrations[\\\\\\/]m(\d{6}_\d{6})_.*?\.php$/i',
\RecursiveRegexIterator::GET_MATCH);
$migrationCandidateIterator = $this->recursiveDiscover
? new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(Yii::getAlias($path)))
: new \FilesystemIterator(Yii::getAlias($path));

$recursiveRegex = new \RegexIterator(
$migrationCandidateIterator,
'~^.*[\/]m(\d{6}_\d{6})_.*?\.php$~i',
\RecursiveRegexIterator::GET_MATCH
);

// Add to array which will be sortable by filename
foreach ($recursiveRegex as $file) {
Expand Down