Merge branch 'master' of git://github.com/yiisoft/yii2

build/controllers/PhpDocController.php

@@ -115,9 +115,9 @@ class PhpDocController extends Controller
     /**
      * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), ['updateFiles']);
+        return array_merge(parent::options($actionId), ['updateFiles']);
     }
 
     protected function updateClassPropertyDocs($file, $className, $propertyDoc)

extensions/apidoc/commands/ApiController.php

@@ -159,8 +159,8 @@ class ApiController extends BaseController
     /**
      * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), ['template', 'guide']);
+        return array_merge(parent::options($actionId), ['template', 'guide']);
     }
 }

extensions/apidoc/commands/GuideController.php

@@ -114,8 +114,8 @@ class GuideController extends BaseController
     /**
      * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), ['apiDocs']);
+        return array_merge(parent::options($actionId), ['apiDocs']);
     }
 }

extensions/apidoc/components/BaseController.php

@@ -126,8 +126,8 @@ abstract class BaseController extends Controller
     /**
      * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), ['template', 'exclude']);
+        return array_merge(parent::options($actionId), ['template', 'exclude']);
     }
 }

extensions/faker/FixtureController.php

@@ -171,12 +171,11 @@ class FixtureController extends \yii\console\controllers\FixtureController
 
 
     /**
-     * Returns the names of the global options for this command.
-     * @return array the names of the global options for this command.
+     * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), [
+        return array_merge(parent::options($actionId), [
             'templatePath', 'language', 'fixtureDataPath'
         ]);
     }

framework/base/View.php

@@ -141,7 +141,6 @@ class View extends Component
     public function render($view, $params = [], $context = null)
     {
         $viewFile = $this->findViewFile($view, $context);
-
         return $this->renderFile($viewFile, $params, $context);
     }
 

framework/caching/MemCache.php

@@ -78,6 +78,7 @@ class MemCache extends Cache
      */
     private $_servers = [];
 
+
     /**
      * Initializes this application component.
      * It creates the memcache instance and adds memcache servers.

framework/console/Controller.php

@@ -264,10 +264,10 @@ class Controller extends \yii\base\Controller
      * Note that the values setting via options are not available
      * until [[beforeAction()]] is being called.
      *
-     * @param string $id action name
+     * @param string $actionId the action id of the current request
      * @return array the names of the options valid for the action
      */
-    public function options($id)
+    public function options($actionId)
     {
         // $id might be used in subclass to provide options specific to action id
         return ['color', 'interactive'];

framework/console/controllers/FixtureController.php

@@ -33,7 +33,6 @@ use yii\test\FixtureTrait;
  */
 class FixtureController extends Controller
 {
-
     use FixtureTrait;
 
     /**
@@ -57,13 +56,13 @@ class FixtureController extends Controller
         'yii\test\InitDb',
     ];
 
+
     /**
-     * Returns the names of the global options for this command.
-     * @return array the names of the global options for this command.
+     * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id), [
+        return array_merge(parent::options($actionId), [
             'namespace', 'globalFixtures'
         ]);
     }

framework/console/controllers/MigrateController.php

@@ -92,14 +92,13 @@ class MigrateController extends Controller
     public $db = 'db';
 
     /**
-     * Returns the names of the global options for this command.
-     * @return array the names of the global options for this command.
+     * @inheritdoc
      */
-    public function options($id)
+    public function options($actionId)
     {
-        return array_merge(parent::options($id),
+        return array_merge(parent::options($actionId),
             ['migrationPath', 'migrationTable', 'db'], // global for all actions
-            ($id == 'create') ? ['templateFile'] : [] // action create
+            ($actionId == 'create') ? ['templateFile'] : [] // action create
         );
     }
 

framework/data/ArrayDataProvider.php

@@ -64,6 +64,7 @@ class ArrayDataProvider extends BaseDataProvider
      */
     public $allModels;
 
+
     /**
      * @inheritdoc
      */

framework/db/ActiveQuery.php

@@ -91,6 +91,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
      */
     public $joinWith;
 
+
     /**
      * Executes query and returns all results as an array.
      * @param Connection $db the DB connection used to create the DB command.

framework/helpers/BaseFileHelper.php

@@ -285,14 +285,14 @@ class BaseFileHelper
             if (isset($options['except'])) {
                 foreach ($options['except'] as $key => $value) {
                     if (is_string($value)) {
-                        $options['except'][$key] = static::parseExcludePattern($value);
+                        $options['except'][$key] = self::parseExcludePattern($value);
                     }
                 }
             }
             if (isset($options['only'])) {
                 foreach ($options['only'] as $key => $value) {
                     if (is_string($value)) {
-                        $options['only'][$key] = static::parseExcludePattern($value);
+                        $options['only'][$key] = self::parseExcludePattern($value);
                     }
                 }
             }

framework/helpers/BaseHtml.php

@@ -342,7 +342,7 @@ class BaseHtml
 
     /**
      * Generates an image tag.
-     * @param string $src the image URL. This parameter will be processed by [[yii\helpers\Url::to()]].
+     * @param array|string $src the image URL. This parameter will be processed by [[yii\helpers\Url::to()]].
      * @param array $options the tag options in terms of name-value pairs. These will be rendered as
      * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
      * If a value is null, the corresponding attribute will not be rendered.

framework/i18n/MessageFormatter.php

@@ -220,7 +220,9 @@ class MessageFormatter extends Component
                 if (!isset($token[2])) {
                     return false;
                 }
-                $subtokens = self::tokenizePattern($token[2]);
+                if (($subtokens = self::tokenizePattern($token[2])) === false) {
+                    return false;
+                }
                 $c = count($subtokens);
                 for ($k = 0; $k + 1 < $c; $k++) {
                     if (is_array($subtokens[$k]) || !is_array($subtokens[++$k])) {

framework/web/Request.php

@@ -124,8 +124,8 @@ class Request extends \yii\base\Request
      */
     public $enableCookieValidation = true;
     /**
-     * @var string|boolean the name of the POST parameter that is used to indicate if a request is a PUT, PATCH or DELETE
-     * request tunneled through POST. Default to '_method'.
+     * @var string the name of the POST parameter that is used to indicate if a request is a PUT, PATCH or DELETE
+     * request tunneled through POST. Defaults to '_method'.
      * @see getMethod()
      * @see getBodyParams()
      */