@@ -48,7 +48,7 @@ |
||
| 48 | 48 | /** |
| 49 | 49 | * @param array $dsl |
| 50 | 50 | * @param array $context |
| 51 | - * @return true |
|
| 51 | + * @return boolean |
|
| 52 | 52 | * @throws \Exception |
| 53 | 53 | */ |
| 54 | 54 | protected function send($dsl, $context) |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | $body = isset($dsl['body']) ? $this->resolveReferencesInText($dsl['body']) : null; |
| 68 | 68 | |
| 69 | 69 | if (isset($dsl['client'])) { |
| 70 | - $client = $this->container->get('httplug.client.'.$dsl['client']); |
|
| 70 | + $client = $this->container->get('httplug.client.' . $dsl['client']); |
|
| 71 | 71 | } else { |
| 72 | 72 | $client = $this->container->get('httplug.client'); |
| 73 | 73 | } |
@@ -447,6 +447,9 @@ |
||
| 447 | 447 | ); |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | + /** |
|
| 451 | + * @param APIMigration $migration |
|
| 452 | + */ |
|
| 450 | 453 | protected function getEntityName($migration) |
| 451 | 454 | { |
| 452 | 455 | return end(explode('\\', get_class($migration))); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | public function endMigration(APIMigration $migration, $force = false) |
| 172 | 172 | { |
| 173 | 173 | if ($migration->status == APIMigration::STATUS_STARTED) { |
| 174 | - throw new \Exception($this->getEntityName($migration)." '{$migration->name}' can not be ended as its status is 'started'..."); |
|
| 174 | + throw new \Exception($this->getEntityName($migration) . " '{$migration->name}' can not be ended as its status is 'started'..."); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | $this->createTableIfNeeded(); |
@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | if (!is_array($existingMigrationData)) { |
| 199 | 199 | // commit to release the lock |
| 200 | 200 | $conn->commit(); |
| 201 | - throw new \Exception($this->getEntityName($migration)." '{$migration->name}' can not be ended as it is not found"); |
|
| 201 | + throw new \Exception($this->getEntityName($migration) . " '{$migration->name}' can not be ended as it is not found"); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | if (($existingMigrationData['status'] != APIMigration::STATUS_STARTED) && !$force) { |
| 205 | 205 | // commit to release the lock |
| 206 | 206 | $conn->commit(); |
| 207 | - throw new \Exception($this->getEntityName($migration)." '{$migration->name}' can not be ended as it is not executing"); |
|
| 207 | + throw new \Exception($this->getEntityName($migration) . " '{$migration->name}' can not be ended as it is not executing"); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | $conn->update( |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | if (!is_array($existingMigrationData)) { |
| 356 | 356 | // commit immediately, to release the lock and avoid deadlocks |
| 357 | 357 | $conn->commit(); |
| 358 | - throw new \Exception($this->getEntityName($migration)." '{$migration->name}' can not be resumed as it is not found"); |
|
| 358 | + throw new \Exception($this->getEntityName($migration) . " '{$migration->name}' can not be resumed as it is not found"); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | // migration exists |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | if ($existingMigrationData['status'] != APIMigration::STATUS_SUSPENDED) { |
| 365 | 365 | // commit to release the lock |
| 366 | 366 | $conn->commit(); |
| 367 | - throw new \Exception($this->getEntityName($migration)." '{$migration->name}' can not be resumed as it is not suspended"); |
|
| 367 | + throw new \Exception($this->getEntityName($migration) . " '{$migration->name}' can not be resumed as it is not suspended"); |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | $migration = new APIMigration( |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | use Kaliop\eZMigrationBundle\API\Collection\MigrationCollection; |
| 11 | 11 | use Kaliop\eZMigrationBundle\API\Value\Migration as APIMigration; |
| 12 | 12 | use Kaliop\eZMigrationBundle\API\Value\MigrationDefinition; |
| 13 | - |
|
| 14 | 13 | use Kaliop\eZMigrationBundle\API\ConfigResolverInterface; |
| 15 | 14 | |
| 16 | 15 | /** |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | $builderArgs = array($this->referenceResolver->resolveReference($dsl['command'])); |
| 64 | 64 | |
| 65 | 65 | if (isset($dsl['arguments'])) { |
| 66 | - foreach($dsl['arguments'] as $arg) { |
|
| 66 | + foreach ($dsl['arguments'] as $arg) { |
|
| 67 | 67 | $builderArgs[] = $this->referenceResolver->resolveReference($arg); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $executed = 0; |
| 94 | 94 | $failed = 0; |
| 95 | 95 | |
| 96 | - foreach($suspendedMigrations as $suspendedMigration) { |
|
| 96 | + foreach ($suspendedMigrations as $suspendedMigration) { |
|
| 97 | 97 | $output->writeln("<info>Resuming {$suspendedMigration->name}</info>"); |
| 98 | 98 | |
| 99 | 99 | try { |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | $time = microtime(true) - $start; |
| 115 | 115 | $output->writeln("Resumed $executed migrations, failed $failed"); |
| 116 | - $output->writeln("Time taken: ".sprintf('%.2f', $time)." secs, memory: ".sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)). ' MB'); |
|
| 116 | + $output->writeln("Time taken: " . sprintf('%.2f', $time) . " secs, memory: " . sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)) . ' MB'); |
|
| 117 | 117 | |
| 118 | 118 | if ($failed) { |
| 119 | 119 | return 2; |
@@ -46,15 +46,15 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | foreach ($conditions as $key => $values) { |
| 48 | 48 | |
| 49 | - switch($key) { |
|
| 49 | + switch ($key) { |
|
| 50 | 50 | |
| 51 | 51 | case self::MATCH_RELATES_TO: |
| 52 | 52 | $contentService = $this->repository->getContentService(); |
| 53 | 53 | $contents = array(); |
| 54 | 54 | // allow to specify the objects to relate to using different ways |
| 55 | 55 | $relatedContents = $this->match($values); |
| 56 | - foreach($relatedContents as $relatedContent) { |
|
| 57 | - foreach($contentService->loadReverseRelations($relatedContent->contentInfo) as $relatingContent) { |
|
| 56 | + foreach ($relatedContents as $relatedContent) { |
|
| 57 | + foreach ($contentService->loadReverseRelations($relatedContent->contentInfo) as $relatingContent) { |
|
| 58 | 58 | $contents[$relatingContent->contentInfo->id] = $relatingContent; |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $contents = array(); |
| 66 | 66 | // allow to specify the objects we relate to using different ways |
| 67 | 67 | $relatingContents = $this->match($values); |
| 68 | - foreach($relatingContents as $relatingContent) { |
|
| 69 | - foreach($contentService->loadRelations($relatingContent->contentInfo) as $relatedContent) { |
|
| 68 | + foreach ($relatingContents as $relatingContent) { |
|
| 69 | + foreach ($contentService->loadRelations($relatingContent->contentInfo) as $relatedContent) { |
|
| 70 | 70 | $contents[$relatedContent->contentInfo->id] = $relatedContent; |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -85,7 +85,9 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | $query = new Query(); |
| 87 | 87 | $query->limit = self::INT_MAX_16BIT; |
| 88 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 88 | + if (isset($query->performCount)) { |
|
| 89 | + $query->performCount = false; |
|
| 90 | + } |
|
| 89 | 91 | $query->filter = $this->getQueryCriterion($key, $values); |
| 90 | 92 | switch ($key) { |
| 91 | 93 | case 'content_type_id': |
@@ -206,7 +208,9 @@ discard block |
||
| 206 | 208 | { |
| 207 | 209 | $query = new Query(); |
| 208 | 210 | $query->limit = self::INT_MAX_16BIT; |
| 209 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 211 | + if (isset($query->performCount)) { |
|
| 212 | + $query->performCount = false; |
|
| 213 | + } |
|
| 210 | 214 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
| 211 | 215 | $results = $this->repository->getSearchService()->findContent($query); |
| 212 | 216 | |
@@ -246,7 +250,9 @@ discard block |
||
| 246 | 250 | { |
| 247 | 251 | $query = new Query(); |
| 248 | 252 | $query->limit = self::INT_MAX_16BIT; |
| 249 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 253 | + if (isset($query->performCount)) { |
|
| 254 | + $query->performCount = false; |
|
| 255 | + } |
|
| 250 | 256 | $query->filter = new Query\Criterion\ContentTypeIdentifier($contentTypeIdentifiers); |
| 251 | 257 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
| 252 | 258 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -274,7 +280,9 @@ discard block |
||
| 274 | 280 | { |
| 275 | 281 | $query = new Query(); |
| 276 | 282 | $query->limit = self::INT_MAX_16BIT; |
| 277 | - if (isset($query->performCount)) $query->performCount = false; |
|
| 283 | + if (isset($query->performCount)) { |
|
| 284 | + $query->performCount = false; |
|
| 285 | + } |
|
| 278 | 286 | $query->filter = new Query\Criterion\ContentTypeId($contentTypeIds); |
| 279 | 287 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
| 280 | 288 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | { |
| 162 | 162 | // allow setting *some* refs even when we have 0 or N matches |
| 163 | 163 | foreach ($referencesDefinition as $key => $reference) { |
| 164 | - switch($reference['attribute']) { |
|
| 164 | + switch ($reference['attribute']) { |
|
| 165 | 165 | |
| 166 | 166 | case 'count': |
| 167 | 167 | $value = count($entity); |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | throw new \InvalidArgumentException($this->getSelfName() . ' does not support setting references for multiple ' . $this->getCollectionName($entity) . 's'); |
| 198 | 198 | } |
| 199 | 199 | if (count($entity) == 0) { |
| 200 | - throw new \InvalidArgumentException($this->getSelfName() . ' does not support setting references for no ' . $this->getCollectionName($entity). 's'); |
|
| 200 | + throw new \InvalidArgumentException($this->getSelfName() . ' does not support setting references for no ' . $this->getCollectionName($entity) . 's'); |
|
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
@@ -58,26 +58,26 @@ |
||
| 58 | 58 | { |
| 59 | 59 | $format = array(); |
| 60 | 60 | if (0 != $dateInterval->y) { |
| 61 | - $format[] = $dateInterval->y.' years'; |
|
| 61 | + $format[] = $dateInterval->y . ' years'; |
|
| 62 | 62 | } |
| 63 | 63 | if (0 != $dateInterval->m) { |
| 64 | - $format[] = $dateInterval->m.' months'; |
|
| 64 | + $format[] = $dateInterval->m . ' months'; |
|
| 65 | 65 | } |
| 66 | 66 | if (0 != $dateInterval->d) { |
| 67 | - $format[] = $dateInterval->d.' days'; |
|
| 67 | + $format[] = $dateInterval->d . ' days'; |
|
| 68 | 68 | } |
| 69 | 69 | //if (0 < $dateInterval->h || 0 < $dateInterval->i || 0 < $dateInterval->s) { |
| 70 | 70 | // $format .= 'T'; |
| 71 | 71 | //} |
| 72 | 72 | if (0 != $dateInterval->h) { |
| 73 | - $format[] = $dateInterval->h.' hours'; |
|
| 73 | + $format[] = $dateInterval->h . ' hours'; |
|
| 74 | 74 | } |
| 75 | 75 | if (0 != $dateInterval->i) { |
| 76 | - $format[] = $dateInterval->i.' minutes'; |
|
| 76 | + $format[] = $dateInterval->i . ' minutes'; |
|
| 77 | 77 | } |
| 78 | 78 | if (0 != $dateInterval->s) { |
| 79 | - $format[] = $dateInterval->s.' seconds'; |
|
| 79 | + $format[] = $dateInterval->s . ' seconds'; |
|
| 80 | 80 | } |
| 81 | - return implode( ', ', $format); |
|
| 81 | + return implode(', ', $format); |
|
| 82 | 82 | } |
| 83 | 83 | } |
@@ -29,18 +29,18 @@ |
||
| 29 | 29 | $versions = (array)$step->dsl['versions']; |
| 30 | 30 | |
| 31 | 31 | foreach ($contentCollection as $content) { |
| 32 | - foreach($versions as $versionId) { |
|
| 32 | + foreach ($versions as $versionId) { |
|
| 33 | 33 | try { |
| 34 | 34 | if ($versionId < 0) { |
| 35 | 35 | $contentVersions = $contentService->loadVersions($content->contentInfo); |
| 36 | 36 | // different eZ kernels apparently sort versions in different order... |
| 37 | 37 | $sortedVersions = array(); |
| 38 | - foreach($contentVersions as $versionInfo) { |
|
| 38 | + foreach ($contentVersions as $versionInfo) { |
|
| 39 | 39 | $sortedVersions[$versionInfo->versionNo] = $versionInfo; |
| 40 | 40 | } |
| 41 | 41 | ksort($sortedVersions); |
| 42 | 42 | $sortedVersions = array_slice($sortedVersions, 0, $versionId); |
| 43 | - foreach($sortedVersions as $versionInfo) { |
|
| 43 | + foreach ($sortedVersions as $versionInfo) { |
|
| 44 | 44 | $contentService->deleteVersion($versionInfo); |
| 45 | 45 | } |
| 46 | 46 | } else { |