Fixed typos

Author: pborreli

UPGRADE.md

@@ -126,7 +126,7 @@ from 2.0 have to configure the annotation driver if they don't use `Configuratio
     $config->setMetadataDriverImpl($driver);
 
 
-## Scalar mappings can now be ommitted from DQL result
+## Scalar mappings can now be omitted from DQL result
 
 You are now allowed to mark scalar SELECT expressions as HIDDEN an they are not hydrated anymore.
 Example:
@@ -307,7 +307,7 @@ them for batch updates like SchemaTool and other commands. However the
 annotations driver being a default driver does not really help that much
 anyways.
 
-Therefore we decided to break backwards compability in this issue and drop
+Therefore we decided to break backwards compatibility in this issue and drop
 the support for Annotations as Default Driver and require our users to
 specify the driver explicitly (which allows us to ask for the path to all
 entities).
@@ -366,7 +366,7 @@ apologize for the inconvenience.
 ## Default Property for Field Mappings
 
 The "default" option for database column defaults has been removed. If desired, database column defaults can
-be implemented by using the columnDefinition attribute of the @Column annotation (or the approriate XML and YAML equivalents).
+be implemented by using the columnDefinition attribute of the @Column annotation (or the appropriate XML and YAML equivalents).
 Prefer PHP default values, if possible.
 
 ## Selecting Partial Objects
@@ -451,7 +451,7 @@ With new required method AbstractTask::buildDocumentation, its implementation de
 
     * "doctrine schema-tool --drop" now always drops the complete database instead of
     only those tables defined by the current database model. The previous method had
-    problems when foreign keys of orphaned tables pointed to tables that were schedulded
+    problems when foreign keys of orphaned tables pointed to tables that were scheduled
     for deletion.
     * Use "doctrine schema-tool --update" to get a save incremental update for your
     database schema without deleting any unused tables, sequences or foreign keys.

docs/en/cookbook/entities-in-session.rst

@@ -64,5 +64,5 @@ object or implement the __sleep() magic method on your entity.
 
     When you called detach on your objects they get "unmanaged" with that
     entity manager. This means you cannot use them as part of write operations
-    during ``EntityManagr#flush()`` anymore in this request.
+    during ``EntityManager#flush()`` anymore in this request.
 

docs/en/reference/faq.rst

@@ -162,7 +162,7 @@ is supposed to kick-start you, but not towards 100%.
 Why does the EntityGenerator not generate inheritance correctly?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Just from the details of the discriminator map the EntityGenerator cannot guess the inheritance hierachy.
+Just from the details of the discriminator map the EntityGenerator cannot guess the inheritance hierarchy.
 This is why the generation of inherited entities does not fully work. You have to adjust some additional
 code to get this one working correctly.
 

docs/en/reference/working-with-associations.rst

@@ -689,7 +689,7 @@ interchangeably, independent of in-memory or sql-backed collections.
          */
         public function setMaxResults($maxResults);
         public function getOrderings();
-        public function getWhereExpresion();
+        public function getWhereExpression();
         public function getFirstResult();
         public function getMaxResults();
     }

docs/en/tutorials/composite-primary-keys.rst

@@ -19,7 +19,7 @@ the ID fields have to have their values set before you call ``EntityManager#pers
 Primitive Types only
 ~~~~~~~~~~~~~~~~~~~~
 
-Even in version 2.0 you can have composite keys as long as they only consist of the primative types
+Even in version 2.0 you can have composite keys as long as they only consist of the primitive types
 ``integer`` and ``string``. Suppose you want to create a database of cars and use the model-name
 and year of production as primary keys:
 
@@ -129,7 +129,7 @@ of one or many parent entities.
 
 -   Dynamic Attributes of an Entity (for example Article). Each Article has many
     attributes with primary key "article_id" and "attribute_name".
