kaliop-uk / ezmigrationbundle

Core/Matcher/ContentVersionMatcher.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\Values\Content\Content;
 use \eZ\Publish\API\Repository\Values\Content\VersionInfo;
-use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use Kaliop\eZMigrationBundle\API\MatcherInterface;
 use Kaliop\eZMigrationBundle\API\Collection\VersionInfoCollection;
 

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
         $versions = array();
 
         $contentCollection = $this->contentMatcher->match($contentConditions, $sort, $offset, $limit);
-        foreach($contentCollection as $content) {
+        foreach ($contentCollection as $content) {
             $versions = array_merge($versions, $this->matchContentVersions($versionConditions, $content));
         }
 
@@ -151,7 +151,7 @@ 
     {
         $versions = array();
         foreach ($this->findAllContentVersions($content) as $versionKey => $versionInfo) {
-            foreach($values as $acceptedStatus) {
+            foreach ($values as $acceptedStatus) {
                 if ($versionInfo->status == self::STATUS_MAP[$acceptedStatus]) {
                     $versions[$versionKey] = $versionInfo;
                     break;
@@ -173,15 +173,15 @@ 
         $contentVersionsCount = count($contentVersions);
         $i = 0;
         foreach ($contentVersions as $versionKey => $versionInfo) {
-            foreach($values as $acceptedVersionNo) {
-                if ($acceptedVersionNo > 0 ) {
+            foreach ($values as $acceptedVersionNo) {
+                if ($acceptedVersionNo > 0) {
                     if ($acceptedVersionNo == $versionInfo->versionNo) {
                         $versions[$versionKey] = $versionInfo;
                         break;
                     }
                 } else {
                     // negative $acceptedVersionNo means 'leave the last X versions', eg: -1 = leave the last version
-                    if ($i < $contentVersionsCount + $acceptedVersionNo)  {
+                    if ($i < $contentVersionsCount + $acceptedVersionNo) {
                         $versions[$versionKey] = $versionInfo;
                         break;
 
@@ -202,7 +202,7 @@ 
         $contentVersions = $this->repository->getContentService()->loadVersions($content->contentInfo);
         // different eZ kernels apparently sort versions in different order...
         $sortedVersions = array();
-        foreach($contentVersions as $versionInfo) {
+        foreach ($contentVersions as $versionInfo) {
             $sortedVersions[$content->contentInfo->id . '/' . $versionInfo->versionNo] = $versionInfo;
         }
         ksort($sortedVersions);

Doc Comments +6 added lines

@@ -110,6 +110,9 @@ 
         }
     }
 
+    /**
+     * @param Content $content
+     */
     protected function matchAnd($conditionsArray, $content = null)
     {
         /// @todo introduce proper re-validation of all child conditions
@@ -133,6 +136,9 @@ 
         return $results;
     }
 
+    /**
+     * @param Content $content
+     */
     protected function matchOr($conditionsArray, $content = null)
     {
         /// @todo introduce proper re-validation of all child conditions

Command/MigrateCommand.php

Spacing +3 added lines, -3 removed lines

@@ -219,9 +219,9 @@ 
         $this->writeln("Executed $executed migrations, failed $failed, skipped $skipped");
         if ($input->getOption('separate-process')) {
             // in case of using subprocesses, we can not measure max memory used
-            $this->writeln("Time taken: ".sprintf('%.2f', $time)." secs");
+            $this->writeln("Time taken: " . sprintf('%.2f', $time) . " secs");
         } else {
-            $this->writeln("Time taken: ".sprintf('%.2f', $time)." secs, memory: ".sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)). ' MB');
+            $this->writeln("Time taken: " . sprintf('%.2f', $time) . " secs, memory: " . sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)) . ' MB');
         }
     }
 
@@ -369,7 +369,7 @@ 
             $builderArgs[] = '--no-debug';
         }
         if ($input->getOption('siteaccess')) {
-            $builderArgs[]='--siteaccess='.$input->getOption('siteaccess');
+            $builderArgs[] = '--siteaccess=' . $input->getOption('siteaccess');
         }
         // 'optional' options
         // note: options 'clear-cache', 'ignore-failures', 'no-interaction', 'path' and 'separate-process' we never propagate

Doc Comments +3 added lines

@@ -193,6 +193,9 @@
         );
     }
 
+    /**
+     * @param ProcessBuilder $builder
+     */
     protected function executeMigrationInSeparateProcess($migrationDefinition, $migrationService, $builder, $builderArgs, $feedback = true)
     {
         $process = $builder

Command/MassMigrateCommand.php

Doc Comments +13 added lines, -1 removed lines

@@ -88,6 +88,12 @@ 
         }
     }
 
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param MigrationDefinition[] $toExecute
+     * @param double $start
+     */
     protected function executeAsParent($input, $output, $toExecute, $start)
     {
         $paths = $this->groupMigrationsByPath($toExecute);
@@ -157,6 +163,12 @@ 
         return $failed;
     }
 
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param MigrationDefinition[] $toExecute
+     * @param \Kaliop\eZMigrationBundle\Core\MigrationService $migrationService
+     */
     protected function executeAsChild($input, $output, $toExecute, $force, $migrationService)
     {
         // @todo disable signal slots that are harmful during migrations, if any
@@ -260,7 +272,7 @@ 
 
     /**
      * @param string $paths
-     * @param $migrationService
+     * @param \Kaliop\eZMigrationBundle\Core\MigrationService $migrationService
      * @param bool $force
      * @param bool $isChild when not in child mode, do not waste time parsing migrations
      * @return MigrationDefinition[] parsed or unparsed, depending on

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Symfony\Component\Process\ProcessBuilder;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Kaliop\eZMigrationBundle\Core\Helper\ProcessManager;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class MassMigrateCommand extends MigrateCommand
 {

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
 
         $processes = array();
         /** @var MigrationDefinition $migrationDefinition */
-        foreach($paths as $path => $count) {
+        foreach ($paths as $path => $count) {
             $this->writeln("<info>Queueing processing of: $path ($count migrations)</info>", OutputInterface::VERBOSITY_VERBOSE);
 
             $process = $builder
@@ -149,10 +149,10 @@ 
 
         $time = microtime(true) - $start;
 
-        $this->writeln('<info>'.$this->migrationsDone[0].' migrations executed, '.$this->migrationsDone[1].' failed, '.$this->migrationsDone[2].' skipped</info>');
+        $this->writeln('<info>' . $this->migrationsDone[0] . ' migrations executed, ' . $this->migrationsDone[1] . ' failed, ' . $this->migrationsDone[2] . ' skipped</info>');
 
         // since we use subprocesses, we can not measure max memory used
-        $this->writeln("Time taken: ".sprintf('%.2f', $time)." secs");
+        $this->writeln("Time taken: " . sprintf('%.2f', $time) . " secs");
 
         return $failed;
     }
@@ -179,7 +179,7 @@ 
         foreach ($toExecute as  $name => $migrationDefinition) {
             // let's skip migrations that we know are invalid - user was warned and he decided to proceed anyway
             if ($migrationDefinition->status == MigrationDefinition::STATUS_INVALID) {
-                $this->writeln("<comment>Skipping migration (invalid definition?) Path: ".$migrationDefinition->path."</comment>", self::VERBOSITY_CHILD);
+                $this->writeln("<comment>Skipping migration (invalid definition?) Path: " . $migrationDefinition->path . "</comment>", self::VERBOSITY_CHILD);
                 $skipped++;
                 continue;
             }
@@ -210,7 +210,7 @@ 
                     $this->executeMigrationInProcess($migrationDefinition, $force, $migrationService, $input);
 
                     $executed++;
-                } catch(\Exception $e) {
+                } catch (\Exception $e) {
                     $failed++;
                     if ($input->getOption('ignore-failures')) {
                         $this->writeln("<error>Migration failed! Path: " . $migrationDefinition->path . ", Reason: " . $e->getMessage() . "</error>", self::VERBOSITY_CHILD);
@@ -235,7 +235,7 @@ 
         //return $failed;
     }
 
-    public function onSubProcessOutput($type, $buffer, $process=null)
+    public function onSubProcessOutput($type, $buffer, $process = null)
     {
         $lines = explode("\n", trim($buffer));
 
@@ -253,7 +253,7 @@ 
 
             // we tag the output from the different processes
             if (trim($line) !== '') {
-                echo '[' . ($process ? $process->getPid() : ''). '] ' . trim($line) . "\n";
+                echo '[' . ($process ? $process->getPid() : '') . '] ' . trim($line) . "\n";
             }
         }
     }
@@ -281,7 +281,7 @@ 
 
         // filter away all migrations except 'to do' ones
         $toExecute = array();
-        foreach($migrationDefinitions as $name => $migrationDefinition) {
+        foreach ($migrationDefinitions as $name => $migrationDefinition) {
             if (!isset($migrations[$name]) || (($migration = $migrations[$name]) && in_array($migration->status, $allowedStatuses))) {
                 $toExecute[$name] = $isChild ? $migrationService->parseMigrationDefinition($migrationDefinition) : $migrationDefinition;
             }
@@ -323,7 +323,7 @@ 
     {
         $output->writeln('Found ' . count($toExecute) . ' migrations in ' . count($paths) . ' directories');
         $output->writeln('In the same directories, migrations previously executed: ' . $this->migrationsAlreadyDone[Migration::STATUS_DONE] .
-            ', failed: ' . $this->migrationsAlreadyDone[Migration::STATUS_FAILED] . ', skipped: '. $this->migrationsAlreadyDone[Migration::STATUS_SKIPPED]);
+            ', failed: ' . $this->migrationsAlreadyDone[Migration::STATUS_FAILED] . ', skipped: ' . $this->migrationsAlreadyDone[Migration::STATUS_SKIPPED]);
         if ($this->migrationsAlreadyDone[Migration::STATUS_STARTED]) {
             $output->writeln('<info>In the same directories, migrations currently executing: ' . $this->migrationsAlreadyDone[Migration::STATUS_STARTED] . '</info>');
         }
@@ -336,7 +336,7 @@ 
     protected function groupMigrationsByPath($toExecute)
     {
         $paths = array();
-        foreach($toExecute as $name => $migrationDefinition) {
+        foreach ($toExecute as $name => $migrationDefinition) {
             $path = dirname($migrationDefinition->path);
             if (!isset($paths[$path])) {
                 $paths[$path] = 1;