Dead code cleanup

lib/Doctrine/DBAL/Connection.php

@@ -1110,7 +1110,7 @@ private function _bindTypedValues($stmt, array $params, array $types)
             // Positional parameters
             $typeOffset = array_key_exists(0, $types) ? -1 : 0;
             $bindIndex = 1;
-            foreach ($params as $position => $value) {
+            foreach ($params as $value) {
                 $typeIndex = $bindIndex + $typeOffset;
                 if (isset($types[$typeIndex])) {
                     $type = $types[$typeIndex];

lib/Doctrine/DBAL/Platforms/DB2Platform.php

@@ -358,7 +358,7 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
 
         $sqls = parent::_getCreateTableSQL($tableName, $columns, $options);
 
-        foreach ($indexes as $index => $definition) {
+        foreach ($indexes AS $definition) {
             $sqls[] = $this->getCreateIndexSQL($definition, $tableName);
         }
         return $sqls;
@@ -376,7 +376,7 @@ public function getAlterTableSQL(TableDiff $diff)
         $columnSql = array();
 
         $queryParts = array();
-        foreach ($diff->addedColumns AS $fieldName => $column) {
+        foreach ($diff->addedColumns AS $column) {
             if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
                 continue;
             }

lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php

@@ -154,7 +154,6 @@ public function getDropForeignKeySQL($foreignKey, $table)
     public function getDropIndexSQL($index, $table=null)
     {
         if ($index instanceof \Doctrine\DBAL\Schema\Index) {
-            $index_ = $index;
             $index = $index->getQuotedName($this);
         } else if (!is_string($index)) {
             throw new \InvalidArgumentException('AbstractPlatform::getDropIndexSQL() expects $index parameter to be string or \Doctrine\DBAL\Schema\Index.');
@@ -284,7 +283,7 @@ public function getAlterTableSQL(TableDiff $diff)
             $queryParts[] = 'RENAME TO ' . $diff->newName;
         }
 
-        foreach ($diff->addedColumns AS $fieldName => $column) {
+        foreach ($diff->addedColumns AS $column) {
             if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
                 continue;
             }

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -460,7 +460,7 @@ public function getAlterTableSQL(TableDiff $diff)
             $queryParts[] =  'RENAME TO ' . $diff->newName;
         }
 
-        foreach ($diff->addedColumns AS $fieldName => $column) {
+        foreach ($diff->addedColumns AS $column) {
             if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
                 continue;
             }

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -354,7 +354,7 @@ protected function _getCreateTableSQL($table, array $columns, array $options = a
         }
 
         if (isset($indexes) && ! empty($indexes)) {
-            foreach ($indexes as $indexName => $index) {
+            foreach ($indexes AS $index) {
                 $sql[] = $this->getCreateIndexSQL($index, $table);
             }
         }
@@ -408,11 +408,6 @@ public function getCreateAutoincrementSql($name, $table, $start = 1)
         $sql   = array();
 
         $indexName  = $table . '_AI_PK';
-        $definition = array(
-            'primary' => true,
-            'columns' => array($name => true),
-        );
-
         $idx = new \Doctrine\DBAL\Schema\Index($indexName, array($name), true, true);
 
         $sql[] = 'DECLARE

lib/Doctrine/DBAL/SQLParserUtils.php

@@ -141,7 +141,6 @@ static public function expandListParameters($query, $params, $types)
             $paramsOrd  = array();
             foreach ($paramPos as $needle => $needlePos) {
                 $paramLen   = strlen($needle);
-                $token      = substr($needle,0,1);
                 $needle     = substr($needle,1);
                 $value      = $params[$needle];
 

lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

@@ -551,7 +551,7 @@ public function renameTable($name, $newName)
     protected function _getPortableDatabasesList($databases)
     {
         $list = array();
-        foreach ($databases as $key => $value) {
+        foreach ($databases as $value) {
             if ($value = $this->_getPortableDatabaseDefinition($value)) {
                 $list[] = $value;
             }
@@ -567,7 +567,7 @@ protected function _getPortableDatabaseDefinition($database)
     protected function _getPortableFunctionsList($functions)
     {
         $list = array();
-        foreach ($functions as $key => $value) {
+        foreach ($functions as $value) {
             if ($value = $this->_getPortableFunctionDefinition($value)) {
                 $list[] = $value;
             }
@@ -583,7 +583,7 @@ protected function _getPortableFunctionDefinition($function)
     protected function _getPortableTriggersList($triggers)
     {
         $list = array();
-        foreach ($triggers as $key => $value) {
+        foreach ($triggers as $value) {
             if ($value = $this->_getPortableTriggerDefinition($value)) {
                 $list[] = $value;
             }
@@ -599,7 +599,7 @@ protected function _getPortableTriggerDefinition($trigger)
     protected function _getPortableSequencesList($sequences)
     {
         $list = array();
-        foreach ($sequences as $key => $value) {
+        foreach ($sequences as $value) {
             if ($value = $this->_getPortableSequenceDefinition($value)) {
                 $list[] = $value;
             }
@@ -631,7 +631,7 @@ protected function _getPortableTableColumnList($table, $database, $tableColumns)
         $eventManager = $this->_platform->getEventManager();
 
         $list = array();
-        foreach ($tableColumns as $key => $tableColumn) {
+        foreach ($tableColumns as $tableColumn) {
             $column = null;
             $defaultPrevented = false;
 
@@ -722,7 +722,7 @@ protected function _getPortableTableIndexesList($tableIndexRows, $tableName=null
     protected function _getPortableTablesList($tables)
     {
         $list = array();
-        foreach ($tables as $key => $value) {
+        foreach ($tables as $value) {
             if ($value = $this->_getPortableTableDefinition($value)) {
                 $list[] = $value;
             }
@@ -738,7 +738,7 @@ protected function _getPortableTableDefinition($table)
     protected function _getPortableUsersList($users)
     {
         $list = array();
-        foreach ($users as $key => $value) {
+        foreach ($users as $value) {
             if ($value = $this->_getPortableUserDefinition($value)) {
                 $list[] = $value;
             }
@@ -754,7 +754,7 @@ protected function _getPortableUserDefinition($user)
     protected function _getPortableViewsList($views)
     {
         $list = array();
-        foreach ($views as $key => $value) {
+        foreach ($views as $value) {
             if ($view = $this->_getPortableViewDefinition($value)) {
                 $viewName = strtolower($view->getQuotedName($this->_platform));
                 $list[$viewName] = $view;
@@ -771,7 +771,7 @@ protected function _getPortableViewDefinition($view)
     protected function _getPortableTableForeignKeysList($tableForeignKeys)
     {
         $list = array();
-        foreach ($tableForeignKeys as $key => $value) {
+        foreach ($tableForeignKeys as $value) {
             if ($value = $this->_getPortableTableForeignKeyDefinition($value)) {
                 $list[] = $value;
             }

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -255,7 +255,7 @@ private function detectColumnRenamings(TableDiff $tableDifferences)
             }
         }
 
-        foreach ($renameCandidates AS $candidate => $candidateColumns) {
+        foreach ($renameCandidates AS $candidateColumns) {
             if (count($candidateColumns) == 1) {
                 list($removedColumn, $addedColumn) = $candidateColumns[0];
                 $removedColumnName = strtolower($removedColumn->getName());

lib/Doctrine/DBAL/Schema/DB2SchemaManager.php

@@ -124,12 +124,11 @@ protected function _getPortableTableIndexesList($tableIndexes, $tableName=null)
     {
         $eventManager = $this->_platform->getEventManager();
 
-        $tableIndexRows = array();
         $indexes = array();
         foreach($tableIndexes AS $indexKey => $data) {
             $data = array_change_key_case($data, \CASE_LOWER);
-            $unique = ($data['uniquerule'] == "D") ? false : true;
-            $primary = ($data['uniquerule'] == "P");
+            $unique = ($data['uniquerule'] == 'D') ? false : true;
+            $primary = ($data['uniquerule'] == 'P');
 
             $indexName = strtolower($data['name']);
             if ($primary) {
@@ -140,7 +139,7 @@ protected function _getPortableTableIndexesList($tableIndexes, $tableName=null)
 
             $data = array(
                 'name' => $indexName,
-                'columns' => explode("+", ltrim($data['colnames'], '+')),
+                'columns' => explode('+', ltrim($data['colnames'], '+')),
                 'unique' => $unique,
                 'primary' => $primary
             );

lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php

@@ -143,17 +143,11 @@ protected function _getPortableTableColumnDefinition($tableColumn)
         }
 
         $length = ((int) $length == 0) ? null : (int) $length;
-        $def =  array(
-            'type' => $type,
-            'length' => $length,
-            'unsigned' => (bool) $unsigned,
-            'fixed' => (bool) $fixed
-        );
 
         $options = array(
             'length'        => $length,
-            'unsigned'      => (bool)$unsigned,
-            'fixed'         => (bool)$fixed,
+            'unsigned'      => (bool) $unsigned,
+            'fixed'         => (bool) $fixed,
             'default'       => isset($tableColumn['default']) ? $tableColumn['default'] : null,
             'notnull'       => (bool) ($tableColumn['null'] != 'YES'),
             'scale'         => null,

lib/Doctrine/DBAL/Schema/OracleSchemaManager.php

@@ -199,7 +199,7 @@ protected function _getPortableTableColumnDefinition($tableColumn)
     protected function _getPortableTableForeignKeysList($tableForeignKeys)
     {
         $list = array();
-        foreach ($tableForeignKeys as $key => $value) {
+        foreach ($tableForeignKeys as $value) {
             $value = \array_change_key_case($value, CASE_LOWER);
             if (!isset($list[$value['constraint_name']])) {
                 if ($value['delete_rule'] == "NO ACTION") {

lib/Doctrine/DBAL/Schema/Schema.php

@@ -123,8 +123,7 @@ public function getTables()
      */
     public function getTable($tableName)
     {
-        $tableName = strtolower($tableName);
-        if (!isset($this->_tables[$tableName])) {
+        if (false === $this->hasTable($tableName)) {
             throw SchemaException::tableDoesNotExist($tableName);
         }
 
@@ -214,7 +213,10 @@ public function renameTable($oldTableName, $newTableName)
     public function dropTable($tableName)
     {
         $tableName = strtolower($tableName);
-        $table = $this->getTable($tableName);
+        if (false === $this->hasTable($tableName)) {
+            throw SchemaException::tableDoesNotExist($tableName);
+        }
+
         unset($this->_tables[$tableName]);
         return $this;
     }

lib/Doctrine/DBAL/Schema/SchemaException.php

@@ -21,7 +21,7 @@ class SchemaException extends \Doctrine\DBAL\DBALException
      */
     static public function tableDoesNotExist($tableName)
     {
-        return new self("There is no table with name '".$tableName."' in the schema.", self::TABLE_DOESNT_EXIST);
+        return new self("There is no table with name '$tableName' in the schema.", self::TABLE_DOESNT_EXIST);
     }
 
     /**

lib/Doctrine/DBAL/Schema/Table.php

@@ -273,7 +273,10 @@ public function changeColumn($columnName, array $options)
     public function dropColumn($columnName)
     {
         $columnName = strtolower($columnName);
-        $column = $this->getColumn($columnName);
+        if (false === $this->hasColumn($columnName)) {
+            throw SchemaException::columnDoesNotExist($columnName, $this->_name);
+        }
+
         unset($this->_columns[$columnName]);
         return $this;
     }

tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php

@@ -77,11 +77,19 @@ public function testDropTable()
         $table = new Table($tableName);
         $schema = new Schema(array($table));
 
-        $this->assertTrue($schema->hasTable("foo"));
+        $this->assertTrue($schema->hasTable($tableName));
 
-        $schema->dropTable("foo");
+        $schema->dropTable($tableName);
 
-        $this->assertFalse($schema->hasTable("foo"));
+        $this->assertFalse($schema->hasTable($tableName));
+    }
+
+    public function testDropInvalidTable()
+    {
+        $this->setExpectedException('Doctrine\DBAL\Schema\SchemaException');
+
+        $schema = new Schema();
+        $schema->dropTable('foo');
     }
 
     public function testCreateTable()

tests/Doctrine/Tests/DBAL/Schema/TableTest.php

@@ -87,6 +87,14 @@ public function testDropColumn()
         $this->assertFalse($table->hasColumn("bar"));
     }
 
+    public function testDropInvalidColumn()
+    {
+        $this->setExpectedException('Doctrine\DBAL\Schema\SchemaException');
+
+        $table = new Table('foo');
+        $table->dropColumn('bar');
+    }
+
     public function testGetUnknownColumnThrowsException()
     {
         $this->setExpectedException("Doctrine\DBAL\Schema\SchemaException");