Completed
Pull Request — master (#5626)
by Gary
09:09
created
lib/Shitty/ORM/Query/AST/Functions/IdentityFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,9 +86,9 @@
 block discarded – undo
86 86
         $tableName = $sqlWalker->getEntityManager()->getClassMetadata($assoc['sourceEntity'])->getTableName();
87 87
 
88 88
         $tableAlias = $sqlWalker->getSQLTableAlias($tableName, $dqlAlias);
89
-        $columnName  = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
89
+        $columnName = $quoteStrategy->getJoinColumnName($joinColumn, $targetEntity, $platform);
90 90
 
91
-        return $tableAlias . '.' . $columnName;
91
+        return $tableAlias.'.'.$columnName;
92 92
     }
93 93
 
94 94
     /**
Please login to merge, or discard this patch.
lib/Shitty/ORM/Query/AST/Node.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             foreach ($props as $name => $prop) {
75 75
                 $ident += 4;
76 76
                 $str .= str_repeat(' ', $ident) . '"' . $name . '": '
77
-                      . $this->dump($prop) . ',' . PHP_EOL;
77
+                        . $this->dump($prop) . ',' . PHP_EOL;
78 78
                 $ident -= 4;
79 79
             }
80 80
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
             foreach ($obj as $k => $v) {
88 88
                 $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
89
-                      . $k . '" => ' . $this->dump($v) . ',';
89
+                        . $k . '" => ' . $this->dump($v) . ',';
90 90
                 $some = true;
91 91
             }
92 92
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -68,32 +68,32 @@
 block discarded – undo
68 68
         $str = '';
69 69
 
70 70
         if ($obj instanceof Node) {
71
-            $str .= get_class($obj) . '(' . PHP_EOL;
71
+            $str .= get_class($obj).'('.PHP_EOL;
72 72
             $props = get_object_vars($obj);
73 73
 
74 74
             foreach ($props as $name => $prop) {
75 75
                 $ident += 4;
76
-                $str .= str_repeat(' ', $ident) . '"' . $name . '": '
77
-                      . $this->dump($prop) . ',' . PHP_EOL;
76
+                $str .= str_repeat(' ', $ident).'"'.$name.'": '
77
+                      . $this->dump($prop).','.PHP_EOL;
78 78
                 $ident -= 4;
79 79
             }
80 80
 
81
-            $str .= str_repeat(' ', $ident) . ')';
81
+            $str .= str_repeat(' ', $ident).')';
82 82
         } else if (is_array($obj)) {
83 83
             $ident += 4;
84 84
             $str .= 'array(';
85 85
             $some = false;
86 86
 
87 87
             foreach ($obj as $k => $v) {
88
-                $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
89
-                      . $k . '" => ' . $this->dump($v) . ',';
88
+                $str .= PHP_EOL.str_repeat(' ', $ident).'"'
89
+                      . $k.'" => '.$this->dump($v).',';
90 90
                 $some = true;
91 91
             }
92 92
 
93 93
             $ident -= 4;
94
-            $str .= ($some ? PHP_EOL . str_repeat(' ', $ident) : '') . ')';
94
+            $str .= ($some ? PHP_EOL.str_repeat(' ', $ident) : '').')';
95 95
         } else if (is_object($obj)) {
96
-            $str .= 'instanceof(' . get_class($obj) . ')';
96
+            $str .= 'instanceof('.get_class($obj).')';
97 97
         } else {
98 98
             $str .= var_export($obj, true);
99 99
         }
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/DefaultQuoteStrategy.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
         $tableName = $class->table['name'];
50 50
 
51 51
         if ( ! empty($class->table['schema'])) {
52
-            $tableName = $class->table['schema'] . '.' . $class->table['name'];
52
+            $tableName = $class->table['schema'].'.'.$class->table['name'];
53 53
 
54 54
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
55
-                $tableName = $class->table['schema'] . '__' . $class->table['name'];
55
+                $tableName = $class->table['schema'].'__'.$class->table['name'];
56 56
             }
57 57
         }
58 58
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $schema = '';
100 100
 
101 101
         if (isset($association['joinTable']['schema'])) {
102
-            $schema = $association['joinTable']['schema'] . '.';
102
+            $schema = $association['joinTable']['schema'].'.';
103 103
         }
104 104
 
105 105
         $tableName = $association['joinTable']['name'];
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             $tableName = $platform->quoteIdentifier($tableName);
109 109
         }
110 110
 
111
-        return $schema . $tableName;
111
+        return $schema.$tableName;
112 112
     }
113 113
 
114 114
     /**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             // Association defined as Id field
129 129
             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];
130 130
             $assocQuotedColumnNames = array_map(
131
-                function ($joinColumn) use ($platform)
131
+                function($joinColumn) use ($platform)
132 132
                 {
133 133
                     return isset($joinColumn['quoted'])
134 134
                         ? $platform->quoteIdentifier($joinColumn['name'])
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
         //     If the alias is to long, characters are cut off from the beginning.
154 154
         // 3 ) Strip non alphanumeric characters
155 155
         // 4 ) Prefix with "_" if the result its numeric
156
-        $columnName = $columnName . '_' . $counter;
156
+        $columnName = $columnName.'_'.$counter;
157 157
         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());
158 158
         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
159
-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;
159
+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
160 160
 
161 161
         return $platform->getSQLResultCasing($columnName);
162 162
     }
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/AnsiQuoteStrategy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,6 +91,6 @@
 block discarded – undo
91 91
      */
