kaliop-uk / ezmigrationbundle

Core/FieldHandler/EzDateAndTime.php

Spacing +7 added lines, -7 removed lines

@@ -58,26 +58,26 @@
     {
         $format = array();
         if (0 != $dateInterval->y) {
-            $format[] = $dateInterval->y.' years';
+            $format[] = $dateInterval->y . ' years';
         }
         if (0 != $dateInterval->m) {
-            $format[] = $dateInterval->m.' months';
+            $format[] = $dateInterval->m . ' months';
         }
         if (0 != $dateInterval->d) {
-            $format[] = $dateInterval->d.' days';
+            $format[] = $dateInterval->d . ' days';
         }
         //if (0 < $dateInterval->h || 0 < $dateInterval->i || 0 < $dateInterval->s) {
         //    $format .= 'T';
         //}
         if (0 != $dateInterval->h) {
-            $format[] = $dateInterval->h.' hours';
+            $format[] = $dateInterval->h . ' hours';
         }
         if (0 != $dateInterval->i) {
-            $format[] = $dateInterval->i.' minutes';
+            $format[] = $dateInterval->i . ' minutes';
         }
         if (0 != $dateInterval->s) {
-            $format[] = $dateInterval->s.' seconds';
+            $format[] = $dateInterval->s . ' seconds';
         }
-        return implode( ', ', $format);
+        return implode(', ', $format);
     }
 }

Core/Executor/ContentTypeManager.php

Doc Comments +4 added lines, -1 removed lines

@@ -652,6 +652,9 @@ 
         return $fieldDefinitionUpdateStruct;
     }
 
+    /**
+     * @param string $contentTypeIdentifier
+     */
     protected function getFieldSettings($value, $fieldTypeIdentifier, $contentTypeIdentifier)
     {
         // 1st update any references in the value array
@@ -704,7 +707,7 @@ 
      *
      * @param string|array $newValue if passed a string, we will use $lang as its language. If passed an array, it will be used as is - expected format [ "eng-GB": "Name", "fre-FR": "Nom", ... ]
      * @param string $lang ex: eng-GB. Not used when $newValue is an array
-     * @param array $currentValue current set of values in all known languages. Will be merged with $newValue, $newValue taking precedence
+     * @param string[] $currentValue current set of values in all known languages. Will be merged with $newValue, $newValue taking precedence
      * @return array in the format [ "eng-GB": "Name", "fre-FR": "Nom", ... ]
      */
     protected function getMultilingualValue($newValue, $lang, $currentValue = array())

Spacing +4 added lines, -4 removed lines

@@ -249,7 +249,7 @@ 
                 }
 
                 // Add new attributes
