Browse Source

code style fixes

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
cc0fe1b02c
  1. 1
      framework/yii/db/QueryBuilder.php
  2. 1
      framework/yii/db/sqlite/QueryBuilder.php
  3. 3
      framework/yii/rbac/PhpManager.php

1
framework/yii/db/QueryBuilder.php

@ -301,7 +301,6 @@ class QueryBuilder extends \yii\base\Object
{ {
return 'ALTER TABLE ' . $this->db->quoteTableName($table) return 'ALTER TABLE ' . $this->db->quoteTableName($table)
. ' DROP CONSTRAINT ' . $this->db->quoteColumnName($name); . ' DROP CONSTRAINT ' . $this->db->quoteColumnName($name);
} }
/** /**

1
framework/yii/db/sqlite/QueryBuilder.php

@ -205,4 +205,3 @@ class QueryBuilder extends \yii\db\QueryBuilder
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.'); throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
} }
} }

3
framework/yii/rbac/PhpManager.php

@ -356,8 +356,7 @@ class PhpManager extends Manager
*/ */
public function saveItem($item, $oldName = null) public function saveItem($item, $oldName = null)
{ {
if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed if ($oldName !== null && ($newName = $item->getName()) !== $oldName) { // name changed
{
if (isset($this->_items[$newName])) { if (isset($this->_items[$newName])) {
throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item."); throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item.");
} }

Loading…
Cancel
Save