92 92
     public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
93 93
     {
94
-        return $platform->getSQLResultCasing($columnName . '_' . $counter);
94
+        return $platform->getSQLResultCasing($columnName.'_'.$counter);
95 95
     }
96 96
 }
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/DefaultEntityListenerResolver.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
     public function resolve($className)
68 68
     {
69 69
         if (isset($this->instances[$className = trim($className, '\\')])) {
70
-           return $this->instances[$className];
70
+            return $this->instances[$className];
71 71
         }
72 72
 
73 73
         return $this->instances[$className] = new $className();
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/Reflection/ReflectionPropertiesGetter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,9 +155,9 @@
 block discarded – undo
155 155
         }
156 156
 
157 157
         if ($property->isProtected()) {
158
-            return "\0*\0" . $propertyName;
158
+            return "\0*\0".$propertyName;
159 159
         }
160 160
 
161
-        return "\0" . $property->getDeclaringClass()->getName() . "\0" . $propertyName;
161
+        return "\0".$property->getDeclaringClass()->getName()."\0".$propertyName;
162 162
     }
163 163
 }
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/UnderscoreNamingStrategy.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
      */
101 101
     public function referenceColumnName()
102 102
     {
103
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
103
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
104 104
     }
105 105
 
106 106
     /**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
      */
109 109
     public function joinColumnName($propertyName, $className = null)
110 110
     {
111
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
111
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
112 112
     }
113 113
 
114 114
     /**
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
118 118
     {
119
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
119
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
120 120
     }
121 121
     
122 122
     /**
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      */
125 125
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
126 126
     {
127
-        return $this->classToTableName($entityName) . '_' .
127
+        return $this->classToTableName($entityName).'_'.
128 128
                 ($referencedColumnName ?: $this->referenceColumnName());
129 129
     }
130 130
     
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/MappingException.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required.";
285 285
 
286 286
         if ( ! empty($hint)) {
287
-            $message .= ' (Hint: ' . $hint . ')';
287
+            $message .= ' (Hint: '.$hint.')';
288 288
         }
289 289
 
290 290
         return new self($message);
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
      */
315 315
     public static function reflectionFailure($entity, \ReflectionException $previousException)
316 316
     {
317
-        return new self('An error occurred in ' . $entity, 0, $previousException);
317
+        return new self('An error occurred in '.$entity, 0, $previousException);
318 318
     }
319 319
 
320 320
     /**
@@ -325,8 +325,8 @@  discard block
 block discarded – undo
325 325
      */
326 326
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
327 327
     {
328
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
329
-            . $className . ' since it is referenced by a join column of another class.');
328
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
329
+            . $className.' since it is referenced by a join column of another class.');
330 330
     }
331 331
 
332 332
     /**
@@ -446,12 +446,12 @@  discard block
 block discarded – undo
446 446
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
447 447
     {
448 448
         if ( ! empty($path)) {
449
-            $path = '[' . $path . ']';
449
+            $path = '['.$path.']';
450 450
         }
451 451
 
452 452
         return new self(
453
-            'File mapping drivers must have a valid directory path, ' .
454
-            'however the given path ' . $path . ' seems to be incorrect!'
453
+            'File mapping drivers must have a valid directory path, '.
454
+            'however the given path '.$path.' seems to be incorrect!'
455 455
         );
456 456
     }
457 457
 
@@ -482,11 +482,11 @@  discard block
 block discarded – undo
482 482
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
483 483
     {
484 484
         return new self(
485
-            "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
486
-            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " .
487
-            "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map(
485
+            "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
486
+            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ".
487
+            "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map(
488 488
                 function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map)
489
-            )) . "})"
489
+            ))."})"
490 490
         );
491 491
     }
492 492
 
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
     public static function illegalOrphanRemoval($className, $field)
634 634
     {
635 635
         return new self("Orphan removal is only allowed on one-to-one and one-to-many ".
636
-            "associations, but " . $className."#" .$field . " is not.");
636
+            "associations, but ".$className."#".$field." is not.");
637 637
     }
638 638
 
639 639
     /**
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
      */
666 666
     public static function noInheritanceOnMappedSuperClass($className)
667 667
     {
668
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
668
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
669 669
     }
670 670
 
