Skip to content

Commit

Permalink
Fix CS: "AS" => "as" in foreach loops.
Browse files Browse the repository at this point in the history
  • Loading branch information
@beberlei
beberlei committed Mar 24, 2012
1 parent 92d1254 commit 72465c6
Show file tree
Hide file tree
Showing 29 changed files with 127 additions and 127 deletions.
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function connect(array $params, $username = null, $password = null, array
$driverOptions
);

foreach ($this->_userDefinedFunctions AS $fn => $data) {
foreach ($this->_userDefinedFunctions as $fn => $data) {
$pdo->sqliteCreateFunction($fn, $data['callback'], $data['numArgs']);
}

Expand Down Expand Up @@ -113,4 +113,4 @@ public function getDatabase(\Doctrine\DBAL\Connection $conn)
$params = $conn->getParams();
return isset($params['path']) ? $params['path'] : null;
}
}
}
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function postConnect(ConnectionEventArgs $args)
if (count($this->_defaultSessionVars)) {
array_change_key_case($this->_defaultSessionVars, \CASE_UPPER);
$vars = array();
foreach ($this->_defaultSessionVars AS $option => $value) {
foreach ($this->_defaultSessionVars as $option => $value) {
$vars[] = $option." = '".$value."'";
}
$sql = "ALTER SESSION SET ".implode(" ", $vars);
Expand Down
28 changes: 14 additions & 14 deletions lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE
$options['primary'] = array();

if (($createFlags&self::CREATE_INDEXES) > 0) {
foreach ($table->getIndexes() AS $index) {
foreach ($table->getIndexes() as $index) {
/* @var $index Index */
if ($index->isPrimary()) {
$options['primary'] = $index->getColumns();
Expand All @@ -1061,7 +1061,7 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE

$columnSql = array();
$columns = array();
foreach ($table->getColumns() AS $column) {
foreach ($table->getColumns() as $column) {
/* @var \Doctrine\DBAL\Schema\Column $column */

if (null !== $this->_eventManager && $this->_eventManager->hasListeners(Events::onSchemaCreateTableColumn)) {
Expand Down Expand Up @@ -1103,7 +1103,7 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE

if (($createFlags&self::CREATE_FOREIGNKEYS) > 0) {
$options['foreignKeys'] = array();
foreach ($table->getForeignKeys() AS $fkConstraint) {
foreach ($table->getForeignKeys() as $fkConstraint) {
$options['foreignKeys'][] = $fkConstraint;
}
}
Expand All @@ -1119,7 +1119,7 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE

$sql = $this->_getCreateTableSQL($tableName, $columns, $options);
if ($this->supportsCommentOnStatement()) {
foreach ($table->getColumns() AS $column) {
foreach ($table->getColumns() as $column) {
if ($this->getColumnComment($column)) {
$sql[] = $this->getCommentOnColumnSQL($tableName, $column->getName(), $this->getColumnComment($column));
}
Expand Down Expand Up @@ -1171,7 +1171,7 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
$sql[] = $query;

if (isset($options['foreignKeys'])) {
foreach ((array) $options['foreignKeys'] AS $definition) {
foreach ((array) $options['foreignKeys'] as $definition) {
$sql[] = $this->getCreateForeignKeySQL($definition, $tableName);
}
}
Expand Down Expand Up @@ -1242,7 +1242,7 @@ public function getCreateConstraintSQL(\Doctrine\DBAL\Schema\Constraint $constra
$query .= ' FOREIGN KEY';

$foreignColumns = array();
foreach ($constraint->getForeignColumns() AS $column) {
foreach ($constraint->getForeignColumns() as $column) {
$foreignColumns[] = $column;
}

Expand Down Expand Up @@ -1496,18 +1496,18 @@ protected function getPreAlterTableIndexForeignKeySQL(TableDiff $diff)

$sql = array();
if ($this->supportsForeignKeyConstraints()) {
foreach ($diff->removedForeignKeys AS $foreignKey) {
foreach ($diff->removedForeignKeys as $foreignKey) {
$sql[] = $this->getDropForeignKeySQL($foreignKey, $tableName);
}
foreach ($diff->changedForeignKeys AS $foreignKey) {
foreach ($diff->changedForeignKeys as $foreignKey) {
$sql[] = $this->getDropForeignKeySQL($foreignKey, $tableName);
}
}

foreach ($diff->removedIndexes AS $index) {
foreach ($diff->removedIndexes as $index) {
$sql[] = $this->getDropIndexSQL($index, $tableName);
}
foreach ($diff->changedIndexes AS $index) {
foreach ($diff->changedIndexes as $index) {
$sql[] = $this->getDropIndexSQL($index, $tableName);
}

Expand All @@ -1524,18 +1524,18 @@ protected function getPostAlterTableIndexForeignKeySQL(TableDiff $diff)

$sql = array();
if ($this->supportsForeignKeyConstraints()) {
foreach ($diff->addedForeignKeys AS $foreignKey) {
foreach ($diff->addedForeignKeys as $foreignKey) {
$sql[] = $this->getCreateForeignKeySQL($foreignKey, $tableName);
}
foreach ($diff->changedForeignKeys AS $foreignKey) {
foreach ($diff->changedForeignKeys as $foreignKey) {
$sql[] = $this->getCreateForeignKeySQL($foreignKey, $tableName);
}
}

foreach ($diff->addedIndexes AS $index) {
foreach ($diff->addedIndexes as $index) {
$sql[] = $this->getCreateIndexSQL($index, $tableName);
}
foreach ($diff->changedIndexes AS $index) {
foreach ($diff->changedIndexes as $index) {
$sql[] = $this->getCreateIndexSQL($index, $tableName);
}

Expand Down
10 changes: 5 additions & 5 deletions lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,23 @@ public function getAlterTableSQL(TableDiff $diff)
$columnSql = array();

$queryParts = array();
foreach ($diff->addedColumns AS $fieldName => $column) {
foreach ($diff->addedColumns as $fieldName => $column) {
if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'ADD COLUMN ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
}

foreach ($diff->removedColumns AS $column) {
foreach ($diff->removedColumns as $column) {
if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'DROP COLUMN ' . $column->getQuotedName($this);
}

foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand All @@ -403,7 +403,7 @@ public function getAlterTableSQL(TableDiff $diff)
. $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
}

foreach ($diff->renamedColumns AS $oldColumnName => $column) {
foreach ($diff->renamedColumns as $oldColumnName => $column) {
if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
continue;
}
Expand Down Expand Up @@ -584,4 +584,4 @@ protected function getReservedKeywordsClass()
{
return 'Doctrine\DBAL\Platforms\Keywords\DB2Keywords';
}
}
}
8 changes: 4 additions & 4 deletions lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public function getAlterTableSQL(TableDiff $diff)
$queryParts[] = 'RENAME TO ' . $diff->newName;
}

foreach ($diff->addedColumns AS $fieldName => $column) {
foreach ($diff->addedColumns as $fieldName => $column) {
if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
continue;
}
Expand All @@ -312,15 +312,15 @@ public function getAlterTableSQL(TableDiff $diff)
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}

foreach ($diff->removedColumns AS $column) {
foreach ($diff->removedColumns as $column) {
if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'DROP ' . $column->getQuotedName($this);
}

foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand All @@ -333,7 +333,7 @@ public function getAlterTableSQL(TableDiff $diff)
. $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}

foreach ($diff->renamedColumns AS $oldColumnName => $column) {
foreach ($diff->renamedColumns as $oldColumnName => $column) {
if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private function isReservedWord($word)
}

$keywordLists = array();
foreach ($this->keywordLists AS $keywordList) {
foreach ($this->keywordLists as $keywordList) {
if ($keywordList->isKeyword($word)) {
$keywordLists[] = $keywordList->getName();
}
Expand Down Expand Up @@ -113,4 +113,4 @@ public function acceptTable(Table $table)
$this->isReservedWord($table->getName())
);
}
}
}
10 changes: 5 additions & 5 deletions lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ public function getAlterTableSQL(TableDiff $diff)
$queryParts[] = 'RENAME TO ' . $diff->newName;
}

foreach ($diff->addedColumns AS $fieldName => $column) {
foreach ($diff->addedColumns as $fieldName => $column) {
if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
continue;
}
Expand All @@ -470,15 +470,15 @@ public function getAlterTableSQL(TableDiff $diff)
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}

foreach ($diff->removedColumns AS $column) {
foreach ($diff->removedColumns as $column) {
if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'DROP ' . $column->getQuotedName($this);
}

foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand All @@ -491,7 +491,7 @@ public function getAlterTableSQL(TableDiff $diff)
. $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}

foreach ($diff->renamedColumns AS $oldColumnName => $column) {
foreach ($diff->renamedColumns as $oldColumnName => $column) {
if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
continue;
}
Expand Down Expand Up @@ -530,7 +530,7 @@ protected function getPreAlterTableIndexForeignKeySQL(TableDiff $diff)
$sql = array();
$table = $diff->name;

foreach ($diff->removedIndexes AS $remKey => $remIndex) {
foreach ($diff->removedIndexes as $remKey => $remIndex) {

foreach ($diff->addedIndexes as $addKey => $addIndex) {
if ($remIndex->getColumns() == $addIndex->getColumns()) {
Expand Down
8 changes: 4 additions & 4 deletions lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public function getAlterTableSQL(TableDiff $diff)
$columnSql = array();

$fields = array();
foreach ($diff->addedColumns AS $column) {
foreach ($diff->addedColumns as $column) {
if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
continue;
}
Expand All @@ -587,7 +587,7 @@ public function getAlterTableSQL(TableDiff $diff)
}

$fields = array();
foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand All @@ -602,7 +602,7 @@ public function getAlterTableSQL(TableDiff $diff)
$sql[] = 'ALTER TABLE ' . $diff->name . ' MODIFY (' . implode(', ', $fields) . ')';
}

foreach ($diff->renamedColumns AS $oldColumnName => $column) {
foreach ($diff->renamedColumns as $oldColumnName => $column) {
if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
continue;
}
Expand All @@ -611,7 +611,7 @@ public function getAlterTableSQL(TableDiff $diff)
}

$fields = array();
foreach ($diff->removedColumns AS $column) {
foreach ($diff->removedColumns as $column) {
if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public function getAlterTableSQL(TableDiff $diff)
$sql[] = 'ALTER TABLE ' . $diff->name . ' ' . $query;
}

foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand Down Expand Up @@ -533,7 +533,7 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
$sql[] = $query;

if (isset($options['indexes']) && ! empty($options['indexes'])) {
foreach ($options['indexes'] AS $index) {
foreach ($options['indexes'] as $index) {
$sql[] = $this->getCreateIndexSQL($index, $tableName);
}
}
Expand Down
12 changes: 6 additions & 6 deletions lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
$sql[] = $query;

if (isset($options['indexes']) && !empty($options['indexes'])) {
foreach ($options['indexes'] AS $index) {
foreach ($options['indexes'] as $index) {
$sql[] = $this->getCreateIndexSQL($index, $tableName);
}
}

if (isset($options['foreignKeys'])) {
foreach ((array) $options['foreignKeys'] AS $definition) {
foreach ((array) $options['foreignKeys'] as $definition) {
$sql[] = $this->getCreateForeignKeySQL($definition, $tableName);
}
}
Expand Down Expand Up @@ -322,23 +322,23 @@ public function getAlterTableSQL(TableDiff $diff)
$queryParts[] = 'RENAME TO ' . $diff->newName;
}

foreach ($diff->addedColumns AS $fieldName => $column) {
foreach ($diff->addedColumns as $fieldName => $column) {
if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
}

foreach ($diff->removedColumns AS $column) {
foreach ($diff->removedColumns as $column) {
if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
continue;
}

$queryParts[] = 'DROP COLUMN ' . $column->getQuotedName($this);
}

foreach ($diff->changedColumns AS $columnDiff) {
foreach ($diff->changedColumns as $columnDiff) {
if ($this->onSchemaAlterTableChangeColumn($columnDiff, $diff, $columnSql)) {
continue;
}
Expand All @@ -349,7 +349,7 @@ public function getAlterTableSQL(TableDiff $diff)
$this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
}

foreach ($diff->renamedColumns AS $oldColumnName => $column) {
foreach ($diff->renamedColumns as $oldColumnName => $column) {
if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Portability/Statement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public function fetchAll($fetchStyle = PDO::FETCH_BOTH, $columnIndex = 0)
return $rows;
}

foreach ($rows AS $num => $row) {
foreach ($rows as $num => $row) {
$rows[$num] = $this->fixRow($row, $iterateRow, $fixCase);
}

Expand All @@ -156,7 +156,7 @@ protected function fixRow($row, $iterateRow, $fixCase)
}

if ($iterateRow) {
foreach ($row AS $k => $v) {
foreach ($row as $k => $v) {
if (($this->portability & Connection::PORTABILITY_EMPTY_TO_NULL) && $v === '') {
$row[$k] = null;
} else if (($this->portability & Connection::PORTABILITY_RTRIM) && is_string($v)) {
Expand Down

0 comments on commit 72465c6

Please sign in to comment.