RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

Fixed typos

Browse Source
This commit is contained in:
Pascal Borreli 2013-04-06 14:11:52 +00:00
parent 64b2ecfefc
commit 30b050b44c
16 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -309,7 +309,7 @@ abstract class AbstractQuery
/**
* Allows to translate entity namespaces to full qualified names.
*
* @param EntityManager $em
* @param Query\ResultSetMapping $rsm
*
* @return void
*/

2
lib/Doctrine/ORM/Event/ListenersInvoker.php
View File

@ -91,7 +91,7 @@ class ListenersInvoker
*
* @param \Doctrine\ORM\Mapping\ClassMetadata $metadata The entity metadata.
* @param string $eventName The entity lifecycle event.
* @param object $entity The Entity on which the event occured.
* @param object $entity The Entity on which the event occurred.
* @param \Doctrine\Common\EventArgs $event The Event args.
* @param integer $invoke Bitmask to invoke listeners.
*/

2
lib/Doctrine/ORM/Id/AssignedGenerator.php
View File

@ -23,7 +23,7 @@ use Doctrine\ORM\EntityManager;
use Doctrine\ORM\ORMException;
/**
* Special generator for application-assigned identifiers (doesnt really generate anything).
* Special generator for application-assigned identifiers (doesn't really generate anything).
*
* @since 2.0
* @author Benjamin Eberlei <kontakt@beberlei.de>

6
lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php
View File

@ -38,9 +38,9 @@ class BigIntegerIdentityGenerator extends AbstractIdGenerator
/**
* Constructor.
*
* @param string|null $seqName The name of the sequence to pass to lastInsertId()
* to obtain the last generated identifier within the current
* database session/connection, if any.
* @param string|null $sequenceName The name of the sequence to pass to lastInsertId()
* to obtain the last generated identifier within the current
* database session/connection, if any.
*/
public function __construct($sequenceName = null)
{

6
lib/Doctrine/ORM/Id/IdentityGenerator.php
View File

@ -38,9 +38,9 @@ class IdentityGenerator extends AbstractIdGenerator
/**
* Constructor.
*
* @param string|null $seqName The name of the sequence to pass to lastInsertId()
* to obtain the last generated identifier within the current
* database session/connection, if any.
* @param string|null $sequenceName The name of the sequence to pass to lastInsertId()
* to obtain the last generated identifier within the current
* database session/connection, if any.
*/
public function __construct($sequenceName = null)
{

1
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -533,6 +533,7 @@ class AnnotationDriver extends AbstractAnnotationDriver
/**
* Parse the given JoinColumn as array
*
* @param JoinColumn $joinColumn
* @return array
*/
private function joinColumnToArray(JoinColumn $joinColumn)

2
lib/Doctrine/ORM/Mapping/EntityListenerResolver.php
View File

@ -49,7 +49,7 @@ interface EntityListenerResolver
/**
* Register a entity listener instance.
*
* @return object An entity listener
* @param object $object An entity listener
*/
function register($object);
}

2
lib/Doctrine/ORM/Mapping/MappingException.php
View File

@ -685,8 +685,8 @@ class MappingException extends \Doctrine\ORM\ORMException
}
/**
* @param string $listenerName
* @param string $className
* @param string $methodName
*
* @return \Doctrine\ORM\Mapping\MappingException
*/

4
lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
View File

@ -98,7 +98,7 @@ abstract class AbstractCollectionPersister
*
* @param \Doctrine\ORM\PersistentCollection $coll
*
* @return void
* @return string
*/
abstract protected function getDeleteSQL(PersistentCollection $coll);
@ -108,7 +108,7 @@ abstract class AbstractCollectionPersister
*
* @param \Doctrine\ORM\PersistentCollection $coll
*
* @return void
* @return array
*/
abstract protected function getDeleteSQLParameters(PersistentCollection $coll);

2
lib/Doctrine/ORM/Query/AST/Functions/FunctionNode.php
View File

