From d9a23975a55d9bd188027eab6e22417a8928c39b Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 1 Aug 2014 04:00:34 +0400 Subject: [PATCH] Relaxed access level for `yii\gii\generators\model\Generator` --- extensions/gii/generators/model/Generator.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/gii/generators/model/Generator.php b/extensions/gii/generators/model/Generator.php index f48c18faf4..b5485e3d2a 100644 --- a/extensions/gii/generators/model/Generator.php +++ b/extensions/gii/generators/model/Generator.php @@ -508,16 +508,16 @@ class Generator extends \yii\gii\Generator } } - private $_tableNames; - private $_classNames; + protected $tableNames; + protected $classNames; /** * @return array the table names that match the pattern specified by [[tableName]]. */ protected function getTableNames() { - if ($this->_tableNames !== null) { - return $this->_tableNames; + if ($this->tableNames !== null) { + return $this->tableNames; } $db = $this->getDbConnection(); if ($db === null) { @@ -540,10 +540,10 @@ class Generator extends \yii\gii\Generator } } elseif (($table = $db->getTableSchema($this->tableName, true)) !== null) { $tableNames[] = $this->tableName; - $this->_classNames[$this->tableName] = $this->modelClass; + $this->classNames[$this->tableName] = $this->modelClass; } - return $this->_tableNames = $tableNames; + return $this->tableNames = $tableNames; } /** @@ -574,8 +574,8 @@ class Generator extends \yii\gii\Generator */ protected function generateClassName($tableName) { - if (isset($this->_classNames[$tableName])) { - return $this->_classNames[$tableName]; + if (isset($this->classNames[$tableName])) { + return $this->classNames[$tableName]; } if (($pos = strrpos($tableName, '.')) !== false) { @@ -601,7 +601,7 @@ class Generator extends \yii\gii\Generator } } - return $this->_classNames[$tableName] = Inflector::id2camel($className, '_'); + return $this->classNames[$tableName] = Inflector::id2camel($className, '_'); } /**