Merge branch 'master' of https://github.com/diezztsk/yii2 into diezztsk-master

framework/CHANGELOG.md

@@ -26,6 +26,11 @@ Yii Framework 2 Change Log
 - Enh #12881: Added `removeValue` method to `yii\helpers\BaseArrayHelper` (nilsburg)
 - Enh: Added constants for specifying `yii\validators\CompareValidator::$type` (cebe)
 
+-- Enh #12748: Added Migration tool automatic generation reference column for foreignKey (MKiselev)
+- Enh #12790: Added `scrollToErrorOffset` option for `ActiveForm` which adds ability to specify offset in pixels when scrolling to error (mg-code)
+- Enh #12748: Migration generator now tries to fetch reference column name for foreignKey from schema if it's not set explicitly (MKiselev)
+- Bug #4113: Error page stacktrace was generating links to private methods which are not part of the API docs (samdark)
+- Enh #12901: Added `getDefaultHelpHeader` method to the `yii\console\controllers\HelpController` class to be able to override default help header in a class heir (diezztsk)
 
 2.0.10 October 20, 2016
 -----------------------

framework/console/controllers/HelpController.php

@@ -182,7 +182,7 @@ class HelpController extends Controller
     protected function getDefaultHelp()
     {
         $commands = $this->getCommandDescriptions();
-        $this->stdout("\nThis is Yii version " . \Yii::getVersion() . ".\n");
+        $this->stdout($this->getDefaultHelpHeader());
         if (!empty($commands)) {
             $this->stdout("\nThe following commands are available:\n\n", Console::BOLD);
             $len = 0;
@@ -437,4 +437,14 @@ class HelpController extends Controller
     {
         return basename(Yii::$app->request->scriptFile);
     }
+
+    /**
+     * Return a default help header.
+     * @return string default help header.
+     * @since 2.0.11
+     */
+    protected function getDefaultHelpHeader()
+    {
+        return "\nThis is Yii version " . \Yii::getVersion() . ".\n";
+    }
 }