--   Address object of a Person, the primary key of the adress is "user_id". This is not a case of a composite primary
+-   Address object of a Person, the primary key of the address is "user_id". This is not a case of a composite primary
     key, but the identity is derived through a foreign entity and a foreign key.
 -   Join Tables with metadata can be modelled as Entity, for example connections between two articles
     with a little description and a score.

lib/Doctrine/ORM/AbstractQuery.php

@@ -386,7 +386,7 @@ public function setResultCacheProfile(QueryCacheProfile $profile = null)
     }
 
     /**
-     * Defines a cache driver to be used for caching result sets and implictly enables caching.
+     * Defines a cache driver to be used for caching result sets and implicitly enables caching.
      *
      * @param \Doctrine\Common\Cache\Cache|null $resultCacheDriver Cache driver
      *

lib/Doctrine/ORM/Events.php

@@ -122,7 +122,7 @@ private function __construct()
 
     /**
      * The preFlush event occurs when the EntityManager#flush() operation is invoked,
-     * but before any changes to managed entites have been calculated. This event is
+     * but before any changes to managed entities have been calculated. This event is
      * always raised right after EntityManager#flush() call.
      */
     const preFlush = 'preFlush';

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -168,7 +168,7 @@ public function hydrateRow()
     }
 
     /**
-     * Excutes one-time preparation tasks, once each time hydration is started
+     * Executes one-time preparation tasks, once each time hydration is started
      * through {@link hydrateAll} or {@link iterate()}.
      *
      * @return void
@@ -178,7 +178,7 @@ protected function prepare()
     }
 
     /**
-     * Excutes one-time cleanup tasks at the end of a hydration that was initiated
+     * Executes one-time cleanup tasks at the end of a hydration that was initiated
      * through {@link hydrateAll} or {@link iterate()}.
      *
      * @return void
@@ -223,7 +223,7 @@ abstract protected function hydrateAllData();
      * Puts the elements of a result row into a new array, grouped by the dql alias
      * they belong to. The column names in the result set are mapped to their
      * field names during this procedure as well as any necessary conversions on
-     * the values applied. Scalar values are kept in a specfic key 'scalars'.
+     * the values applied. Scalar values are kept in a specific key 'scalars'.
      *
      * @param array  $data               SQL Result Row.
      * @param array &$cache              Cache for column to field result information.
@@ -321,7 +321,7 @@ protected function gatherRowData(array $data, array &$cache, array &$id, array &
             }
 
             // in an inheritance hierarchy the same field could be defined several times.
-            // We overwrite this value so long we dont have a non-null value, that value we keep.
+            // We overwrite this value so long we don't have a non-null value, that value we keep.
             // Per definition it cannot be that a field is defined several times and has several values.
             if (isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) && $value === null) {
                 continue;

lib/Doctrine/ORM/Internal/Hydration/HydrationException.php

@@ -49,7 +49,7 @@ public static function parentObjectOfRelationNotFound($alias, $parentAlias)
     public static function emptyDiscriminatorValue($dqlAlias)
     {
         return new self("The DQL alias '" . $dqlAlias . "' contains an entity ".
-            "of an inheritance hierachy with an empty discriminator value. This means " .
+            "of an inheritance hierarchy with an empty discriminator value. This means " .
             "that the database contains inconsistent data with an empty " .
             "discriminator value in a table row."
         );

lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php

@@ -200,7 +200,7 @@ public function build()
         } else if ($this->type == ClassMetadata::ONE_TO_ONE) {
             $cm->mapOneToOne($mapping);
         } else {
-            throw new \InvalidArgumentException("Type should be a ToOne Assocation here");
+            throw new \InvalidArgumentException("Type should be a ToOne Association here");
         }
         return $this->builder;
     }

lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php

@@ -163,7 +163,7 @@ public function addNamedQuery($name, $dqlQuery)
     }
 
     /**
-     * Sets class as root of a joined table inheritance hierachy.
+     * Sets class as root of a joined table inheritance hierarchy.
      *
      * @return ClassMetadataBuilder
      */
