@@ -151,7 +151,7 @@ |
||
151 | 151 | * Commits a transaction, returning the database connection to autocommit mode until the next call to |
152 | 152 | * ProductProcessor::beginTransaction() starts a new transaction. |
153 | 153 | * |
154 | - * @return boolean Returns TRUE on success or FALSE on failure |
|
154 | + * @return boolean|null Returns TRUE on success or FALSE on failure |
|
155 | 155 | * @link http://php.net/manual/en/pdo.commit.php |
156 | 156 | */ |
157 | 157 | public function commit() |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * Return's the product bunch processor instance. |
119 | 119 | * |
120 | - * @return \TechDivision\Import\Product\Services\ProductBunchProcessorInterface The product bunch processor instance |
|
120 | + * @return ProductUrlRewriteProcessorInterface The product bunch processor instance |
|
121 | 121 | */ |
122 | 122 | protected function getProductUrlRewriteProcessor() |
123 | 123 | { |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | * @param string $path The path of the category to return |
623 | 623 | * @param string $storeViewCode The store view code of the category to return |
624 | 624 | * |
625 | - * @return array The category |
|
625 | + * @return string The category |
|
626 | 626 | */ |
627 | 627 | protected function getCategoryByPath($path, $storeViewCode = StoreViewCodes::ADMIN) |
628 | 628 | { |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | if ($storeViewCode === StoreViewCodes::ADMIN) { |
229 | 229 | // log a message and return |
230 | 230 | $this->getSubject() |
231 | - ->getSystemLogger() |
|
232 | - ->debug( |
|
233 | - sprintf( |
|
234 | - 'Store with code "%s" is not active, no URL rewrites will be created for product with SKU "%s"', |
|
235 | - $storeViewCode, |
|
236 | - $sku |
|
237 | - ) |
|
238 | - ); |
|
231 | + ->getSystemLogger() |
|
232 | + ->debug( |
|
233 | + sprintf( |
|
234 | + 'Store with code "%s" is not active, no URL rewrites will be created for product with SKU "%s"', |
|
235 | + $storeViewCode, |
|
236 | + $sku |
|
237 | + ) |
|
238 | + ); |
|
239 | 239 | |
240 | 240 | // return without creating any rewrites |
241 | 241 | return $this->getRow(); |
@@ -245,14 +245,14 @@ discard block |
||
245 | 245 | if (!$this->getSubject()->storeIsActive($storeViewCode)) { |
246 | 246 | // log a message and return |
247 | 247 | $this->getSubject() |
248 | - ->getSystemLogger() |
|
249 | - ->debug( |
|
250 | - sprintf( |
|
251 | - 'Store with code "%s" is not active, no URL rewrites will be created for product with SKU "%s"', |
|
252 | - $storeViewCode, |
|
253 | - $sku |
|
254 | - ) |
|
255 | - ); |
|
248 | + ->getSystemLogger() |
|
249 | + ->debug( |
|
250 | + sprintf( |
|
251 | + 'Store with code "%s" is not active, no URL rewrites will be created for product with SKU "%s"', |
|
252 | + $storeViewCode, |
|
253 | + $sku |
|
254 | + ) |
|
255 | + ); |
|
256 | 256 | |
257 | 257 | // return without creating any rewrites |
258 | 258 | return $this->getRow(); |
@@ -311,8 +311,8 @@ discard block |
||
311 | 311 | // query whether or not debug mode has been enabled |
312 | 312 | if ($this->getSubject()->isDebugMode()) { |
313 | 313 | $this->getSubject() |
314 | - ->getSystemLogger() |
|
315 | - ->warning($this->getSubject()->appendExceptionSuffix($e->getMessage())); |
|
314 | + ->getSystemLogger() |
|
315 | + ->warning($this->getSubject()->appendExceptionSuffix($e->getMessage())); |
|
316 | 316 | } else { |
317 | 317 | throw $e; |
318 | 318 | } |
@@ -361,18 +361,18 @@ discard block |
||
361 | 361 | // do NOT create new URL rewrites, if the product is NOT visible (any more), BUT |
362 | 362 | // handle existing URL rewrites, e. g. to remove and clean up the URL rewrites |
363 | 363 | if (!$this->isVisible()) { |
364 | - // log a message |
|
365 | - $this->getSubject() |
|
366 | - ->getSystemLogger() |
|
367 | - ->debug( |
|
368 | - sprintf( |
|
369 | - 'Product with SKU "%s" is not visible, so no URL rewrites will be created', |
|
370 | - $this->getValue(ColumnKeys::SKU) |
|
371 | - ) |
|
372 | - ); |
|
373 | - |
|
374 | - // return without creating any rewrites |
|
375 | - return; |
|
364 | + // log a message |
|
365 | + $this->getSubject() |
|
366 | + ->getSystemLogger() |
|
367 | + ->debug( |
|
368 | + sprintf( |
|
369 | + 'Product with SKU "%s" is not visible, so no URL rewrites will be created', |
|
370 | + $this->getValue(ColumnKeys::SKU) |
|
371 | + ) |
|
372 | + ); |
|
373 | + |
|
374 | + // return without creating any rewrites |
|
375 | + return; |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | // load the root category of the default store view (as we're in the |
@@ -400,8 +400,8 @@ discard block |
||
400 | 400 | // query whether or not debug mode has been enabled |
401 | 401 | if ($this->getSubject()->isDebugMode()) { |
402 | 402 | $this->getSubject() |
403 | - ->getSystemLogger() |
|
404 | - ->warning($this->getSubject()->appendExceptionSuffix($e->getMessage())); |
|
403 | + ->getSystemLogger() |
|
404 | + ->warning($this->getSubject()->appendExceptionSuffix($e->getMessage())); |
|
405 | 405 | } else { |
406 | 406 | throw $e; |
407 | 407 | } |
@@ -18,10 +18,6 @@ |
||
18 | 18 | * @link http://www.techdivision.com |
19 | 19 | */ |
20 | 20 | |
21 | -use Lurker\Event\FilesystemEvent; |
|
22 | - |
|
23 | -use Symfony\Component\Finder\Finder; |
|
24 | - |
|
25 | 21 | /** |
26 | 22 | * Defines the available build tasks. |
27 | 23 | * |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | { |
59 | 59 | // optimize autoloader with custom path |
60 | 60 | return $this->taskComposerInstall() |
61 | - ->preferDist() |
|
62 | - ->optimizeAutoloader() |
|
63 | - ->run(); |
|
61 | + ->preferDist() |
|
62 | + ->optimizeAutoloader() |
|
63 | + ->run(); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | { |
73 | 73 | // optimize autoloader with custom path |
74 | 74 | return $this->taskComposerUpdate() |
75 | - ->preferDist() |
|
76 | - ->optimizeAutoloader() |
|
77 | - ->run(); |
|
75 | + ->preferDist() |
|
76 | + ->optimizeAutoloader() |
|
77 | + ->run(); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | public function prepare() |
96 | 96 | { |
97 | 97 | return $this->taskFileSystemStack() |
98 | - ->mkdir($this->properties['dist.dir']) |
|
99 | - ->mkdir($this->properties['target.dir']) |
|
100 | - ->mkdir(sprintf('%s/reports', $this->properties['target.dir'])) |
|
101 | - ->run(); |
|
98 | + ->mkdir($this->properties['dist.dir']) |
|
99 | + ->mkdir($this->properties['target.dir']) |
|
100 | + ->mkdir(sprintf('%s/reports', $this->properties['target.dir'])) |
|
101 | + ->run(); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | |
169 | 169 | // run PHPUnit |
170 | 170 | return $this->taskPHPUnit(sprintf('%s/bin/phpunit', $this->properties['vendor.dir'])) |
171 | - ->configFile('phpunit.xml') |
|
172 | - ->run(); |
|
171 | + ->configFile('phpunit.xml') |
|
172 | + ->run(); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | /** |
@@ -100,14 +100,14 @@ discard block |
||
100 | 100 | |
101 | 101 | // finally log a warning that the old category is not available ony more |
102 | 102 | $this->getSubject() |
103 | - ->getSystemLogger() |
|
104 | - ->warning( |
|
105 | - sprintf( |
|
106 | - 'Category with ID "%d" is not longer available for URL rewrite with ID "%d"', |
|
107 | - $metadata[UrlRewriteObserver::CATEGORY_ID], |
|
108 | - $existingUrlRewrite[MemberNames::URL_REWRITE_ID] |
|
109 | - ) |
|
110 | - ); |
|
103 | + ->getSystemLogger() |
|
104 | + ->warning( |
|
105 | + sprintf( |
|
106 | + 'Category with ID "%d" is not longer available for URL rewrite with ID "%d"', |
|
107 | + $metadata[UrlRewriteObserver::CATEGORY_ID], |
|
108 | + $existingUrlRewrite[MemberNames::URL_REWRITE_ID] |
|
109 | + ) |
|
110 | + ); |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | } |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | if ($targetPath === $existingUrlRewrite[MemberNames::REQUEST_PATH]) { |
120 | 120 | // finally log a warning that the old category is not available ony more |
121 | 121 | $this->getSubject() |
122 | - ->getSystemLogger() |
|
123 | - ->warning( |
|
124 | - sprintf( |
|
125 | - 'New target path "%s" eqals request path for URL rewrite with ID "%d"', |
|
126 | - $existingUrlRewrite[MemberNames::REQUEST_PATH], |
|
127 | - $existingUrlRewrite[MemberNames::URL_REWRITE_ID] |
|
128 | - ) |
|
129 | - ); |
|
122 | + ->getSystemLogger() |
|
123 | + ->warning( |
|
124 | + sprintf( |
|
125 | + 'New target path "%s" eqals request path for URL rewrite with ID "%d"', |
|
126 | + $existingUrlRewrite[MemberNames::REQUEST_PATH], |
|
127 | + $existingUrlRewrite[MemberNames::URL_REWRITE_ID] |
|
128 | + ) |
|
129 | + ); |
|
130 | 130 | |
131 | 131 | // stop processing the URL rewrite |
132 | 132 | continue; |
@@ -153,14 +153,14 @@ discard block |
||
153 | 153 | |
154 | 154 | // log a message, that old URL rewrites have been cleaned-up |
155 | 155 | $this->getSubject() |
156 | - ->getSystemLogger() |
|
157 | - ->warning( |
|
158 | - sprintf( |
|
159 | - 'Cleaned-up URL rewrite "%s" for product with SKU "%s"', |
|
160 | - $existingUrlRewrite[MemberNames::REQUEST_PATH], |
|
161 | - $this->getValue(ColumnKeys::SKU) |
|
162 | - ) |
|
163 | - ); |
|
156 | + ->getSystemLogger() |
|
157 | + ->warning( |
|
158 | + sprintf( |
|
159 | + 'Cleaned-up URL rewrite "%s" for product with SKU "%s"', |
|
160 | + $existingUrlRewrite[MemberNames::REQUEST_PATH], |
|
161 | + $this->getValue(ColumnKeys::SKU) |
|
162 | + ) |
|
163 | + ); |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | } |
@@ -105,7 +105,7 @@ |
||
105 | 105 | |
106 | 106 | // skip update of URL rewrite, if nothing to change |
107 | 107 | if ($targetPath === $existingUrlRewrite[MemberNames::TARGET_PATH] && |
108 | - 301 === (int)$existingUrlRewrite[MemberNames::REDIRECT_TYPE]) { |
|
108 | + 301 === (int) $existingUrlRewrite[MemberNames::REDIRECT_TYPE]) { |
|
109 | 109 | // stop processing the URL rewrite |
110 | 110 | continue; |
111 | 111 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | * Create's and invokes the UrlRewriteObserver instance. |
81 | 81 | * |
82 | 82 | * @param boolean $generateCategoryProductRewrites Whether or not the configuration to generare catagory/product URL rewrites has been activated |
83 | - * @param array $productCategoryIds The array with the category IDs the product has been related with |
|
83 | + * @param string[] $productCategoryIds The array with the category IDs the product has been related with |
|
84 | 84 | * @param array $category The array with the categories |
85 | 85 | * |
86 | 86 | * @return void |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | $mockSubject->expects($this->any()) |
457 | 457 | ->method('getCategory') |
458 | 458 | ->will( |
459 | - $this->returnCallback(function ($categoryId, $storeViewCode) use ($categories) { |
|
459 | + $this->returnCallback(function($categoryId, $storeViewCode) use ($categories) { |
|
460 | 460 | foreach ($categories as $category) { |
461 | 461 | if ((int) $category[MemberNames::ENTITY_ID] === (int) $categoryId) { |
462 | 462 | return $category; |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | $mockSubject->expects($this->any()) |
484 | 484 | ->method('getCoreConfigData') |
485 | 485 | ->will( |
486 | - $this->returnCallback(function ($arg1, $arg2) { |
|
486 | + $this->returnCallback(function($arg1, $arg2) { |
|
487 | 487 | return $arg2; |
488 | 488 | }) |
489 | 489 | ); |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | |
70 | 70 | // initialize a mock processor instance |
71 | 71 | $this->mockProductUrlRewriteProcessor = $this->getMockBuilder('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface') |
72 | - ->setMethods(get_class_methods('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface')) |
|
73 | - ->getMock(); |
|
72 | + ->setMethods(get_class_methods('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface')) |
|
73 | + ->getMock(); |
|
74 | 74 | |
75 | 75 | // initialize the observer |
76 | 76 | $this->observer = new UrlRewriteObserver($this->mockProductUrlRewriteProcessor); |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | |
371 | 371 | // mock the system logger |
372 | 372 | $mockSystemLogger = $this->getMockBuilder('Psr\Log\LoggerInterface') |
373 | - ->setMethods(get_class_methods('Psr\Log\LoggerInterface')) |
|
374 | - ->getMock(); |
|
373 | + ->setMethods(get_class_methods('Psr\Log\LoggerInterface')) |
|
374 | + ->getMock(); |
|
375 | 375 | |
376 | 376 | // create a mock subject |
377 | 377 | $mockSubject = $this->getMockBuilder('TechDivision\Import\Product\UrlRewrite\Subjects\UrlRewriteSubject') |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | return $arg2; |
481 | 481 | }) |
482 | 482 | ); |
483 | - $mockSubject->expects(($this->any())) |
|
483 | + $mockSubject->expects(($this->any())) |
|
484 | 484 | ->method('getImportAdapter') |
485 | 485 | ->willReturn($mockImportAdapter); |
486 | 486 |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | $mockSubject->expects($this->any()) |
457 | 457 | ->method('getCategory') |
458 | 458 | ->will( |
459 | - $this->returnCallback(function ($categoryId, $storeViewCode) use ($categories) { |
|
459 | + $this->returnCallback(function($categoryId, $storeViewCode) use ($categories) { |
|
460 | 460 | foreach ($categories as $category) { |
461 | 461 | if ((int) $category[MemberNames::ENTITY_ID] === (int) $categoryId) { |
462 | 462 | return $category; |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | $mockSubject->expects($this->any()) |
484 | 484 | ->method('getCoreConfigData') |
485 | 485 | ->will( |
486 | - $this->returnCallback(function ($arg1, $arg2) { |
|
486 | + $this->returnCallback(function($arg1, $arg2) { |
|
487 | 487 | return $arg2; |
488 | 488 | }) |
489 | 489 | ); |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | |
67 | 67 | // initialize a mock processor instance |
68 | 68 | $this->mockProductUrlRewriteProcessor = $this->getMockBuilder('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface') |
69 | - ->setMethods(get_class_methods('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface')) |
|
70 | - ->getMock(); |
|
69 | + ->setMethods(get_class_methods('TechDivision\Import\Product\UrlRewrite\Services\ProductUrlRewriteProcessorInterface')) |
|
70 | + ->getMock(); |
|
71 | 71 | |
72 | 72 | // initialize the observer |
73 | 73 | $this->observer = new UrlRewriteUpdateObserver($this->mockProductUrlRewriteProcessor); |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | |
134 | 134 | // mock the system logger |
135 | 135 | $mockSystemLogger = $this->getMockBuilder('Psr\Log\LoggerInterface') |
136 | - ->setMethods(get_class_methods('Psr\Log\LoggerInterface')) |
|
137 | - ->getMock(); |
|
136 | + ->setMethods(get_class_methods('Psr\Log\LoggerInterface')) |
|
137 | + ->getMock(); |
|
138 | 138 | |
139 | 139 | // the found URL rewrites |
140 | 140 | $urlRewrites = array( |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | ->method('getUrlRewritesByEntityTypeAndEntityIdAndStoreId') |
297 | 297 | ->with(UrlRewriteObserver::ENTITY_TYPE, $entityId, $storeId) |
298 | 298 | ->willReturn($urlRewrites); |
299 | - $this->mockProductUrlRewriteProcessor->expects($this->exactly(6)) |
|
299 | + $this->mockProductUrlRewriteProcessor->expects($this->exactly(6)) |
|
300 | 300 | ->method('persistUrlRewrite') |
301 | 301 | ->withConsecutive( |
302 | 302 | array( |