Commit 16a9572f authored by Pascal Borreli's avatar Pascal Borreli

Fixed typos

parent b280efbe
...@@ -43,7 +43,7 @@ now set to 'utf8'/'utf8_general_ci' by default. Previously the MySQL server defa ...@@ -43,7 +43,7 @@ now set to 'utf8'/'utf8_general_ci' by default. Previously the MySQL server defa
# Upgrade to 2.2 # 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. 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. 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 ...@@ -55,7 +55,7 @@ Doctrine\DBAL\Connection#executeQuery() got a new last parameter "QueryCacheProf
## Doctrine\DBAL\Driver\Statement split ## Doctrine\DBAL\Driver\Statement split
The Driver statement was split into a ResultStatement and the normal statement extending from it. 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 ## MsSql Platform/SchemaManager renamed
......
...@@ -44,7 +44,7 @@ Assumptions: ...@@ -44,7 +44,7 @@ Assumptions:
* For querying you either want to query ALL or just exactly one shard. * 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. * 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. * 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) * The database schema on all shards is the same (or compatible)
......
...@@ -131,7 +131,7 @@ class Connection implements DriverConnection ...@@ -131,7 +131,7 @@ class Connection implements DriverConnection
private $_transactionIsolationLevel; private $_transactionIsolationLevel;
/** /**
* If nested transations should use savepoints * If nested transactions should use savepoints
* *
* @var integer * @var integer
*/ */
...@@ -601,9 +601,9 @@ class Connection implements DriverConnection ...@@ -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. * If an SQLLogger is configured, the execution is logged.
* *
* @param string $query The SQL query to execute. * @param string $query The SQL query to execute.
...@@ -687,13 +687,13 @@ class Connection implements DriverConnection ...@@ -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. * applying a given projection/transformation function on each row of the result.
* *
* @param string $query The SQL query to execute. * @param string $query The SQL query to execute.
* @param array $params The parameters, if any. * @param array $params The parameters, if any.
* @param Closure $mapper The transformation function that is applied on each row. * @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. * represents a row of the result set.
* @return mixed The projected result of the query. * @return mixed The projected result of the query.
*/ */
......
...@@ -94,7 +94,7 @@ class MysqliStatement implements \IteratorAggregate, Statement ...@@ -94,7 +94,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
if (isset(self::$_paramTypeMap[$type])) { if (isset(self::$_paramTypeMap[$type])) {
$type = self::$_paramTypeMap[$type]; $type = self::$_paramTypeMap[$type];
} else { } else {
throw new MysqliException("Unkown type: '{$type}'"); throw new MysqliException("Unknown type: '{$type}'");
} }
} }
......
...@@ -24,7 +24,7 @@ use Doctrine\DBAL\Platforms; ...@@ -24,7 +24,7 @@ use Doctrine\DBAL\Platforms;
/** /**
* PDO Oracle driver * 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, * 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 * which leads us to the recommendation to use the "oci8" driver to connect
* to Oracle instead. * to Oracle instead.
......
...@@ -34,7 +34,7 @@ class SQLSrvException extends \Doctrine\DBAL\DBALException ...@@ -34,7 +34,7 @@ class SQLSrvException extends \Doctrine\DBAL\DBALException
$message .= "SQLSTATE [".$error['SQLSTATE'].", ".$error['code']."]: ". $error['message']."\n"; $message .= "SQLSTATE [".$error['SQLSTATE'].", ".$error['code']."]: ". $error['message']."\n";
} }
if ( ! $message) { 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)); return new self(rtrim($message));
......
...@@ -155,7 +155,7 @@ final class DriverManager ...@@ -155,7 +155,7 @@ final class DriverManager
*/ */
private static function _checkParams(array $params) private static function _checkParams(array $params)
{ {
// check existance of mandatory parameters // check existence of mandatory parameters
// driver // driver
if ( ! isset($params['driver']) && ! isset($params['driverClass'])) { if ( ! isset($params['driver']) && ! isset($params['driverClass'])) {
......
...@@ -24,9 +24,9 @@ use Doctrine\DBAL\Events; ...@@ -24,9 +24,9 @@ use Doctrine\DBAL\Events;
use Doctrine\Common\EventSubscriber; 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_TIME_FORMAT="HH24:MI:SS"
* NLS_DATE_FORMAT="YYYY-MM-DD HH24:MI:SS" * NLS_DATE_FORMAT="YYYY-MM-DD HH24:MI:SS"
......
...@@ -151,7 +151,7 @@ class TableGenerator ...@@ -151,7 +151,7 @@ class TableGenerator
} catch(\Exception $e) { } catch(\Exception $e) {
$this->conn->rollback(); $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; return $value;
......
...@@ -708,12 +708,12 @@ abstract class AbstractPlatform ...@@ -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 * concat() accepts an arbitrary number of parameters. Each parameter
* must contain an expression * 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 * @return string
*/ */
public function getConcatExpression() public function getConcatExpression()
...@@ -1812,7 +1812,7 @@ abstract class AbstractPlatform ...@@ -1812,7 +1812,7 @@ abstract class AbstractPlatform
/** /**
* getCustomTypeDeclarationSql * 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. * e.g. when a field has the "columnDefinition" keyword.
* Only "AUTOINCREMENT" and "PRIMARY KEY" are added if appropriate. * Only "AUTOINCREMENT" and "PRIMARY KEY" are added if appropriate.
* *
...@@ -2319,7 +2319,7 @@ abstract class AbstractPlatform ...@@ -2319,7 +2319,7 @@ abstract class AbstractPlatform
/** /**
* Whether the platform supports identity columns. * 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. * database on insert of a row.
* *
* @return boolean * @return boolean
...@@ -2450,7 +2450,7 @@ abstract class AbstractPlatform ...@@ -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 * @return bool
*/ */
...@@ -2460,7 +2460,7 @@ abstract class AbstractPlatform ...@@ -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 * @return bool
*/ */
...@@ -2609,7 +2609,7 @@ abstract class AbstractPlatform ...@@ -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 * @return int
*/ */
......
...@@ -87,12 +87,12 @@ class MySqlPlatform extends AbstractPlatform ...@@ -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 * concat() accepts an arbitrary number of parameters. Each parameter
* must contain an expression or an array with expressions. * 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 * @override
*/ */
public function getConcatExpression() public function getConcatExpression()
...@@ -138,7 +138,7 @@ class MySqlPlatform extends AbstractPlatform ...@@ -138,7 +138,7 @@ class MySqlPlatform extends AbstractPlatform
/** /**
* Two approaches to listing the table indexes. The information_schema is * 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 $table
* @param string $currentDatabase * @param string $currentDatabase
......
...@@ -746,7 +746,7 @@ LEFT JOIN user_cons_columns r_cols ...@@ -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 * @return int
*/ */
......
...@@ -39,7 +39,7 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -39,7 +39,7 @@ class PostgreSqlPlatform extends AbstractPlatform
* Note: Not SQL92, but common functionality. * Note: Not SQL92, but common functionality.
* *
* @param string $value the target $value the string or the string column. * @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. * @param int $len extract this amount of characters.
* @return string sql that extracts part of a string. * @return string sql that extracts part of a string.
* @override * @override
...@@ -618,7 +618,7 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -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 * @param array $field
* @return string * @return string
......
...@@ -606,7 +606,7 @@ class SQLServerPlatform extends AbstractPlatform ...@@ -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 * @param array $field
* @return string * @return string
...@@ -869,7 +869,7 @@ class SQLServerPlatform extends AbstractPlatform ...@@ -869,7 +869,7 @@ class SQLServerPlatform extends AbstractPlatform
*/ */
public function appendLockHint($fromClause, $lockMode) public function appendLockHint($fromClause, $lockMode)
{ {
// @todo coorect // @todo correct
if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) { if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) {
return $fromClause . ' WITH (tablockx)'; return $fromClause . ' WITH (tablockx)';
} else if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE) { } else if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE) {
......
...@@ -962,7 +962,7 @@ class QueryBuilder ...@@ -962,7 +962,7 @@ class QueryBuilder
$fromClauses[$from['alias']] = $fromClause; $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) { foreach ($this->sqlParts['join'] as $fromAlias => $joins) {
if ( ! isset($fromClauses[$fromAlias]) ) { if ( ! isset($fromClauses[$fromAlias]) ) {
throw QueryException::unknownFromAlias($fromAlias, array_keys($fromClauses)); throw QueryException::unknownFromAlias($fromAlias, array_keys($fromClauses));
......
...@@ -46,7 +46,7 @@ class Comparator ...@@ -46,7 +46,7 @@ class Comparator
/** /**
* Returns a SchemaDiff object containing the differences between the schemas $fromSchema and $toSchema. * 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 * operations to change the schema stored in $fromSchema to the schema that is
* stored in $toSchema. * stored in $toSchema.
* *
...@@ -262,7 +262,7 @@ class Comparator ...@@ -262,7 +262,7 @@ class Comparator
/** /**
* Try to find columns that only changed their name, rename operations maybe cheaper than add/drop * 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 * @param TableDiff $tableDifferences
*/ */
......
...@@ -151,7 +151,7 @@ class Index extends AbstractAsset implements Constraint ...@@ -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 * @param Index $other
* @return bool * @return bool
...@@ -171,7 +171,7 @@ class Index extends AbstractAsset implements Constraint ...@@ -171,7 +171,7 @@ class Index extends AbstractAsset implements Constraint
if ( ! $this->isUnique() && !$this->isPrimary()) { if ( ! $this->isUnique() && !$this->isPrimary()) {
// this is a special case: If the current key is neither primary or unique, any uniqe or // 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 // 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. // index that has no constraints.
return true; return true;
} else if ($other->isPrimary() != $this->isPrimary()) { } else if ($other->isPrimary() != $this->isPrimary()) {
......
...@@ -87,7 +87,7 @@ interface SchemaSynchronizer ...@@ -87,7 +87,7 @@ interface SchemaSynchronizer
function dropSchema(Schema $dropSchema); function dropSchema(Schema $dropSchema);
/** /**
* Drop all assets from the underyling db. * Drop all assets from the underlying db.
* *
* @return void * @return void
*/ */
......
...@@ -185,7 +185,7 @@ class SingleDatabaseSynchronizer extends AbstractSchemaSynchronizer ...@@ -185,7 +185,7 @@ class SingleDatabaseSynchronizer extends AbstractSchemaSynchronizer
} }
/** /**
* Drop all assets from the underyling db. * Drop all assets from the underlying db.
* *
* @return void * @return void
*/ */
......
...@@ -325,7 +325,7 @@ class Table extends AbstractAsset ...@@ -325,7 +325,7 @@ class Table extends AbstractAsset
/** /**
* Add a foreign key constraint * 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} * @deprecated Use {@link addForeignKeyConstraint}
* @param Table $foreignTable * @param Table $foreignTable
...@@ -458,9 +458,9 @@ class Table extends AbstractAsset ...@@ -458,9 +458,9 @@ class Table extends AbstractAsset
$name = strtolower($name); $name = strtolower($name);
$this->_fkConstraints[$name] = $constraint; $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 // 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()); $this->addIndex($constraint->getColumns());
} }
......
...@@ -32,7 +32,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform, ...@@ -32,7 +32,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform,
Doctrine\DBAL\Schema\Index; 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 * @link www.doctrine-project.org
......
...@@ -108,7 +108,7 @@ class PoolingShardConnection extends Connection ...@@ -108,7 +108,7 @@ class PoolingShardConnection extends Connection
foreach ($params['shards'] as $shard) { foreach ($params['shards'] as $shard) {
if ( ! isset($shard['id'])) { 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) { if ( !is_numeric($shard['id']) || $shard['id'] < 1) {
......
...@@ -185,7 +185,7 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer ...@@ -185,7 +185,7 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
} }
/** /**
* Drop all assets from the underyling db. * Drop all assets from the underlying db.
* *
* @return void * @return void
*/ */
...@@ -204,15 +204,15 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer ...@@ -204,15 +204,15 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
private function extractSchemaFederation(Schema $schema, $isFederation) private function extractSchemaFederation(Schema $schema, $isFederation)
{ {
$partionedSchema = clone $schema; $partitionedSchema = clone $schema;
foreach ($partionedSchema->getTables() as $table) { foreach ($partitionedSchema->getTables() as $table) {
if ($isFederation) { if ($isFederation) {
$table->addOption(self::FEDERATION_DISTRIBUTION_NAME, $this->shardManager->getDistributionKey()); $table->addOption(self::FEDERATION_DISTRIBUTION_NAME, $this->shardManager->getDistributionKey());
} }
if ( $table->hasOption(self::FEDERATION_TABLE_FEDERATED) !== $isFederation) { if ( $table->hasOption(self::FEDERATION_TABLE_FEDERATED) !== $isFederation) {
$partionedSchema->dropTable($table->getName()); $partitionedSchema->dropTable($table->getName());
} else { } else {
foreach ($table->getForeignKeys() as $fk) { foreach ($table->getForeignKeys() as $fk) {
$foreignTable = $schema->getTable($fk->getForeignTableName()); $foreignTable = $schema->getTable($fk->getForeignTableName());
...@@ -223,13 +223,13 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer ...@@ -223,13 +223,13 @@ class SQLAzureFederationsSynchronizer implements AbstractSchemaSynchronizer
} }
} }
return $partionedSchema; return $partitionedSchema;
} }
/** /**
* Work on the Global/Federation based on currently existing shards and * Work on the Global/Federation based on currently existing shards and
* perform the given operation on the underyling schema synchronizer given * perform the given operation on the underlying schema synchronizer given
* the different partioned schema instances. * the different partitioned schema instances.
* *
* @param Schema $schema * @param Schema $schema
* @param Closure $operation * @param Closure $operation
......
...@@ -34,7 +34,7 @@ use Doctrine\DBAL\Connection; ...@@ -34,7 +34,7 @@ use Doctrine\DBAL\Connection;
* necessary data for all use-cases. Switching between shards should be done with * necessary data for all use-cases. Switching between shards should be done with
* caution, especially if lazy loading is implemented. Any query is always * 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 * 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. * will hit the wrong shard.
* *
* @author Benjamin Eberlei <kontakt@beberlei.de> * @author Benjamin Eberlei <kontakt@beberlei.de>
......
...@@ -22,7 +22,7 @@ namespace Doctrine\DBAL\Types; ...@@ -22,7 +22,7 @@ namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\Platforms\AbstractPlatform; 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> * @author Benjamin Eberlei <kontakt@beberlei.de>
* @since 2.3 * @since 2.3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment