doctrine / persistence

lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php

Spacing +6 added lines, -6 removed lines

@@ -94,12 +94,12 @@ 
      */
     public function findMappingFile($className)
     {
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
+        $fileName = str_replace('\\', '.', $className).$this->fileExtension;
 
         // Check whether file exists
         foreach ($this->paths as $path) {
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
-                return $path . DIRECTORY_SEPARATOR . $fileName;
+            if (is_file($path.DIRECTORY_SEPARATOR.$fileName)) {
+                return $path.DIRECTORY_SEPARATOR.$fileName;
             }
         }
 
@@ -115,7 +115,7 @@ 
 
         if ($this->paths) {
             foreach ($this->paths as $path) {
-                if (! is_dir($path)) {
+                if (!is_dir($path)) {
                     throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
                 }
 
@@ -145,11 +145,11 @@ 
      */
     public function fileExists($className)
     {
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
+        $fileName = str_replace('\\', '.', $className).$this->fileExtension;
 
         // Check whether file exists
         foreach ((array) $this->paths as $path) {
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
+            if (is_file($path.DIRECTORY_SEPARATOR.$fileName)) {
                 return true;
             }
         }

lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php

Spacing +14 added lines, -14 removed lines

@@ -124,11 +124,11 @@ 
      */
     public function fileExists($className)
     {
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className) . $this->fileExtension;
+        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
         foreach ($this->paths as $path) {
-            if (! isset($this->prefixes[$path])) {
+            if (!isset($this->prefixes[$path])) {
                 // global namespace class
-                if (is_file($path . DIRECTORY_SEPARATOR . $defaultFileName)) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
                     return true;
                 }
 
@@ -137,11 +137,11 @@ 
 
             $prefix = $this->prefixes[$path];
 
-            if (strpos($className, $prefix . '\\') !== 0) {
+            if (strpos($className, $prefix.'\\') !== 0) {
                 continue;
             }
 
-            $filename = $path . '/' . strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator) . $this->fileExtension;
+            $filename = $path.'/'.strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator).$this->fileExtension;
             if (is_file($filename)) {
                 return true;
             }
@@ -159,7 +159,7 @@ 
 
         if ($this->paths) {
             foreach ((array) $this->paths as $path) {
-                if (! is_dir($path)) {
+                if (!is_dir($path)) {
                     throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
                 }
 
@@ -184,7 +184,7 @@ 
                             '\\'
                         );
 
-                        $classes[] = $this->prefixes[$path] . str_replace(DIRECTORY_SEPARATOR, '\\', $nsSuffix) . '\\' . str_replace($this->nsSeparator, '\\', $fileName);
+                        $classes[] = $this->prefixes[$path].str_replace(DIRECTORY_SEPARATOR, '\\', $nsSuffix).'\\'.str_replace($this->nsSeparator, '\\', $fileName);
                     } else {
                         $classes[] = str_replace($this->nsSeparator, '\\', $fileName);
                     }
@@ -200,11 +200,11 @@ 
      */
     public function findMappingFile($className)
     {
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className) . $this->fileExtension;
+        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
         foreach ($this->paths as $path) {
-            if (! isset($this->prefixes[$path])) {
-                if (is_file($path . DIRECTORY_SEPARATOR . $defaultFileName)) {
-                    return $path . DIRECTORY_SEPARATOR . $defaultFileName;
+            if (!isset($this->prefixes[$path])) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
+                    return $path.DIRECTORY_SEPARATOR.$defaultFileName;
                 }
 
                 continue;
@@ -212,16 +212,16 @@ 
 
             $prefix = $this->prefixes[$path];
 
-            if (strpos($className, $prefix . '\\') !== 0) {
+            if (strpos($className, $prefix.'\\') !== 0) {
                 continue;
             }
 
-            $filename = $path . '/' . strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator) . $this->fileExtension;
+            $filename = $path.'/'.strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator).$this->fileExtension;
             if (is_file($filename)) {
                 return $filename;
             }
         }
 
-        throw MappingException::mappingFileNotFound($className, substr($className, strrpos($className, '\\') + 1) . $this->fileExtension);
+        throw MappingException::mappingFileNotFound($className, substr($className, strrpos($className, '\\') + 1).$this->fileExtension);
     }
 }

tests/Doctrine/Tests/Common/Persistence/Mapping/DefaultFileLocatorTest.php

Spacing +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function testGetPaths()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path]);
         self::assertSame([$path], $locator->getPaths());
@@ -31,7 +31,7 @@ 
 
     public function testUniquePaths()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path, $path]);
         self::assertSame([$path], $locator->getPaths());
@@ -39,16 +39,16 @@ 
 
     public function testFindMappingFile()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path], '.yml');
 