671 671
     /**
@@ -677,8 +677,8 @@  discard block
 block discarded – undo
677 677
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
678 678
     {
679 679
         return new self(
680
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
681
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " .
680
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
681
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
682 682
             "to avoid this exception from occurring."
683 683
         );
684 684
     }
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
      */
692 692
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
693 693
     {
694
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
694
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
695 695
     }
696 696
 
697 697
     /**
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
      */
738 738
     public static function invalidFetchMode($className, $annotation)
739 739
     {
740
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
740
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
741 741
     }
742 742
 
743 743
     /**
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
      */
748 748
     public static function compositeKeyAssignedIdGeneratorRequired($className)
749 749
     {
750
-        return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
750
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
751 751
     }
752 752
 
753 753
     /**
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
759 759
      */
760 760
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
761 761
     {
762
-        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
762
+        return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'.");
763 763
     }
764 764
 
765 765
     /**
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
      */
772 772
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
773 773
     {
774
-        $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
774
+        $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades));
775 775
 
776 776
         return new self(sprintf(
777 777
             "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
     {
804 804
         return new self(
805 805
             sprintf(
806
-                'Infinite nesting detected for embedded property %s::%s. ' .
806
+                'Infinite nesting detected for embedded property %s::%s. '.
807 807
                 'You cannot embed an embeddable from the same type inside an embeddable.',
808 808
                 $className,
809 809
                 $propertyName
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/ClassMetadataFactory.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
      */
106 106
     protected function onNotFoundMetadata($className)
107 107
     {
108
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
108
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
109 109
             return;
110 110
         }
111 111
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             $this->completeIdGeneratorMapping($class);
163 163
         }
164 164
 
165
-        if (!$class->isMappedSuperclass) {
165
+        if ( ! $class->isMappedSuperclass) {
166 166
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
167 167
 
168 168
                 if (isset($embeddableClass['inherited'])) {
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
                 $identifier = $embeddableMetadata->getIdentifier();
189 189
 
190
-                if (! empty($identifier)) {
190
+                if ( ! empty($identifier)) {
191 191
                     $this->inheritIdGeneratorMapping($class, $embeddableMetadata);
192 192
                 }
193 193
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
      */
258 258
     protected function validateRuntimeMetadata($class, $parent)
259 259
     {
260
-        if ( ! $class->reflClass ) {
260
+        if ( ! $class->reflClass) {
261 261
             // only validate if there is a reflection class instance
262 262
             return;
263 263
         }
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
         $class->validateLifecycleCallbacks($this->getReflectionService());
268 268
 
269 269
         // verify inheritance
270
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
270
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
271 271
             if ( ! $parent) {
272 272
                 if (count($class->discriminatorMap) == 0) {
273 273
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
     {
429 429
         foreach ($parentClass->associationMappings as $field => $mapping) {
430 430
             if ($parentClass->isMappedSuperclass) {
431
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
431
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
432 432
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
433 433
                 }
434 434
                 $mapping['sourceEntity'] = $subClass->name;
@@ -476,11 +476,11 @@  discard block
 block discarded – undo
476 476
             $embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
477 477
 
478 478
             $parentClass->mapEmbedded(array(
479
-                'fieldName' => $prefix . '.' . $property,
479
+                'fieldName' => $prefix.'.'.$property,
480 480
                 'class' => $embeddableMetadata->name,
481 481
                 'columnPrefix' => $embeddableClass['columnPrefix'],
482 482
                 'declaredField' => $embeddableClass['declaredField']
483
-                        ? $prefix . '.' . $embeddableClass['declaredField']
483
+                        ? $prefix.'.'.$embeddableClass['declaredField']
484 484
                         : $prefix,
485 485
                 'originalField' => $embeddableClass['originalField'] ?: $property,
486 486
             ));
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
      */
498 498
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
499 499
     {
500
-        if (! $parentClass->isMappedSuperclass) {
500
+        if ( ! $parentClass->isMappedSuperclass) {
501 501
             return;
502 502
         }
503 503
 
@@ -696,14 +696,14 @@  discard block
 block discarded – undo
696 696
             case ClassMetadata::GENERATOR_TYPE_CUSTOM:
697 697
                 $definition = $class->customGeneratorDefinition;
698 698
                 if ( ! class_exists($definition['class'])) {
699
-                    throw new ORMException("Can't instantiate custom generator : " .
699
+                    throw new ORMException("Can't instantiate custom generator : ".
700 700
                         $definition['class']);
701 701
                 }
702 702
                 $class->setIdGenerator(new $definition['class']);
703 703
                 break;
704 704
 
705 705
             default:
706
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
706
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
707 707
         }
708 708
     }
709 709
 
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
      */
754 754
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
755 755
     {
756
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
756
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
757 757
     }
758 758
 
759 759
     /**
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
      */
778 778
     private function getTargetPlatform()
779 779
     {
780
-        if (!$this->targetPlatform) {
780
+        if ( ! $this->targetPlatform) {
781 781
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
782 782
         }
783 783
 
Please login to merge, or discard this patch.