-                foreach($newFieldDefinitions as $newFieldDefinition) {
+                foreach ($newFieldDefinitions as $newFieldDefinition) {
                     if ($newFieldDefinition->position == 0) {
                         $newFieldDefinition->position = ++$maxFieldDefinitionPos;
                     }
@@ -370,7 +370,7 @@ 
                     break;
                 case 'content_type_groups_ids':
                     $value = [];
-                    foreach($contentType->contentTypeGroups as $existingGroup) {
+                    foreach ($contentType->contentTypeGroups as $existingGroup) {
                         $value[] = $existingGroup->id;
                     }
                     break;
@@ -766,7 +766,7 @@ 
         $contentTypeGroup = $this->contentTypeGroupMatcher->matchOneByKey($contentTypeGroupId);
         $contentTypeGroupId = $contentTypeGroup->id;
 
-        foreach($contentType->contentTypeGroups as $existingGroup) {
+        foreach ($contentType->contentTypeGroups as $existingGroup) {
             if ($existingGroup->id === $contentTypeGroupId) {
                 return;
             }
@@ -782,7 +782,7 @@ 
         $contentTypeGroup = $this->contentTypeGroupMatcher->matchOneByKey($contentTypeGroupId);
         $contentTypeGroupId = $contentTypeGroup->id;
 
-        foreach($contentType->contentTypeGroups as $existingGroup) {
+        foreach ($contentType->contentTypeGroups as $existingGroup) {
             if ($existingGroup->id === $contentTypeGroupId) {
                 $contentTypeService = $this->repository->getContentTypeService();
                 $contentTypeService->unassignContentTypeGroup($contentType, $contentTypeGroup);

Core/Executor/ContentVersionManager.php

Spacing +3 added lines, -3 removed lines

@@ -29,18 +29,18 @@
         $versions = (array)$step->dsl['versions'];
 
         foreach ($contentCollection as $content) {
-            foreach($versions as $versionId) {
+            foreach ($versions as $versionId) {
                 try {
                     if ($versionId < 0) {
                         $contentVersions = $contentService->loadVersions($content->contentInfo);
                         // different eZ kernels apparently sort versions in different order...
                         $sortedVersions = array();
-                        foreach($contentVersions as $versionInfo) {
+                        foreach ($contentVersions as $versionInfo) {
                             $sortedVersions[$versionInfo->versionNo] = $versionInfo;
                         }
                         ksort($sortedVersions);
                         $sortedVersions = array_slice($sortedVersions, 0, $versionId);
-                        foreach($sortedVersions as $versionInfo) {
+                        foreach ($sortedVersions as $versionInfo) {
                             $contentService->deleteVersion($versionInfo);
                         }
                     } else {

Core/Executor/ContentManager.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
 use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct;
 use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct;

Spacing +2 added lines, -2 removed lines

@@ -520,7 +520,7 @@ 
                     $locations = $locationService->loadLocations($content->contentInfo);
                     if (count($locations) > 1) {
                         $otherParentLocations = array();
-                        foreach($locations as $otherLocation) {
+                        foreach ($locations as $otherLocation) {
                             if ($otherLocation->id != $location->id) {
                                 $otherParentLocations[] = $otherLocation->parentLocationId;
                             }
@@ -696,7 +696,7 @@ 
             },
             array_filter(
                 $this->repository->getContentLanguageService()->loadLanguages(),
-                function ($language) {
+                function($language) {
                     return $language->enabled;
                 }
             )

Core/Matcher/TrashMatcher.php

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
             $query = new Query();
             $query->limit = self::INT_MAX_16BIT;
-            if (isset($query->performCount)) $query->performCount = false;
+            if (isset($query->performCount)) {
+                $query->performCount = false;
+            }
             $query->filter = $this->getQueryCriterion($key, $values);
             $results = $this->repository->getTrashService()->findTrashItems($query);
 

Core/Matcher/ContentMatcherDirectLoad.php

Spacing +2 added lines, -2 removed lines

@@ -22,13 +22,13 @@
             $contents = array();
             switch ($key) {
                 case self::MATCH_CONTENT_ID:
-                    foreach($match as $contentId) {
+                    foreach ($match as $contentId) {
                         $content = $this->repository->getContentService()->loadContent($contentId);
                         $contents[$content->id] = $content;
                     }
                     break;
                 case self::MATCH_CONTENT_REMOTE_ID:
-                    foreach($match as $contentRemoteId) {
+                    foreach ($match as $contentRemoteId) {
                         $content = $this->repository->getContentService()->loadContentByRemoteId($contentRemoteId);
                         $contents[$content->id] = $content;
                     }

Core/Matcher/LocationMatcherDirectLoad.php

Spacing +2 added lines, -2 removed lines

@@ -24,13 +24,13 @@
             $locations = array();
             switch ($key) {
                 case self::MATCH_LOCATION_ID:
-                    foreach($match as $locationId) {
+                    foreach ($match as $locationId) {
                         $location = $this->repository->getLocationService()->loadLocation($locationId);
                         $locations[$location->id] = $location;
                     }
                     break;
                 case self::MATCH_LOCATION_REMOTE_ID:
-                    foreach($match as $locationRemoteId) {
+                    foreach ($match as $locationRemoteId) {
                         $location = $this->repository->getLocationService()->loadLocationByRemoteId($locationRemoteId);
                         $locations[$location->id] = $location;
                     }

Indentation -1 removed lines

@@ -15,7 +15,6 @@
      * @param array $sort
      * @param int $offset
      * @param int $limit
-
      * @return LocationCollection
      */
     public function matchLocation(array $conditions, array $sort = array(), $offset = 0, $limit = 0)

Core/Loader/FilesystemRecursive.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
         if (empty($paths)) {
             $paths = array();
             /** @var $bundle \Symfony\Component\HttpKernel\Bundle\BundleInterface */
-            foreach($this->kernel->getBundles() as $bundle)
+            foreach ($this->kernel->getBundles() as $bundle)
             {
                 $path = $bundle->getPath() . "/" . $this->versionDirectory;
                 if (is_dir($path)) {
@@ -67,7 +67,7 @@ 
         }
 
         $definitions = array();
-        foreach($paths as $path) {
+        foreach ($paths as $path) {
             if (is_file($path)) {
                 $definitions[basename($path)] = $returnFilename ? $path : new MigrationDefinition(
                     basename($path),

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 throw new \Exception("Path '$path' is neither a file nor directory");
             }
         }

Command/MassMigrateCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -331,7 +331,7 @@
 
     /**
      * @param string $paths
-     * @param $migrationService
+     * @param \Kaliop\eZMigrationBundle\Core\MigrationService $migrationService
      * @param bool $isChild when not in child mode, do not waste time parsing migrations
      * @return MigrationDefinition[] parsed or unparsed, depending on
      *

Spacing +16 added lines, -16 removed lines

@@ -89,7 +89,7 @@ 
             }
 
             $concurrency = $input->getOption('concurrency');
-            $this->writeln("Executing migrations using ".count($paths)." processes with a concurrency of $concurrency");
+            $this->writeln("Executing migrations using " . count($paths) . " processes with a concurrency of $concurrency");
 
             $kernel = $this->getContainer()->get('kernel');
             $builder = new ProcessBuilder();
@@ -110,23 +110,23 @@ 
                 $builderArgs[] = '--no-debug';
             }
             if ($input->getOption('default-language')) {
-                $builderArgs[]='--default-language='.$input->getOption('default-language');
+                $builderArgs[] = '--default-language=' . $input->getOption('default-language');
             }
             if ($input->getOption('no-transactions')) {
-                $builderArgs[]='--no-transactions';
+                $builderArgs[] = '--no-transactions';
             }
             if ($input->getOption('siteaccess')) {
-                $builderArgs[]='--siteaccess='.$input->getOption('siteaccess');
+                $builderArgs[] = '--siteaccess=' . $input->getOption('siteaccess');
             }
             if ($input->getOption('ignore-failures')) {
-                $builderArgs[]='--ignore-failures';
+                $builderArgs[] = '--ignore-failures';
             }
             if ($input->getOption('separate-process')) {
-                $builderArgs[]='--separate-process';
+                $builderArgs[] = '--separate-process';
             }
             $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
@@ -163,11 +163,11 @@ 
 
             $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>');
             $this->writeln("<info>Import finished</info>\n");
 
             // 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;
 
@@ -206,7 +206,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;
                 }
@@ -280,7 +280,7 @@ 
                         );
 
                         $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);
@@ -306,7 +306,7 @@ 
         }
     }
 
-    public function onSubProcessOutput($type, $buffer, $process=null)
+    public function onSubProcessOutput($type, $buffer, $process = null)
     {
         $lines = explode("\n", trim($buffer));
 
@@ -324,7 +324,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";
             }
         }
     }
@@ -346,7 +346,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]) && $migration->status == Migration::STATUS_TODO)) {
                 $toExecute[$name] = $isChild ? $migrationService->parseMigrationDefinition($migrationDefinition) : $migrationDefinition;
             }
@@ -388,7 +388,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]);
     }
 
     protected function askForConfirmation(InputInterface $input, OutputInterface $output)
@@ -419,7 +419,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;