Completed
Pull Request — master (#5667)
by Jeroen De
15:27
created
lib/Doctrine/ORM/Configuration.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@
 block discarded – undo
151 151
      */
152 152
     public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = true)
153 153
     {
154
-        AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
154
+        AnnotationRegistry::registerFile(__DIR__.'/Mapping/Driver/DoctrineAnnotations.php');
155 155
 
156 156
         if ($useSimpleAnnotationReader) {
157 157
             // Register the ORM Annotations in the AnnotationRegistry
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -918,7 +918,7 @@
 block discarded – undo
918 918
      * @since 2.5
919 919
      *
920 920
      * @param string $name  The name of the hint.
921
-     * @param mixed  $value The value of the hint.
921
+     * @param string  $value The value of the hint.
922 922
      */
923 923
     public function setDefaultQueryHint($name, $value)
924 924
     {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/ASTException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
      */
34 34
     public static function noDispatchForNode($node)
35 35
     {
36
-        return new self("Double-dispatch for node " . get_class($node) . " is not supported.");
36
+        return new self("Double-dispatch for node ".get_class($node)." is not supported.");
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
lib/Doctrine/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/Doctrine/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/Doctrine/ORM/Query/AST/Functions/SizeFunction.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
                 if ($first) $first = false; else $sql .= ' AND ';
71 71
 
72 72
                 $sql .= $targetTableAlias . '.' . $sourceColumn
73
-                      . ' = '
74
-                      . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
73
+                        . ' = '
74
+                        . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
75 75
             }
76 76
         } else { // many-to-many
77 77
             $targetClass = $sqlWalker->getEntityManager()->getClassMetadata($assoc['targetEntity']);
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
                 );
101 101
 
102 102
                 $sql .= $joinTableAlias . '.' . $joinColumn['name']
103
-                      . ' = '
104
-                      . $sourceTableAlias . '.' . $sourceColumnName;
103
+                        . ' = '
104
+                        . $sourceTableAlias . '.' . $sourceColumnName;
105 105
             }
106 106
         }
107 107
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
             $targetTableAlias   = $sqlWalker->getSQLTableAlias($targetClass->getTableName());
61 61
             $sourceTableAlias   = $sqlWalker->getSQLTableAlias($class->getTableName(), $dqlAlias);
62 62
 
63
-            $sql .= $quoteStrategy->getTableName($targetClass, $platform) . ' ' . $targetTableAlias . ' WHERE ';
63
+            $sql .= $quoteStrategy->getTableName($targetClass, $platform).' '.$targetTableAlias.' WHERE ';
64 64
 
65 65
             $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']];
66 66
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
70 70
                 if ($first) $first = false; else $sql .= ' AND ';
71 71
 
72
-                $sql .= $targetTableAlias . '.' . $sourceColumn
72
+                $sql .= $targetTableAlias.'.'.$sourceColumn
73 73
                       . ' = '
74
-                      . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
74
+                      . $sourceTableAlias.'.'.$quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
75 75
             }
76 76
         } else { // many-to-many
77 77
             $targetClass = $sqlWalker->getEntityManager()->getClassMetadata($assoc['targetEntity']);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             $sourceTableAlias = $sqlWalker->getSQLTableAlias($class->getTableName(), $dqlAlias);
85 85
 
86 86
             // join to target table
87
-            $sql .= $quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $platform) . ' ' . $joinTableAlias . ' WHERE ';
87
+            $sql .= $quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $platform).' '.$joinTableAlias.' WHERE ';
88 88
 
89 89
             $joinColumns = $assoc['isOwningSide']
90 90
                 ? $joinTable['joinColumns']
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
                     $class->fieldNames[$joinColumn['referencedColumnName']], $class, $platform
100 100
                 );
101 101
 
102
-                $sql .= $joinTableAlias . '.' . $joinColumn['name']
102
+                $sql .= $joinTableAlias.'.'.$joinColumn['name']
103 103
                       . ' = '
104
-                      . $sourceTableAlias . '.' . $sourceColumnName;
104
+                      . $sourceTableAlias.'.'.$sourceColumnName;
105 105
             }
106 106
         }
107 107
 
108
-        return '(' . $sql . ')';
108
+        return '('.$sql.')';
109 109
     }
110 110
 
111 111
     /**
Please login to merge, or discard this patch.
Braces   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,11 @@  discard block
 block discarded – undo
67 67
             $first = true;
68 68
 
69 69
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
70
-                if ($first) $first = false; else $sql .= ' AND ';
70
+                if ($first) {
71
+                    $first = false;
72
+                } else {
73
+                    $sql .= ' AND ';
74
+                }
71 75
 
72 76
                 $sql .= $targetTableAlias . '.' . $sourceColumn
73 77
                       . ' = '
@@ -93,7 +97,11 @@  discard block
 block discarded – undo
93 97
             $first = true;
94 98
 
95 99
             foreach ($joinColumns as $joinColumn) {
96
-                if ($first) $first = false; else $sql .= ' AND ';
100
+                if ($first) {
101
+                    $first = false;
102
+                } else {
103
+                    $sql .= ' AND ';
104
+                }
97 105
 
98 106
                 $sourceColumnName = $quoteStrategy->getColumnName(
99 107
                     $class->fieldNames[$joinColumn['referencedColumnName']], $class, $platform
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/Functions/AbsFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
      */
45 45
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
46 46
     {
47
-        return 'ABS(' . $sqlWalker->walkSimpleArithmeticExpression(
47
+        return 'ABS('.$sqlWalker->walkSimpleArithmeticExpression(
48 48
             $this->simpleArithmeticExpression
49
-        ) . ')';
49
+        ).')';
50 50
     }
51 51
 
52 52
     /**
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(array($platform,'getConcatExpression'), $args);
56
+        return call_user_func_array(array($platform, 'getConcatExpression'), $args);
57 57
     }
58 58
 
59 59
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/CoalesceExpression.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
      */
43 43
     public function __construct(array $scalarExpressions)
44 44
     {
45
-        $this->scalarExpressions  = $scalarExpressions;
45
+        $this->scalarExpressions = $scalarExpressions;
46 46
     }
47 47
 
48 48
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Lexer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@
 block discarded – undo
170 170
 
171 171
             // Recognize identifiers, aliased or qualified names
172 172
             case (ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\'):
173
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
173
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
174 174
 
175 175
                 if (defined($name)) {
176 176
                     $type = constant($name);
Please login to merge, or discard this patch.