Commit 0a638c1a by Alexander Makarov

Merge pull request #2188 from nineinchnick/2184-fix-findFiles

fix the _only_ option in calls to FileHelper::findFiles()
parents 2be0fd6e 62a7e397
......@@ -42,10 +42,10 @@ class ClassmapController extends Controller
}
return null;
},
'only' => ['.php'],
'only' => ['*.php'],
'except' => [
'Yii.php',
'BaseYii.php',
'/Yii.php',
'/BaseYii.php',
'/console/',
],
];
......
......@@ -71,10 +71,10 @@ class PhpDocController extends Controller
}
return null;
},
'only' => ['.php'],
'only' => ['*.php'],
'except' => array_merge($except, [
'BaseYii.php',
'Yii.php',
'/BaseYii.php',
'/Yii.php',
'/views/',
'/requirements/',
'/gii/generators/',
......
......@@ -137,7 +137,7 @@ class RenderController extends Controller
}
return null;
},
'only' => ['.php'],
'only' => ['*.php'],
'except' => $except,
];
return FileHelper::findFiles($path, $options);
......@@ -147,7 +147,7 @@ class RenderController extends Controller
{
$path = FileHelper::normalizePath($path);
$options = [
'only' => ['.md'],
'only' => ['*.md'],
'except' => $except,
];
return FileHelper::findFiles($path, $options);
......@@ -160,4 +160,4 @@ class RenderController extends Controller
{
return array_merge(parent::globalOptions(), ['template', 'guide']);
}
}
\ No newline at end of file
}
......@@ -204,7 +204,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
$fixturePath = Yii::getAlias($this->fixturePath);
if ($this->needToGenerateAll($file[0])) {
$files = FileHelper::findFiles($templatePath, ['only' => ['.php']]);
$files = FileHelper::findFiles($templatePath, ['only' => ['*.php']]);
} else {
$filesToSearch = [];
foreach ($file as $fileName) {
......
......@@ -314,7 +314,7 @@ class FixtureController extends Controller
{
$fixturesPath = Yii::getAlias($this->fixturePath);
$filesToSearch = ['.php'];
$filesToSearch = ['*.php'];
if (!$this->needToApplyAll($fixtures[0])) {
$filesToSearch = [];
foreach ($fixtures as $fileName) {
......
......@@ -30,7 +30,7 @@ return [
// and the '.svn' will match all files and directories named exactly '.svn'.
// Note, the '/' characters in a pattern matches both '/' and '\'.
// See helpers/FileHelper::findFiles() description for more details on pattern matching rules.
'only' => ['.php'],
'only' => ['*.php'],
// array, list of patterns that specify which files (not directories) should be processed.
// If empty or not set, all files will be processed.
// Please refer to "except" for details about the patterns.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment