From 43b301f22b6a8ba2fe0fa6c0493cc2283376acd7 Mon Sep 17 00:00:00 2001 From: Benjamin Morel Date: Mon, 3 Dec 2012 11:02:29 +0000 Subject: [PATCH] Fixed English mistakes --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 2 +- .../Persisters/AbstractCollectionPersister.php | 6 +++--- .../Command/EnsureProductionSettingsCommand.php | 2 +- lib/Doctrine/ORM/Tools/EntityGenerator.php | 2 +- tests/Doctrine/Tests/DbalFunctionalTestCase.php | 2 +- .../ORM/Functional/ExtraLazyCollectionTest.php | 16 ++++++++-------- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 22c53f2f9..a9dfa9b8c 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -29,7 +29,7 @@ use Doctrine\Common\ClassLoader; /** * A ClassMetadata instance holds all the object-relational mapping metadata - * of an entity and it's associations. + * of an entity and its associations. * * Once populated, ClassMetadata instances are usually cached in a serialized form. * diff --git a/lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php b/lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php index 26147261e..e1cad36bc 100644 --- a/lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php +++ b/lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php @@ -113,7 +113,7 @@ abstract class AbstractCollectionPersister abstract protected function getDeleteSQLParameters(PersistentCollection $coll); /** - * Updates the given collection, synchronizing it's state with the database + * Updates the given collection, synchronizing its state with the database * by inserting, updating and deleting individual elements. * * @param \Doctrine\ORM\PersistentCollection $coll @@ -208,7 +208,7 @@ abstract class AbstractCollectionPersister */ public function contains(PersistentCollection $coll, $element) { - throw new \BadMethodCallException("Checking for existance of an element is not supported by this CollectionPersister."); + throw new \BadMethodCallException("Checking for existence of an element is not supported by this CollectionPersister."); } /** @@ -223,7 +223,7 @@ abstract class AbstractCollectionPersister */ public function containsKey(PersistentCollection $coll, $key) { - throw new \BadMethodCallException("Checking for existance of a key is not supported by this CollectionPersister."); + throw new \BadMethodCallException("Checking for existence of a key is not supported by this CollectionPersister."); } /** diff --git a/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php index 67461e293..f261e89ee 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php @@ -46,7 +46,7 @@ class EnsureProductionSettingsCommand extends Command ->setDefinition(array( new InputOption( 'complete', null, InputOption::VALUE_NONE, - 'Flag to also inspect database connection existance.' + 'Flag to also inspect database connection existence.' ) )) ->setHelp(<<_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); $this->assertFalse($user->articles->isInitialized(), "Pre-Condition: Collection is not initialized."); - // Test One to Many existance retrieved from DB + // Test One to Many existence retrieved from DB $article = $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId); $queryCount = $this->getCurrentQueryCount(); @@ -231,7 +231,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized."); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - // Test One to Many existance with state new + // Test One to Many existence with state new $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); $article->topic = "Testnew"; $article->text = "blub"; @@ -240,7 +240,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertFalse($user->articles->contains($article)); $this->assertEquals($queryCount, $this->getCurrentQueryCount(), "Checking for contains of new entity should cause no query to be executed."); - // Test One to Many existance with state clear + // Test One to Many existence with state clear $this->_em->persist($article); $this->_em->flush(); @@ -249,7 +249,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($queryCount+1, $this->getCurrentQueryCount(), "Checking for contains of persisted entity should cause one query to be executed."); $this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized."); - // Test One to Many existance with state managed + // Test One to Many existence with state managed $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); $article->topic = "How to not fail anymore on tests"; $article->text = "That is simple! Just write more tests!"; @@ -271,7 +271,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition: Collection is not initialized."); - // Test Many to Many existance retrieved from DB + // Test Many to Many existence retrieved from DB $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); $queryCount = $this->getCurrentQueryCount(); @@ -279,7 +279,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), "Checking for contains of managed entity should cause one query to be executed."); $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); - // Test Many to Many existance with state new + // Test Many to Many existence with state new $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); $group->name = "A New group!"; @@ -289,7 +289,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($queryCount, $this->getCurrentQueryCount(), "Checking for contains of new entity should cause no query to be executed."); $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); - // Test Many to Many existance with state clear + // Test Many to Many existence with state clear $this->_em->persist($group); $this->_em->flush(); @@ -299,7 +299,7 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), "Checking for contains of persisted entity should cause one query to be executed."); $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); - // Test Many to Many existance with state managed + // Test Many to Many existence with state managed $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); $group->name = "My managed group"; diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 4b72a9a27..571e2e10f 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -14,7 +14,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase /* The query cache shared between all functional tests. */ private static $_queryCacheImpl = null; - /* Shared connection when a TestCase is run alone (outside of it's functional suite) */ + /* Shared connection when a TestCase is run alone (outside of its functional suite) */ protected static $_sharedConn; /**