Merge pull request #172 from pborreli/master

Fixed typos

UPGRADE

@@ -43,7 +43,7 @@ now set to 'utf8'/'utf8_general_ci' by default. Previously the MySQL server defa
 
 # Upgrade to 2.2
 
-## Doctrine\DBAL\Connection#insert and Doctrine\DBAL\Connnection#update
+## Doctrine\DBAL\Connection#insert and Doctrine\DBAL\Connection#update
 
 Both methods now accept an optional last parameter $types with binding types of the values passed.
 This can potentially break child classes that have overwritten one of these methods.
@@ -55,7 +55,7 @@ Doctrine\DBAL\Connection#executeQuery() got a new last parameter "QueryCacheProf
 ## Doctrine\DBAL\Driver\Statement split
 
 The Driver statement was split into a ResultStatement and the normal statement extending from it.
-This seperates the configuration and the retrieval API from a statement.
+This separates the configuration and the retrieval API from a statement.
 
 ## MsSql Platform/SchemaManager renamed
 

docs/design/SHARDING.md

@@ -44,7 +44,7 @@ Assumptions:
 
 * For querying you either want to query ALL or just exactly one shard.
 * IDs for ALL sharded tables have to be unique across all shards.
-* Non-shareded data is replicated between all shards. They redundantly keep the information available. This is necessary so join queries on shards to reference data work.
+* Non-sharded data is replicated between all shards. They redundantly keep the information available. This is necessary so join queries on shards to reference data work.
 * If you retrieve an object A from a shard, then all references and collections of this object reside on the same shard.
 * The database schema on all shards is the same (or compatible)
 

lib/Doctrine/DBAL/Connection.php

@@ -131,7 +131,7 @@ class Connection implements DriverConnection
     private $_transactionIsolationLevel;
 
     /**
-     * If nested transations should use savepoints
+     * If nested transactions should use savepoints
      *
      * @var integer
      */
@@ -601,9 +601,9 @@ class Connection implements DriverConnection
     }
 
     /**
-     * Executes an, optionally parameterized, SQL query.
+     * Executes an, optionally parametrized, SQL query.
      *
-     * If the query is parameterized, a prepared statement is used.
+     * If the query is parametrized, a prepared statement is used.
      * If an SQLLogger is configured, the execution is logged.
      *
      * @param string $query The SQL query to execute.
@@ -687,13 +687,13 @@ class Connection implements DriverConnection
     }
 
     /**
-     * Executes an, optionally parameterized, SQL query and returns the result,
+     * Executes an, optionally parametrized, SQL query and returns the result,
      * applying a given projection/transformation function on each row of the result.
      *
      * @param string $query The SQL query to execute.
      * @param array $params The parameters, if any.
      * @param Closure $mapper The transformation function that is applied on each row.
-     *                        The function receives a single paramater, an array, that
+     *                        The function receives a single parameter, an array, that
      *                        represents a row of the result set.
      * @return mixed The projected result of the query.
      */

lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php

@@ -94,7 +94,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
             if (isset(self::$_paramTypeMap[$type])) {
                 $type = self::$_paramTypeMap[$type];
             } else {
-                throw new MysqliException("Unkown type: '{$type}'");
+                throw new MysqliException("Unknown type: '{$type}'");
             }
         }
 

lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php

