diff --git a/framework/console/controllers/AppController.php b/framework/console/controllers/AppController.php index 237ba0f..a47acfe 100644 --- a/framework/console/controllers/AppController.php +++ b/framework/console/controllers/AppController.php @@ -294,7 +294,7 @@ class AppController extends Controller * @param string $targetDir the target directory * @param string $baseDir base directory * @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 * renamed. Example value: array('1.old.txt'=>'2.new.txt'). * @return array the file list (see {@link copyFiles}) @@ -304,7 +304,7 @@ class AppController extends Controller $list = array(); $handle = opendir($sourceDir); 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; } $sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file; diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php index 30f4c11..9f01173 100644 --- a/framework/web/AssetManager.php +++ b/framework/web/AssetManager.php @@ -99,8 +99,8 @@ class AssetManager extends Component * * For example, given the bundle name "foo/button", the method will first convert it * into the path alias "@foo/button"; since "@foo" is the root alias, it will look - * for the bundle manifest file "@foo/assets.php". The manifest file should declare - * the bundles used by the "foo/button" extension. + * for the bundle manifest file "@foo/assets.php". The manifest file should return an array + * that lists the bundles used by the "foo/button" extension. The array format is the same as [[bundles]]. * * @param string $name the bundle name * @return AssetBundle the loaded bundle object. Null is returned if the bundle does not exist. @@ -238,6 +238,10 @@ class AssetManager extends Component ); if (isset($options['beforeCopy'])) { $opts['beforeCopy'] = $options['beforeCopy']; + } else { + $opts['beforeCopy'] = function ($from, $to) { + return strncmp(basename($from), '.', 1) !== 0; + }; } if (isset($options['afterCopy'])) { $opts['afterCopy'] = $options['afterCopy']; diff --git a/framework/web/Response.php b/framework/web/Response.php index da2482f..1d604e9 100644 --- a/framework/web/Response.php +++ b/framework/web/Response.php @@ -112,8 +112,8 @@ class Response extends \yii\base\Response *
  • mimeType: mime type of the file, if not set it will be guessed automatically based on the file name, if set to null no content-type header will be sent.
  • *
  • xHeader: appropriate x-sendfile header, defaults to "X-Sendfile"
  • *
  • terminate: whether to terminate the current application after calling this method, defaults to true
  • - *
  • forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true. (Since version 1.1.9.)
  • - *
  • addHeaders: an array of additional http headers in header-value pairs (available since version 1.1.10)
  • + *
  • forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true
  • + *
  • addHeaders: an array of additional http headers in header-value pairs
  • * */ public function xSendFile($filePath, $options = array())