Completed
Push — master ( 24408b...ba3223 )
by Luís
24s
created
lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
             ? $this->persister->expandCriteriaParameters($criteria)
297 297
             : $this->persister->expandParameters($criteria);
298 298
 
299
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset);
299
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset);
300 300
     }
301 301
 
302 302
     /**
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
  */
42 42
 abstract class AbstractEntityPersister implements CachedEntityPersister
43 43
 {
44
-     /**
45
-     * @var \Doctrine\ORM\UnitOfWork
46
-     */
44
+        /**
45
+         * @var \Doctrine\ORM\UnitOfWork
46
+         */
47 47
     protected $uow;
48 48
 
49 49
     /**
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
      */
62 62
     protected $class;
63 63
 
64
-     /**
65
-     * @var array
66
-     */
64
+        /**
65
+         * @var array
66
+         */
67 67
     protected $queuedCache = [];
68 68
 
69 69
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -301,14 +301,14 @@
 block discarded – undo
301 301
      */
302 302
     private function resolveMagicCall($method, $by, array $arguments)
303 303
     {
304
-        if (! $arguments) {
305
-            throw ORMException::findByRequiresParameter($method . $by);
304
+        if ( ! $arguments) {
305
+            throw ORMException::findByRequiresParameter($method.$by);
306 306
         }
307 307
 
308 308
         $fieldName = lcfirst(Inflector::classify($by));
309 309
 
310
-        if (! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
311
-            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method . $by);
310
+        if ( ! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
311
+            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method.$by);
312 312
         }
313 313
 
314 314
         return $this->$method([$fieldName => $arguments[0]], ...array_slice($arguments, 1));
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityManager.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
      */
225 225
     public function transactional($func)
226 226
     {
227
-        if (!is_callable($func)) {
228
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
227
+        if ( ! is_callable($func)) {
228
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
229 229
         }
230 230
 
231 231
         $this->conn->beginTransaction();
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
      */
754 754
     public function isOpen()
755 755
     {
756
-        return (!$this->closed);
756
+        return ( ! $this->closed);
757 757
     }
758 758
 
759 759
     /**
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
                 sprintf(
865 865
                     'Invalid $connection argument of type %s given%s.',
866 866
                     is_object($connection) ? get_class($connection) : gettype($connection),
867
-                    is_object($connection) ? '' : ': "' . $connection . '"'
867
+                    is_object($connection) ? '' : ': "'.$connection.'"'
868 868
                 )
869 869
             );
870 870
         }
Please login to merge, or discard this patch.
tools/sandbox/bootstrap.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@  discard block
 block discarded – undo
5 5
 
6 6
 // Path to composer autoloader. You can use different provided by your favorite framework,
7 7
 // if you want to.
8
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
9
-if(!is_readable($loaderPath)){
8
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
9
+if ( ! is_readable($loaderPath)) {
10 10
     throw new LogicException('Run php composer.phar install at first');
11 11
 }
12 12
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $config = new \Doctrine\ORM\Configuration();
20 20
 
21 21
 // Set up Metadata Drivers
22
-$driverImpl = $config->newDefaultAnnotationDriver([__DIR__ . "/Entities"]);
22
+$driverImpl = $config->newDefaultAnnotationDriver([__DIR__."/Entities"]);
23 23
 $config->setMetadataDriverImpl($driverImpl);
24 24
 
25 25
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 $config->setQueryCacheImpl($cache);
30 30
 
31 31
 // Proxy configuration
32
-$config->setProxyDir(__DIR__ . '/Proxies');
32
+$config->setProxyDir(__DIR__.'/Proxies');
33 33
 $config->setProxyNamespace('Proxies');
34 34
 
35 35
 // Database connection information
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
             $args[] = $sqlWalker->walkStringPrimary($expression);
54 54
         }
55 55
 
56
-        return call_user_func_array([$platform,'getConcatExpression'], $args);
56
+        return call_user_func_array([$platform, 'getConcatExpression'], $args);
57 57
     }
58 58
 
59 59
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Parser.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
         $tokenStr = substr($dql, $token['position'], $length);
493 493
 
494 494
         // Building informative message
495
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
495
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
496 496
 
497 497
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
498 498
     }
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
             // If the namespace is not given then assumes the first FROM entity namespace
640 640
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
641 641
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
642
-                $fqcn       = $namespace . '\\' . $className;
642
+                $fqcn       = $namespace.'\\'.$className;
643 643
 
644 644
                 if (class_exists($fqcn)) {
645 645
                     $expression->className  = $fqcn;
@@ -691,13 +691,13 @@  discard block
 block discarded – undo
691 691
                 }
692 692
 
693 693
                 $this->semanticalError(
694
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
694
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
695 695
                 );
696 696
             }
697 697
 
698 698
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
699 699
                 $this->semanticalError(
700
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
700
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
701 701
                     $deferredItem['token']
702 702
                 );
703 703
             }
@@ -768,7 +768,7 @@  discard block
 block discarded – undo
768 768
             // Check if field or association exists
769 769
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
770 770
                 $this->semanticalError(
771
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
771
+                    'Class '.$class->name.' has no field or association named '.$field,
772 772
                     $deferredItem['token']
773 773
                 );
774 774
             }
@@ -808,8 +808,8 @@  discard block
 block discarded – undo
808 808
                 // Build the error message
809 809
                 $semanticalError  = 'Invalid PathExpression. ';
810 810
                 $semanticalError .= (count($expectedStringTypes) == 1)
811
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
812
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
811
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
812
+                    : implode(' or ', $expectedStringTypes).' expected.';
813 813
 
814 814
                 $this->semanticalError($semanticalError, $deferredItem['token']);
815 815
             }
@@ -978,7 +978,7 @@  discard block
 block discarded – undo
978 978
 
979 979
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
980 980
 
981
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
981
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
982 982
         }
983 983
 
984 984
         return $schemaName;
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
      */
994 994
     private function validateAbstractSchemaName($schemaName)
995 995
     {
996
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
996
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
997 997
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
998 998
         }
999 999
     }
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
 
1050 1050
         if ( ! isset($this->queryComponents[$identVariable])) {
1051 1051
             $this->semanticalError(
1052
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
1052
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
1053 1053
             );
1054 1054
         }
1055 1055
 
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
         $class = $qComp['metadata'];
1064 1064
 
1065 1065
         if ( ! $class->hasAssociation($field)) {
1066
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
1066
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
1067 1067
         }
1068 1068
 
1069 1069
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2485,7 +2485,7 @@  discard block
 block discarded – undo
2485 2485
         // Peek beyond the matching closing parenthesis ')'
2486 2486
         $peek = $this->peekBeyondClosingParenthesis();
2487 2487
 
2488
-        if (in_array($peek['value'], ["=",  "<", "<=", "<>", ">", ">=", "!="]) ||
2488
+        if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) ||
2489 2489
             in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) ||
2490 2490
             $this->isMathOperator($peek)) {
2491 2491
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2590,7 +2590,7 @@  discard block
 block discarded – undo
2590 2590
             return $this->NullComparisonExpression();
2591 2591
         }
2592 2592
 
2593
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
2593
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
2594 2594
             return $this->EmptyCollectionComparisonExpression();
2595 2595
         }