-        self::assertSame(__DIR__ . '/_files' . DIRECTORY_SEPARATOR . 'stdClass.yml', $locator->findMappingFile('stdClass'));
+        self::assertSame(__DIR__.'/_files'.DIRECTORY_SEPARATOR.'stdClass.yml', $locator->findMappingFile('stdClass'));
     }
 
     public function testFindMappingFileNotFound()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path], '.yml');
 
@@ -59,7 +59,7 @@ 
 
     public function testGetAllClassNames()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator       = new DefaultFileLocator([$path], '.yml');
         $allClasses    = $locator->getAllClassNames(null);
@@ -79,7 +79,7 @@ 
 
     public function testGetAllClassNamesNonMatchingFileExtension()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path], '.xml');
         self::assertSame([], $locator->getAllClassNames('global'));
@@ -87,7 +87,7 @@ 
 
     public function testFileExists()
     {
-        $path = __DIR__ . '/_files';
+        $path = __DIR__.'/_files';
 
         $locator = new DefaultFileLocator([$path], '.yml');
 

tests/Doctrine/Tests/Common/Persistence/Mapping/SymfonyFileLocatorTest.php

Spacing +17 added lines, -17 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function testGetPaths()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix]);
@@ -25,7 +25,7 @@ 
 
     public function testGetPrefixes()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix]);
@@ -42,7 +42,7 @@ 
 
     public function testFileExists()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -55,7 +55,7 @@ 
 
     public function testGetAllClassNames()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator       = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -80,7 +80,7 @@ 
      */
     public function testInvalidCustomNamespaceSeparator()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         new SymfonyFileLocator([$path => $prefix], '.yml', null);
