Skip to content

Commit e2c5074

Browse files
committed
Fixed a bug that the ignore_note_file_names search arguments were not passed properly.
1 parent f194787 commit e2c5074

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

source/PHPClassMapGenerator_Base.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ protected function _getFileList( $sDirPath, array $aSearchOptions ) {
8585
GLOB_BRACE,
8686
$_aExcludingDirPaths,
8787
( array ) $aSearchOptions[ 'exclude_dir_names' ],
88-
$aSearchOptions[ 'exclude_file_names' ]
88+
$aSearchOptions[ 'exclude_file_names' ],
89+
$aSearchOptions[ 'ignore_note_file_names' ]
8990
)
9091
: ( array ) glob( $sDirPath . '*.' . $_sFileExtensionPattern, GLOB_BRACE );
9192
return array_filter( $_aFilePaths ); // drop non-value elements.
@@ -100,7 +101,8 @@ protected function _getFileList( $sDirPath, array $aSearchOptions ) {
100101
0,
101102
$_aExcludingDirPaths,
102103
( array ) $aSearchOptions['exclude_dir_names'],
103-
$aSearchOptions['exclude_file_names']
104+
$aSearchOptions['exclude_file_names'],
105+
$aSearchOptions[ 'ignore_note_file_names' ]
104106
)
105107
: ( array ) glob( $sDirPath . '*.' . $__sAllowedExtension );
106108
$_aFilePaths = array_merge( $__aFilePaths, $_aFilePaths );
@@ -151,7 +153,7 @@ private function ___fileExists( array $aFilePaths, $sSuffix='' ) {
151153
/**
152154
* The recursive version of the glob() function.
153155
*/
154-
private function ___doRecursiveGlob( $sPathPatten, $nFlags=0, array $aExcludeDirPaths=array(), array $aExcludeDirNames=array(), array $aExcludeFileNames=array() ) {
156+
private function ___doRecursiveGlob( $sPathPatten, $nFlags=0, array $aExcludeDirPaths=array(), array $aExcludeDirNames=array(), array $aExcludeFileNames=array(), array $aIgnoreNotes=array() ) {
155157

156158
if ( $this->___fileExists( $aIgnoreNotes, dirname( $sPathPatten ) . '/' ) ) {
157159
return array();
@@ -180,7 +182,8 @@ private function ___doRecursiveGlob( $sPathPatten, $nFlags=0, array $aExcludeDir
180182
$nFlags,
181183
$aExcludeDirPaths,
182184
$aExcludeDirNames,
183-
$aExcludeFileNames
185+
$aExcludeFileNames,
186+
$aIgnoreNotes
184187
)
185188
);
186189

0 commit comments

Comments
 (0)