Completed
Pull Request — master (#1261)
by Huberty
13:19
created
lib/Doctrine/ORM/Mapping/EscapingQuoteStrategy.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         if($reservedKeyList->isKeyword($class->table['name'])){
57 57
             return $platform->quoteIdentifier($class->table['name']);
58 58
         }
59
-         return $class->table['name'];
59
+            return $class->table['name'];
60 60
     }
61 61
 
62 62
     /**
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function getColumnName($fieldName, ClassMetadata $class, AbstractPlatform $platform)
36 36
     {
37
-        if(isset($class->fieldMappings[$fieldName]['quoted'])){
37
+        if (isset($class->fieldMappings[$fieldName]['quoted'])) {
38 38
             return $platform->quoteIdentifier($class->fieldMappings[$fieldName]['columnName']);
39 39
         }
40 40
         $reservedKeyList = $platform->getReservedKeywordsList();
41
-        if($reservedKeyList->isKeyword($fieldName)){
41
+        if ($reservedKeyList->isKeyword($fieldName)) {
42 42
             return $platform->quoteIdentifier($class->fieldMappings[$fieldName]['columnName']);
43 43
         }
44 44
         return $class->fieldMappings[$fieldName]['columnName'];
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
      */
50 50
     public function getTableName(ClassMetadata $class, AbstractPlatform $platform)
51 51
     {
52
-        if(isset($class->table['quoted'])){
52
+        if (isset($class->table['quoted'])) {
53 53
             return $platform->quoteIdentifier($class->table['name']);
54 54
         }
55 55
         $reservedKeyList = $platform->getReservedKeywordsList();
56
-        if($reservedKeyList->isKeyword($class->table['name'])){
56
+        if ($reservedKeyList->isKeyword($class->table['name'])) {
57 57
             return $platform->quoteIdentifier($class->table['name']);
58 58
         }
59 59
          return $class->table['name'];
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
      */
65 65
     public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform)
66 66
     {
67
-        if(isset($definition['quoted'])){
67
+        if (isset($definition['quoted'])) {
68 68
             return $platform->quoteIdentifier($class->table['name']);
69 69
         }
70 70
         $reservedKeyList = $platform->getReservedKeywordsList();
71
-        if($reservedKeyList->isKeyword($definition['sequenceName'])){
71
+        if ($reservedKeyList->isKeyword($definition['sequenceName'])) {
72 72
             return $platform->quoteIdentifier($definition['sequenceName']);
73 73
         }
74 74
         return $definition['sequenceName'];
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
      */
80 80
     public function getJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
81 81
     {
82
-        if(isset($joinColumn['quoted'])){
82
+        if (isset($joinColumn['quoted'])) {
83 83
             return $platform->quoteIdentifier($joinColumn['name']);
84 84
         }
85 85
         $reservedKeyList = $platform->getReservedKeywordsList();
86
-        if($reservedKeyList->isKeyword($joinColumn['name'])){
86
+        if ($reservedKeyList->isKeyword($joinColumn['name'])) {
87 87
             return $platform->quoteIdentifier($joinColumn['name']);
88 88
         }
89 89
         return $joinColumn['name'];
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
      */
95 95
     public function getReferencedJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
96 96
     {
97
-        if(isset($joinColumn['quoted'])){
97
+        if (isset($joinColumn['quoted'])) {
98 98
             return $platform->quoteIdentifier($joinColumn['referencedColumnName']);
99 99
         }
100 100
         $reservedKeyList = $platform->getReservedKeywordsList();
101
-        if($reservedKeyList->isKeyword($joinColumn['referencedColumnName'])){
101
+        if ($reservedKeyList->isKeyword($joinColumn['referencedColumnName'])) {
102 102
             return $platform->quoteIdentifier($joinColumn['referencedColumnName']);
103 103
         }
104 104
         return $joinColumn['referencedColumnName'];
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform)
111 111
     {
112
-        if(isset($association['joinTable']['quoted'])){
112
+        if (isset($association['joinTable']['quoted'])) {
113 113
             return $platform->quoteIdentifier($association['joinTable']['name']);
114 114
         }
115 115
         $reservedKeyList = $platform->getReservedKeywordsList();
116
-        if($reservedKeyList->isKeyword($association['joinTable']['name'])){
116
+        if ($reservedKeyList->isKeyword($association['joinTable']['name'])) {
117 117
             return $platform->quoteIdentifier($association['joinTable']['name']);
118 118
         }
119 119
         return $association['joinTable']['name'];
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
             // Association defined as Id field
137 137
             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];
138 138
             $assocQuotedColumnNames = array_map(
139
-                function ($joinColumn) use ($platform)
139
+                function($joinColumn) use ($platform)
140 140
                 {
141
-                    if(isset($joinColumn['quoted'])){
141
+                    if (isset($joinColumn['quoted'])) {
142 142
                         return $platform->quoteIdentifier($joinColumn['name']);
143 143
                     }
144 144
                     $reservedKeyList = $platform->getReservedKeywordsList();
145
-                    if($reservedKeyList->isKeyword($joinColumn['name'])){
145
+                    if ($reservedKeyList->isKeyword($joinColumn['name'])) {
146 146
                         return $platform->quoteIdentifier($joinColumn['name']);
147 147
                     }
148 148
                     return $joinColumn['name'];
@@ -166,10 +166,10 @@  discard block
 block discarded – undo
166 166
         //     If the alias is to long, characters are cut off from the beginning.
167 167
         // 3 ) Strip non alphanumeric characters
168 168
         // 4 ) Prefix with "_" if the result its numeric
169
-        $columnName = $columnName . '_' . $counter;
169
+        $columnName = $columnName.'_'.$counter;
170 170
         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());
171 171
         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
172
-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;
172
+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
173 173
 
174 174
         return $platform->getSQLResultCasing($columnName);
175 175
     }
Please login to merge, or discard this patch.