Completed
Pull Request — master (#572)
by Andreas
04:21
created
lib/Doctrine/DBAL/Migrations/Tools/Console/Helper/ConfigurationHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
          * instead of any other one.
61 61
          */
62 62
         if ($input->getOption('configuration')) {
63
-            $outputWriter->write("Loading configuration from command option: " . $input->getOption('configuration'));
63
+            $outputWriter->write("Loading configuration from command option: ".$input->getOption('configuration'));
64 64
 
65 65
             return $this->loadConfig($input->getOption('configuration'), $outputWriter);
66 66
         }
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/Finder/GlobFinder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
     {
39 39
         $dir = $this->getRealPath($directory);
40 40
 
41
-        $files = glob(rtrim($dir, '/') . '/Version*.php');
41
+        $files = glob(rtrim($dir, '/').'/Version*.php');
42 42
 
43 43
         return $this->loadMigrations($files, $namespace);
44 44
     }
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/SqlFileWriter.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         $string = $this->buildMigrationFile($queriesByVersion, $direction);
79 79
 
80 80
         if ($this->outputWriter) {
81
-            $this->outputWriter->write("\n" . sprintf('Writing migration file to "<info>%s</info>"', $path));
81
+            $this->outputWriter->write("\n".sprintf('Writing migration file to "<info>%s</info>"', $path));
82 82
         }
83 83
 
84 84
         return file_put_contents($path, $string);
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
         $string = sprintf("-- Doctrine Migration File Generated on %s\n", date('Y-m-d H:i:s'));
90 90
 
91 91
         foreach ($queriesByVersion as $version => $queries) {
92
-            $string .= "\n-- Version " . $version . "\n";
92
+            $string .= "\n-- Version ".$version."\n";
93 93
 
94 94
             foreach ($queries as $query) {
95
-                $string .= $query . ";\n";
95
+                $string .= $query.";\n";
96 96
             }
97 97
 
98 98
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
         if (is_dir($path)) {
121 121
             $path = realpath($path);
122
-            $path = $path . '/doctrine_migration_' . date('YmdHis') . '.sql';
122
+            $path = $path.'/doctrine_migration_'.date('YmdHis').'.sql';
123 123
         }
124 124
 
125 125
         return $path;
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/MigrationsVersion.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,6 +42,6 @@
 block discarded – undo
42 42
      */
43 43
     private static function isACustomPharBuild($gitversion)
44 44
     {
45
-        return $gitversion !== '@' . 'git-version@';
45
+        return $gitversion !== '@'.'git-version@';
46 46
     }
47 47
 }
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/Version.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -187,14 +187,14 @@  discard block
 block discarded – undo
187 187
         if (is_array($sql)) {
188 188
             foreach ($sql as $key => $query) {
189 189
                 $this->sql[] = $query;
190
-                if ( ! empty($params[$key])) {
190
+                if (!empty($params[$key])) {
191 191
                     $queryTypes = isset($types[$key]) ? $types[$key] : [];
192 192
                     $this->addQueryParams($params[$key], $queryTypes);
193 193
                 }
194 194
             }
195 195
         } else {
196 196
             $this->sql[] = $sql;
197
-            if ( ! empty($params)) {
197
+            if (!empty($params)) {
198 198
                 $this->addQueryParams($params, $types);
199 199
             }
200 200
         }
@@ -223,11 +223,11 @@  discard block
 block discarded – undo
223 223
     {
224 224
         $queries = $this->execute($direction, true);
225 225
 
226
-        if ( ! empty($this->params)) {
226
+        if (!empty($this->params)) {
227 227
             throw MigrationException::migrationNotConvertibleToSql($this->class);
228 228
         }
229 229
 
230
-        $this->outputWriter->write("\n-- Version " . $this->version . "\n");
230
+        $this->outputWriter->write("\n-- Version ".$this->version."\n");
231 231
 
232 232
         $sqlQueries = [$this->version => $queries];
233 233
 
@@ -280,12 +280,12 @@  discard block
 block discarded – undo
280 280
             $this->state = self::STATE_PRE;
281 281
             $fromSchema  = $this->schemaProvider->createFromSchema();
282 282
 
283
-            $this->migration->{'pre' . ucfirst($direction)}($fromSchema);
283
+            $this->migration->{'pre'.ucfirst($direction)}($fromSchema);
284 284
 
285 285
             if ($direction === self::DIRECTION_UP) {
286
-                $this->outputWriter->write("\n" . sprintf('  <info>++</info> migrating <comment>%s</comment>', $this->version) . "\n");
286
+                $this->outputWriter->write("\n".sprintf('  <info>++</info> migrating <comment>%s</comment>', $this->version)."\n");
287 287
             } else {
288
-                $this->outputWriter->write("\n" . sprintf('  <info>--</info> reverting <comment>%s</comment>', $this->version) . "\n");
288
+                $this->outputWriter->write("\n".sprintf('  <info>--</info> reverting <comment>%s</comment>', $this->version)."\n");
289 289
             }
290 290
 
291 291
             $this->state = self::STATE_EXEC;
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
             $this->executeRegisteredSql($dryRun, $timeAllQueries);
299 299
 
300 300
             $this->state = self::STATE_POST;
301
-            $this->migration->{'post' . ucfirst($direction)}($toSchema);
301
+            $this->migration->{'post'.ucfirst($direction)}($toSchema);
302 302
 
303
-            if ( ! $dryRun) {
303
+            if (!$dryRun) {
304 304
                 if ($direction === self::DIRECTION_UP) {
305 305
                     $this->markMigrated();
306 306
                 } else {
@@ -408,13 +408,13 @@  discard block
 block discarded – undo
408 408
 
409 409
     private function executeRegisteredSql($dryRun = false, $timeAllQueries = false)
410 410
     {
411
-        if ( ! $dryRun) {
412
-            if ( ! empty($this->sql)) {
411
+        if (!$dryRun) {
412
+            if (!empty($this->sql)) {
413 413
                 foreach ($this->sql as $key => $query) {
414 414
                     $queryStart = microtime(true);
415 415
 
416
-                    if ( ! isset($this->params[$key])) {
417
-                        $this->outputWriter->write('     <comment>-></comment> ' . $query);
416
+                    if (!isset($this->params[$key])) {
417
+                        $this->outputWriter->write('     <comment>-></comment> '.$query);
418 418
                         $this->connection->executeQuery($query);
419 419
                     } else {
420 420
                         $this->outputWriter->write(sprintf('    <comment>-</comment> %s (with parameters)', $query));
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/Provider/OrmSchemaProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 
38 38
     public function __construct($em)
39 39
     {
40
-        if ( ! $this->isEntityManager($em)) {
40
+        if (!$this->isEntityManager($em)) {
41 41
             throw new \InvalidArgumentException(sprintf(
42 42
                 '$em is not a valid Doctrine ORM Entity Manager, got "%s"',
43 43
                 is_object($em) ? get_class($em) : gettype($em)
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/Provider/LazySchemaDiffProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
         return $this->proxyFactory->createProxy(
72 72
             Schema::class,
73
-            function (& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator) {
73
+            function(& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator) {
74 74
                 $initializer   = null;
75 75
                 $wrappedObject = $originalSchemaManipulator->createFromSchema();
76 76
 
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
     {
88 88
         $originalSchemaManipulator = $this->originalSchemaManipulator;
89 89
 
90
-        if ($fromSchema instanceof LazyLoadingInterface && ! $fromSchema->isProxyInitialized()) {
90
+        if ($fromSchema instanceof LazyLoadingInterface && !$fromSchema->isProxyInitialized()) {
91 91
             return $this->proxyFactory->createProxy(
92 92
                 Schema::class,
93
-                function (& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator, $fromSchema) {
93
+                function(& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator, $fromSchema) {
94 94
                     $initializer   = null;
95 95
                     $wrappedObject = $originalSchemaManipulator->createToSchema($fromSchema);
96 96
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     public function getSqlDiffToMigrate(Schema $fromSchema, Schema $toSchema)
112 112
     {
113 113
         if ($toSchema instanceof LazyLoadingInterface
114
-            && ! $toSchema->isProxyInitialized()) {
114
+            && !$toSchema->isProxyInitialized()) {
115 115
             return [];
116 116
         }
117 117
 
Please login to merge, or discard this patch.
Doctrine/DBAL/Migrations/Tools/Console/Helper/MigrationDirectoryHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $dir = $dir ? $dir : getcwd();
47 47
         $dir = rtrim($dir, '/');
48 48
 
49
-        if ( ! file_exists($dir)) {
49
+        if (!file_exists($dir)) {
50 50
             throw new \InvalidArgumentException(sprintf('Migrations directory "%s" does not exist.', $dir));
51 51
         }
52 52
 
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 
65 65
     private function appendDir($dir)
66 66
     {
67
-        return DIRECTORY_SEPARATOR . $dir;
67
+        return DIRECTORY_SEPARATOR.$dir;
68 68
     }
69 69
 
70 70
     private function createDirIfNotExists($dir)
71 71
     {
72
-        if ( ! file_exists($dir)) {
72
+        if (!file_exists($dir)) {
73 73
             mkdir($dir, 0755, true);
74 74
         }
75 75
     }
Please login to merge, or discard this patch.
lib/Doctrine/DBAL/Migrations/Tools/Console/Command/VersionCommand.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     {
93 93
         $this->configuration = $this->getMigrationConfiguration($input, $output);
94 94
 
95
-        if ( ! $input->getOption('add') && ! $input->getOption('delete')) {
95
+        if (!$input->getOption('add') && !$input->getOption('delete')) {
96 96
             throw new \InvalidArgumentException('You must specify whether you want to --add or --delete the specified version.');
97 97
         }
98 98
 
@@ -148,26 +148,26 @@  discard block
 block discarded – undo
148 148
 
149 149
     private function mark($version, $all = false)
150 150
     {
151
-        if ( ! $this->configuration->hasVersion($version)) {
151
+        if (!$this->configuration->hasVersion($version)) {
152 152
             throw MigrationException::unknownMigrationVersion($version);
153 153
         }
154 154
 
155 155
         $version = $this->configuration->getVersion($version);
156 156
         if ($this->markMigrated && $this->configuration->hasVersionMigrated($version)) {
157
-            if ( ! $all) {
157
+            if (!$all) {
158 158
                 throw new \InvalidArgumentException(sprintf('The version "%s" already exists in the version table.', $version));
159 159
             }
160 160
             $marked = true;
161 161
         }
162 162
 
163
-        if ( ! $this->markMigrated && ! $this->configuration->hasVersionMigrated($version)) {
164
-            if ( ! $all) {
163
+        if (!$this->markMigrated && !$this->configuration->hasVersionMigrated($version)) {
164
+            if (!$all) {
165 165
                 throw new \InvalidArgumentException(sprintf('The version "%s" does not exists in the version table.', $version));
166 166
             }
167 167
             $marked = false;
168 168
         }
169 169
 
170
-        if ( ! isset($marked)) {
170
+        if (!isset($marked)) {
171 171
             if ($this->markMigrated) {
172 172
                 $version->markMigrated();
173 173
             } else {
Please login to merge, or discard this patch.