Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
0a638c1a
Commit
0a638c1a
authored
Jan 27, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2188 from nineinchnick/2184-fix-findFiles
fix the _only_ option in calls to FileHelper::findFiles()
parents
2be0fd6e
62a7e397
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
ClassmapController.php
build/controllers/ClassmapController.php
+3
-3
PhpDocController.php
build/controllers/PhpDocController.php
+3
-3
RenderController.php
extensions/apidoc/commands/RenderController.php
+2
-2
FixtureController.php
extensions/faker/FixtureController.php
+1
-1
FixtureController.php
framework/console/controllers/FixtureController.php
+1
-1
messageConfig.php
framework/views/messageConfig.php
+1
-1
No files found.
build/controllers/ClassmapController.php
View file @
0a638c1a
...
@@ -42,10 +42,10 @@ class ClassmapController extends Controller
...
@@ -42,10 +42,10 @@ class ClassmapController extends Controller
}
}
return
null
;
return
null
;
},
},
'only'
=>
[
'.php'
],
'only'
=>
[
'
*
.php'
],
'except'
=>
[
'except'
=>
[
'Yii.php'
,
'
/
Yii.php'
,
'BaseYii.php'
,
'
/
BaseYii.php'
,
'/console/'
,
'/console/'
,
],
],
];
];
...
...
build/controllers/PhpDocController.php
View file @
0a638c1a
...
@@ -71,10 +71,10 @@ class PhpDocController extends Controller
...
@@ -71,10 +71,10 @@ class PhpDocController extends Controller
}
}
return
null
;
return
null
;
},
},
'only'
=>
[
'.php'
],
'only'
=>
[
'
*
.php'
],
'except'
=>
array_merge
(
$except
,
[
'except'
=>
array_merge
(
$except
,
[
'BaseYii.php'
,
'
/
BaseYii.php'
,
'Yii.php'
,
'
/
Yii.php'
,
'/views/'
,
'/views/'
,
'/requirements/'
,
'/requirements/'
,
'/gii/generators/'
,
'/gii/generators/'
,
...
...
extensions/apidoc/commands/RenderController.php
View file @
0a638c1a
...
@@ -137,7 +137,7 @@ class RenderController extends Controller
...
@@ -137,7 +137,7 @@ class RenderController extends Controller
}
}
return
null
;
return
null
;
},
},
'only'
=>
[
'.php'
],
'only'
=>
[
'
*
.php'
],
'except'
=>
$except
,
'except'
=>
$except
,
];
];
return
FileHelper
::
findFiles
(
$path
,
$options
);
return
FileHelper
::
findFiles
(
$path
,
$options
);
...
@@ -147,7 +147,7 @@ class RenderController extends Controller
...
@@ -147,7 +147,7 @@ class RenderController extends Controller
{
{
$path
=
FileHelper
::
normalizePath
(
$path
);
$path
=
FileHelper
::
normalizePath
(
$path
);
$options
=
[
$options
=
[
'only'
=>
[
'.md'
],
'only'
=>
[
'
*
.md'
],
'except'
=>
$except
,
'except'
=>
$except
,
];
];
return
FileHelper
::
findFiles
(
$path
,
$options
);
return
FileHelper
::
findFiles
(
$path
,
$options
);
...
...
extensions/faker/FixtureController.php
View file @
0a638c1a
...
@@ -204,7 +204,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
...
@@ -204,7 +204,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
$fixturePath
=
Yii
::
getAlias
(
$this
->
fixturePath
);
$fixturePath
=
Yii
::
getAlias
(
$this
->
fixturePath
);
if
(
$this
->
needToGenerateAll
(
$file
[
0
]))
{
if
(
$this
->
needToGenerateAll
(
$file
[
0
]))
{
$files
=
FileHelper
::
findFiles
(
$templatePath
,
[
'only'
=>
[
'.php'
]]);
$files
=
FileHelper
::
findFiles
(
$templatePath
,
[
'only'
=>
[
'
*
.php'
]]);
}
else
{
}
else
{
$filesToSearch
=
[];
$filesToSearch
=
[];
foreach
(
$file
as
$fileName
)
{
foreach
(
$file
as
$fileName
)
{
...
...
framework/console/controllers/FixtureController.php
View file @
0a638c1a
...
@@ -314,7 +314,7 @@ class FixtureController extends Controller
...
@@ -314,7 +314,7 @@ class FixtureController extends Controller
{
{
$fixturesPath
=
Yii
::
getAlias
(
$this
->
fixturePath
);
$fixturesPath
=
Yii
::
getAlias
(
$this
->
fixturePath
);
$filesToSearch
=
[
'.php'
];
$filesToSearch
=
[
'
*
.php'
];
if
(
!
$this
->
needToApplyAll
(
$fixtures
[
0
]))
{
if
(
!
$this
->
needToApplyAll
(
$fixtures
[
0
]))
{
$filesToSearch
=
[];
$filesToSearch
=
[];
foreach
(
$fixtures
as
$fileName
)
{
foreach
(
$fixtures
as
$fileName
)
{
...
...
framework/views/messageConfig.php
View file @
0a638c1a
...
@@ -30,7 +30,7 @@ return [
...
@@ -30,7 +30,7 @@ return [
// and the '.svn' will match all files and directories named exactly '.svn'.
// and the '.svn' will match all files and directories named exactly '.svn'.
// Note, the '/' characters in a pattern matches both '/' and '\'.
// Note, the '/' characters in a pattern matches both '/' and '\'.
// See helpers/FileHelper::findFiles() description for more details on pattern matching rules.
// 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.
// array, list of patterns that specify which files (not directories) should be processed.
// If empty or not set, all files will be processed.
// If empty or not set, all files will be processed.
// Please refer to "except" for details about the patterns.
// Please refer to "except" for details about the patterns.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment