php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-01 23:51:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup console namespace changes

Browse Source
This commit is contained in:
Carsten Brandt
2016-02-06 20:05:14 +01:00
parent 3f828d9599
commit 5db772ef7b
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/console/controllers/BaseMigrateController.php
View File

@@ -71,7 +71,7 @@ abstract class BaseMigrateController extends Controller
return array_merge( return array_merge(
parent::options($actionID), parent::options($actionID),
['migrationPath'], // global for all actions ['migrationPath'], // global for all actions
$actionID === 'create' ? ['templateFile', 'templateFileGenerators', 'fields'] : [] // action create $actionID === 'create' ? ['templateFile', 'fields'] : [] // action create
); );
} }

2
framework/console/controllers/HelpController.php
View File

@@ -397,7 +397,7 @@ class HelpController extends Controller
} else { } else {
$defaultValue = var_export($defaultValue, true); $defaultValue = var_export($defaultValue, true);
} }
$doc = "$type (defaults to " . $defaultValue . ')'; $doc = "$type (defaults to $defaultValue)";
} else { } else {
$doc = $type; $doc = $type;
} }

6
framework/console/controllers/MessageController.php
View File

@@ -41,7 +41,6 @@ class MessageController extends Controller
* @var string controller default action ID. * @var string controller default action ID.
*/ */
public $defaultAction = 'extract'; public $defaultAction = 'extract';
/** /**
* @var string required, root directory of all source files. * @var string required, root directory of all source files.
*/ */
@@ -141,7 +140,7 @@ class MessageController extends Controller
*/ */
public function options($actionID) public function options($actionID)
{ {
return [ return array_merge(parent::options($actionID), [
'sourcePath', 'sourcePath',
'messagePath', 'messagePath',
'languages', 'languages',
@@ -158,7 +157,7 @@ class MessageController extends Controller
'messageTable', 'messageTable',
'catalog', 'catalog',
'ignoreCategories' 'ignoreCategories'
]; ]);
} }
/** /**
@@ -531,6 +530,7 @@ EOD;
* @param string $category category that is checked * @param string $category category that is checked
* @param array $ignoreCategories message categories to ignore. * @param array $ignoreCategories message categories to ignore.
* @return boolean * @return boolean
* @since 2.0.7
*/ */
protected function isCategoryIgnored($category, array $ignoreCategories) protected function isCategoryIgnored($category, array $ignoreCategories)
{ {

1
framework/console/controllers/MigrateController.php
View File

@@ -65,6 +65,7 @@ class MigrateController extends BaseMigrateController
public $templateFile = '@yii/views/migration.php'; public $templateFile = '@yii/views/migration.php';
/** /**
* @inheritdoc * @inheritdoc
* @since 2.0.7
*/ */
public $generatorTemplateFiles = [ public $generatorTemplateFiles = [
'create_table' => '@yii/views/createTableMigration.php', 'create_table' => '@yii/views/createTableMigration.php',

1
framework/console/controllers/ServeController.php
View File

@@ -43,6 +43,7 @@ class ServeController extends Controller
*/ */
public $router; public $router;
/** /**
* Runs PHP built-in web server * Runs PHP built-in web server
* *