@@ -175,7 +175,7 @@ public function setJoinedTableInheritance()
     }
 
     /**
-     * Sets class as root of a single table inheritance hierachy.
+     * Sets class as root of a single table inheritance hierarchy.
      *
      * @return ClassMetadataBuilder
      */
@@ -207,7 +207,7 @@ public function setDiscriminatorColumn($name, $type = 'string', $length = 255)
     }
 
     /**
-     * Adds a subclass to this inheritance hierachy.
+     * Adds a subclass to this inheritance hierarchy.
      *
      * @param string $name
      * @param string $class
@@ -319,7 +319,7 @@ public function addManyToOne($name, $targetEntity, $inversedBy = null)
     }
 
     /**
-     * Creates a ManyToOne Assocation Builder.
+     * Creates a ManyToOne Association Builder.
      *
      * Note: This method does not add the association, you have to call build() on the AssociationBuilder.
      *
@@ -361,7 +361,7 @@ public function createOneToOne($name, $targetEntity)
     }
 
     /**
-     * Adds simple inverse one-to-one assocation.
+     * Adds simple inverse one-to-one association.
      *
      * @param string $name
      * @param string $targetEntity
@@ -378,7 +378,7 @@ public function addInverseOneToOne($name, $targetEntity, $mappedBy)
     }
 
     /**
-     * Adds simple owning one-to-one assocation.
+     * Adds simple owning one-to-one association.
      *
      * @param string      $name
      * @param string      $targetEntity
@@ -398,7 +398,7 @@ public function addOwningOneToOne($name, $targetEntity, $inversedBy = null)
     }
 
     /**
-     * Creates a ManyToMany Assocation Builder.
+     * Creates a ManyToMany Association Builder.
      *
      * @param string $name
      * @param string $targetEntity
@@ -418,7 +418,7 @@ public function createManyToMany($name, $targetEntity)
     }
 
     /**
-     * Adds a simple owning many to many assocation.
+     * Adds a simple owning many to many association.
      *
      * @param string      $name
      * @param string      $targetEntity
@@ -438,7 +438,7 @@ public function addOwningManyToMany($name, $targetEntity, $inversedBy = null)
     }
 
     /**
-     * Adds a simple inverse many to many assocation.
+     * Adds a simple inverse many to many association.
      *
      * @param string $name
      * @param string $targetEntity
@@ -455,7 +455,7 @@ public function addInverseManyToMany($name, $targetEntity, $mappedBy)
     }
 
     /**
-     * Creates a one to many assocation builder.
+     * Creates a one to many association builder.
      *
      * @param string $name
      * @param string $targetEntity
@@ -475,7 +475,7 @@ public function createOneToMany($name, $targetEntity)
     }
 
     /**
-     * Adds simple OneToMany assocation.
+     * Adds simple OneToMany association.
      *
      * @param string $name
      * @param string $targetEntity

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -193,7 +193,7 @@ protected function validateRuntimeMetadata($class, $parent)
         }
 
         $class->validateIdentifier();
-        $class->validateAssocations();
+        $class->validateAssociations();
         $class->validateLifecycleCallbacks($this->getReflectionService());
 
         // verify inheritance
@@ -319,7 +319,7 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
         foreach ($parentClass->associationMappings as $field => $mapping) {
             if ($parentClass->isMappedSuperclass) {
                 if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
-                    throw MappingException::illegalToManyAssocationOnMappedSuperclass($parentClass->name, $field);
+                    throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
                 $mapping['sourceEntity'] = $subClass->name;
             }

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -509,7 +509,7 @@ class ClassMetadataInfo implements ClassMetadata
     public $isIdentifierComposite = false;
 
     /**
-     * READ-ONLY: Flag indicating wheather the identifier/primary key contains at least one foreign key association.
+     * READ-ONLY: Flag indicating whether the identifier/primary key contains at least one foreign key association.
      *
      * This flag is necessary because some code blocks require special treatment of this cases.
      *
@@ -631,7 +631,7 @@ public function __construct($entityName, NamingStrategy $namingStrategy = null)
     }
 
     /**
-     * Gets the ReflectionPropertys of the mapped class.
+     * Gets the ReflectionProperties of the mapped class.
      *
      * @return array An array of ReflectionProperty instances.
      */