@@ -24,7 +24,7 @@ use Doctrine\DBAL\Platforms;
 /**
  * PDO Oracle driver
  *
- * WARNING: This driver gives us segfauls in our testsuites on CLOB and other
+ * WARNING: This driver gives us segfaults in our testsuites on CLOB and other
  * stuff. PDO Oracle is not maintained by Oracle or anyone in the PHP community,
  * which leads us to the recommendation to use the "oci8" driver to connect
  * to Oracle instead.

lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php

@@ -34,7 +34,7 @@ class SQLSrvException extends \Doctrine\DBAL\DBALException
             $message .= "SQLSTATE [".$error['SQLSTATE'].", ".$error['code']."]: ". $error['message']."\n";
         }
         if ( ! $message) {
-            $message = "SQL Server error occured but no error message was retrieved from driver.";
+            $message = "SQL Server error occurred but no error message was retrieved from driver.";
         }
 
         return new self(rtrim($message));

lib/Doctrine/DBAL/DriverManager.php

@@ -155,7 +155,7 @@ final class DriverManager
      */
     private static function _checkParams(array $params)
     {
-        // check existance of mandatory parameters
+        // check existence of mandatory parameters
 
         // driver
         if ( ! isset($params['driver']) && ! isset($params['driverClass'])) {

lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php

@@ -24,9 +24,9 @@ use Doctrine\DBAL\Events;
 use Doctrine\Common\EventSubscriber;
 
 /**
- * Should be used when Oracle Server default enviroment does not match the Doctrine requirements.
+ * Should be used when Oracle Server default environment does not match the Doctrine requirements.
  *
- * The following enviroment variables are required for the Doctrine default date format:
+ * The following environment variables are required for the Doctrine default date format:
  *
  * NLS_TIME_FORMAT="HH24:MI:SS"
  * NLS_DATE_FORMAT="YYYY-MM-DD HH24:MI:SS"

lib/Doctrine/DBAL/Id/TableGenerator.php

@@ -151,7 +151,7 @@ class TableGenerator
 
         } catch(\Exception $e) {
             $this->conn->rollback();
-            throw new \Doctrine\DBAL\DBALException("Error occured while generating ID with TableGenerator, aborted generation: " . $e->getMessage(), 0, $e);
+            throw new \Doctrine\DBAL\DBALException("Error occurred while generating ID with TableGenerator, aborted generation: " . $e->getMessage(), 0, $e);
         }
 
         return $value;

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -708,12 +708,12 @@ abstract class AbstractPlatform
     }
 
     /**
-     * Returns a series of strings concatinated
+     * Returns a series of strings concatenated
      *
      * concat() accepts an arbitrary number of parameters. Each parameter
      * must contain an expression
      *
-     * @param string $arg1, $arg2 ... $argN     strings that will be concatinated.
+     * @param string $arg1, $arg2 ... $argN     strings that will be concatenated.
      * @return string
      */
     public function getConcatExpression()
@@ -1812,7 +1812,7 @@ abstract class AbstractPlatform
 
     /**
      * getCustomTypeDeclarationSql
-     * Obtail SQL code portion needed to create a custom column,
+     * Obtain SQL code portion needed to create a custom column,
      * e.g. when a field has the "columnDefinition" keyword.
      * Only "AUTOINCREMENT" and "PRIMARY KEY" are added if appropriate.
      *
@@ -2319,7 +2319,7 @@ abstract class AbstractPlatform
 
     /**
      * Whether the platform supports identity columns.
-     * Identity columns are columns that recieve an auto-generated value from the
+     * Identity columns are columns that receive an auto-generated value from the
      * database on insert of a row.
      *
      * @return boolean
@@ -2450,7 +2450,7 @@ abstract class AbstractPlatform
     }
 
     /**
-     * Does this plaform support to add inline column comments as postfix.
+     * Does this platform support to add inline column comments as postfix.
      *
      * @return bool
      */
@@ -2460,7 +2460,7 @@ abstract class AbstractPlatform
     }
 
     /**
-     * Does this platform support the propriortary synatx "COMMENT ON asset"
+     * Does this platform support the proprietary syntax "COMMENT ON asset"
      *
      * @return bool
      */
@@ -2609,7 +2609,7 @@ abstract class AbstractPlatform
     }
 
     /**
-     * Maximum length of any given databse identifier, like tables or column names.
+     * Maximum length of any given database identifier, like tables or column names.
      *
      * @return int
      */

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -87,12 +87,12 @@ class MySqlPlatform extends AbstractPlatform
     }
 
     /**
-     * Returns a series of strings concatinated
+     * Returns a series of strings concatenated
      *
      * concat() accepts an arbitrary number of parameters. Each parameter
      * must contain an expression or an array with expressions.
      *
-     * @param string|array(string) strings that will be concatinated.
+     * @param string|array(string) strings that will be concatenated.
      * @override
      */
     public function getConcatExpression()
@@ -138,7 +138,7 @@ class MySqlPlatform extends AbstractPlatform
 
     /**
      * Two approaches to listing the table indexes. The information_schema is
-     * prefered, because it doesn't cause problems with SQL keywords such as "order" or "table".
+     * preferred, because it doesn't cause problems with SQL keywords such as "order" or "table".
      *
      * @param string $table
      * @param string $currentDatabase

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -746,7 +746,7 @@ LEFT JOIN user_cons_columns r_cols
     }
 
     /**
-     * Maximum length of any given databse identifier, like tables or column names.
+     * Maximum length of any given database identifier, like tables or column names.
      *
      * @return int
      */

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -39,7 +39,7 @@ class PostgreSqlPlatform extends AbstractPlatform
      * Note: Not SQL92, but common functionality.
      *
      * @param string $value the target $value the string or the string column.
