@@ -78,8 +78,7 @@ |
||
78 | 78 | $this->errOutput->setVerbosity(OutputInterface::VERBOSITY_NORMAL); |
79 | 79 | $this->errOutput->writeln($message, $type); |
80 | 80 | $this->errOutput->setVerbosity(OutputInterface::VERBOSITY_QUIET); |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->errOutput->writeln($message, $type); |
85 | 84 | } |
@@ -162,7 +162,9 @@ discard block |
||
162 | 162 | // sort tags by depth so that there will be no errors in case we are deleting parent and child |
163 | 163 | $tagsCollection = $tagsCollection->getArrayCopy(); |
164 | 164 | uasort($tagsCollection, function ($t1, $t2) { |
165 | - if ($t1->depth == $t2->depth) return 0; |
|
165 | + if ($t1->depth == $t2->depth) { |
|
166 | + return 0; |
|
167 | + } |
|
166 | 168 | return ($t1->depth > $t2->depth) ? -1 : 1; |
167 | 169 | }); |
168 | 170 | |
@@ -267,7 +269,9 @@ discard block |
||
267 | 269 | // sort top to bottom |
268 | 270 | $tagCollection = $tagCollection->getArrayCopy(); |
269 | 271 | uasort($tagCollection, function ($t1, $t2) { |
270 | - if ($t1->depth == $t2->depth) return 0; |
|
272 | + if ($t1->depth == $t2->depth) { |
|
273 | + return 0; |
|
274 | + } |
|
271 | 275 | return ($t1->depth > $t2->depth) ? 1 : -1; |
272 | 276 | }); |
273 | 277 | break; |
@@ -275,7 +279,9 @@ discard block |
||
275 | 279 | // sort bottom to top |
276 | 280 | $tagCollection = $tagCollection->getArrayCopy(); |
277 | 281 | uasort($tagCollection, function ($t1, $t2) { |
278 | - if ($t1->depth == $t2->depth) return 0; |
|
282 | + if ($t1->depth == $t2->depth) { |
|
283 | + return 0; |
|
284 | + } |
|
279 | 285 | return ($t1->depth > $t2->depth) ? -1 : 1; |
280 | 286 | }); |
281 | 287 | break; |
@@ -56,7 +56,9 @@ |
||
56 | 56 | |
57 | 57 | $query = new Query(); |
58 | 58 | $query->limit = $this->queryLimit; |
59 | - if (isset($query->performCount)) $query->performCount = false; |
|
59 | + if (isset($query->performCount)) { |
|
60 | + $query->performCount = false; |
|
61 | + } |
|
60 | 62 | $query->filter = $this->getQueryCriterion($key, $values); |
61 | 63 | $results = $this->repository->getTrashService()->findTrashItems($query); |
62 | 64 |
@@ -599,8 +599,9 @@ |
||
599 | 599 | */ |
600 | 600 | public function getCurrentContext($migrationName) |
601 | 601 | { |
602 | - if (!isset($this->migrationContext[$migrationName])) |
|
603 | - return null; |
|
602 | + if (!isset($this->migrationContext[$migrationName])) { |
|
603 | + return null; |
|
604 | + } |
|
604 | 605 | $context = $this->migrationContext[$migrationName]; |
605 | 606 | // avoid attempting to store the current outputInterface when saving the context |
606 | 607 | if (isset($context['output'])) { |
@@ -145,7 +145,9 @@ discard block |
||
145 | 145 | // q: when getting a query via QueryType, should we always inject offset/limit? |
146 | 146 | $query->limit = $limit != 0 ? $limit : $this->queryLimit; |
147 | 147 | $query->offset = $offset; |
148 | - if (isset($query->performCount)) $query->performCount = false; |
|
148 | + if (isset($query->performCount)) { |
|
149 | + $query->performCount = false; |
|
150 | + } |
|
149 | 151 | if (!empty($sort)) { |
150 | 152 | $query->sortClauses = $this->getSortClauses($sort); |
151 | 153 | } else { |
@@ -271,7 +273,9 @@ discard block |
||
271 | 273 | { |
272 | 274 | $query = new Query(); |
273 | 275 | $query->limit = $this->queryLimit; |
274 | - if (isset($query->performCount)) $query->performCount = false; |
|
276 | + if (isset($query->performCount)) { |
|
277 | + $query->performCount = false; |
|
278 | + } |
|
275 | 279 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
276 | 280 | $results = $this->getSearchService()->findContent($query); |
277 | 281 | |
@@ -311,7 +315,9 @@ discard block |
||
311 | 315 | { |
312 | 316 | $query = new Query(); |
313 | 317 | $query->limit = $this->queryLimit; |
314 | - if (isset($query->performCount)) $query->performCount = false; |
|
318 | + if (isset($query->performCount)) { |
|
319 | + $query->performCount = false; |
|
320 | + } |
|
315 | 321 | $query->filter = new Query\Criterion\ContentTypeIdentifier($contentTypeIdentifiers); |
316 | 322 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
317 | 323 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -339,7 +345,9 @@ discard block |
||
339 | 345 | { |
340 | 346 | $query = new Query(); |
341 | 347 | $query->limit = $this->queryLimit; |
342 | - if (isset($query->performCount)) $query->performCount = false; |
|
348 | + if (isset($query->performCount)) { |
|
349 | + $query->performCount = false; |
|
350 | + } |
|
343 | 351 | $query->filter = new Query\Criterion\ContentTypeId($contentTypeIds); |
344 | 352 | // sort objects by depth, lower to higher, so that deleting them has less chances of failure |
345 | 353 | // NB: we only do this in eZP versions that allow depth sorting on content queries |
@@ -107,7 +107,9 @@ discard block |
||
107 | 107 | if (!empty($sort)) { |
108 | 108 | $query->sortClauses = $this->getSortClauses($sort); |
109 | 109 | } |
110 | - if (isset($query->performCount)) $query->performCount = false; |
|
110 | + if (isset($query->performCount)) { |
|
111 | + $query->performCount = false; |
|
112 | + } |
|
111 | 113 | |
112 | 114 | $results = $this->getSearchService()->findLocations($query); |
113 | 115 | |
@@ -254,7 +256,9 @@ discard block |
||
254 | 256 | { |
255 | 257 | $query = new LocationQuery(); |
256 | 258 | $query->limit = self::INT_MAX_16BIT; |
257 | - if (isset($query->performCount)) $query->performCount = false; |
|
259 | + if (isset($query->performCount)) { |
|
260 | + $query->performCount = false; |
|
261 | + } |
|
258 | 262 | $query->filter = new Query\Criterion\ParentLocationId($parentLocationIds); |
259 | 263 | |
260 | 264 | $results = $this->getSearchService()->findLocations($query); |
@@ -61,8 +61,7 @@ |
||
61 | 61 | } |
62 | 62 | } |
63 | 63 | } |
64 | - } |
|
65 | - else { |
|
64 | + } else { |
|
66 | 65 | throw new MigrationBundleException("Path '$path' is neither a file nor directory"); |
67 | 66 | } |
68 | 67 | } |