@@ -104,7 +104,7 @@ 
      */
     public function testGetClassNamesWithCustomNsSeparator($separator, $dir)
     {
-        $path   = __DIR__ . $dir;
+        $path   = __DIR__.$dir;
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml', $separator);
@@ -147,30 +147,30 @@ 
      */
     public function testFindMappingFileWithCustomNsSeparator($separator, $dir, $files)
     {
-        $path   = __DIR__ . $dir;
+        $path   = __DIR__.$dir;
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml', $separator);
 
         foreach ($files as $filePath => $className) {
-            self::assertSame(realpath($path . '/' . $filePath), realpath($locator->findMappingFile($className)));
+            self::assertSame(realpath($path.'/'.$filePath), realpath($locator->findMappingFile($className)));
         }
     }
 
 
     public function testFindMappingFile()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
 
-        self::assertSame(__DIR__ . '/_files/stdClass.yml', $locator->findMappingFile('Foo\\stdClass'));
+        self::assertSame(__DIR__.'/_files/stdClass.yml', $locator->findMappingFile('Foo\\stdClass'));
     }
 
     public function testFindMappingFileNotFound()
     {
-        $path   = __DIR__ . '/_files';
+        $path   = __DIR__.'/_files';
         $prefix = 'Foo';
 
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -184,13 +184,13 @@ 
     {
         // Low -> High
         $prefixes                             = [];
-        $prefixes[__DIR__ . '/_match_ns']     = 'Foo';
-        $prefixes[__DIR__ . '/_match_ns/Bar'] = 'Foo\\Bar';
+        $prefixes[__DIR__.'/_match_ns']     = 'Foo';
+        $prefixes[__DIR__.'/_match_ns/Bar'] = 'Foo\\Bar';
 
         $locator = new SymfonyFileLocator($prefixes, '.yml');
 
         self::assertSame(
-            __DIR__ . '/_match_ns/Bar/barEntity.yml',
+            __DIR__.'/_match_ns/Bar/barEntity.yml',
             $locator->findMappingFile("Foo\\Bar\\barEntity")
         );
     }
@@ -198,13 +198,13 @@ 
     public function testFindMappingFileMostSpecificNamespaceFirst()
     {
         $prefixes                             = [];
-        $prefixes[__DIR__ . '/_match_ns/Bar'] = 'Foo\\Bar';
-        $prefixes[__DIR__ . '/_match_ns']     = 'Foo';
+        $prefixes[__DIR__.'/_match_ns/Bar'] = 'Foo\\Bar';
+        $prefixes[__DIR__.'/_match_ns']     = 'Foo';
 
         $locator = new SymfonyFileLocator($prefixes, '.yml');
 
         self::assertSame(
-            __DIR__ . '/_match_ns/Bar/barEntity.yml',
+            __DIR__.'/_match_ns/Bar/barEntity.yml',
             $locator->findMappingFile("Foo\\Bar\\barEntity")
         );
     }

lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
     public function __construct($reader, $paths = null)
     {
         $this->reader = $reader;
-        if (! $paths) {
+        if (!$paths) {
             return;
         }
 
@@ -192,7 +192,7 @@ 
             return $this->classNames;
         }
 
-        if (! $this->paths) {
+        if (!$this->paths) {
             throw MappingException::pathRequired();
         }
 
@@ -200,7 +200,7 @@ 
         $includedFiles = [];
 
         foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
+            if (!is_dir($path)) {
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -209,14 +209,14 @@ 
                     new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
                     RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 RecursiveRegexIterator::GET_MATCH
             );
 
             foreach ($iterator as $file) {
                 $sourceFile = $file[0];
 
-                if (! preg_match('(^phar:)i', $sourceFile)) {
+                if (!preg_match('(^phar:)i', $sourceFile)) {
                     $sourceFile = realpath($sourceFile);
                 }
 
@@ -240,7 +240,7 @@ 
         foreach ($declared as $className) {
             $rc         = new ReflectionClass($className);
             $sourceFile = $rc->getFileName();
-            if (! in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
+            if (!in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
                 continue;
             }
 

lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
             return $this->classNames;
         }
 
-        if (! $this->paths) {
+        if (!$this->paths) {
             throw MappingException::pathRequired();
         }
 
@@ -82,7 +82,7 @@ 
         $includedFiles = [];
 
         foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
+            if (!is_dir($path)) {
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -107,7 +107,7 @@ 
         foreach ($declared as $className) {
             $rc         = new ReflectionClass($className);
             $sourceFile = $rc->getFileName();
-            if (! in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
+            if (!in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
                 continue;
             }
 
@@ -124,6 +124,6 @@ 
      */
     public function isTransient($className)
     {
-        return ! method_exists($className, 'loadMetadata');
+        return !method_exists($className, 'loadMetadata');
     }
 }

lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
      */
     private function assertValidField($field)
     {
-        if (! isset($this->entityChangeSet[$field])) {
+        if (!isset($this->entityChangeSet[$field])) {
             throw new InvalidArgumentException(sprintf(
                 'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
                 $field,

lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php

Spacing +6 added lines, -6 removed lines

@@ -90,7 +90,7 @@ 
             $name = $this->defaultConnection;
         }
 
-        if (! isset($this->connections[$name])) {
+        if (!isset($this->connections[$name])) {
             throw new InvalidArgumentException(sprintf('Doctrine %s Connection named "%s" does not exist.', $this->name, $name));
         }
 
@@ -145,7 +145,7 @@ 
             $name = $this->defaultManager;
         }
 
-        if (! isset($this->managers[$name])) {
+        if (!isset($this->managers[$name])) {
             throw new InvalidArgumentException(sprintf('Doctrine %s Manager named "%s" does not exist.', $this->name, $name));
         }
 
@@ -160,7 +160,7 @@ 
         // Check for namespace alias
         if (strpos($class, ':') !== false) {
             [$namespaceAlias, $simpleClassName] = explode(':', $class, 2);
-            $class                              = $this->getAliasNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $class                              = $this->getAliasNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         $proxyClass = new ReflectionClass($class);
@@ -168,7 +168,7 @@ 
         if ($proxyClass->implementsInterface($this->proxyInterfaceName)) {
             $parentClass = $proxyClass->getParentClass();
 
-            if (! $parentClass) {
+            if (!$parentClass) {
                 return null;
             }
 
@@ -178,7 +178,7 @@ 
         foreach ($this->managers as $id) {
             $manager = $this->getService($id);
 
-            if (! $manager->getMetadataFactory()->isTransient($class)) {
+            if (!$manager->getMetadataFactory()->isTransient($class)) {
                 return $manager;
             }
         }
@@ -222,7 +222,7 @@ 
             $name = $this->defaultManager;
         }
 
-        if (! isset($this->managers[$name])) {
+        if (!isset($this->managers[$name])) {
             throw new InvalidArgumentException(sprintf('Doctrine %s Manager named "%s" does not exist.', $this->name, $name));
         }
 

lib/Doctrine/Common/Persistence/PersistentObject.php

Spacing +15 added lines, -15 removed lines

@@ -76,7 +76,7 @@ 
     public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
     {
         if ($objectManager !== self::$objectManager) {
-            throw new RuntimeException('Trying to use PersistentObject with different ObjectManager instances. ' .
+            throw new RuntimeException('Trying to use PersistentObject with different ObjectManager instances. '.
                 'Was PersistentObject::setObjectManager() called?');
         }
 
@@ -96,17 +96,17 @@ 
      */
     private function set($field, $args)
     {
-        if ($this->cm->hasField($field) && ! $this->cm->isIdentifier($field)) {
+        if ($this->cm->hasField($field) && !$this->cm->isIdentifier($field)) {
             $this->$field = $args[0];
         } elseif ($this->cm->hasAssociation($field) && $this->cm->isSingleValuedAssociation($field)) {
             $targetClass = $this->cm->getAssociationTargetClass($field);
-            if (! ($args[0] instanceof $targetClass) && $args[0] !== null) {
-                throw new InvalidArgumentException("Expected persistent object of type '" . $targetClass . "'");
+            if (!($args[0] instanceof $targetClass) && $args[0] !== null) {
+                throw new InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
             }
             $this->$field = $args[0];
             $this->completeOwningSide($field, $targetClass, $args[0]);
         } else {
-            throw new BadMethodCallException("no field with name '" . $field . "' exists on '" . $this->cm->getName() . "'");
+            throw new BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
         }
     }
 
@@ -125,7 +125,7 @@ 
             return $this->$field;
         }
 
-        throw new BadMethodCallException("no field with name '" . $field . "' exists on '" . $this->cm->getName() . "'");
+        throw new BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
     }
 
     /**
@@ -141,14 +141,14 @@ 
     {
         // add this object on the owning side as well, for obvious infinite recursion
         // reasons this is only done when called on the inverse side.
-        if (! $this->cm->isAssociationInverseSide($field)) {
+        if (!$this->cm->isAssociationInverseSide($field)) {
             return;
         }
 
         $mappedByField  = $this->cm->getAssociationMappedByTargetField($field);
         $targetMetadata = self::$objectManager->getClassMetadata($targetClass);
 
-        $setter = ($targetMetadata->isCollectionValuedAssociation($mappedByField) ? 'add' : 'set') . $mappedByField;
+        $setter = ($targetMetadata->isCollectionValuedAssociation($mappedByField) ? 'add' : 'set').$mappedByField;
         $targetObject->$setter($this);
     }
 
@@ -165,15 +165,15 @@ 
      */
     private function add($field, $args)
     {
-        if (! $this->cm->hasAssociation($field) || ! $this->cm->isCollectionValuedAssociation($field)) {
-            throw new BadMethodCallException('There is no method add' . $field . '() on ' . $this->cm->getName());
+        if (!$this->cm->hasAssociation($field) || !$this->cm->isCollectionValuedAssociation($field)) {
+            throw new BadMethodCallException('There is no method add'.$field.'() on '.$this->cm->getName());
         }
 
         $targetClass = $this->cm->getAssociationTargetClass($field);
-        if (! ($args[0] instanceof $targetClass)) {
-            throw new InvalidArgumentException("Expected persistent object of type '" . $targetClass . "'");
+        if (!($args[0] instanceof $targetClass)) {
+            throw new InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
         }
-        if (! ($this->$field instanceof Collection)) {
+        if (!($this->$field instanceof Collection)) {
             $this->$field = new ArrayCollection($this->$field ?: []);
         }
         $this->$field->add($args[0]);
@@ -193,7 +193,7 @@ 
             return;
         }
 
-        if (! self::$objectManager) {
+        if (!self::$objectManager) {
             throw new RuntimeException('No runtime object manager set. Call PersistentObject#setObjectManager().');
         }
 
@@ -223,7 +223,7 @@ 
         } elseif ($command === 'add') {
             $this->add($field, $args);
         } else {
-            throw new BadMethodCallException('There is no method ' . $method . ' on ' . $this->cm->getName());
+            throw new BadMethodCallException('There is no method '.$method.' on '.$this->cm->getName());
         }
     }
 }