php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-29 22:21:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

added .hgignore to list of typically ignored files

Browse Source
This commit is contained in:
Alexander Makarov
2013-04-18 20:46:37 +04:00
parent 4db5041d66
commit c006ebeb49
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/console/controllers/AppController.php
View File

@@ -294,7 +294,7 @@ class AppController extends Controller
* @param string $targetDir the target directory * @param string $targetDir the target directory
* @param string $baseDir base directory * @param string $baseDir base directory
* @param array $ignoreFiles list of the names of files that should * @param array $ignoreFiles list of the names of files that should
* be ignored in list building process. Argument available since 1.1.11. * be ignored in list building process.
* @param array $renameMap hash array of file names that should be * @param array $renameMap hash array of file names that should be
* renamed. Example value: array('1.old.txt'=>'2.new.txt'). * renamed. Example value: array('1.old.txt'=>'2.new.txt').
* @return array the file list (see {@link copyFiles}) * @return array the file list (see {@link copyFiles})
@@ -304,7 +304,7 @@ class AppController extends Controller
$list = array(); $list = array();
$handle = opendir($sourceDir); $handle = opendir($sourceDir);
while(($file = readdir($handle)) !== false) { while(($file = readdir($handle)) !== false) {
if(in_array($file, array('.', '..', '.svn', '.gitignore')) || in_array($file, $ignoreFiles)) { if(in_array($file, array('.', '..', '.svn', '.gitignore', '.hgignore')) || in_array($file, $ignoreFiles)) {
continue; continue;
} }
$sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file; $sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file;

4
framework/web/AssetManager.php
View File

@@ -55,9 +55,9 @@ class AssetManager extends Component
public $linkAssets = false; public $linkAssets = false;
/** /**
* @var array list of directories and files which should be excluded from the publishing process. * @var array list of directories and files which should be excluded from the publishing process.
* Defaults to exclude '.svn' and '.gitignore' files only. This option has no effect if {@link linkAssets} is enabled. * Defaults to exclude '.svn', '.gitignore' and '.hgignore' files only. This option has no effect if {@link linkAssets} is enabled.
**/ **/
public $excludeFiles = array('.svn', '.gitignore'); public $excludeFiles = array('.svn', '.gitignore', '.hgignore');
/** /**
* @var integer the permission to be set for newly published asset files. * @var integer the permission to be set for newly published asset files.
* This value will be used by PHP chmod() function. * This value will be used by PHP chmod() function.