doctrine / orm

lib/Doctrine/ORM/Mapping/MappingException.php

Spacing +23 added lines, -23 removed lines

@@ -284,7 +284,7 @@ 
         $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required.";
 
         if ( ! empty($hint)) {
-            $message .= ' (Hint: ' . $hint . ')';
+            $message .= ' (Hint: '.$hint.')';
         }
 
         return new self($message);
@@ -314,7 +314,7 @@ 
      */
     public static function reflectionFailure($entity, \ReflectionException $previousException)
     {
-        return new self('An error occurred in ' . $entity, 0, $previousException);
+        return new self('An error occurred in '.$entity, 0, $previousException);
     }
 
     /**
@@ -325,8 +325,8 @@ 
      */
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
     {
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
-            . $className . ' since it is referenced by a join column of another class.');
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
+            . $className.' since it is referenced by a join column of another class.');
     }
 
     /**
@@ -431,7 +431,7 @@ 
      */
     public static function noIdDefined($entity)
     {
-        return new self('No ID defined for entity ' . $entity);
+        return new self('No ID defined for entity '.$entity);
     }
 
     /**
@@ -456,12 +456,12 @@ 
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
     {
         if ( ! empty($path)) {
-            $path = '[' . $path . ']';
+            $path = '['.$path.']';
         }
 
         return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
+            'File mapping drivers must have a valid directory path, '.
+            'however the given path '.$path.' seems to be incorrect!'
         );
     }
 
@@ -492,11 +492,11 @@ 
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
     {
         return new self(
-            "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
-            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " .
-            "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map(
+            "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
+            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ".
+            "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map(
                 function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map)
-            )) . "})"
+            ))."})"
         );
     }
 
@@ -643,7 +643,7 @@ 
     public static function illegalOrphanRemoval($className, $field)
     {
         return new self("Orphan removal is only allowed on one-to-one and one-to-many ".
-            "associations, but " . $className."#" .$field . " is not.");
+            "associations, but ".$className."#".$field." is not.");
     }
 
     /**
@@ -675,7 +675,7 @@ 
      */
     public static function noInheritanceOnMappedSuperClass($className)
     {
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
     }
 
     /**
@@ -687,8 +687,8 @@ 
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
     {
         return new self(
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " .
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
             "to avoid this exception from occurring."
         );
     }
@@ -701,7 +701,7 @@ 
      */
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
     {
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
     }
 
     /**
@@ -747,7 +747,7 @@ 
      */
     public static function invalidFetchMode($className, $annotation)
     {
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
     }
 
     /**
@@ -757,7 +757,7 @@ 
      */
     public static function compositeKeyAssignedIdGeneratorRequired($className)
     {
-        return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
     }
 
     /**
@@ -769,7 +769,7 @@ 
      */
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
     {
-        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
+        return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'.");
     }
 
     /**
@@ -781,7 +781,7 @@ 
      */
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
     {
-        $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
+        $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades));
 
         return new self(sprintf(
             "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
@@ -813,7 +813,7 @@ 
     {
         return new self(
             sprintf(
-                'Infinite nesting detected for embedded property %s::%s. ' .
+                'Infinite nesting detected for embedded property %s::%s. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
                 $className,
                 $propertyName
@@ -826,7 +826,7 @@ 
      */
     public static function fromLibXmlErrors(array $errors) : self
     {
-        return new self(implode(PHP_EOL, array_map(function (\LibXMLError $error) : string {
+        return new self(implode(PHP_EOL, array_map(function(\LibXMLError $error) : string {
             return sprintf(
                 'libxml error: %s%s:%d',
                 $error->message,

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

Spacing +10 added lines, -10 removed lines

@@ -165,7 +165,7 @@ 
 
         if (isset($xmlRoot['inheritance-type'])) {
             $inheritanceType = (string) $xmlRoot['inheritance-type'];
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceType));
 
             if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate <discriminator-column...>
@@ -367,7 +367,7 @@ 
                 }
 
                 if (isset($oneToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToOneElement['fetch']);
                 }
 
                 if (isset($oneToOneElement['mapped-by'])) {
@@ -416,7 +416,7 @@ 
                 ];
 
                 if (isset($oneToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToManyElement['fetch']);
                 }
 
                 if (isset($oneToManyElement->cascade)) {
@@ -466,7 +466,7 @@ 
                 }
 
                 if (isset($manyToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToOneElement['fetch']);
                 }
 
                 if (isset($manyToOneElement['inversed-by'])) {
@@ -508,7 +508,7 @@ 
                 ];
 
                 if (isset($manyToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToManyElement['fetch']);
                 }
 
                 if (isset($manyToManyElement['orphan-removal'])) {
@@ -628,7 +628,7 @@ 
 
                 // Check for `fetch`
                 if (isset($overrideElement['fetch'])) {
-                    $override['fetch'] = constant(Metadata::class . '::FETCH_' . (string) $overrideElement['fetch']);
+                    $override['fetch'] = constant(Metadata::class.'::FETCH_'.(string) $overrideElement['fetch']);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -638,7 +638,7 @@ 
         // Evaluate <lifecycle-callbacks...>
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
-                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string) $lifecycleCallback['type']));
+                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::'.(string) $lifecycleCallback['type']));
             }
         }
 
@@ -799,12 +799,12 @@ 
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
 
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
         }
 
         if ($usage) {
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
         }
 
         return [
@@ -872,7 +872,7 @@ 
         $document = new \DOMDocument();
         $document->load($file);
         try {
-            if ( ! $document->schemaValidate(__DIR__ . '/../../../../../doctrine-mapping.xsd')) {
+            if ( ! $document->schemaValidate(__DIR__.'/../../../../../doctrine-mapping.xsd')) {
                 $errors = libxml_get_errors();
                 throw MappingException::fromLibXmlErrors($errors);
             }