-     * @param int $from extract from this characeter.
+     * @param int $from extract from this character.
      * @param int $len extract this amount of characters.
      * @return string sql that extracts part of a string.
      * @override
@@ -618,7 +618,7 @@ class PostgreSqlPlatform extends AbstractPlatform
     }
 
     /**
-     * Decleration for a UUID field in PostgreSQL
+     * Declaration for a UUID field in PostgreSQL
      *
      * @param array $field
      * @return string

lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php

@@ -606,7 +606,7 @@ class SQLServerPlatform extends AbstractPlatform
     }
 
     /**
-     * Decleration for a UNIQUEIDENTIFIER (GUID) field in SQL Server
+     * Declaration for a UNIQUEIDENTIFIER (GUID) field in SQL Server
      *
      * @param array $field
      * @return string
@@ -869,7 +869,7 @@ class SQLServerPlatform extends AbstractPlatform
      */
     public function appendLockHint($fromClause, $lockMode)
     {
-        // @todo coorect
+        // @todo correct
         if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) {
             return $fromClause . ' WITH (tablockx)';
         } else if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE) {

lib/Doctrine/DBAL/Query/QueryBuilder.php

@@ -962,7 +962,7 @@ class QueryBuilder
             $fromClauses[$from['alias']] = $fromClause;
         }
 
-        // loop through all JOIN clasues for validation purpose
+        // loop through all JOIN clauses for validation purpose
         foreach ($this->sqlParts['join'] as $fromAlias => $joins) {
             if ( ! isset($fromClauses[$fromAlias]) ) {
                 throw QueryException::unknownFromAlias($fromAlias, array_keys($fromClauses));

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -46,7 +46,7 @@ class Comparator
     /**
      * Returns a SchemaDiff object containing the differences between the schemas $fromSchema and $toSchema.
      *
-     * The returned diferences are returned in such a way that they contain the
+     * The returned differences are returned in such a way that they contain the
      * operations to change the schema stored in $fromSchema to the schema that is
      * stored in $toSchema.
      *
@@ -262,7 +262,7 @@ class Comparator
 
     /**
      * Try to find columns that only changed their name, rename operations maybe cheaper than add/drop
-     * however ambiguouties between different possibilites should not lead to renaming at all.
+     * however ambiguities between different possibilities should not lead to renaming at all.
      *
      * @param TableDiff $tableDifferences
      */

lib/Doctrine/DBAL/Schema/Index.php

@@ -151,7 +151,7 @@ class Index extends AbstractAsset implements Constraint
     }
 
     /**
-     * Check if the other index already fullfills all the indexing and constraint needs of the current one.
+     * Check if the other index already fulfills all the indexing and constraint needs of the current one.
      *
      * @param Index $other
      * @return bool
@@ -171,7 +171,7 @@ class Index extends AbstractAsset implements Constraint
             if ( ! $this->isUnique() && !$this->isPrimary()) {
                 // this is a special case: If the current key is neither primary or unique, any uniqe or
                 // primary key will always have the same effect for the index and there cannot be any constraint
-                // overlaps. This means a primary or unique index can always fullfill the requirements of just an
+                // overlaps. This means a primary or unique index can always fulfill the requirements of just an
                 // index that has no constraints.
                 return true;
             } else if ($other->isPrimary() != $this->isPrimary()) {

lib/Doctrine/DBAL/Schema/Synchronizer/SchemaSynchronizer.php

@@ -87,7 +87,7 @@ interface SchemaSynchronizer
     function dropSchema(Schema $dropSchema);
 
     /**
-     * Drop all assets from the underyling db.
+     * Drop all assets from the underlying db.
      *
      * @return void
      */

lib/Doctrine/DBAL/Schema/Synchronizer/SingleDatabaseSynchronizer.php

@@ -185,7 +185,7 @@ class SingleDatabaseSynchronizer extends AbstractSchemaSynchronizer
     }
 
     /**
-     * Drop all assets from the underyling db.
+     * Drop all assets from the underlying db.
      *
      * @return void
      */