2596 2596
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Id/TableGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
                         $this->_tableName, $this->_sequenceName, $this->_allocationSize
93 93
                     );
94 94
 
95
-                    if ($conn->executeUpdate($updateSql, [1 => $currentLevel, 2 => $currentLevel+1]) !== 1) {
95
+                    if ($conn->executeUpdate($updateSql, [1 => $currentLevel, 2 => $currentLevel + 1]) !== 1) {
96 96
                         // no affected rows, concurrency issue, throw exception
97 97
                     }
98 98
                 } else {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/SqlValueVisitor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
     /**
40 40
      * @var array
41 41
      */
42
-    private $types  = [];
42
+    private $types = [];
43 43
 
44 44
     /**
45 45
      * Converts a comparison expression into the target query language output.
Please login to merge, or discard this patch.
lib/Doctrine/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;
@@ -477,11 +477,11 @@  discard block
 block discarded – undo
477 477
 
478 478
             $parentClass->mapEmbedded(
479 479
                 [
480
-                    'fieldName' => $prefix . '.' . $property,
480
+                    'fieldName' => $prefix.'.'.$property,
481 481
                     'class' => $embeddableMetadata->name,
482 482
                     'columnPrefix' => $embeddableClass['columnPrefix'],
483 483
                     'declaredField' => $embeddableClass['declaredField']
484
-                            ? $prefix . '.' . $embeddableClass['declaredField']
484
+                            ? $prefix.'.'.$embeddableClass['declaredField']
485 485
                             : $prefix,
486 486
                     'originalField' => $embeddableClass['originalField'] ?: $property,
487 487
                 ]
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
      */
500 500
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
501 501
     {
502
-        if (! $parentClass->isMappedSuperclass) {
502
+        if ( ! $parentClass->isMappedSuperclass) {
503 503
             return;
504 504
         }
505 505
 
@@ -704,14 +704,14 @@  discard block
 block discarded – undo
704 704
             case ClassMetadata::GENERATOR_TYPE_CUSTOM:
705 705
                 $definition = $class->customGeneratorDefinition;
706 706
                 if ( ! class_exists($definition['class'])) {
707
-                    throw new ORMException("Can't instantiate custom generator : " .
707
+                    throw new ORMException("Can't instantiate custom generator : ".
708 708
                         $definition['class']);
709 709
                 }
710 710
                 $class->setIdGenerator(new $definition['class']);
711 711
                 break;
712 712
 
713 713
             default:
714
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
714
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
715 715
         }
716 716
     }
717 717
 
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
      */
762 762
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
763 763
     {
764
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
764
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
765 765
     }
766 766
 
767 767
     /**
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
      */
786 786
     private function getTargetPlatform()
787 787
     {
788
-        if (!$this->targetPlatform) {
788
+        if ( ! $this->targetPlatform) {
789 789
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
790 790
         }
791 791
 
Please login to merge, or discard this patch.