aimeos /
ai-controller-jobs
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | $context = \TestHelperJobs::getContext(); |
| 17 | 17 | $aimeos = \TestHelperJobs::getAimeos(); |
| 18 | 18 | |
| 19 | - $obj = \Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos ); |
|
| 20 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj ); |
|
| 19 | + $obj = \Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos); |
|
| 20 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | $context = \TestHelperJobs::getContext(); |
| 27 | 27 | $aimeos = \TestHelperJobs::getAimeos(); |
| 28 | 28 | |
| 29 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
| 30 | - \Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
| 29 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 30 | + \Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos, 'Wrong$$$Name'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | $context = \TestHelperJobs::getContext(); |
| 37 | 37 | $aimeos = \TestHelperJobs::getAimeos(); |
| 38 | 38 | |
| 39 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
| 40 | - \Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
| 39 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 40 | + \Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos, 'WrongClass'); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | $context = \TestHelperJobs::getContext(); |
| 47 | 47 | $aimeos = \TestHelperJobs::getAimeos(); |
| 48 | 48 | |
| 49 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
| 50 | - \Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos, 'Factory' ); |
|
| 49 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 50 | + \Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos, 'Factory'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $context = \TestHelperJobs::getContext(); |
| 20 | 20 | $aimeos = \TestHelperJobs::getAimeos(); |
| 21 | 21 | |
| 22 | - $this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos ); |
|
| 22 | + $this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | public function testGetName() |
| 33 | 33 | { |
| 34 | - $this->assertEquals( 'Rescale product images', $this->object->getName() ); |
|
| 34 | + $this->assertEquals('Rescale product images', $this->object->getName()); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testGetDescription() |
| 39 | 39 | { |
| 40 | 40 | $text = 'Rescales product images to the new sizes'; |
| 41 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
| 41 | + $this->assertEquals($text, $this->object->getDescription()); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -49,31 +49,31 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | $name = 'ControllerJobsMediaScaleStandardRun'; |
| 52 | - $context->getConfig()->set( 'mshop/media/manager/name', $name ); |
|
| 53 | - $context->getConfig()->set( 'controller/common/media/name', $name ); |
|
| 52 | + $context->getConfig()->set('mshop/media/manager/name', $name); |
|
| 53 | + $context->getConfig()->set('controller/common/media/name', $name); |
|
| 54 | 54 | |
| 55 | 55 | |
| 56 | - $managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Media\\Manager\\Standard' ) |
|
| 57 | - ->setMethods( array( 'saveItem' ) ) |
|
| 58 | - ->setConstructorArgs( array( $context ) ) |
|
| 56 | + $managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Media\\Manager\\Standard') |
|
| 57 | + ->setMethods(array('saveItem')) |
|
| 58 | + ->setConstructorArgs(array($context)) |
|
| 59 | 59 | ->getMock(); |
| 60 | 60 | |
| 61 | - \Aimeos\MShop\Media\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub ); |
|
| 61 | + \Aimeos\MShop\Media\Manager\Factory::injectManager('\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub); |
|
| 62 | 62 | |
| 63 | - $managerStub->expects( $this->atLeast( 1 ) )->method( 'saveItem' ); |
|
| 63 | + $managerStub->expects($this->atLeast(1))->method('saveItem'); |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $cntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Media\\Standard' ) |
|
| 67 | - ->setMethods( array( 'scale' ) ) |
|
| 68 | - ->setConstructorArgs( array( $context ) ) |
|
| 66 | + $cntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Media\\Standard') |
|
| 67 | + ->setMethods(array('scale')) |
|
| 68 | + ->setConstructorArgs(array($context)) |
|
| 69 | 69 | ->getMock(); |
| 70 | 70 | |
| 71 | - \Aimeos\Controller\Common\Media\Factory::injectController( '\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub ); |
|
| 71 | + \Aimeos\Controller\Common\Media\Factory::injectController('\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub); |
|
| 72 | 72 | |
| 73 | - $cntlStub->expects( $this->atLeast( 1 ) )->method( 'scale' ); |
|
| 73 | + $cntlStub->expects($this->atLeast(1))->method('scale'); |
|
| 74 | 74 | |
| 75 | 75 | |
| 76 | - $object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos ); |
|
| 76 | + $object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos); |
|
| 77 | 77 | $object->run(); |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
| 33 | 33 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
| 34 | 34 | */ |
| 35 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
| 36 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
| 35 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
| 36 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
| 37 | 37 | { |
| 38 | 38 | $this->context = $context; |
| 39 | 39 | $this->mapping = $mapping; |
@@ -48,13 +48,13 @@ discard block |
||
| 48 | 48 | * @param integer $pos Computed position of the list item in the associated list of items |
| 49 | 49 | * @return array Given associative list enriched by default values if they were not already set |
| 50 | 50 | */ |
| 51 | - protected function addListItemDefaults( array $list, $pos ) |
|
| 51 | + protected function addListItemDefaults(array $list, $pos) |
|
| 52 | 52 | { |
| 53 | - if( !isset( $list['product.lists.position'] ) ) { |
|
| 53 | + if (!isset($list['product.lists.position'])) { |
|
| 54 | 54 | $list['product.lists.position'] = $pos; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if( !isset( $list['product.lists.status'] ) ) { |
|
| 57 | + if (!isset($list['product.lists.status'])) { |
|
| 58 | 58 | $list['product.lists.status'] = 1; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | protected function getObject() |
| 94 | 94 | { |
| 95 | - if( $this->object === null ) { |
|
| 96 | - throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' ); |
|
| 95 | + if ($this->object === null) { |
|
| 96 | + throw new \Aimeos\Controller\Jobs\Exception('No processor object available'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | return $this->object; |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | * @param mixed $default Default value if key isn't found |
| 109 | 109 | * @param mixed Value for the key in the list of the default value |
| 110 | 110 | */ |
| 111 | - protected function getValue( array $list, $key, $default ) |
|
| 111 | + protected function getValue(array $list, $key, $default) |
|
| 112 | 112 | { |
| 113 | - return ( isset( $list[$key] ) ? $list[$key] : $default ); |
|
| 113 | + return (isset($list[$key]) ? $list[$key] : $default); |
|
| 114 | 114 | } |
| 115 | 115 | } |
@@ -351,8 +351,7 @@ discard block |
||
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | $container->close(); |
| 354 | - } |
|
| 355 | - catch( \Exception $e ) |
|
| 354 | + } catch( \Exception $e ) |
|
| 356 | 355 | { |
| 357 | 356 | $logger->log( 'Product import error: ' . $e->getMessage() ); |
| 358 | 357 | $logger->log( $e->getTraceAsString() ); |
@@ -540,8 +539,7 @@ discard block |
||
| 540 | 539 | } |
| 541 | 540 | |
| 542 | 541 | $manager->commit(); |
| 543 | - } |
|
| 544 | - catch( \Exception $e ) |
|
| 542 | + } catch( \Exception $e ) |
|
| 545 | 543 | { |
| 546 | 544 | $manager->rollback(); |
| 547 | 545 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function getName() |
| 33 | 33 | { |
| 34 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' ); |
|
| 34 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV'); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function getDescription() |
| 44 | 44 | { |
| 45 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' ); |
|
| 45 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files'); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $context = $this->getContext(); |
| 58 | 58 | $config = $context->getConfig(); |
| 59 | 59 | $logger = $context->getLogger(); |
| 60 | - $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ); |
|
| 60 | + $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'); |
|
| 61 | 61 | $mappings = $this->getDefaultMapping(); |
| 62 | 62 | |
| 63 | 63 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @see controller/common/product/import/csv/converter |
| 78 | 78 | * @see controller/common/product/import/csv/max-size |
| 79 | 79 | */ |
| 80 | - $domains = $config->get( 'controller/common/product/import/csv/domains', $domains ); |
|
| 80 | + $domains = $config->get('controller/common/product/import/csv/domains', $domains); |
|
| 81 | 81 | |
| 82 | 82 | /** controller/jobs/product/import/csv/domains |
| 83 | 83 | * List of item domain names that should be retrieved along with the product items |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * @see controller/jobs/product/import/csv/backup |
| 98 | 98 | * @see controller/common/product/import/csv/max-size |
| 99 | 99 | */ |
| 100 | - $domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains ); |
|
| 100 | + $domains = $config->get('controller/jobs/product/import/csv/domains', $domains); |
|
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | /** controller/common/product/import/csv/mapping |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @see controller/common/product/import/csv/converter |
| 126 | 126 | * @see controller/common/product/import/csv/max-size |
| 127 | 127 | */ |
| 128 | - $mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings ); |
|
| 128 | + $mappings = $config->get('controller/common/product/import/csv/mapping', $mappings); |
|
| 129 | 129 | |
| 130 | 130 | /** controller/jobs/product/import/csv/mapping |
| 131 | 131 | * List of mappings between the position in the CSV file and item keys |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * @see controller/jobs/product/import/csv/backup |
| 146 | 146 | * @see controller/common/product/import/csv/max-size |
| 147 | 147 | */ |
| 148 | - $mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings ); |
|
| 148 | + $mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings); |
|
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | /** controller/common/product/import/csv/converter |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * @see controller/common/product/import/csv/mapping |
| 188 | 188 | * @see controller/common/product/import/csv/max-size |
| 189 | 189 | */ |
| 190 | - $converters = $config->get( 'controller/common/product/import/csv/converter', [] ); |
|
| 190 | + $converters = $config->get('controller/common/product/import/csv/converter', []); |
|
| 191 | 191 | |
| 192 | 192 | /** controller/jobs/product/import/csv/converter |
| 193 | 193 | * List of converter names for the values at the position in the CSV file |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * @see controller/jobs/product/import/csv/backup |
| 208 | 208 | * @see controller/common/product/import/csv/max-size |
| 209 | 209 | */ |
| 210 | - $converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters ); |
|
| 210 | + $converters = $config->get('controller/jobs/product/import/csv/converter', $converters); |
|
| 211 | 211 | |
| 212 | 212 | |
| 213 | 213 | /** controller/common/product/import/csv/max-size |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | * @see controller/common/product/import/csv/mapping |
| 228 | 228 | * @see controller/common/product/import/csv/converter |
| 229 | 229 | */ |
| 230 | - $maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 ); |
|
| 230 | + $maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000); |
|
| 231 | 231 | |
| 232 | 232 | |
| 233 | 233 | /** controller/jobs/product/import/csv/skip-lines |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * @see controller/jobs/product/import/csv/backup |
| 250 | 250 | * @see controller/common/product/import/csv/max-size |
| 251 | 251 | */ |
| 252 | - $skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 ); |
|
| 252 | + $skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0); |
|
| 253 | 253 | |
| 254 | 254 | |
| 255 | 255 | /** controller/jobs/product/import/csv/strict |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | * @see controller/jobs/product/import/csv/backup |
| 274 | 274 | * @see controller/common/product/import/csv/max-size |
| 275 | 275 | */ |
| 276 | - $strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true ); |
|
| 276 | + $strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true); |
|
| 277 | 277 | |
| 278 | 278 | |
| 279 | 279 | /** controller/jobs/product/import/csv/backup |
@@ -306,74 +306,74 @@ discard block |
||
| 306 | 306 | * @see controller/jobs/product/import/csv/strict |
| 307 | 307 | * @see controller/common/product/import/csv/max-size |
| 308 | 308 | */ |
| 309 | - $backup = $config->get( 'controller/jobs/product/import/csv/backup' ); |
|
| 309 | + $backup = $config->get('controller/jobs/product/import/csv/backup'); |
|
| 310 | 310 | |
| 311 | 311 | |
| 312 | - if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) ) |
|
| 312 | + if (!isset($mappings['item']) || !is_array($mappings['item'])) |
|
| 313 | 313 | { |
| 314 | - $msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' ); |
|
| 315 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
| 314 | + $msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item'); |
|
| 315 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | try |
| 319 | 319 | { |
| 320 | 320 | $procMappings = $mappings; |
| 321 | - unset( $procMappings['item'] ); |
|
| 321 | + unset($procMappings['item']); |
|
| 322 | 322 | |
| 323 | - $codePos = $this->getCodePosition( $mappings['item'] ); |
|
| 324 | - $convlist = $this->getConverterList( $converters ); |
|
| 325 | - $processor = $this->getProcessors( $procMappings ); |
|
| 323 | + $codePos = $this->getCodePosition($mappings['item']); |
|
| 324 | + $convlist = $this->getConverterList($converters); |
|
| 325 | + $processor = $this->getProcessors($procMappings); |
|
| 326 | 326 | $container = $this->getContainer(); |
| 327 | 327 | $path = $container->getName(); |
| 328 | 328 | |
| 329 | - $msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ ); |
|
| 330 | - $logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE ); |
|
| 329 | + $msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__); |
|
| 330 | + $logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE); |
|
| 331 | 331 | |
| 332 | - foreach( $container as $content ) |
|
| 332 | + foreach ($container as $content) |
|
| 333 | 333 | { |
| 334 | 334 | $name = $content->getName(); |
| 335 | 335 | |
| 336 | - for( $i = 0; $i < $skiplines; $i++ ) { |
|
| 336 | + for ($i = 0; $i < $skiplines; $i++) { |
|
| 337 | 337 | $content->next(); |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] ) |
|
| 340 | + while (($data = $this->getData($content, $maxcnt, $codePos)) !== []) |
|
| 341 | 341 | { |
| 342 | - $data = $this->convertData( $convlist, $data ); |
|
| 343 | - $products = $this->getProducts( array_keys( $data ), $domains ); |
|
| 344 | - $errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict ); |
|
| 345 | - $chunkcnt = count( $data ); |
|
| 342 | + $data = $this->convertData($convlist, $data); |
|
| 343 | + $products = $this->getProducts(array_keys($data), $domains); |
|
| 344 | + $errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict); |
|
| 345 | + $chunkcnt = count($data); |
|
| 346 | 346 | |
| 347 | 347 | $msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)'; |
| 348 | - $logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE ); |
|
| 348 | + $logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE); |
|
| 349 | 349 | |
| 350 | 350 | $errors += $errcnt; |
| 351 | 351 | $total += $chunkcnt; |
| 352 | - unset( $products, $data ); |
|
| 352 | + unset($products, $data); |
|
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | $container->close(); |
| 357 | 357 | } |
| 358 | - catch( \Exception $e ) |
|
| 358 | + catch (\Exception $e) |
|
| 359 | 359 | { |
| 360 | - $logger->log( 'Product import error: ' . $e->getMessage() ); |
|
| 361 | - $logger->log( $e->getTraceAsString() ); |
|
| 360 | + $logger->log('Product import error: ' . $e->getMessage()); |
|
| 361 | + $logger->log($e->getTraceAsString()); |
|
| 362 | 362 | |
| 363 | - throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() ); |
|
| 363 | + throw new \Aimeos\Controller\Jobs\Exception($e->getMessage()); |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | $msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)'; |
| 367 | - $logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE ); |
|
| 367 | + $logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE); |
|
| 368 | 368 | |
| 369 | - if( $errors > 0 ) |
|
| 369 | + if ($errors > 0) |
|
| 370 | 370 | { |
| 371 | - $msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total ); |
|
| 372 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
| 371 | + $msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total); |
|
| 372 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) { |
|
| 376 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) ); |
|
| 375 | + if (!empty($backup) && @rename($path, strftime($backup)) === false) { |
|
| 376 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file')); |
|
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | 379 | |
@@ -385,16 +385,16 @@ discard block |
||
| 385 | 385 | * @return integer Position of the "product.code" column |
| 386 | 386 | * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found |
| 387 | 387 | */ |
| 388 | - protected function getCodePosition( array $mapping ) |
|
| 388 | + protected function getCodePosition(array $mapping) |
|
| 389 | 389 | { |
| 390 | - foreach( $mapping as $pos => $key ) |
|
| 390 | + foreach ($mapping as $pos => $key) |
|
| 391 | 391 | { |
| 392 | - if( $key === 'product.code' ) { |
|
| 392 | + if ($key === 'product.code') { |
|
| 393 | 393 | return $pos; |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) ); |
|
| 397 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found')); |
|
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | * @see controller/jobs/product/import/csv/container/content |
| 430 | 430 | * @see controller/jobs/product/import/csv/container/options |
| 431 | 431 | */ |
| 432 | - $location = $config->get( 'controller/jobs/product/import/csv/location' ); |
|
| 432 | + $location = $config->get('controller/jobs/product/import/csv/location'); |
|
| 433 | 433 | |
| 434 | 434 | /** controller/jobs/product/import/csv/container/type |
| 435 | 435 | * Nave of the container type to read the data from |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | * @see controller/jobs/product/import/csv/container/content |
| 453 | 453 | * @see controller/jobs/product/import/csv/container/options |
| 454 | 454 | */ |
| 455 | - $container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' ); |
|
| 455 | + $container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory'); |
|
| 456 | 456 | |
| 457 | 457 | /** controller/jobs/product/import/csv/container/content |
| 458 | 458 | * Name of the content type inside the container to read the data from |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | * @see controller/jobs/product/import/csv/container/type |
| 474 | 474 | * @see controller/jobs/product/import/csv/container/options |
| 475 | 475 | */ |
| 476 | - $content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' ); |
|
| 476 | + $content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV'); |
|
| 477 | 477 | |
| 478 | 478 | /** controller/jobs/product/import/csv/container/options |
| 479 | 479 | * List of file container options for the product import files |
@@ -491,15 +491,15 @@ discard block |
||
| 491 | 491 | * @see controller/jobs/product/import/csv/container/content |
| 492 | 492 | * @see controller/jobs/product/import/csv/container/type |
| 493 | 493 | */ |
| 494 | - $options = $config->get( 'controller/jobs/product/import/csv/container/options', [] ); |
|
| 494 | + $options = $config->get('controller/jobs/product/import/csv/container/options', []); |
|
| 495 | 495 | |
| 496 | - if( $location === null ) |
|
| 496 | + if ($location === null) |
|
| 497 | 497 | { |
| 498 | - $msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location' ); |
|
| 499 | - throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
|
| 498 | + $msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location'); |
|
| 499 | + throw new \Aimeos\Controller\Jobs\Exception($msg); |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
| 502 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | |
@@ -514,65 +514,65 @@ discard block |
||
| 514 | 514 | * @return integer Number of products that couldn't be imported |
| 515 | 515 | * @throws \Aimeos\Controller\Jobs\Exception |
| 516 | 516 | */ |
| 517 | - protected function import( array $products, array $data, array $mapping, |
|
| 518 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict ) |
|
| 517 | + protected function import(array $products, array $data, array $mapping, |
|
| 518 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict) |
|
| 519 | 519 | { |
| 520 | 520 | $items = []; |
| 521 | 521 | $errors = 0; |
| 522 | 522 | $context = $this->getContext(); |
| 523 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'product' ); |
|
| 524 | - $indexManager = \Aimeos\MShop\Factory::createManager( $context, 'index' ); |
|
| 523 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'product'); |
|
| 524 | + $indexManager = \Aimeos\MShop\Factory::createManager($context, 'index'); |
|
| 525 | 525 | |
| 526 | - foreach( $data as $code => $list ) |
|
| 526 | + foreach ($data as $code => $list) |
|
| 527 | 527 | { |
| 528 | 528 | $manager->begin(); |
| 529 | 529 | |
| 530 | 530 | try |
| 531 | 531 | { |
| 532 | - $code = trim( $code ); |
|
| 532 | + $code = trim($code); |
|
| 533 | 533 | |
| 534 | - if( isset( $products[$code] ) ) { |
|
| 534 | + if (isset($products[$code])) { |
|
| 535 | 535 | $product = $products[$code]; |
| 536 | 536 | } else { |
| 537 | 537 | $product = $manager->createItem(); |
| 538 | 538 | } |
| 539 | 539 | |
| 540 | - $map = $this->getMappedChunk( $list, $mapping ); |
|
| 540 | + $map = $this->getMappedChunk($list, $mapping); |
|
| 541 | 541 | |
| 542 | - if( isset( $map[0] ) ) |
|
| 542 | + if (isset($map[0])) |
|
| 543 | 543 | { |
| 544 | 544 | $map = $map[0]; // there can only be one chunk for the base product data |
| 545 | 545 | |
| 546 | - $typecode = trim( isset( $map['product.type'] ) ? $map['product.type'] : 'default' ); |
|
| 547 | - $map['product.typeid'] = $this->getTypeId( 'product/type', 'product', $typecode ); |
|
| 546 | + $typecode = trim(isset($map['product.type']) ? $map['product.type'] : 'default'); |
|
| 547 | + $map['product.typeid'] = $this->getTypeId('product/type', 'product', $typecode); |
|
| 548 | 548 | |
| 549 | - $product->fromArray( $this->addItemDefaults( $map ) ); |
|
| 550 | - $product = $manager->saveItem( $product ); |
|
| 549 | + $product->fromArray($this->addItemDefaults($map)); |
|
| 550 | + $product = $manager->saveItem($product); |
|
| 551 | 551 | |
| 552 | - $list = $processor->process( $product, $list ); |
|
| 552 | + $list = $processor->process($product, $list); |
|
| 553 | 553 | |
| 554 | - $product = $manager->saveItem( $product ); |
|
| 554 | + $product = $manager->saveItem($product); |
|
| 555 | 555 | $items[$product->getId()] = $product; |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | 558 | $manager->commit(); |
| 559 | 559 | } |
| 560 | - catch( \Exception $e ) |
|
| 560 | + catch (\Exception $e) |
|
| 561 | 561 | { |
| 562 | 562 | $manager->rollback(); |
| 563 | 563 | |
| 564 | - $msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() ); |
|
| 565 | - $context->getLogger()->log( $msg ); |
|
| 564 | + $msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage()); |
|
| 565 | + $context->getLogger()->log($msg); |
|
| 566 | 566 | |
| 567 | 567 | $errors++; |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | - if( $strict && !empty( $list ) ) { |
|
| 571 | - $context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) ); |
|
| 570 | + if ($strict && !empty($list)) { |
|
| 571 | + $context->getLogger()->log('Not imported: ' . print_r($list, true)); |
|
| 572 | 572 | } |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - $indexManager->rebuildIndex( $items ); |
|
| 575 | + $indexManager->rebuildIndex($items); |
|
| 576 | 576 | |
| 577 | 577 | return $errors; |
| 578 | 578 | } |
@@ -584,9 +584,9 @@ discard block |
||
| 584 | 584 | * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1 |
| 585 | 585 | * @return array Given associative list enriched by default values if they were not already set |
| 586 | 586 | */ |
| 587 | - protected function addItemDefaults( array $list ) |
|
| 587 | + protected function addItemDefaults(array $list) |
|
| 588 | 588 | { |
| 589 | - if( !isset( $list['product.status'] ) ) { |
|
| 589 | + if (!isset($list['product.status'])) { |
|
| 590 | 590 | $list['product.status'] = 1; |
| 591 | 591 | } |
| 592 | 592 | |
@@ -131,8 +131,7 @@ |
||
| 131 | 131 | $data = $this->getObject()->process( $product, $data ); |
| 132 | 132 | |
| 133 | 133 | $manager->commit(); |
| 134 | - } |
|
| 135 | - catch( \Exception $e ) |
|
| 134 | + } catch( \Exception $e ) |
|
| 136 | 135 | { |
| 137 | 136 | $manager->rollback(); |
| 138 | 137 | throw $e; |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
| 43 | 43 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
| 44 | 44 | */ |
| 45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
| 46 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
| 45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
| 46 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
| 47 | 47 | { |
| 48 | - parent::__construct( $context, $mapping, $object ); |
|
| 48 | + parent::__construct($context, $mapping, $object); |
|
| 49 | 49 | |
| 50 | - $this->cache = $this->getCache( 'stocktype' ); |
|
| 50 | + $this->cache = $this->getCache('stocktype'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -58,53 +58,53 @@ discard block |
||
| 58 | 58 | * @param array $data List of CSV fields with position as key and data as value |
| 59 | 59 | * @return array List of data which hasn't been imported |
| 60 | 60 | */ |
| 61 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
| 61 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
| 62 | 62 | { |
| 63 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' ); |
|
| 63 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock'); |
|
| 64 | 64 | $manager->begin(); |
| 65 | 65 | |
| 66 | 66 | try |
| 67 | 67 | { |
| 68 | - $map = $this->getMappedChunk( $data, $this->getMapping() ); |
|
| 69 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 68 | + $map = $this->getMappedChunk($data, $this->getMapping()); |
|
| 69 | + $items = $this->getStockItems($product->getCode()); |
|
| 70 | 70 | |
| 71 | - foreach( $map as $pos => $list ) |
|
| 71 | + foreach ($map as $pos => $list) |
|
| 72 | 72 | { |
| 73 | - if( !array_key_exists( 'stock.stocklevel', $list ) ) { |
|
| 73 | + if (!array_key_exists('stock.stocklevel', $list)) { |
|
| 74 | 74 | continue; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - $stockType = trim( isset( $list['stock.type'] ) ? $list['stock.type'] : 'default' ); |
|
| 77 | + $stockType = trim(isset($list['stock.type']) ? $list['stock.type'] : 'default'); |
|
| 78 | 78 | |
| 79 | - if( !isset( $list['stock.typeid'] ) ) { |
|
| 80 | - $list['stock.typeid'] = $this->cache->get( $stockType ); |
|
| 79 | + if (!isset($list['stock.typeid'])) { |
|
| 80 | + $list['stock.typeid'] = $this->cache->get($stockType); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - if( isset( $list['stock.dateback'] ) && trim( $list['stock.dateback'] ) === '' ) { |
|
| 83 | + if (isset($list['stock.dateback']) && trim($list['stock.dateback']) === '') { |
|
| 84 | 84 | $list['stock.dateback'] = null; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if( trim( $list['stock.stocklevel'] ) === '' ) { |
|
| 87 | + if (trim($list['stock.stocklevel']) === '') { |
|
| 88 | 88 | $list['stock.stocklevel'] = null; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $list['stock.productcode'] = $product->getCode(); |
| 92 | 92 | |
| 93 | - if( ( $item = array_pop( $items ) ) === null ) { |
|
| 93 | + if (($item = array_pop($items)) === null) { |
|
| 94 | 94 | $item = $manager->createItem(); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $item->fromArray( $list ); |
|
| 98 | - $manager->saveItem( $item, false ); |
|
| 97 | + $item->fromArray($list); |
|
| 98 | + $manager->saveItem($item, false); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - $manager->deleteItems( array_keys( $items ) ); |
|
| 101 | + $manager->deleteItems(array_keys($items)); |
|
| 102 | 102 | |
| 103 | - $data = $this->getObject()->process( $product, $data ); |
|
| 103 | + $data = $this->getObject()->process($product, $data); |
|
| 104 | 104 | |
| 105 | 105 | $manager->commit(); |
| 106 | 106 | } |
| 107 | - catch( \Exception $e ) |
|
| 107 | + catch (\Exception $e) |
|
| 108 | 108 | { |
| 109 | 109 | $manager->rollback(); |
| 110 | 110 | throw $e; |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | * @param string $code Unique product code |
| 121 | 121 | * @return \Aimeos\MShop\Stock\Item\Iface[] Associative list of stock items |
| 122 | 122 | */ |
| 123 | - protected function getStockItems( $code ) |
|
| 123 | + protected function getStockItems($code) |
|
| 124 | 124 | { |
| 125 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' ); |
|
| 125 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock'); |
|
| 126 | 126 | |
| 127 | 127 | $search = $manager->createSearch(); |
| 128 | - $search->setConditions( $search->compare( '==', 'stock.productcode', $code ) ); |
|
| 128 | + $search->setConditions($search->compare('==', 'stock.productcode', $code)); |
|
| 129 | 129 | |
| 130 | - return $manager->searchItems( $search ); |
|
| 130 | + return $manager->searchItems($search); |
|
| 131 | 131 | } |
| 132 | 132 | } |
@@ -17,31 +17,31 @@ discard block |
||
| 17 | 17 | $this->context = \TestHelperJobs::getContext('unitperf'); |
| 18 | 18 | |
| 19 | 19 | $config = $this->context->getConfig(); |
| 20 | - $config->set( 'controller/jobs/product/import/csv/location', 'tmp/product-import.zip' ); |
|
| 21 | - $config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' ); |
|
| 22 | - $config->set( 'controller/jobs/product/import/csv/container/content', 'CSV' ); |
|
| 23 | - $config->set( 'controller/jobs/product/import/csv/mapping', $this->getMapping() ); |
|
| 20 | + $config->set('controller/jobs/product/import/csv/location', 'tmp/product-import.zip'); |
|
| 21 | + $config->set('controller/jobs/product/import/csv/container/type', 'Zip'); |
|
| 22 | + $config->set('controller/jobs/product/import/csv/container/content', 'CSV'); |
|
| 23 | + $config->set('controller/jobs/product/import/csv/mapping', $this->getMapping()); |
|
| 24 | 24 | |
| 25 | - $container = \Aimeos\MW\Container\Factory::getContainer( 'tmp/product-import.zip', 'Zip', 'CSV', [] ); |
|
| 25 | + $container = \Aimeos\MW\Container\Factory::getContainer('tmp/product-import.zip', 'Zip', 'CSV', []); |
|
| 26 | 26 | |
| 27 | - $content = $container->create( 'product.csv' ); |
|
| 27 | + $content = $container->create('product.csv'); |
|
| 28 | 28 | |
| 29 | - for( $i = 0; $i < 1000; $i++ ) |
|
| 29 | + for ($i = 0; $i < 1000; $i++) |
|
| 30 | 30 | { |
| 31 | 31 | $data = []; |
| 32 | 32 | |
| 33 | - $data = $this->addProduct( $data, $i ); |
|
| 34 | - $data = $this->addText( $data, $i ); |
|
| 35 | - $data = $this->addMedia( $data, $i ); |
|
| 36 | - $data = $this->addPrice( $data, $i ); |
|
| 37 | - $data = $this->addAttribute( $data, $i ); |
|
| 38 | - $data = $this->addProductRef( $data, $i ); |
|
| 39 | - $data = $this->addProperty( $data, $i ); |
|
| 33 | + $data = $this->addProduct($data, $i); |
|
| 34 | + $data = $this->addText($data, $i); |
|
| 35 | + $data = $this->addMedia($data, $i); |
|
| 36 | + $data = $this->addPrice($data, $i); |
|
| 37 | + $data = $this->addAttribute($data, $i); |
|
| 38 | + $data = $this->addProductRef($data, $i); |
|
| 39 | + $data = $this->addProperty($data, $i); |
|
| 40 | 40 | |
| 41 | - $content->add( $data ); |
|
| 41 | + $content->add($data); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - $container->add( $content ); |
|
| 44 | + $container->add($content); |
|
| 45 | 45 | |
| 46 | 46 | $container->close(); |
| 47 | 47 | } |
@@ -55,25 +55,25 @@ discard block |
||
| 55 | 55 | $this->cleanupPrice(); |
| 56 | 56 | $this->cleanupProduct(); |
| 57 | 57 | |
| 58 | - unlink( 'tmp/product-import.zip' ); |
|
| 58 | + unlink('tmp/product-import.zip'); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | public function testImport() |
| 63 | 63 | { |
| 64 | 64 | $aimeos = \TestHelperJobs::getAimeos(); |
| 65 | - $cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $this->context, $aimeos, 'Standard' ); |
|
| 65 | + $cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($this->context, $aimeos, 'Standard'); |
|
| 66 | 66 | |
| 67 | - $start = microtime( true ); |
|
| 67 | + $start = microtime(true); |
|
| 68 | 68 | |
| 69 | 69 | $cntl->run(); |
| 70 | 70 | |
| 71 | - $stop = microtime( true ); |
|
| 72 | - echo "\n product import CSV: " . ( ( $stop - $start ) ) . " sec\n"; |
|
| 71 | + $stop = microtime(true); |
|
| 72 | + echo "\n product import CSV: " . (($stop - $start)) . " sec\n"; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | - protected function addAttribute( array $data, $cnt ) |
|
| 76 | + protected function addAttribute(array $data, $cnt) |
|
| 77 | 77 | { |
| 78 | 78 | $data[] = 'length'; // type |
| 79 | 79 | $data[] = 'import-' . ($cnt % 30); // code |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | |
| 89 | - protected function addMedia( array $data, $cnt ) |
|
| 89 | + protected function addMedia(array $data, $cnt) |
|
| 90 | 90 | { |
| 91 | 91 | $data[] = "/path/to/image-$cnt.jpg"; // url |
| 92 | 92 | |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
| 97 | - protected function addPrice( array $data, $cnt ) |
|
| 97 | + protected function addPrice(array $data, $cnt) |
|
| 98 | 98 | { |
| 99 | 99 | $data[] = 1; // quantity |
| 100 | 100 | $data[] = 'import-' . $cnt; // label |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | |
| 108 | - protected function addProduct( array $data, $cnt ) |
|
| 108 | + protected function addProduct(array $data, $cnt) |
|
| 109 | 109 | { |
| 110 | 110 | $data[] = 'import-' . $cnt; // code |
| 111 | 111 | $data[] = 'import-' . $cnt; // label |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | |
| 119 | - protected function addProductRef( array $data, $cnt ) |
|
| 119 | + protected function addProductRef(array $data, $cnt) |
|
| 120 | 120 | { |
| 121 | 121 | $data[] = 'import-' . ($cnt % 100); // code |
| 122 | 122 | $data[] = 'suggestion'; // type |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | |
| 128 | - protected function addProperty( array $data, $cnt ) |
|
| 128 | + protected function addProperty(array $data, $cnt) |
|
| 129 | 129 | { |
| 130 | 130 | $data[] = 'package-weight'; // type |
| 131 | 131 | $data[] = '0.5'; // value |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
| 137 | - protected function addText( array $data, $cnt ) |
|
| 137 | + protected function addText(array $data, $cnt) |
|
| 138 | 138 | { |
| 139 | 139 | $data[] = 'name'; // type |
| 140 | 140 | $data[] = 'import-name-' . $cnt; //content |
@@ -149,132 +149,132 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | protected function cleanupAttribute() |
| 151 | 151 | { |
| 152 | - $manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context ); |
|
| 152 | + $manager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context); |
|
| 153 | 153 | |
| 154 | 154 | $search = $manager->createSearch(); |
| 155 | 155 | $expr = array( |
| 156 | - $search->compare( '==', 'attribute.domain', 'product' ), |
|
| 157 | - $search->compare( '==', 'attribute.label', 'import-%' ), |
|
| 156 | + $search->compare('==', 'attribute.domain', 'product'), |
|
| 157 | + $search->compare('==', 'attribute.label', 'import-%'), |
|
| 158 | 158 | ); |
| 159 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 160 | - $search->setSortations( array( $search->sort( '+', 'attribute.id' ) ) ); |
|
| 159 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 160 | + $search->setSortations(array($search->sort('+', 'attribute.id'))); |
|
| 161 | 161 | |
| 162 | 162 | $start = 0; |
| 163 | 163 | |
| 164 | 164 | do |
| 165 | 165 | { |
| 166 | - $result = $manager->searchItems( $search ); |
|
| 167 | - $manager->deleteItems( array_keys( $result ) ); |
|
| 166 | + $result = $manager->searchItems($search); |
|
| 167 | + $manager->deleteItems(array_keys($result)); |
|
| 168 | 168 | |
| 169 | - $count = count( $result ); |
|
| 169 | + $count = count($result); |
|
| 170 | 170 | $start += $count; |
| 171 | - $search->setSlice( $start ); |
|
| 171 | + $search->setSlice($start); |
|
| 172 | 172 | } |
| 173 | - while( $count == $search->getSliceSize() ); |
|
| 173 | + while ($count == $search->getSliceSize()); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | |
| 177 | 177 | protected function cleanupMedia() |
| 178 | 178 | { |
| 179 | - $manager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context ); |
|
| 179 | + $manager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context); |
|
| 180 | 180 | |
| 181 | 181 | $search = $manager->createSearch(); |
| 182 | 182 | $expr = array( |
| 183 | - $search->compare( '==', 'media.domain', 'product' ), |
|
| 184 | - $search->compare( '==', 'media.label', 'import-%' ), |
|
| 183 | + $search->compare('==', 'media.domain', 'product'), |
|
| 184 | + $search->compare('==', 'media.label', 'import-%'), |
|
| 185 | 185 | ); |
| 186 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 187 | - $search->setSortations( array( $search->sort( '+', 'media.id' ) ) ); |
|
| 186 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 187 | + $search->setSortations(array($search->sort('+', 'media.id'))); |
|
| 188 | 188 | |
| 189 | 189 | $start = 0; |
| 190 | 190 | |
| 191 | 191 | do |
| 192 | 192 | { |
| 193 | - $result = $manager->searchItems( $search ); |
|
| 194 | - $manager->deleteItems( array_keys( $result ) ); |
|
| 193 | + $result = $manager->searchItems($search); |
|
| 194 | + $manager->deleteItems(array_keys($result)); |
|
| 195 | 195 | |
| 196 | - $count = count( $result ); |
|
| 196 | + $count = count($result); |
|
| 197 | 197 | $start += $count; |
| 198 | - $search->setSlice( $start ); |
|
| 198 | + $search->setSlice($start); |
|
| 199 | 199 | } |
| 200 | - while( $count == $search->getSliceSize() ); |
|
| 200 | + while ($count == $search->getSliceSize()); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | protected function cleanupPrice() |
| 205 | 205 | { |
| 206 | - $manager = \Aimeos\MShop\Price\Manager\Factory::createManager( $this->context ); |
|
| 206 | + $manager = \Aimeos\MShop\Price\Manager\Factory::createManager($this->context); |
|
| 207 | 207 | |
| 208 | 208 | $search = $manager->createSearch(); |
| 209 | 209 | $expr = array( |
| 210 | - $search->compare( '==', 'price.domain', 'product' ), |
|
| 211 | - $search->compare( '==', 'price.label', 'import-%' ), |
|
| 210 | + $search->compare('==', 'price.domain', 'product'), |
|
| 211 | + $search->compare('==', 'price.label', 'import-%'), |
|
| 212 | 212 | ); |
| 213 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 214 | - $search->setSortations( array( $search->sort( '+', 'price.id' ) ) ); |
|
| 213 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 214 | + $search->setSortations(array($search->sort('+', 'price.id'))); |
|
| 215 | 215 | |
| 216 | 216 | $start = 0; |
| 217 | 217 | |
| 218 | 218 | do |
| 219 | 219 | { |
| 220 | - $result = $manager->searchItems( $search ); |
|
| 221 | - $manager->deleteItems( array_keys( $result ) ); |
|
| 220 | + $result = $manager->searchItems($search); |
|
| 221 | + $manager->deleteItems(array_keys($result)); |
|
| 222 | 222 | |
| 223 | - $count = count( $result ); |
|
| 223 | + $count = count($result); |
|
| 224 | 224 | $start += $count; |
| 225 | - $search->setSlice( $start ); |
|
| 225 | + $search->setSlice($start); |
|
| 226 | 226 | } |
| 227 | - while( $count == $search->getSliceSize() ); |
|
| 227 | + while ($count == $search->getSliceSize()); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | |
| 231 | 231 | protected function cleanupProduct() |
| 232 | 232 | { |
| 233 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 233 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 234 | 234 | |
| 235 | 235 | $search = $manager->createSearch(); |
| 236 | - $search->setConditions( $search->compare( '==', 'product.code', 'import-%' ) ); |
|
| 237 | - $search->setSortations( array( $search->sort( '+', 'product.id' ) ) ); |
|
| 236 | + $search->setConditions($search->compare('==', 'product.code', 'import-%')); |
|
| 237 | + $search->setSortations(array($search->sort('+', 'product.id'))); |
|
| 238 | 238 | |
| 239 | 239 | $start = 0; |
| 240 | 240 | |
| 241 | 241 | do |
| 242 | 242 | { |
| 243 | - $result = $manager->searchItems( $search ); |
|
| 244 | - $manager->deleteItems( array_keys( $result ) ); |
|
| 243 | + $result = $manager->searchItems($search); |
|
| 244 | + $manager->deleteItems(array_keys($result)); |
|
| 245 | 245 | |
| 246 | - $count = count( $result ); |
|
| 246 | + $count = count($result); |
|
| 247 | 247 | $start += $count; |
| 248 | - $search->setSlice( $start ); |
|
| 248 | + $search->setSlice($start); |
|
| 249 | 249 | } |
| 250 | - while( $count == $search->getSliceSize() ); |
|
| 250 | + while ($count == $search->getSliceSize()); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | |
| 254 | 254 | protected function cleanupText() |
| 255 | 255 | { |
| 256 | - $manager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context ); |
|
| 256 | + $manager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context); |
|
| 257 | 257 | |
| 258 | 258 | $search = $manager->createSearch(); |
| 259 | 259 | $expr = array( |
| 260 | - $search->compare( '==', 'text.domain', 'product' ), |
|
| 261 | - $search->compare( '==', 'text.label', 'import-%' ), |
|
| 260 | + $search->compare('==', 'text.domain', 'product'), |
|
| 261 | + $search->compare('==', 'text.label', 'import-%'), |
|
| 262 | 262 | ); |
| 263 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 264 | - $search->setSortations( array( $search->sort( '+', 'text.id' ) ) ); |
|
| 263 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 264 | + $search->setSortations(array($search->sort('+', 'text.id'))); |
|
| 265 | 265 | |
| 266 | 266 | $start = 0; |
| 267 | 267 | |
| 268 | 268 | do |
| 269 | 269 | { |
| 270 | - $result = $manager->searchItems( $search ); |
|
| 271 | - $manager->deleteItems( array_keys( $result ) ); |
|
| 270 | + $result = $manager->searchItems($search); |
|
| 271 | + $manager->deleteItems(array_keys($result)); |
|
| 272 | 272 | |
| 273 | - $count = count( $result ); |
|
| 273 | + $count = count($result); |
|
| 274 | 274 | $start += $count; |
| 275 | - $search->setSlice( $start ); |
|
| 275 | + $search->setSlice($start); |
|
| 276 | 276 | } |
| 277 | - while( $count == $search->getSliceSize() ); |
|
| 277 | + while ($count == $search->getSliceSize()); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->context = \TestHelperJobs::getContext(); |
| 26 | 26 | $aimeos = \TestHelperJobs::getAimeos(); |
| 27 | 27 | |
| 28 | - $this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard( $this->context, $aimeos ); |
|
| 28 | + $this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard($this->context, $aimeos); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
@@ -44,14 +44,14 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function testGetName() |
| 46 | 46 | { |
| 47 | - $this->assertEquals( 'Log cleanup', $this->object->getName() ); |
|
| 47 | + $this->assertEquals('Log cleanup', $this->object->getName()); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | public function testGetDescription() |
| 52 | 52 | { |
| 53 | 53 | $text = 'Removes the old log entries from the database and archives them (optional)'; |
| 54 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
| 54 | + $this->assertEquals($text, $this->object->getDescription()); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
@@ -59,38 +59,38 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | $config = $this->context->getConfig(); |
| 61 | 61 | |
| 62 | - $mock = $this->getMockBuilder( '\\Aimeos\\MAdmin\\Log\\Manager\\Standard' ) |
|
| 63 | - ->setMethods( array( 'deleteItems' ) ) |
|
| 64 | - ->setConstructorArgs( array( $this->context ) ) |
|
| 62 | + $mock = $this->getMockBuilder('\\Aimeos\\MAdmin\\Log\\Manager\\Standard') |
|
| 63 | + ->setMethods(array('deleteItems')) |
|
| 64 | + ->setConstructorArgs(array($this->context)) |
|
| 65 | 65 | ->getMock(); |
| 66 | 66 | |
| 67 | - $mock->expects( $this->atLeastOnce() )->method( 'deleteItems' ); |
|
| 67 | + $mock->expects($this->atLeastOnce())->method('deleteItems'); |
|
| 68 | 68 | |
| 69 | - $tmppath = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'tmp'; |
|
| 69 | + $tmppath = dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'tmp'; |
|
| 70 | 70 | $name = 'ControllerJobsAdminLogDefaultRun'; |
| 71 | - $config->set( 'madmin/log/manager/name', $name ); |
|
| 72 | - $config->set( 'controller/jobs/admin/log/standard/limit-days', 0 ); |
|
| 73 | - $config->set( 'controller/jobs/admin/log/standard/path', $tmppath ); |
|
| 71 | + $config->set('madmin/log/manager/name', $name); |
|
| 72 | + $config->set('controller/jobs/admin/log/standard/limit-days', 0); |
|
| 73 | + $config->set('controller/jobs/admin/log/standard/path', $tmppath); |
|
| 74 | 74 | |
| 75 | - \Aimeos\MAdmin\Log\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock ); |
|
| 75 | + \Aimeos\MAdmin\Log\Manager\Factory::injectManager('\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock); |
|
| 76 | 76 | |
| 77 | - if( !is_dir( $tmppath ) && mkdir( $tmppath ) === false ) { |
|
| 78 | - throw new \RuntimeException( sprintf( 'Unable to create temporary path "%1$s"', $tmppath ) ); |
|
| 77 | + if (!is_dir($tmppath) && mkdir($tmppath) === false) { |
|
| 78 | + throw new \RuntimeException(sprintf('Unable to create temporary path "%1$s"', $tmppath)); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | $this->object->run(); |
| 82 | 82 | |
| 83 | - foreach( new \DirectoryIterator( $tmppath ) as $file ) |
|
| 83 | + foreach (new \DirectoryIterator($tmppath) as $file) |
|
| 84 | 84 | { |
| 85 | - if( $file->isFile() && $file->getExtension() === 'zip' ) |
|
| 85 | + if ($file->isFile() && $file->getExtension() === 'zip') |
|
| 86 | 86 | { |
| 87 | - $container = \Aimeos\MW\Container\Factory::getContainer( $file->getPathName(), 'Zip', 'CSV', [] ); |
|
| 88 | - $container->get( 'unittest facility.csv' ); |
|
| 89 | - unlink( $file->getPathName() ); |
|
| 87 | + $container = \Aimeos\MW\Container\Factory::getContainer($file->getPathName(), 'Zip', 'CSV', []); |
|
| 88 | + $container->get('unittest facility.csv'); |
|
| 89 | + unlink($file->getPathName()); |
|
| 90 | 90 | return; |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - $this->fail( 'Log archive file not found' ); |
|
| 94 | + $this->fail('Log archive file not found'); |
|
| 95 | 95 | } |
| 96 | 96 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | $context = \TestHelperJobs::getContext(); |
| 25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
| 26 | 26 | |
| 27 | - $this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos ); |
|
| 27 | + $this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function testGetName() |
| 44 | 44 | { |
| 45 | - $this->assertEquals( 'Capture authorized payments', $this->object->getName() ); |
|
| 45 | + $this->assertEquals('Capture authorized payments', $this->object->getName()); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGetDescription() |
| 50 | 50 | { |
| 51 | 51 | $text = 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time'; |
| 52 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
| 52 | + $this->assertEquals($text, $this->object->getDescription()); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
@@ -60,49 +60,49 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | $name = 'ControllerJobsServicePaymentProcessDefaultRun'; |
| 63 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
| 64 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
| 63 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
| 64 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
| 65 | 65 | |
| 66 | 66 | |
| 67 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
| 68 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
| 69 | - ->setConstructorArgs( array( $context ) ) |
|
| 67 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
| 68 | + ->setMethods(array('getProvider', 'searchItems')) |
|
| 69 | + ->setConstructorArgs(array($context)) |
|
| 70 | 70 | ->getMock(); |
| 71 | 71 | |
| 72 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
| 73 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
| 74 | - ->setConstructorArgs( array( $context ) ) |
|
| 72 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
| 73 | + ->setMethods(array('saveItem', 'searchItems')) |
|
| 74 | + ->setConstructorArgs(array($context)) |
|
| 75 | 75 | ->getMock(); |
| 76 | 76 | |
| 77 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
| 78 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
| 77 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
| 78 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
| 79 | 79 | |
| 80 | 80 | |
| 81 | 81 | $serviceItem = $serviceManagerStub->createItem(); |
| 82 | 82 | $orderItem = $orderManagerStub->createItem(); |
| 83 | 83 | |
| 84 | - $serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' ) |
|
| 85 | - ->setMethods( array( 'isImplemented', 'capture' ) ) |
|
| 86 | - ->setConstructorArgs( array( $context, $serviceItem ) ) |
|
| 84 | + $serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay') |
|
| 85 | + ->setMethods(array('isImplemented', 'capture')) |
|
| 86 | + ->setConstructorArgs(array($context, $serviceItem)) |
|
| 87 | 87 | ->getMock(); |
| 88 | 88 | |
| 89 | 89 | |
| 90 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 91 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
| 90 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
| 91 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
| 92 | 92 | |
| 93 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
| 94 | - ->will( $this->returnValue( $serviceProviderStub ) ); |
|
| 93 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
| 94 | + ->will($this->returnValue($serviceProviderStub)); |
|
| 95 | 95 | |
| 96 | - $orderManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 97 | - ->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) ); |
|
| 96 | + $orderManagerStub->expects($this->once())->method('searchItems') |
|
| 97 | + ->will($this->onConsecutiveCalls(array($orderItem), [])); |
|
| 98 | 98 | |
| 99 | - $serviceProviderStub->expects( $this->once() )->method( 'isImplemented' ) |
|
| 100 | - ->will( $this->returnValue( true ) ); |
|
| 99 | + $serviceProviderStub->expects($this->once())->method('isImplemented') |
|
| 100 | + ->will($this->returnValue(true)); |
|
| 101 | 101 | |
| 102 | - $serviceProviderStub->expects( $this->once() )->method( 'capture' ); |
|
| 102 | + $serviceProviderStub->expects($this->once())->method('capture'); |
|
| 103 | 103 | |
| 104 | 104 | |
| 105 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos ); |
|
| 105 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos); |
|
| 106 | 106 | $object->run(); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -114,52 +114,52 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | $name = 'ControllerJobsServicePaymentProcessDefaultRun'; |
| 117 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
| 118 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
| 117 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
| 118 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
| 119 | 119 | |
| 120 | 120 | |
| 121 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
| 122 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
| 123 | - ->setConstructorArgs( array( $context ) ) |
|
| 121 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
| 122 | + ->setMethods(array('saveItem', 'searchItems')) |
|
| 123 | + ->setConstructorArgs(array($context)) |
|
| 124 | 124 | ->getMock(); |
| 125 | 125 | |
| 126 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
| 127 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
| 128 | - ->setConstructorArgs( array( $context ) ) |
|
| 126 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
| 127 | + ->setMethods(array('getProvider', 'searchItems')) |
|
| 128 | + ->setConstructorArgs(array($context)) |
|
| 129 | 129 | ->getMock(); |
| 130 | 130 | |
| 131 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
| 132 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
| 131 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
| 132 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
| 133 | 133 | |
| 134 | 134 | |
| 135 | 135 | $serviceItem = $serviceManagerStub->createItem(); |
| 136 | 136 | $orderItem = $orderManagerStub->createItem(); |
| 137 | 137 | |
| 138 | - $serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' ) |
|
| 139 | - ->setMethods( array( 'isImplemented', 'capture' ) ) |
|
| 140 | - ->setConstructorArgs( array( $context, $serviceItem ) ) |
|
| 138 | + $serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay') |
|
| 139 | + ->setMethods(array('isImplemented', 'capture')) |
|
| 140 | + ->setConstructorArgs(array($context, $serviceItem)) |
|
| 141 | 141 | ->getMock(); |
| 142 | 142 | |
| 143 | 143 | |
| 144 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 145 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
| 144 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
| 145 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
| 146 | 146 | |
| 147 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
| 148 | - ->will( $this->returnValue( $serviceProviderStub ) ); |
|
| 147 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
| 148 | + ->will($this->returnValue($serviceProviderStub)); |
|
| 149 | 149 | |
| 150 | - $orderManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 151 | - ->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) ); |
|
| 150 | + $orderManagerStub->expects($this->once())->method('searchItems') |
|
| 151 | + ->will($this->onConsecutiveCalls(array($orderItem), [])); |
|
| 152 | 152 | |
| 153 | - $serviceProviderStub->expects( $this->once() )->method( 'isImplemented' ) |
|
| 154 | - ->will( $this->returnValue( true ) ); |
|
| 153 | + $serviceProviderStub->expects($this->once())->method('isImplemented') |
|
| 154 | + ->will($this->returnValue(true)); |
|
| 155 | 155 | |
| 156 | - $serviceProviderStub->expects( $this->once() )->method( 'capture' ) |
|
| 157 | - ->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test oder service payment: capture' ) ) ); |
|
| 156 | + $serviceProviderStub->expects($this->once())->method('capture') |
|
| 157 | + ->will($this->throwException(new \Aimeos\MShop\Service\Exception('test oder service payment: capture'))); |
|
| 158 | 158 | |
| 159 | - $orderManagerStub->expects( $this->never() )->method( 'saveItem' ); |
|
| 159 | + $orderManagerStub->expects($this->never())->method('saveItem'); |
|
| 160 | 160 | |
| 161 | 161 | |
| 162 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos ); |
|
| 162 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos); |
|
| 163 | 163 | $object->run(); |
| 164 | 164 | } |
| 165 | 165 | |
@@ -171,36 +171,36 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | |
| 173 | 173 | $name = 'ControllerJobsServicePaymentProcessDefaultRun'; |
| 174 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
| 175 | - $context->getConfig()->set( 'mshop/order/manager/name', $name ); |
|
| 174 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
| 175 | + $context->getConfig()->set('mshop/order/manager/name', $name); |
|
| 176 | 176 | |
| 177 | 177 | |
| 178 | - $orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' ) |
|
| 179 | - ->setMethods( array( 'saveItem', 'searchItems' ) ) |
|
| 180 | - ->setConstructorArgs( array( $context ) ) |
|
| 178 | + $orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard') |
|
| 179 | + ->setMethods(array('saveItem', 'searchItems')) |
|
| 180 | + ->setConstructorArgs(array($context)) |
|
| 181 | 181 | ->getMock(); |
| 182 | 182 | |
| 183 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
| 184 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
| 185 | - ->setConstructorArgs( array( $context ) ) |
|
| 183 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
| 184 | + ->setMethods(array('getProvider', 'searchItems')) |
|
| 185 | + ->setConstructorArgs(array($context)) |
|
| 186 | 186 | ->getMock(); |
| 187 | 187 | |
| 188 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
| 189 | - \Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub ); |
|
| 188 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
| 189 | + \Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub); |
|
| 190 | 190 | |
| 191 | 191 | |
| 192 | 192 | $serviceItem = $serviceManagerStub->createItem(); |
| 193 | 193 | |
| 194 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 195 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
| 194 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
| 195 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
| 196 | 196 | |
| 197 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
| 198 | - ->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test service delivery process: getProvider' ) ) ); |
|
| 197 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
| 198 | + ->will($this->throwException(new \Aimeos\MShop\Service\Exception('test service delivery process: getProvider'))); |
|
| 199 | 199 | |
| 200 | - $orderManagerStub->expects( $this->never() )->method( 'searchItems' ); |
|
| 200 | + $orderManagerStub->expects($this->never())->method('searchItems'); |
|
| 201 | 201 | |
| 202 | 202 | |
| 203 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos ); |
|
| 203 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos); |
|
| 204 | 204 | $object->run(); |
| 205 | 205 | } |
| 206 | 206 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | $context = \TestHelperJobs::getContext(); |
| 25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
| 26 | 26 | |
| 27 | - $this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos ); |
|
| 27 | + $this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function testGetName() |
| 44 | 44 | { |
| 45 | - $this->assertEquals( 'Batch update of payment/delivery status', $this->object->getName() ); |
|
| 45 | + $this->assertEquals('Batch update of payment/delivery status', $this->object->getName()); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGetDescription() |
| 50 | 50 | { |
| 51 | 51 | $text = 'Executes payment or delivery service providers that uses batch updates'; |
| 52 | - $this->assertEquals( $text, $this->object->getDescription() ); |
|
| 52 | + $this->assertEquals($text, $this->object->getDescription()); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
@@ -60,34 +60,34 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | $name = 'ControllerJobsServiceAsyncProcessDefaultRun'; |
| 63 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
| 63 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
| 67 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
| 68 | - ->setConstructorArgs( array( $context ) ) |
|
| 66 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
| 67 | + ->setMethods(array('getProvider', 'searchItems')) |
|
| 68 | + ->setConstructorArgs(array($context)) |
|
| 69 | 69 | ->getMock(); |
| 70 | 70 | |
| 71 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
| 71 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | $serviceItem = $serviceManagerStub->createItem(); |
| 75 | 75 | |
| 76 | - $serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual' ) |
|
| 77 | - ->setConstructorArgs( array( $context, $serviceItem ) ) |
|
| 76 | + $serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Manual') |
|
| 77 | + ->setConstructorArgs(array($context, $serviceItem)) |
|
| 78 | 78 | ->getMock(); |
| 79 | 79 | |
| 80 | 80 | |
| 81 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 82 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
| 81 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
| 82 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
| 83 | 83 | |
| 84 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
| 85 | - ->will( $this->returnValue( $serviceProviderStub ) ); |
|
| 84 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
| 85 | + ->will($this->returnValue($serviceProviderStub)); |
|
| 86 | 86 | |
| 87 | - $serviceProviderStub->expects( $this->once() )->method( 'updateAsync' ); |
|
| 87 | + $serviceProviderStub->expects($this->once())->method('updateAsync'); |
|
| 88 | 88 | |
| 89 | 89 | |
| 90 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos ); |
|
| 90 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos); |
|
| 91 | 91 | $object->run(); |
| 92 | 92 | } |
| 93 | 93 | |
@@ -99,27 +99,27 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | |
| 101 | 101 | $name = 'ControllerJobsServiceAsyncProcessDefaultRun'; |
| 102 | - $context->getConfig()->set( 'mshop/service/manager/name', $name ); |
|
| 102 | + $context->getConfig()->set('mshop/service/manager/name', $name); |
|
| 103 | 103 | |
| 104 | 104 | |
| 105 | - $serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' ) |
|
| 106 | - ->setMethods( array( 'getProvider', 'searchItems' ) ) |
|
| 107 | - ->setConstructorArgs( array( $context ) ) |
|
| 105 | + $serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard') |
|
| 106 | + ->setMethods(array('getProvider', 'searchItems')) |
|
| 107 | + ->setConstructorArgs(array($context)) |
|
| 108 | 108 | ->getMock(); |
| 109 | 109 | |
| 110 | - \Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub ); |
|
| 110 | + \Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub); |
|
| 111 | 111 | |
| 112 | 112 | |
| 113 | 113 | $serviceItem = $serviceManagerStub->createItem(); |
| 114 | 114 | |
| 115 | - $serviceManagerStub->expects( $this->once() )->method( 'searchItems' ) |
|
| 116 | - ->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) ); |
|
| 115 | + $serviceManagerStub->expects($this->once())->method('searchItems') |
|
| 116 | + ->will($this->onConsecutiveCalls(array($serviceItem), [])); |
|
| 117 | 117 | |
| 118 | - $serviceManagerStub->expects( $this->once() )->method( 'getProvider' ) |
|
| 119 | - ->will( $this->throwException( new \Aimeos\MShop\Service\Exception() ) ); |
|
| 118 | + $serviceManagerStub->expects($this->once())->method('getProvider') |
|
| 119 | + ->will($this->throwException(new \Aimeos\MShop\Service\Exception())); |
|
| 120 | 120 | |
| 121 | 121 | |
| 122 | - $object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos ); |
|
| 122 | + $object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos); |
|
| 123 | 123 | $object->run(); |
| 124 | 124 | } |
| 125 | 125 | } |