lib/Doctrine/DBAL/Schema/Table.php

@@ -325,7 +325,7 @@ class Table extends AbstractAsset
     /**
      * Add a foreign key constraint
      *
-     * Name is to be generated by the database itsself.
+     * Name is to be generated by the database itself.
      *
      * @deprecated Use {@link addForeignKeyConstraint}
      * @param Table $foreignTable
@@ -458,9 +458,9 @@ class Table extends AbstractAsset
         $name = strtolower($name);
 
         $this->_fkConstraints[$name] = $constraint;
-        // add an explicit index on the foreign key columns. If there is already an index that fullfils this requirements drop the request.
+        // add an explicit index on the foreign key columns. If there is already an index that fulfils this requirements drop the request.
         // In the case of __construct calling this method during hydration from schema-details all the explicitly added indexes
-        // lead to duplicates. This creates compuation overhead in this case, however no duplicate indexes are ever added (based on columns).
+        // lead to duplicates. This creates computation overhead in this case, however no duplicate indexes are ever added (based on columns).
         $this->addIndex($constraint->getColumns());
     }
 

lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php

@@ -32,7 +32,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform,
     Doctrine\DBAL\Schema\Index;
 
 /**
- * Gather SQL statements that allow to completly drop the current schema.
+ * Gather SQL statements that allow to completely drop the current schema.
  *
  * 
  * @link    www.doctrine-project.org

lib/Doctrine/DBAL/Sharding/PoolingShardConnection.php

@@ -108,7 +108,7 @@ class PoolingShardConnection extends Connection
 
         foreach ($params['shards'] as $shard) {
             if ( ! isset($shard['id'])) {
-                throw new \InvalidArgumentException("Missing 'id' for one configured shard. Please specificy a unique shard-id.");
+                throw new \InvalidArgumentException("Missing 'id' for one configured shard. Please specify a unique shard-id.");
             }
 
             if ( !is_numeric($shard['id']) || $shard['id'] < 1) {

lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizer.php

@@ -185,7 +185,7 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
     }
 
     /**
-     * Drop all assets from the underyling db.
+     * Drop all assets from the underlying db.
      *
      * @return void
      */
@@ -204,15 +204,15 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
 
     private function extractSchemaFederation(Schema $schema, $isFederation)
     {
-        $partionedSchema = clone $schema;
+        $partitionedSchema = clone $schema;
 
-        foreach ($partionedSchema->getTables() as $table) {
+        foreach ($partitionedSchema->getTables() as $table) {
             if ($isFederation) {
                 $table->addOption(self::FEDERATION_DISTRIBUTION_NAME, $this->shardManager->getDistributionKey());
             }
 
             if ( $table->hasOption(self::FEDERATION_TABLE_FEDERATED) !== $isFederation) {
-                $partionedSchema->dropTable($table->getName());
+                $partitionedSchema->dropTable($table->getName());
             } else {
                 foreach ($table->getForeignKeys() as $fk) {
                     $foreignTable = $schema->getTable($fk->getForeignTableName());
@@ -223,13 +223,13 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
             }
         }
 
-        return $partionedSchema;
+        return $partitionedSchema;
     }
 
     /**
      * Work on the Global/Federation based on currently existing shards and
-     * perform the given operation on the underyling schema synchronizer given
-     * the different partioned schema instances.
+     * perform the given operation on the underlying schema synchronizer given
+     * the different partitioned schema instances.
      *
      * @param Schema $schema
      * @param Closure $operation

lib/Doctrine/DBAL/Sharding/ShardManager.php

@@ -34,7 +34,7 @@ use Doctrine\DBAL\Connection;
  * necessary data for all use-cases. Switching between shards should be done with
  * caution, especially if lazy loading is implemented. Any query is always
  * executed against the last shard that was selected. If a query is created for
- * a shard Y but then a shard X is selected when its actually excecuted you
+ * a shard Y but then a shard X is selected when its actually executed you
  * will hit the wrong shard.
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>

lib/Doctrine/DBAL/Types/GuidType.php

@@ -22,7 +22,7 @@ namespace Doctrine\DBAL\Types;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 /**
- * Represents a GUID/UUID datatype (both are actually synomys) in the database.
+ * Represents a GUID/UUID datatype (both are actually synonyms) in the database.
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  * @since 2.3