doctrine / orm

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

Spacing +13 added lines, -13 removed lines

@@ -105,7 +105,7 @@ 
      */
     protected function onNotFoundMetadata($className)
     {
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
             return;
         }
 
@@ -162,7 +162,7 @@ 
             $this->completeIdGeneratorMapping($class);
         }
 
-        if (!$class->isMappedSuperclass) {
+        if ( ! $class->isMappedSuperclass) {
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
 
                 if (isset($embeddableClass['inherited'])) {
@@ -187,7 +187,7 @@ 
 
                 $identifier = $embeddableMetadata->getIdentifier();
 
-                if (! empty($identifier)) {
+                if ( ! empty($identifier)) {
                     $this->inheritIdGeneratorMapping($class, $embeddableMetadata);
                 }
 
@@ -257,7 +257,7 @@ 
      */
     protected function validateRuntimeMetadata($class, $parent)
     {
-        if ( ! $class->reflClass ) {
+        if ( ! $class->reflClass) {
             // only validate if there is a reflection class instance
             return;
         }
@@ -267,7 +267,7 @@ 
         $class->validateLifecycleCallbacks($this->getReflectionService());
 
         // verify inheritance
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
             if ( ! $parent) {
                 if (count($class->discriminatorMap) == 0) {
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -428,7 +428,7 @@ 
     {
         foreach ($parentClass->associationMappings as $field => $mapping) {
             if ($parentClass->isMappedSuperclass) {
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
                 $mapping['sourceEntity'] = $subClass->name;
@@ -477,11 +477,11 @@ 
 
             $parentClass->mapEmbedded(
                 [
-                    'fieldName' => $prefix . '.' . $property,
+                    'fieldName' => $prefix.'.'.$property,
                     'class' => $embeddableMetadata->name,
                     'columnPrefix' => $embeddableClass['columnPrefix'],
                     'declaredField' => $embeddableClass['declaredField']
-                            ? $prefix . '.' . $embeddableClass['declaredField']
+                            ? $prefix.'.'.$embeddableClass['declaredField']
                             : $prefix,
                     'originalField' => $embeddableClass['originalField'] ?: $property,
                 ]
@@ -499,7 +499,7 @@ 
      */
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
-        if (! $parentClass->isMappedSuperclass) {
+        if ( ! $parentClass->isMappedSuperclass) {
             return;
         }
 
@@ -707,14 +707,14 @@ 
                     throw new ORMException("Can't instantiate custom generator : no custom generator definition");
                 }
                 if ( ! class_exists($definition['class'])) {
-                    throw new ORMException("Can't instantiate custom generator : " .
+                    throw new ORMException("Can't instantiate custom generator : ".
                         $definition['class']);
                 }
                 $class->setIdGenerator(new $definition['class']);
                 break;
 
             default:
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
         }
     }
 
@@ -764,7 +764,7 @@ 
      */
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -788,7 +788,7 @@ 
      */
     private function getTargetPlatform()
     {
-        if (!$this->targetPlatform) {
+        if ( ! $this->targetPlatform) {
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
         }
 

lib/Doctrine/ORM/Query/Parser.php

Spacing +12 added lines, -12 removed lines

@@ -487,7 +487,7 @@ 
         $tokenStr = substr($dql, $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
     }
@@ -634,7 +634,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -686,13 +686,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -761,7 +761,7 @@ 
             // Check if field or association exists
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
                 $this->semanticalError(
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
+                    'Class '.$class->name.' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -801,8 +801,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= (count($expectedStringTypes) == 1)
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -976,7 +976,7 @@ 
 
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
 
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -988,7 +988,7 @@ 
      */
     private function validateAbstractSchemaName($schemaName)
     {
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
         }
     }
@@ -1044,7 +1044,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1058,7 +1058,7 @@ 
         $class = $qComp['metadata'];
 
         if ( ! $class->hasAssociation($field)) {
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2587,7 +2587,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Doctrine/ORM/PersistentCollection.php

Spacing +4 added lines, -4 removed lines

@@ -401,7 +401,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -434,7 +434,7 @@ 
             && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }
 
@@ -449,7 +449,7 @@ 
      */
     public function count()
     {
-        if (! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
+        if ( ! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
             return $persister->count($this) + ($this->isDirty ? $this->collection->count() : 0);
@@ -567,7 +567,7 @@ 
         if ($this->association['isOwningSide'] && $this->owner) {
             $this->changed();
 
-            if (! $this->em->getClassMetadata(get_class($this->owner))->isChangeTrackingDeferredExplicit()) {
+            if ( ! $this->em->getClassMetadata(get_class($this->owner))->isChangeTrackingDeferredExplicit()) {
                 $uow->scheduleCollectionDeletion($this);
             }
 

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

Spacing +10 added lines, -10 removed lines

@@ -108,15 +108,15 @@ 
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
+        $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']);
 
         $entityManager = $this->_createEntityManager($metadataDriver);
 
         $mf = $entityManager->getMetadataFactory();
         $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class);
         $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class);
-        $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class);
-        $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class);
+        $h2 = $mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class);
+        $m2 = $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class);
 
         $this->assertNotSame($m1, $m2);
         $this->assertFalse($h2);
@@ -173,7 +173,7 @@ 
         self::markTestSkipped('This test is just incorrect and must be fixed');
 
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/JoinedInheritanceType/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -213,7 +213,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $em = $this->_createEntityManager($mockDriver, $conn);
 
         $conn->expects($this->any())
@@ -233,10 +233,10 @@ 
     {
         $driverMock = new DriverMock();
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
-        if (!$conn) {
+        if ( ! $conn) {
             $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         }
         $config->setMetadataDriverImpl($metadataDriver);
@@ -290,7 +290,7 @@ 
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/Quote/']);
         $em     = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -385,7 +385,7 @@ 
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
+            ->will($this->returnCallback(function(OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
                 $test->assertNull($args->getFoundMetadata());
                 $test->assertSame('Foo', $args->getClassName());
                 $test->assertSame($em, $args->getObjectManager());
@@ -445,7 +445,7 @@ 
     public function testInheritsIdGeneratorMappingFromEmbeddable()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/DDC4006/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);