Completed
Pull Request — master (#5669)
by Jeremy
48:42 queued 40:04
created
lib/Doctrine/ORM/Tools/Setup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
      */
45 45
     public static function registerAutoloadDirectory($directory)
46 46
     {
47
-        if (!class_exists('Doctrine\Common\ClassLoader', false)) {
48
-            require_once $directory . "/Doctrine/Common/ClassLoader.php";
47
+        if ( ! class_exists('Doctrine\Common\ClassLoader', false)) {
48
+            require_once $directory."/Doctrine/Common/ClassLoader.php";
49 49
         }
50 50
 
51 51
         $loader = new ClassLoader("Doctrine", $directory);
52 52
         $loader->register();
53 53
 
54
-        $loader = new ClassLoader("Symfony\Component", $directory . "/Doctrine");
54
+        $loader = new ClassLoader("Symfony\Component", $directory."/Doctrine");
55 55
         $loader->register();
56 56
     }
57 57
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
         }
147 147
 
148 148
         if ($cache instanceof CacheProvider) {
149
-            $cache->setNamespace("dc2_" . md5($proxyDir) . "_"); // to avoid collisions
149
+            $cache->setNamespace("dc2_".md5($proxyDir)."_"); // to avoid collisions
150 150
         }
151 151
 
152 152
         $config = new Configuration();
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Doctrine ORM
4
- *
5
- * LICENSE
6
- *
7
- * This source file is subject to the new BSD license that is bundled
8
- * with this package in the file LICENSE.txt.
9
- * If you did not receive a copy of the license and are unable to
10
- * obtain it through the world-wide-web, please send an email
11
- * to [email protected] so I can send you a copy immediately.
12
- */
3
+     * Doctrine ORM
4
+     *
5
+     * LICENSE
6
+     *
7
+     * This source file is subject to the new BSD license that is bundled
8
+     * with this package in the file LICENSE.txt.
9
+     * If you did not receive a copy of the license and are unable to
10
+     * obtain it through the world-wide-web, please send an email
11
+     * to [email protected] so I can send you a copy immediately.
12
+     */
13 13
 
14 14
 namespace Doctrine\ORM\Tools\Pagination;
15 15
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
      */
44 44
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
45 45
     {
46
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
46
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
47 47
             $this->orderByClause
48
-        )) . ')';
48
+        )).')';
49 49
     }
50 50
 
51 51
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Doctrine ORM
4
- *
5
- * LICENSE
6
- *
7
- * This source file is subject to the new BSD license that is bundled
8
- * with this package in the file LICENSE. This license can also be viewed
9
- * at http://hobodave.com/license.txt
10
- *
11
- * @category    DoctrineExtensions
12
- * @package     DoctrineExtensions\Paginate
13
- * @author      David Abdemoulaie <[email protected]>
14
- * @copyright   Copyright (c) 2010 David Abdemoulaie (http://hobodave.com/)
15
- * @license     http://hobodave.com/license.txt New BSD License
16
- */
3
+     * Doctrine ORM
4
+     *
5
+     * LICENSE
6
+     *
7
+     * This source file is subject to the new BSD license that is bundled
8
+     * with this package in the file LICENSE. This license can also be viewed
9
+     * at http://hobodave.com/license.txt
10
+     *
11
+     * @category    DoctrineExtensions
12
+     * @package     DoctrineExtensions\Paginate
13
+     * @author      David Abdemoulaie <[email protected]>
14
+     * @copyright   Copyright (c) 2010 David Abdemoulaie (http://hobodave.com/)
15
+     * @license     http://hobodave.com/license.txt New BSD License
16
+     */
17 17
 
18 18
 namespace Doctrine\ORM\Tools\Pagination;
19 19
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
                 array($pathExpression)
101 101
             );
102 102
             $expression = new InExpression($arithmeticExpression);
103
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
103
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
104 104
 
105 105
         } else {
106 106
             $expression = new NullComparisonExpression($pathExpression);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
                 if ( ! is_dir($dir)) {
142 142
                     mkdir($dir, 0775, true);
143 143
                 }
144
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
144
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
145 145
                     throw ExportException::attemptOverwriteExistingFile($path);
146 146
                 }
147 147
                 file_put_contents($path, $output);
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
      */
160 160
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
161 161
     {
162
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
162
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
163 163
     }
164 164
 
165 165
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      */
66 66
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
67 67
     {
68
-        return $this->_outputDir . '/' . str_replace('\\', '/', $metadata->name) . $this->_extension;
68
+        return $this->_outputDir.'/'.str_replace('\\', '/', $metadata->name).$this->_extension;
69 69
     }
70 70
 