@ -22,7 +22,7 @@ namespace Doctrine\ORM\Query\AST\Functions;
use Doctrine\ORM\Query\AST\Node;
/**
* Abtract Function Node.
* Abstract Function Node.
*
*
* @link www.doctrine-project.org

4
lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php
View File

@ -83,9 +83,9 @@ class IdentityFunction extends FunctionNode
}
$tableAlias = $sqlWalker->getSQLTableAlias($class->getTableName(), $dqlAlias);
$columName = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
$columnName = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
return $tableAlias . '.' . $columName;
return $tableAlias . '.' . $columnName;
}
/**

8
lib/Doctrine/ORM/Query/Parser.php
View File

@ -2,7 +2,7 @@
/*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHARNTABILITY AND FITNESS FOR
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
@ -1064,7 +1064,7 @@ class Parser
// Creating AST node
$pathExpr = new AST\PathExpression($expectedTypes, $identVariable, $field);
// Defer PathExpression validation if requested to be defered
// Defer PathExpression validation if requested to be deferred
$this->deferredPathExpressions[] = array(
'expression' => $pathExpr,
'nestingLevel' => $this->nestingLevel,
@ -2413,7 +2413,7 @@ class Parser
}
if ($token['type'] === Lexer::T_IDENTIFIER || $token['type'] === Lexer::T_INPUT_PARAMETER || $this->isFunction()) {
// Peek beyond the matching closing paranthesis.
// Peek beyond the matching closing parenthesis.
$beyond = $this->lexer->peek();
switch ($peek['value']) {
@ -2765,7 +2765,7 @@ class Parser
* StringExpression ::= StringPrimary | "(" Subselect ")"
*
* @return \Doctrine\ORM\Query\AST\StringPrimary |
* \Doctrine]ORM\Query\AST\Subselect
* \Doctrine\ORM\Query\AST\Subselect
*/
public function StringExpression()
{

2
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -428,7 +428,7 @@ class SqlWalker implements TreeWalker
$conn = $this->em->getConnection();
$values = array();
if ($class->discriminatorValue !== null) { // discrimnators can be 0
if ($class->discriminatorValue !== null) { // discriminators can be 0
$values[] = $conn->quote($class->discriminatorValue);
}

1
lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
View File

@ -35,6 +35,7 @@ class ConsoleRunner
/**
* Create a Symfony Console HelperSet
*
* @param EntityManager $entityManager
* @return HelperSet
*/
public static function createHelperSet(EntityManager $entityManager)

4
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -475,7 +475,7 @@ public function __construct()
public function setFieldVisibility($visibility)
{
if ($visibility !== self::FIELD_VISIBLE_PRIVATE && $visibility !== self::FIELD_VISIBLE_PROTECTED) {
throw new \InvalidArgumentException('Invalid provided visibilty (only private and protected are allowed): ' . $visibility);
throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility);
}
$this->fieldVisibility = $visibility;
@ -1480,7 +1480,7 @@ public function __construct()
/**
* @param integer $type The generator to use for the mapped class.
*
* @return string The literal string for the generetor type.
* @return string The literal string for the generator type.
*
* @throws \InvalidArgumentException When the generator type does not exists.
*/

6
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -597,7 +597,7 @@ class UnitOfWork implements PropertyChangedListener
$orgValue = $originalData[$propName];
// skip if value havent changed
// skip if value haven't changed
if ($orgValue === $actualValue) {
continue;
}
@ -1055,7 +1055,7 @@ class UnitOfWork implements PropertyChangedListener
$calc = $this->getCommitOrderCalculator();
// See if there are any new classes in the changeset, that are not in the
// commit order graph yet (dont have a node).
// commit order graph yet (don't have a node).
// We have to inspect changeSet to be able to correctly build dependencies.
// It is not possible to use IdentityMap here because post inserted ids
// are not yet available.
@ -1820,7 +1820,7 @@ class UnitOfWork implements PropertyChangedListener
$managedCopyVersion = $reflField->getValue($managedCopy);
$entityVersion = $reflField->getValue($entity);
// Throw exception if versions dont match.
// Throw exception if versions don't match.
if ($managedCopyVersion != $entityVersion) {
throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
}