@@ -938,7 +938,7 @@ public function validateIdentifier()
      *
      * @throws MappingException
      */
-    public function validateAssocations()
+    public function validateAssociations()
     {
         foreach ($this->associationMappings as $mapping) {
             if ( ! ClassLoader::classExists($mapping['targetEntity']) ) {
@@ -1437,15 +1437,15 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
                 ));
             }
 
-            $uniqueContraintColumns = array();
+            $uniqueConstraintColumns = array();
             foreach ($mapping['joinColumns'] as &$joinColumn) {
                 if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) {
                     if (count($mapping['joinColumns']) == 1) {
                         if ( ! isset($mapping['id']) || ! $mapping['id']) {
                             $joinColumn['unique'] = true;
                         }
                     } else {
-                        $uniqueContraintColumns[] = $joinColumn['name'];
+                        $uniqueConstraintColumns[] = $joinColumn['name'];
                     }
                 }
 
@@ -1472,12 +1472,12 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
                         ? $joinColumn['fieldName'] : $joinColumn['name'];
             }
 
-            if ($uniqueContraintColumns) {
+            if ($uniqueConstraintColumns) {
                 if ( ! $this->table) {
                     throw new RuntimeException("ClassMetadataInfo::setTable() has to be called before defining a one to one relationship.");
                 }
                 $this->table['uniqueConstraints'][$mapping['fieldName']."_uniq"] = array(
-                    'columns' => $uniqueContraintColumns
+                    'columns' => $uniqueConstraintColumns
                 );
             }
 
@@ -1488,7 +1488,7 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
         $mapping['isCascadeRemove'] = $mapping['orphanRemoval'] ? true : $mapping['isCascadeRemove'];
 
         if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
-            throw MappingException::illegalInverseIdentifierAssocation($this->name, $mapping['fieldName']);
+            throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
         }
 
         return $mapping;
@@ -2051,7 +2051,7 @@ public function isInheritedField($fieldName)
     }
 
     /**
-     * Checks if this entity is the root in any entity-inheritance-hierachy.
+     * Checks if this entity is the root in any entity-inheritance-hierarchy.
      *
      * @return bool
      */
@@ -2427,7 +2427,7 @@ public function setCustomRepositoryClass($repositoryClassName)
      * @deprecated Deprecated since version 2.4 in favor of \Doctrine\ORM\Event\ListenersInvoker
      * 
      * @param string $lifecycleEvent The lifecycle event.
-     * @param object $entity         The Entity on which the event occured.
+     * @param object $entity         The Entity on which the event occurred.
      *
      * @return void
      */

lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php

@@ -21,7 +21,7 @@
 namespace Doctrine\ORM\Mapping;
 
 /**
- * The default DefaultEntityListene
+ * The default DefaultEntityListener
  *
  * @since   2.4
  * @author  Fabio B. Silva <[email protected]>

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -247,7 +247,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
             $mapping = array();
             $mapping['fieldName'] = $property->getName();
 
-            // Check for JoinColummn/JoinColumns annotations
+            // Check for JoinColumn/JoinColumns annotations
             $joinColumns = array();
 
             if ($joinColumnAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinColumn')) {
@@ -375,7 +375,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                 $override   = array();
                 $fieldName  = $associationOverride->name;
 
-                // Check for JoinColummn/JoinColumns annotations
+                // Check for JoinColumn/JoinColumns annotations
                 if ($associationOverride->joinColumns) {
                     $joinColumns = array();
                     foreach ($associationOverride->joinColumns as $joinColumn) {