71 71
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     public function exportClassMetadata(ClassMetadataInfo $metadata)
42 42
     {
43 43
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
44
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
44
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
45 45
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
46 46
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
47 47
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
99 99
 
100
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
100
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
101 101
             $root->addChild('change-tracking-policy', $trackingPolicy);
102 102
         }
103 103
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
             }
296 296
 
297 297
             if (count($cascade) === 5) {
298
-                $cascade  = array('cascade-all');
298
+                $cascade = array('cascade-all');
299 299
             }
300 300
 
301 301
             if ($cascade) {
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
             }
378 378
         }
379 379
 
380
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
380
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
381 381
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
382 382
 
383 383
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
     {
427 427
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
428 428
 
429
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
429
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
430 430
             return;
431 431
         }
432 432
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,27 +51,27 @@  discard block
 block discarded – undo
51 51
         }
52 52
 
53 53
         if ($metadata->inheritanceType) {
54
-            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_' . $this->_getInheritanceTypeString($metadata->inheritanceType) . ');';
54
+            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_'.$this->_getInheritanceTypeString($metadata->inheritanceType).');';
55 55
         }
56 56
 
57 57
         if ($metadata->customRepositoryClassName) {
58
-            $lines[] = "\$metadata->customRepositoryClassName = '" . $metadata->customRepositoryClassName . "';";
58
+            $lines[] = "\$metadata->customRepositoryClassName = '".$metadata->customRepositoryClassName."';";
59 59
         }
60 60
 
61 61
         if ($metadata->table) {
62
-            $lines[] = '$metadata->setPrimaryTable(' . $this->_varExport($metadata->table) . ');';
62
+            $lines[] = '$metadata->setPrimaryTable('.$this->_varExport($metadata->table).');';
63 63
         }
64 64
 
65 65
         if ($metadata->discriminatorColumn) {
66
-            $lines[] = '$metadata->setDiscriminatorColumn(' . $this->_varExport($metadata->discriminatorColumn) . ');';
66
+            $lines[] = '$metadata->setDiscriminatorColumn('.$this->_varExport($metadata->discriminatorColumn).');';
67 67
         }
68 68
 
69 69
         if ($metadata->discriminatorMap) {
70
-            $lines[] = '$metadata->setDiscriminatorMap(' . $this->_varExport($metadata->discriminatorMap) . ');';
70
+            $lines[] = '$metadata->setDiscriminatorMap('.$this->_varExport($metadata->discriminatorMap).');';
71 71
         }
72 72
 
73 73
         if ($metadata->changeTrackingPolicy) {
74
-            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_' . $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy) . ');';
74
+            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_'.$this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy).');';
75 75
         }
76 76
 
77 77
         if ($metadata->lifecycleCallbacks) {
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
         }
84 84
 
85 85
         foreach ($metadata->fieldMappings as $fieldMapping) {
86
-            $lines[] = '$metadata->mapField(' . $this->_varExport($fieldMapping) . ');';
86
+            $lines[] = '$metadata->mapField('.$this->_varExport($fieldMapping).');';
87 87
         }
88 88
 
89 89
         if ( ! $metadata->isIdentifierComposite && $generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
90
-            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_' . $generatorType . ');';
90
+            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_'.$generatorType.');';
91 91
         }
92 92
 
93 93
         foreach ($metadata->associationMappings as $associationMapping) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                 $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
151 151
             }
152 152
 
153
-            $lines[] = '$metadata->' . $method . '(' . $this->_varExport($associationMappingArray) . ');';
153
+            $lines[] = '$metadata->'.$method.'('.$this->_varExport($associationMappingArray).');';
154 154
         }
155 155
 
156 156
         return implode("\n", $lines);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     protected function _varExport($var)
165 165
     {
166 166
         $export = var_export($var, true);
167
-        $export = str_replace("\n", PHP_EOL . str_repeat(' ', 8), $export);
167
+        $export = str_replace("\n", PHP_EOL.str_repeat(' ', 8), $export);
168 168
         $export = str_replace('  ', ' ', $export);
169 169
         $export = str_replace('array (', 'array(', $export);
170 170
         $export = str_replace('array( ', 'array(', $export);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         $schema = array();
76 76
         foreach ($this->from as $path) {
77 77
             if (is_dir($path)) {
78
-                $files = glob($path . '/*.yml');
78
+                $files = glob($path.'/*.yml');
79 79
                 foreach ($files as $file) {
80 80
                     $schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
81 81
                 }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
239 239
 
240 240
             $definition = array(
241
-                'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name']:$column['sequence']
241
+                'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name'] : $column['sequence']
242 242
             );
243 243
 
244 244
             if (isset($column['sequence']['size'])) {
Please login to merge, or discard this patch.