@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function getName() |
| 31 | 31 | { |
| 32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Products bought together' ); |
|
| 32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Products bought together'); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function getDescription() |
| 42 | 42 | { |
| 43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates bought together product suggestions' ); |
|
| 43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates bought together product suggestions'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * @see controller/jobs/product/bought/min-confidence |
| 73 | 73 | * @see controller/jobs/product/bought/limit-days |
| 74 | 74 | */ |
| 75 | - $maxItems = $config->get( 'controller/jobs/product/bought/max-items', 5 ); |
|
| 75 | + $maxItems = $config->get('controller/jobs/product/bought/max-items', 5); |
|
| 76 | 76 | |
| 77 | 77 | /** controller/jobs/product/bought/min-support |
| 78 | 78 | * Minimum support value to sort out all irrelevant combinations |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @see controller/jobs/product/bought/min-confidence |
| 102 | 102 | * @see controller/jobs/product/bought/limit-days |
| 103 | 103 | */ |
| 104 | - $minSupport = $config->get( 'controller/jobs/product/bought/min-support', 0.02 ); |
|
| 104 | + $minSupport = $config->get('controller/jobs/product/bought/min-support', 0.02); |
|
| 105 | 105 | |
| 106 | 106 | /** controller/jobs/product/bought/min-confidence |
| 107 | 107 | * Minimum confidence value for high quality suggestions |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @see controller/jobs/product/bought/min-support |
| 127 | 127 | * @see controller/jobs/product/bought/limit-days |
| 128 | 128 | */ |
| 129 | - $minConfidence = $config->get( 'controller/jobs/product/bought/min-confidence', 0.66 ); |
|
| 129 | + $minConfidence = $config->get('controller/jobs/product/bought/min-confidence', 0.66); |
|
| 130 | 130 | |
| 131 | 131 | /** controller/jobs/product/bought/limit-days |
| 132 | 132 | * Only use orders placed in the past within the configured number of days for calculating bought together products |
@@ -150,45 +150,45 @@ discard block |
||
| 150 | 150 | * @see controller/jobs/product/bought/min-support |
| 151 | 151 | * @see controller/jobs/product/bought/min-confidence |
| 152 | 152 | */ |
| 153 | - $days = $config->get( 'controller/jobs/product/bought/limit-days', 180 ); |
|
| 154 | - $date = date( 'Y-m-d H:i:s', time() - $days * 86400 ); |
|
| 153 | + $days = $config->get('controller/jobs/product/bought/limit-days', 180); |
|
| 154 | + $date = date('Y-m-d H:i:s', time() - $days * 86400); |
|
| 155 | 155 | |
| 156 | 156 | |
| 157 | - $typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' ); |
|
| 157 | + $typeItem = $this->getTypeItem('product/lists/type', 'product', 'bought-together'); |
|
| 158 | 158 | |
| 159 | - $baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
| 159 | + $baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
| 160 | 160 | $search = $baseManager->createSearch(); |
| 161 | - $search->setConditions( $search->compare( '>', 'order.base.ctime', $date ) ); |
|
| 162 | - $search->setSlice( 0, 0 ); |
|
| 161 | + $search->setConditions($search->compare('>', 'order.base.ctime', $date)); |
|
| 162 | + $search->setSlice(0, 0); |
|
| 163 | 163 | $totalOrders = 0; |
| 164 | - $baseManager->searchItems( $search, [], $totalOrders ); |
|
| 164 | + $baseManager->searchItems($search, [], $totalOrders); |
|
| 165 | 165 | |
| 166 | - $baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' ); |
|
| 166 | + $baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product'); |
|
| 167 | 167 | $search = $baseProductManager->createSearch(); |
| 168 | - $search->setConditions( $search->compare( '>', 'order.base.product.ctime', $date ) ); |
|
| 168 | + $search->setConditions($search->compare('>', 'order.base.product.ctime', $date)); |
|
| 169 | 169 | $start = 0; |
| 170 | 170 | |
| 171 | 171 | do |
| 172 | 172 | { |
| 173 | - $totalCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' ); |
|
| 174 | - $prodIds = array_keys( $totalCounts ); |
|
| 173 | + $totalCounts = $baseProductManager->aggregate($search, 'order.base.product.productid'); |
|
| 174 | + $prodIds = array_keys($totalCounts); |
|
| 175 | 175 | |
| 176 | - foreach( $totalCounts as $id => $count ) |
|
| 176 | + foreach ($totalCounts as $id => $count) |
|
| 177 | 177 | { |
| 178 | - $this->removeListItems( $id, $typeItem->getId() ); |
|
| 178 | + $this->removeListItems($id, $typeItem->getId()); |
|
| 179 | 179 | |
| 180 | - if( $count / $totalOrders > $minSupport ) |
|
| 180 | + if ($count / $totalOrders > $minSupport) |
|
| 181 | 181 | { |
| 182 | - $productIds = $this->getSuggestions( $id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date ); |
|
| 183 | - $this->addListItems( $id, $typeItem->getId(), $productIds ); |
|
| 182 | + $productIds = $this->getSuggestions($id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date); |
|
| 183 | + $this->addListItems($id, $typeItem->getId(), $productIds); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - $count = count( $totalCounts ); |
|
| 187 | + $count = count($totalCounts); |
|
| 188 | 188 | $start += $count; |
| 189 | - $search->setSlice( $start ); |
|
| 189 | + $search->setSlice($start); |
|
| 190 | 190 | } |
| 191 | - while( $count >= $search->getSliceSize() ); |
|
| 191 | + while ($count >= $search->getSliceSize()); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
@@ -205,59 +205,59 @@ discard block |
||
| 205 | 205 | * @param string $date Date in YYYY-MM-DD HH:mm:ss format after which orders should be used for calculations |
| 206 | 206 | * @return array List of suggested product IDs as key and their confidence as value |
| 207 | 207 | */ |
| 208 | - protected function getSuggestions( $id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date ) |
|
| 208 | + protected function getSuggestions($id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date) |
|
| 209 | 209 | { |
| 210 | 210 | $refIds = []; |
| 211 | 211 | $context = $this->getContext(); |
| 212 | 212 | |
| 213 | - $catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' ); |
|
| 214 | - $baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' ); |
|
| 213 | + $catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists'); |
|
| 214 | + $baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product'); |
|
| 215 | 215 | |
| 216 | 216 | |
| 217 | 217 | $search = $baseProductManager->createSearch(); |
| 218 | - $func = $search->createFunction( 'order.base.product.count', array( (string) $id ) ); |
|
| 218 | + $func = $search->createFunction('order.base.product.count', array((string) $id)); |
|
| 219 | 219 | $expr = array( |
| 220 | - $search->compare( '==', 'order.base.product.productid', $prodIds ), |
|
| 221 | - $search->compare( '>', 'order.base.product.ctime', $date ), |
|
| 222 | - $search->compare( '==', $func, 1 ), |
|
| 220 | + $search->compare('==', 'order.base.product.productid', $prodIds), |
|
| 221 | + $search->compare('>', 'order.base.product.ctime', $date), |
|
| 222 | + $search->compare('==', $func, 1), |
|
| 223 | 223 | ); |
| 224 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 224 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 225 | 225 | |
| 226 | - $relativeCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' ); |
|
| 226 | + $relativeCounts = $baseProductManager->aggregate($search, 'order.base.product.productid'); |
|
| 227 | 227 | |
| 228 | 228 | |
| 229 | 229 | $search = $catalogListManager->createSearch(); |
| 230 | 230 | $expr = array( |
| 231 | - $search->compare( '==', 'catalog.lists.refid', array_keys( $relativeCounts ) ), |
|
| 232 | - $search->compare( '==', 'catalog.lists.domain', 'product' ), |
|
| 231 | + $search->compare('==', 'catalog.lists.refid', array_keys($relativeCounts)), |
|
| 232 | + $search->compare('==', 'catalog.lists.domain', 'product'), |
|
| 233 | 233 | ); |
| 234 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 234 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 235 | 235 | |
| 236 | - foreach( $catalogListManager->searchItems( $search ) as $listItem ) { |
|
| 236 | + foreach ($catalogListManager->searchItems($search) as $listItem) { |
|
| 237 | 237 | $refIds[$listItem->getRefId()] = true; |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | |
| 241 | - unset( $relativeCounts[$id] ); |
|
| 241 | + unset($relativeCounts[$id]); |
|
| 242 | 242 | $supportA = $count / $total; |
| 243 | 243 | $products = []; |
| 244 | 244 | |
| 245 | - foreach( $relativeCounts as $prodId => $relCnt ) |
|
| 245 | + foreach ($relativeCounts as $prodId => $relCnt) |
|
| 246 | 246 | { |
| 247 | - if( !isset( $refIds[$prodId] ) ) { |
|
| 247 | + if (!isset($refIds[$prodId])) { |
|
| 248 | 248 | continue; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | $supportAB = $relCnt / $total; |
| 252 | 252 | |
| 253 | - if( $supportAB > $minSupport && ( $conf = ( $supportAB / $supportA ) ) > $minConfidence ) { |
|
| 253 | + if ($supportAB > $minSupport && ($conf = ($supportAB / $supportA)) > $minConfidence) { |
|
| 254 | 254 | $products[$prodId] = $conf; |
| 255 | 255 | } |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - arsort( $products ); |
|
| 258 | + arsort($products); |
|
| 259 | 259 | |
| 260 | - return array_keys( array_slice( $products, 0, $maxItems, true ) ); |
|
| 260 | + return array_keys(array_slice($products, 0, $maxItems, true)); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | |
@@ -268,26 +268,26 @@ discard block |
||
| 268 | 268 | * @param integer $typeId Unique ID of the list type used for the referenced products |
| 269 | 269 | * @param array $productIds List of position as key and product ID as value |
| 270 | 270 | */ |
| 271 | - protected function addListItems( $productId, $typeId, array $productIds ) |
|
| 271 | + protected function addListItems($productId, $typeId, array $productIds) |
|
| 272 | 272 | { |
| 273 | - if( empty( $productIds ) ) { |
|
| 273 | + if (empty($productIds)) { |
|
| 274 | 274 | return; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
| 277 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
| 278 | 278 | $item = $manager->createItem(); |
| 279 | 279 | |
| 280 | - foreach( $productIds as $pos => $refid ) |
|
| 280 | + foreach ($productIds as $pos => $refid) |
|
| 281 | 281 | { |
| 282 | - $item->setId( null ); |
|
| 283 | - $item->setParentId( $productId ); |
|
| 284 | - $item->setDomain( 'product' ); |
|
| 285 | - $item->setTypeId( $typeId ); |
|
| 286 | - $item->setPosition( $pos ); |
|
| 287 | - $item->setRefId( $refid ); |
|
| 288 | - $item->setStatus( 1 ); |
|
| 289 | - |
|
| 290 | - $manager->saveItem( $item, false ); |
|
| 282 | + $item->setId(null); |
|
| 283 | + $item->setParentId($productId); |
|
| 284 | + $item->setDomain('product'); |
|
| 285 | + $item->setTypeId($typeId); |
|
| 286 | + $item->setPosition($pos); |
|
| 287 | + $item->setRefId($refid); |
|
| 288 | + $item->setStatus(1); |
|
| 289 | + |
|
| 290 | + $manager->saveItem($item, false); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
@@ -298,20 +298,20 @@ discard block |
||
| 298 | 298 | * @param string $productId Unique ID of the product the references should be removed from |
| 299 | 299 | * @param integer $typeId Unique ID of the list type the referenced products should be removed from |
| 300 | 300 | */ |
| 301 | - protected function removeListItems( $productId, $typeId ) |
|
| 301 | + protected function removeListItems($productId, $typeId) |
|
| 302 | 302 | { |
| 303 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
| 303 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
| 304 | 304 | |
| 305 | 305 | $search = $manager->createSearch(); |
| 306 | 306 | $expr = array( |
| 307 | - $search->compare( '==', 'product.lists.parentid', $productId ), |
|
| 308 | - $search->compare( '==', 'product.lists.domain', 'product' ), |
|
| 309 | - $search->compare( '==', 'product.lists.typeid', $typeId ), |
|
| 307 | + $search->compare('==', 'product.lists.parentid', $productId), |
|
| 308 | + $search->compare('==', 'product.lists.domain', 'product'), |
|
| 309 | + $search->compare('==', 'product.lists.typeid', $typeId), |
|
| 310 | 310 | ); |
| 311 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 311 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 312 | 312 | |
| 313 | - $listItems = $manager->searchItems( $search ); |
|
| 313 | + $listItems = $manager->searchItems($search); |
|
| 314 | 314 | |
| 315 | - $manager->deleteItems( array_keys( $listItems ) ); |
|
| 315 | + $manager->deleteItems(array_keys($listItems)); |
|
| 316 | 316 | } |
| 317 | 317 | } |
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - \Aimeos\MShop\Factory::setCache( true ); |
|
| 20 | + \Aimeos\MShop\Factory::setCache(true); |
|
| 21 | 21 | |
| 22 | 22 | $this->context = \TestHelperCntl::getContext(); |
| 23 | - $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] ); |
|
| 23 | + $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | protected function tearDown() |
| 28 | 28 | { |
| 29 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 29 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 30 | 30 | \Aimeos\MShop\Factory::clear(); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -43,21 +43,21 @@ discard block |
||
| 43 | 43 | 1 => '2000-01-01 00:00:00', |
| 44 | 44 | ); |
| 45 | 45 | |
| 46 | - $product = $this->create( 'job_csv_test' ); |
|
| 46 | + $product = $this->create('job_csv_test'); |
|
| 47 | 47 | |
| 48 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 49 | - $object->process( $product, $data ); |
|
| 48 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
| 49 | + $object->process($product, $data); |
|
| 50 | 50 | |
| 51 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 52 | - $this->delete( $product ); |
|
| 51 | + $items = $this->getStockItems($product->getCode()); |
|
| 52 | + $this->delete($product); |
|
| 53 | 53 | |
| 54 | 54 | |
| 55 | - $this->assertEquals( 1, count( $items ) ); |
|
| 55 | + $this->assertEquals(1, count($items)); |
|
| 56 | 56 | |
| 57 | - foreach( $items as $item ) |
|
| 57 | + foreach ($items as $item) |
|
| 58 | 58 | { |
| 59 | - $this->assertEquals( 100, $item->getStocklevel() ); |
|
| 60 | - $this->assertEquals( '2000-01-01 00:00:00', $item->getDateBack() ); |
|
| 59 | + $this->assertEquals(100, $item->getStocklevel()); |
|
| 60 | + $this->assertEquals('2000-01-01 00:00:00', $item->getDateBack()); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
@@ -78,19 +78,19 @@ discard block |
||
| 78 | 78 | 3 => '200', |
| 79 | 79 | ); |
| 80 | 80 | |
| 81 | - $product = $this->create( 'job_csv_test' ); |
|
| 81 | + $product = $this->create('job_csv_test'); |
|
| 82 | 82 | |
| 83 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 84 | - $object->process( $product, $data ); |
|
| 83 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
| 84 | + $object->process($product, $data); |
|
| 85 | 85 | |
| 86 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 87 | - $this->delete( $product ); |
|
| 86 | + $items = $this->getStockItems($product->getCode()); |
|
| 87 | + $this->delete($product); |
|
| 88 | 88 | |
| 89 | 89 | |
| 90 | - $this->assertEquals( 2, count( $items ) ); |
|
| 90 | + $this->assertEquals(2, count($items)); |
|
| 91 | 91 | |
| 92 | - foreach( $items as $item ) { |
|
| 93 | - $this->assertEquals( 200, $item->getStocklevel() ); |
|
| 92 | + foreach ($items as $item) { |
|
| 93 | + $this->assertEquals(200, $item->getStocklevel()); |
|
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |
@@ -109,21 +109,21 @@ discard block |
||
| 109 | 109 | 0 => '20', |
| 110 | 110 | ); |
| 111 | 111 | |
| 112 | - $product = $this->create( 'job_csv_test' ); |
|
| 112 | + $product = $this->create('job_csv_test'); |
|
| 113 | 113 | |
| 114 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 114 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
| 115 | 115 | |
| 116 | - $object->process( $product, $data ); |
|
| 117 | - $object->process( $product, $dataUpdate ); |
|
| 116 | + $object->process($product, $data); |
|
| 117 | + $object->process($product, $dataUpdate); |
|
| 118 | 118 | |
| 119 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 120 | - $this->delete( $product ); |
|
| 119 | + $items = $this->getStockItems($product->getCode()); |
|
| 120 | + $this->delete($product); |
|
| 121 | 121 | |
| 122 | 122 | |
| 123 | - $item = reset( $items ); |
|
| 123 | + $item = reset($items); |
|
| 124 | 124 | |
| 125 | - $this->assertEquals( 1, count( $items ) ); |
|
| 126 | - $this->assertEquals( 20, $item->getStocklevel() ); |
|
| 125 | + $this->assertEquals(1, count($items)); |
|
| 126 | + $this->assertEquals(20, $item->getStocklevel()); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | |
@@ -137,19 +137,19 @@ discard block |
||
| 137 | 137 | 0 => 50, |
| 138 | 138 | ); |
| 139 | 139 | |
| 140 | - $product = $this->create( 'job_csv_test' ); |
|
| 140 | + $product = $this->create('job_csv_test'); |
|
| 141 | 141 | |
| 142 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 143 | - $object->process( $product, $data ); |
|
| 142 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
| 143 | + $object->process($product, $data); |
|
| 144 | 144 | |
| 145 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, [], $this->endpoint ); |
|
| 146 | - $object->process( $product, [] ); |
|
| 145 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, [], $this->endpoint); |
|
| 146 | + $object->process($product, []); |
|
| 147 | 147 | |
| 148 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 149 | - $this->delete( $product ); |
|
| 148 | + $items = $this->getStockItems($product->getCode()); |
|
| 149 | + $this->delete($product); |
|
| 150 | 150 | |
| 151 | 151 | |
| 152 | - $this->assertEquals( 0, count( $items ) ); |
|
| 152 | + $this->assertEquals(0, count($items)); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | |
@@ -167,20 +167,20 @@ discard block |
||
| 167 | 167 | 2 => '', |
| 168 | 168 | ); |
| 169 | 169 | |
| 170 | - $product = $this->create( 'job_csv_test' ); |
|
| 170 | + $product = $this->create('job_csv_test'); |
|
| 171 | 171 | |
| 172 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 173 | - $object->process( $product, $data ); |
|
| 172 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint); |
|
| 173 | + $object->process($product, $data); |
|
| 174 | 174 | |
| 175 | - $items = $this->getStockItems( $product->getCode() ); |
|
| 176 | - $this->delete( $product ); |
|
| 175 | + $items = $this->getStockItems($product->getCode()); |
|
| 176 | + $this->delete($product); |
|
| 177 | 177 | |
| 178 | - $this->assertEquals( 1, count( $items ) ); |
|
| 178 | + $this->assertEquals(1, count($items)); |
|
| 179 | 179 | |
| 180 | - foreach( $items as $item ) |
|
| 180 | + foreach ($items as $item) |
|
| 181 | 181 | { |
| 182 | - $this->assertEquals( null, $item->getStocklevel() ); |
|
| 183 | - $this->assertEquals( null, $item->getDateBack() ); |
|
| 182 | + $this->assertEquals(null, $item->getStocklevel()); |
|
| 183 | + $this->assertEquals(null, $item->getDateBack()); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | |
@@ -188,41 +188,41 @@ discard block |
||
| 188 | 188 | /** |
| 189 | 189 | * @param string $code |
| 190 | 190 | */ |
| 191 | - protected function create( $code ) |
|
| 191 | + protected function create($code) |
|
| 192 | 192 | { |
| 193 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 194 | - $typeManager = $manager->getSubManager( 'type' ); |
|
| 193 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 194 | + $typeManager = $manager->getSubManager('type'); |
|
| 195 | 195 | |
| 196 | 196 | $typeSearch = $typeManager->createSearch(); |
| 197 | - $typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) ); |
|
| 198 | - $typeResult = $typeManager->searchItems( $typeSearch ); |
|
| 197 | + $typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default')); |
|
| 198 | + $typeResult = $typeManager->searchItems($typeSearch); |
|
| 199 | 199 | |
| 200 | - if( ( $typeItem = reset( $typeResult ) ) === false ) { |
|
| 201 | - throw new \RuntimeException( 'No product type "default" found' ); |
|
| 200 | + if (($typeItem = reset($typeResult)) === false) { |
|
| 201 | + throw new \RuntimeException('No product type "default" found'); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | $item = $manager->createItem(); |
| 205 | - $item->setTypeid( $typeItem->getId() ); |
|
| 206 | - $item->setCode( $code ); |
|
| 205 | + $item->setTypeid($typeItem->getId()); |
|
| 206 | + $item->setCode($code); |
|
| 207 | 207 | |
| 208 | - return $manager->saveItem( $item ); |
|
| 208 | + return $manager->saveItem($item); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | |
| 212 | - protected function delete( \Aimeos\MShop\Product\Item\Iface $product ) |
|
| 212 | + protected function delete(\Aimeos\MShop\Product\Item\Iface $product) |
|
| 213 | 213 | { |
| 214 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 215 | - $manager->deleteItem( $product->getId() ); |
|
| 214 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 215 | + $manager->deleteItem($product->getId()); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | |
| 219 | - protected function getStockItems( $code ) |
|
| 219 | + protected function getStockItems($code) |
|
| 220 | 220 | { |
| 221 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' ); |
|
| 221 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'stock'); |
|
| 222 | 222 | |
| 223 | 223 | $search = $manager->createSearch(); |
| 224 | - $search->setConditions( $search->compare( '==', 'stock.productcode', $code ) ); |
|
| 224 | + $search->setConditions($search->compare('==', 'stock.productcode', $code)); |
|
| 225 | 225 | |
| 226 | - return $manager->searchItems( $search ); |
|
| 226 | + return $manager->searchItems($search); |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | \ No newline at end of file |
@@ -15,16 +15,16 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | protected function setUp() |
| 17 | 17 | { |
| 18 | - \Aimeos\MShop\Factory::setCache( true ); |
|
| 18 | + \Aimeos\MShop\Factory::setCache(true); |
|
| 19 | 19 | |
| 20 | 20 | $this->context = \TestHelperCntl::getContext(); |
| 21 | - $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] ); |
|
| 21 | + $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | protected function tearDown() |
| 26 | 26 | { |
| 27 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 27 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 28 | 28 | \Aimeos\MShop\Factory::clear(); |
| 29 | 29 | } |
| 30 | 30 | |
@@ -45,26 +45,26 @@ discard block |
||
| 45 | 45 | 3 => 'CNE', |
| 46 | 46 | ); |
| 47 | 47 | |
| 48 | - $product = $this->create( 'job_csv_test' ); |
|
| 48 | + $product = $this->create('job_csv_test'); |
|
| 49 | 49 | |
| 50 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 51 | - $object->process( $product, $data ); |
|
| 50 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 51 | + $object->process($product, $data); |
|
| 52 | 52 | |
| 53 | - $product = $this->get( 'job_csv_test' ); |
|
| 54 | - $this->delete( $product ); |
|
| 53 | + $product = $this->get('job_csv_test'); |
|
| 54 | + $this->delete($product); |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | - $listItems1 = $product->getListItems( 'product', 'default' ); |
|
| 58 | - $listItems2 = $product->getListItems( 'product', 'suggestion' ); |
|
| 57 | + $listItems1 = $product->getListItems('product', 'default'); |
|
| 58 | + $listItems2 = $product->getListItems('product', 'suggestion'); |
|
| 59 | 59 | |
| 60 | - $this->assertEquals( 1, count( $listItems1 ) ); |
|
| 61 | - $this->assertEquals( 1, count( $listItems2 ) ); |
|
| 60 | + $this->assertEquals(1, count($listItems1)); |
|
| 61 | + $this->assertEquals(1, count($listItems2)); |
|
| 62 | 62 | |
| 63 | - $this->assertEquals( 1, reset( $listItems1 )->getStatus() ); |
|
| 64 | - $this->assertEquals( 1, reset( $listItems2 )->getStatus() ); |
|
| 63 | + $this->assertEquals(1, reset($listItems1)->getStatus()); |
|
| 64 | + $this->assertEquals(1, reset($listItems2)->getStatus()); |
|
| 65 | 65 | |
| 66 | - $this->assertEquals( 'CNC', reset( $listItems1 )->getRefItem()->getCode() ); |
|
| 67 | - $this->assertEquals( 'CNE', reset( $listItems2 )->getRefItem()->getCode() ); |
|
| 66 | + $this->assertEquals('CNC', reset($listItems1)->getRefItem()->getCode()); |
|
| 67 | + $this->assertEquals('CNE', reset($listItems2)->getRefItem()->getCode()); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | |
@@ -80,27 +80,27 @@ discard block |
||
| 80 | 80 | 1 => "CNC\nCNE", |
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | - $product = $this->create( 'job_csv_test' ); |
|
| 83 | + $product = $this->create('job_csv_test'); |
|
| 84 | 84 | |
| 85 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 86 | - $object->process( $product, $data ); |
|
| 85 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 86 | + $object->process($product, $data); |
|
| 87 | 87 | |
| 88 | - $product = $this->get( 'job_csv_test' ); |
|
| 89 | - $this->delete( $product ); |
|
| 88 | + $product = $this->get('job_csv_test'); |
|
| 89 | + $this->delete($product); |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | $pos = 0; |
| 93 | - $codes = array( 'CNC', 'CNE' ); |
|
| 93 | + $codes = array('CNC', 'CNE'); |
|
| 94 | 94 | $listItems = $product->getListItems(); |
| 95 | 95 | |
| 96 | - $this->assertEquals( 2, count( $listItems ) ); |
|
| 96 | + $this->assertEquals(2, count($listItems)); |
|
| 97 | 97 | |
| 98 | - foreach( $listItems as $listItem ) |
|
| 98 | + foreach ($listItems as $listItem) |
|
| 99 | 99 | { |
| 100 | - $this->assertEquals( 1, $listItem->getStatus() ); |
|
| 101 | - $this->assertEquals( 'product', $listItem->getDomain() ); |
|
| 102 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
| 103 | - $this->assertEquals( $codes[$pos], $listItem->getRefItem()->getCode() ); |
|
| 100 | + $this->assertEquals(1, $listItem->getStatus()); |
|
| 101 | + $this->assertEquals('product', $listItem->getDomain()); |
|
| 102 | + $this->assertEquals('default', $listItem->getType()); |
|
| 103 | + $this->assertEquals($codes[$pos], $listItem->getRefItem()->getCode()); |
|
| 104 | 104 | $pos++; |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -123,26 +123,26 @@ discard block |
||
| 123 | 123 | 1 => 'CNE', |
| 124 | 124 | ); |
| 125 | 125 | |
| 126 | - $product = $this->create( 'job_csv_test' ); |
|
| 126 | + $product = $this->create('job_csv_test'); |
|
| 127 | 127 | |
| 128 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 129 | - $object->process( $product, $data ); |
|
| 128 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 129 | + $object->process($product, $data); |
|
| 130 | 130 | |
| 131 | - $product = $this->get( 'job_csv_test' ); |
|
| 131 | + $product = $this->get('job_csv_test'); |
|
| 132 | 132 | |
| 133 | - $object->process( $product, $dataUpdate ); |
|
| 133 | + $object->process($product, $dataUpdate); |
|
| 134 | 134 | |
| 135 | - $product = $this->get( 'job_csv_test' ); |
|
| 136 | - $this->delete( $product ); |
|
| 135 | + $product = $this->get('job_csv_test'); |
|
| 136 | + $this->delete($product); |
|
| 137 | 137 | |
| 138 | 138 | |
| 139 | 139 | $listItems = $product->getListItems(); |
| 140 | - $listItem = reset( $listItems ); |
|
| 140 | + $listItem = reset($listItems); |
|
| 141 | 141 | |
| 142 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 143 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
| 142 | + $this->assertEquals(1, count($listItems)); |
|
| 143 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
| 144 | 144 | |
| 145 | - $this->assertEquals( 'CNE', $listItem->getRefItem()->getCode() ); |
|
| 145 | + $this->assertEquals('CNE', $listItem->getRefItem()->getCode()); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -158,21 +158,21 @@ discard block |
||
| 158 | 158 | 1 => 'CNC', |
| 159 | 159 | ); |
| 160 | 160 | |
| 161 | - $product = $this->create( 'job_csv_test' ); |
|
| 161 | + $product = $this->create('job_csv_test'); |
|
| 162 | 162 | |
| 163 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 164 | - $object->process( $product, $data ); |
|
| 163 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 164 | + $object->process($product, $data); |
|
| 165 | 165 | |
| 166 | - $product = $this->get( 'job_csv_test' ); |
|
| 166 | + $product = $this->get('job_csv_test'); |
|
| 167 | 167 | |
| 168 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, [], $this->endpoint ); |
|
| 169 | - $object->process( $product, [] ); |
|
| 168 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, [], $this->endpoint); |
|
| 169 | + $object->process($product, []); |
|
| 170 | 170 | |
| 171 | - $product = $this->get( 'job_csv_test' ); |
|
| 172 | - $this->delete( $product ); |
|
| 171 | + $product = $this->get('job_csv_test'); |
|
| 172 | + $this->delete($product); |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - $this->assertEquals( 0, count( $product->getListItems() ) ); |
|
| 175 | + $this->assertEquals(0, count($product->getListItems())); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | |
@@ -192,18 +192,18 @@ discard block |
||
| 192 | 192 | 3 => 'CNE', |
| 193 | 193 | ); |
| 194 | 194 | |
| 195 | - $product = $this->create( 'job_csv_test' ); |
|
| 195 | + $product = $this->create('job_csv_test'); |
|
| 196 | 196 | |
| 197 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 198 | - $object->process( $product, $data ); |
|
| 197 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 198 | + $object->process($product, $data); |
|
| 199 | 199 | |
| 200 | - $product = $this->get( 'job_csv_test' ); |
|
| 201 | - $this->delete( $product ); |
|
| 200 | + $product = $this->get('job_csv_test'); |
|
| 201 | + $this->delete($product); |
|
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | $listItems = $product->getListItems(); |
| 205 | 205 | |
| 206 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 206 | + $this->assertEquals(1, count($listItems)); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | |
@@ -223,79 +223,79 @@ discard block |
||
| 223 | 223 | 3 => 'CNE', |
| 224 | 224 | ); |
| 225 | 225 | |
| 226 | - $this->context->getConfig()->set( 'controller/common/product/import/csv/processor/product/listtypes', array( 'default' ) ); |
|
| 226 | + $this->context->getConfig()->set('controller/common/product/import/csv/processor/product/listtypes', array('default')); |
|
| 227 | 227 | |
| 228 | - $product = $this->create( 'job_csv_test' ); |
|
| 228 | + $product = $this->create('job_csv_test'); |
|
| 229 | 229 | |
| 230 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 231 | - $object->process( $product, $data ); |
|
| 230 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Product\Standard($this->context, $mapping, $this->endpoint); |
|
| 231 | + $object->process($product, $data); |
|
| 232 | 232 | |
| 233 | - $product = $this->get( 'job_csv_test' ); |
|
| 234 | - $this->delete( $product ); |
|
| 233 | + $product = $this->get('job_csv_test'); |
|
| 234 | + $this->delete($product); |
|
| 235 | 235 | |
| 236 | 236 | |
| 237 | 237 | $listItems = $product->getListItems(); |
| 238 | - $listItem = reset( $listItems ); |
|
| 238 | + $listItem = reset($listItems); |
|
| 239 | 239 | |
| 240 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 241 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
| 240 | + $this->assertEquals(1, count($listItems)); |
|
| 241 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
| 242 | 242 | |
| 243 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
| 244 | - $this->assertEquals( 'CNE', $listItem->getRefItem()->getCode() ); |
|
| 243 | + $this->assertEquals('default', $listItem->getType()); |
|
| 244 | + $this->assertEquals('CNE', $listItem->getRefItem()->getCode()); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | 249 | * @param string $code |
| 250 | 250 | */ |
| 251 | - protected function create( $code ) |
|
| 251 | + protected function create($code) |
|
| 252 | 252 | { |
| 253 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 254 | - $typeManager = $manager->getSubManager( 'type' ); |
|
| 253 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 254 | + $typeManager = $manager->getSubManager('type'); |
|
| 255 | 255 | |
| 256 | 256 | $typeSearch = $typeManager->createSearch(); |
| 257 | - $typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) ); |
|
| 258 | - $typeResult = $typeManager->searchItems( $typeSearch ); |
|
| 257 | + $typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default')); |
|
| 258 | + $typeResult = $typeManager->searchItems($typeSearch); |
|
| 259 | 259 | |
| 260 | - if( ( $typeItem = reset( $typeResult ) ) === false ) { |
|
| 261 | - throw new \RuntimeException( 'No product type "default" found' ); |
|
| 260 | + if (($typeItem = reset($typeResult)) === false) { |
|
| 261 | + throw new \RuntimeException('No product type "default" found'); |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | $item = $manager->createItem(); |
| 265 | - $item->setTypeid( $typeItem->getId() ); |
|
| 266 | - $item->setCode( $code ); |
|
| 265 | + $item->setTypeid($typeItem->getId()); |
|
| 266 | + $item->setCode($code); |
|
| 267 | 267 | |
| 268 | - return $manager->saveItem( $item ); |
|
| 268 | + return $manager->saveItem($item); |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | |
| 272 | - protected function delete( \Aimeos\MShop\Product\Item\Iface $product ) |
|
| 272 | + protected function delete(\Aimeos\MShop\Product\Item\Iface $product) |
|
| 273 | 273 | { |
| 274 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 275 | - $listManager = $manager->getSubManager( 'lists' ); |
|
| 274 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 275 | + $listManager = $manager->getSubManager('lists'); |
|
| 276 | 276 | |
| 277 | - foreach( $product->getListItems('product') as $listItem ) { |
|
| 278 | - $listManager->deleteItem( $listItem->getId() ); |
|
| 277 | + foreach ($product->getListItems('product') as $listItem) { |
|
| 278 | + $listManager->deleteItem($listItem->getId()); |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - $manager->deleteItem( $product->getId() ); |
|
| 281 | + $manager->deleteItem($product->getId()); |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | |
| 285 | 285 | /** |
| 286 | 286 | * @param string $code |
| 287 | 287 | */ |
| 288 | - protected function get( $code ) |
|
| 288 | + protected function get($code) |
|
| 289 | 289 | { |
| 290 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 290 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 291 | 291 | |
| 292 | 292 | $search = $manager->createSearch(); |
| 293 | - $search->setConditions( $search->compare( '==', 'product.code', $code ) ); |
|
| 293 | + $search->setConditions($search->compare('==', 'product.code', $code)); |
|
| 294 | 294 | |
| 295 | - $result = $manager->searchItems( $search, array('product') ); |
|
| 295 | + $result = $manager->searchItems($search, array('product')); |
|
| 296 | 296 | |
| 297 | - if( ( $item = reset( $result ) ) === false ) { |
|
| 298 | - throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) ); |
|
| 297 | + if (($item = reset($result)) === false) { |
|
| 298 | + throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code)); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | return $item; |
@@ -15,16 +15,16 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | protected function setUp() |
| 17 | 17 | { |
| 18 | - \Aimeos\MShop\Factory::setCache( true ); |
|
| 18 | + \Aimeos\MShop\Factory::setCache(true); |
|
| 19 | 19 | |
| 20 | 20 | $this->context = \TestHelperCntl::getContext(); |
| 21 | - $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] ); |
|
| 21 | + $this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | protected function tearDown() |
| 26 | 26 | { |
| 27 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 27 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 28 | 28 | \Aimeos\MShop\Factory::clear(); |
| 29 | 29 | } |
| 30 | 30 | |
@@ -55,32 +55,32 @@ discard block |
||
| 55 | 55 | 8 => 'variant', |
| 56 | 56 | ); |
| 57 | 57 | |
| 58 | - $product = $this->create( 'job_csv_test' ); |
|
| 58 | + $product = $this->create('job_csv_test'); |
|
| 59 | 59 | |
| 60 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 61 | - $object->process( $product, $data ); |
|
| 60 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 61 | + $object->process($product, $data); |
|
| 62 | 62 | |
| 63 | - $product = $this->get( 'job_csv_test' ); |
|
| 64 | - $this->delete( $product ); |
|
| 63 | + $product = $this->get('job_csv_test'); |
|
| 64 | + $this->delete($product); |
|
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | $pos = 0; |
| 68 | 68 | $listItems = $product->getListItems(); |
| 69 | 69 | $expected = array( |
| 70 | - array( 'variant', 'length', '30' ), |
|
| 71 | - array( 'variant', 'width', '29' ), |
|
| 72 | - array( 'variant', 'color', 'white' ), |
|
| 70 | + array('variant', 'length', '30'), |
|
| 71 | + array('variant', 'width', '29'), |
|
| 72 | + array('variant', 'color', 'white'), |
|
| 73 | 73 | ); |
| 74 | 74 | |
| 75 | - $this->assertEquals( 3, count( $listItems ) ); |
|
| 75 | + $this->assertEquals(3, count($listItems)); |
|
| 76 | 76 | |
| 77 | - foreach( $listItems as $listItem ) |
|
| 77 | + foreach ($listItems as $listItem) |
|
| 78 | 78 | { |
| 79 | - $this->assertEquals( 1, $listItem->getStatus() ); |
|
| 80 | - $this->assertEquals( 'attribute', $listItem->getDomain() ); |
|
| 81 | - $this->assertEquals( $expected[$pos][0], $listItem->getType() ); |
|
| 82 | - $this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getType() ); |
|
| 83 | - $this->assertEquals( $expected[$pos][2], $listItem->getRefItem()->getCode() ); |
|
| 79 | + $this->assertEquals(1, $listItem->getStatus()); |
|
| 80 | + $this->assertEquals('attribute', $listItem->getDomain()); |
|
| 81 | + $this->assertEquals($expected[$pos][0], $listItem->getType()); |
|
| 82 | + $this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getType()); |
|
| 83 | + $this->assertEquals($expected[$pos][2], $listItem->getRefItem()->getCode()); |
|
| 84 | 84 | $pos++; |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -100,29 +100,29 @@ discard block |
||
| 100 | 100 | 2 => 'variant', |
| 101 | 101 | ); |
| 102 | 102 | |
| 103 | - $product = $this->create( 'job_csv_test' ); |
|
| 103 | + $product = $this->create('job_csv_test'); |
|
| 104 | 104 | |
| 105 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 106 | - $object->process( $product, $data ); |
|
| 105 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint); |
|
| 106 | + $object->process($product, $data); |
|
| 107 | 107 | |
| 108 | - $product = $this->get( 'job_csv_test' ); |
|
| 108 | + $product = $this->get('job_csv_test'); |
|
| 109 | 109 | |
| 110 | - $this->delete( $product ); |
|
| 110 | + $this->delete($product); |
|
| 111 | 111 | |
| 112 | 112 | |
| 113 | 113 | $pos = 0; |
| 114 | - $codes = array( 'white', 'black', 'aimeos' ); |
|
| 114 | + $codes = array('white', 'black', 'aimeos'); |
|
| 115 | 115 | |
| 116 | - foreach( $product->getListItems() as $listItems ) |
|
| 116 | + foreach ($product->getListItems() as $listItems) |
|
| 117 | 117 | { |
| 118 | - $this->assertEquals( 3, count( $listItems ) ); |
|
| 118 | + $this->assertEquals(3, count($listItems)); |
|
| 119 | 119 | |
| 120 | - foreach( $listItems as $listItem ) |
|
| 120 | + foreach ($listItems as $listItem) |
|
| 121 | 121 | { |
| 122 | - $this->assertEquals( 1, $listItem->getStatus() ); |
|
| 123 | - $this->assertEquals( 'attribute', $listItem->getDomain() ); |
|
| 124 | - $this->assertEquals( 'variant', $listItem->getType() ); |
|
| 125 | - $this->assertEquals( $codes[$pos], $listItem->getRefItem()->getCode() ); |
|
| 122 | + $this->assertEquals(1, $listItem->getStatus()); |
|
| 123 | + $this->assertEquals('attribute', $listItem->getDomain()); |
|
| 124 | + $this->assertEquals('variant', $listItem->getType()); |
|
| 125 | + $this->assertEquals($codes[$pos], $listItem->getRefItem()->getCode()); |
|
| 126 | 126 | $pos++; |
| 127 | 127 | } |
| 128 | 128 | } |
@@ -146,27 +146,27 @@ discard block |
||
| 146 | 146 | 1 => '29', |
| 147 | 147 | ); |
| 148 | 148 | |
| 149 | - $product = $this->create( 'job_csv_test' ); |
|
| 149 | + $product = $this->create('job_csv_test'); |
|
| 150 | 150 | |
| 151 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 152 | - $object->process( $product, $data ); |
|
| 151 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 152 | + $object->process($product, $data); |
|
| 153 | 153 | |
| 154 | - $product = $this->get( 'job_csv_test' ); |
|
| 154 | + $product = $this->get('job_csv_test'); |
|
| 155 | 155 | |
| 156 | - $object->process( $product, $dataUpdate ); |
|
| 156 | + $object->process($product, $dataUpdate); |
|
| 157 | 157 | |
| 158 | - $product = $this->get( 'job_csv_test' ); |
|
| 159 | - $this->delete( $product ); |
|
| 158 | + $product = $this->get('job_csv_test'); |
|
| 159 | + $this->delete($product); |
|
| 160 | 160 | |
| 161 | 161 | |
| 162 | 162 | $listItems = $product->getListItems(); |
| 163 | - $listItem = reset( $listItems ); |
|
| 163 | + $listItem = reset($listItems); |
|
| 164 | 164 | |
| 165 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 166 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
| 165 | + $this->assertEquals(1, count($listItems)); |
|
| 166 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
| 167 | 167 | |
| 168 | - $this->assertEquals( 'width', $listItem->getRefItem()->getType() ); |
|
| 169 | - $this->assertEquals( '29', $listItem->getRefItem()->getCode() ); |
|
| 168 | + $this->assertEquals('width', $listItem->getRefItem()->getType()); |
|
| 169 | + $this->assertEquals('29', $listItem->getRefItem()->getCode()); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | |
@@ -182,23 +182,23 @@ discard block |
||
| 182 | 182 | 1 => '30', |
| 183 | 183 | ); |
| 184 | 184 | |
| 185 | - $product = $this->create( 'job_csv_test' ); |
|
| 185 | + $product = $this->create('job_csv_test'); |
|
| 186 | 186 | |
| 187 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 188 | - $object->process( $product, $data ); |
|
| 187 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 188 | + $object->process($product, $data); |
|
| 189 | 189 | |
| 190 | - $product = $this->get( 'job_csv_test' ); |
|
| 190 | + $product = $this->get('job_csv_test'); |
|
| 191 | 191 | |
| 192 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, [], $this->endpoint ); |
|
| 193 | - $object->process( $product, [] ); |
|
| 192 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, [], $this->endpoint); |
|
| 193 | + $object->process($product, []); |
|
| 194 | 194 | |
| 195 | - $product = $this->get( 'job_csv_test' ); |
|
| 196 | - $this->delete( $product ); |
|
| 195 | + $product = $this->get('job_csv_test'); |
|
| 196 | + $this->delete($product); |
|
| 197 | 197 | |
| 198 | 198 | |
| 199 | 199 | $listItems = $product->getListItems(); |
| 200 | 200 | |
| 201 | - $this->assertEquals( 0, count( $listItems ) ); |
|
| 201 | + $this->assertEquals(0, count($listItems)); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | |
@@ -218,18 +218,18 @@ discard block |
||
| 218 | 218 | 3 => '30', |
| 219 | 219 | ); |
| 220 | 220 | |
| 221 | - $product = $this->create( 'job_csv_test' ); |
|
| 221 | + $product = $this->create('job_csv_test'); |
|
| 222 | 222 | |
| 223 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 224 | - $object->process( $product, $data ); |
|
| 223 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 224 | + $object->process($product, $data); |
|
| 225 | 225 | |
| 226 | - $product = $this->get( 'job_csv_test' ); |
|
| 227 | - $this->delete( $product ); |
|
| 226 | + $product = $this->get('job_csv_test'); |
|
| 227 | + $this->delete($product); |
|
| 228 | 228 | |
| 229 | 229 | |
| 230 | 230 | $listItems = $product->getListItems(); |
| 231 | 231 | |
| 232 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 232 | + $this->assertEquals(1, count($listItems)); |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | |
@@ -245,19 +245,19 @@ discard block |
||
| 245 | 245 | 1 => '30', |
| 246 | 246 | ); |
| 247 | 247 | |
| 248 | - $product = $this->create( 'job_csv_test' ); |
|
| 248 | + $product = $this->create('job_csv_test'); |
|
| 249 | 249 | |
| 250 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 250 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 251 | 251 | |
| 252 | 252 | try { |
| 253 | - $object->process( $product, $data ); |
|
| 254 | - } catch( \Exception $e ) { |
|
| 255 | - $this->delete( $product ); |
|
| 253 | + $object->process($product, $data); |
|
| 254 | + } catch (\Exception $e) { |
|
| 255 | + $this->delete($product); |
|
| 256 | 256 | return; |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - $this->delete( $product ); |
|
| 260 | - $this->markTestFail( 'No exception thrown' ); |
|
| 259 | + $this->delete($product); |
|
| 260 | + $this->markTestFail('No exception thrown'); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | |
@@ -281,80 +281,80 @@ discard block |
||
| 281 | 281 | 5 => 'default', |
| 282 | 282 | ); |
| 283 | 283 | |
| 284 | - $this->context->getConfig()->set( 'controller/common/product/import/csv/processor/attribute/listtypes', array( 'default' ) ); |
|
| 284 | + $this->context->getConfig()->set('controller/common/product/import/csv/processor/attribute/listtypes', array('default')); |
|
| 285 | 285 | |
| 286 | - $product = $this->create( 'job_csv_test' ); |
|
| 286 | + $product = $this->create('job_csv_test'); |
|
| 287 | 287 | |
| 288 | - $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint ); |
|
| 289 | - $object->process( $product, $data ); |
|
| 288 | + $object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint); |
|
| 289 | + $object->process($product, $data); |
|
| 290 | 290 | |
| 291 | - $product = $this->get( 'job_csv_test' ); |
|
| 292 | - $this->delete( $product ); |
|
| 291 | + $product = $this->get('job_csv_test'); |
|
| 292 | + $this->delete($product); |
|
| 293 | 293 | |
| 294 | 294 | |
| 295 | 295 | $listItems = $product->getListItems(); |
| 296 | - $listItem = reset( $listItems ); |
|
| 296 | + $listItem = reset($listItems); |
|
| 297 | 297 | |
| 298 | - $this->assertEquals( 1, count( $listItems ) ); |
|
| 299 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem ); |
|
| 298 | + $this->assertEquals(1, count($listItems)); |
|
| 299 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem); |
|
| 300 | 300 | |
| 301 | - $this->assertEquals( 'default', $listItem->getType() ); |
|
| 302 | - $this->assertEquals( 'width', $listItem->getRefItem()->getType() ); |
|
| 303 | - $this->assertEquals( '30', $listItem->getRefItem()->getCode() ); |
|
| 301 | + $this->assertEquals('default', $listItem->getType()); |
|
| 302 | + $this->assertEquals('width', $listItem->getRefItem()->getType()); |
|
| 303 | + $this->assertEquals('30', $listItem->getRefItem()->getCode()); |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | 308 | * @param string $code |
| 309 | 309 | */ |
| 310 | - protected function create( $code ) |
|
| 310 | + protected function create($code) |
|
| 311 | 311 | { |
| 312 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 313 | - $typeManager = $manager->getSubManager( 'type' ); |
|
| 312 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 313 | + $typeManager = $manager->getSubManager('type'); |
|
| 314 | 314 | |
| 315 | 315 | $typeSearch = $typeManager->createSearch(); |
| 316 | - $typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) ); |
|
| 317 | - $typeResult = $typeManager->searchItems( $typeSearch ); |
|
| 316 | + $typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default')); |
|
| 317 | + $typeResult = $typeManager->searchItems($typeSearch); |
|
| 318 | 318 | |
| 319 | - if( ( $typeItem = reset( $typeResult ) ) === false ) { |
|
| 320 | - throw new \RuntimeException( 'No product type "default" found' ); |
|
| 319 | + if (($typeItem = reset($typeResult)) === false) { |
|
| 320 | + throw new \RuntimeException('No product type "default" found'); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $item = $manager->createItem(); |
| 324 | - $item->setTypeid( $typeItem->getId() ); |
|
| 325 | - $item->setCode( $code ); |
|
| 324 | + $item->setTypeid($typeItem->getId()); |
|
| 325 | + $item->setCode($code); |
|
| 326 | 326 | |
| 327 | - return $manager->saveItem( $item ); |
|
| 327 | + return $manager->saveItem($item); |
|
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | |
| 331 | - protected function delete( \Aimeos\MShop\Product\Item\Iface $product ) |
|
| 331 | + protected function delete(\Aimeos\MShop\Product\Item\Iface $product) |
|
| 332 | 332 | { |
| 333 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 334 | - $listManager = $manager->getSubManager( 'lists' ); |
|
| 333 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 334 | + $listManager = $manager->getSubManager('lists'); |
|
| 335 | 335 | |
| 336 | - foreach( $product->getListItems('attribute') as $listItem ) { |
|
| 337 | - $listManager->deleteItem( $listItem->getId() ); |
|
| 336 | + foreach ($product->getListItems('attribute') as $listItem) { |
|
| 337 | + $listManager->deleteItem($listItem->getId()); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - $manager->deleteItem( $product->getId() ); |
|
| 340 | + $manager->deleteItem($product->getId()); |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | |
| 344 | 344 | /** |
| 345 | 345 | * @param string $code |
| 346 | 346 | */ |
| 347 | - protected function get( $code ) |
|
| 347 | + protected function get($code) |
|
| 348 | 348 | { |
| 349 | - $manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context ); |
|
| 349 | + $manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context); |
|
| 350 | 350 | |
| 351 | 351 | $search = $manager->createSearch(); |
| 352 | - $search->setConditions( $search->compare( '==', 'product.code', $code ) ); |
|
| 352 | + $search->setConditions($search->compare('==', 'product.code', $code)); |
|
| 353 | 353 | |
| 354 | - $result = $manager->searchItems( $search, array('attribute') ); |
|
| 354 | + $result = $manager->searchItems($search, array('attribute')); |
|
| 355 | 355 | |
| 356 | - if( ( $item = reset( $result ) ) === false ) { |
|
| 357 | - throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) ); |
|
| 356 | + if (($item = reset($result)) === false) { |
|
| 357 | + throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code)); |
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | return $item; |
@@ -15,14 +15,14 @@ discard block |
||
| 15 | 15 | public static function bootstrap() |
| 16 | 16 | { |
| 17 | 17 | self::getAimeos(); |
| 18 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 18 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
| 22 | - public static function getContext( $site = 'unittest' ) |
|
| 22 | + public static function getContext($site = 'unittest') |
|
| 23 | 23 | { |
| 24 | - if( !isset( self::$context[$site] ) ) { |
|
| 25 | - self::$context[$site] = self::createContext( $site ); |
|
| 24 | + if (!isset(self::$context[$site])) { |
|
| 25 | + self::$context[$site] = self::createContext($site); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | return clone self::$context[$site]; |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | public static function getAimeos() |
| 33 | 33 | { |
| 34 | - if( !isset( self::$aimeos ) ) |
|
| 34 | + if (!isset(self::$aimeos)) |
|
| 35 | 35 | { |
| 36 | 36 | require_once 'Bootstrap.php'; |
| 37 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
| 37 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
| 38 | 38 | |
| 39 | - $extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); |
|
| 40 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
| 39 | + $extdir = dirname(dirname(dirname(dirname(dirname(__FILE__))))); |
|
| 40 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | return self::$aimeos; |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | public static function getControllerPaths() |
| 48 | 48 | { |
| 49 | - return self::getAimeos()->getCustomPaths( 'controller/jobs' ); |
|
| 49 | + return self::getAimeos()->getCustomPaths('controller/jobs'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @param string $site |
| 55 | 55 | */ |
| 56 | - private static function createContext( $site ) |
|
| 56 | + private static function createContext($site) |
|
| 57 | 57 | { |
| 58 | 58 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 59 | 59 | $aimeos = self::getAimeos(); |
@@ -63,76 +63,76 @@ discard block |
||
| 63 | 63 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
| 64 | 64 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
| 65 | 65 | |
| 66 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
| 67 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
| 68 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
| 69 | - $ctx->setConfig( $conf ); |
|
| 66 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
| 67 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
| 68 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
| 69 | + $ctx->setConfig($conf); |
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 73 | - $ctx->setLogger( $logger ); |
|
| 72 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 73 | + $ctx->setLogger($logger); |
|
| 74 | 74 | |
| 75 | 75 | |
| 76 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 77 | - $ctx->setDatabaseManager( $dbm ); |
|
| 76 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 77 | + $ctx->setDatabaseManager($dbm); |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | - $fs = new \Aimeos\MW\Filesystem\Manager\Standard( $conf ); |
|
| 81 | - $ctx->setFilesystemManager( $fs ); |
|
| 80 | + $fs = new \Aimeos\MW\Filesystem\Manager\Standard($conf); |
|
| 81 | + $ctx->setFilesystemManager($fs); |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf ); |
|
| 85 | - $ctx->setMessageQueueManager( $mq ); |
|
| 84 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($conf); |
|
| 85 | + $ctx->setMessageQueueManager($mq); |
|
| 86 | 86 | |
| 87 | 87 | |
| 88 | 88 | $session = new \Aimeos\MW\Session\None(); |
| 89 | - $ctx->setSession( $session ); |
|
| 89 | + $ctx->setSession($session); |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
| 93 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
| 92 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
| 93 | + $ctx->setI18n(array('de' => $i18n)); |
|
| 94 | 94 | |
| 95 | 95 | |
| 96 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 97 | - $locale = $localeManager->bootstrap( $site, 'de', '', false ); |
|
| 98 | - $ctx->setLocale( $locale ); |
|
| 96 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 97 | + $locale = $localeManager->bootstrap($site, 'de', '', false); |
|
| 98 | + $ctx->setLocale($locale); |
|
| 99 | 99 | |
| 100 | 100 | |
| 101 | - $view = self::createView( $conf ); |
|
| 102 | - $ctx->setView( $view ); |
|
| 101 | + $view = self::createView($conf); |
|
| 102 | + $ctx->setView($view); |
|
| 103 | 103 | |
| 104 | 104 | |
| 105 | - $ctx->setEditor( 'core:controller/jobs' ); |
|
| 105 | + $ctx->setEditor('core:controller/jobs'); |
|
| 106 | 106 | |
| 107 | 107 | return $ctx; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | |
| 111 | - protected static function createView( \Aimeos\MW\Config\Iface $config ) |
|
| 111 | + protected static function createView(\Aimeos\MW\Config\Iface $config) |
|
| 112 | 112 | { |
| 113 | 113 | $tmplpaths = array_merge_recursive( |
| 114 | - self::getAimeos()->getCustomPaths( 'client/html/templates' ), |
|
| 115 | - self::getAimeos()->getCustomPaths( 'controller/jobs/templates' ) |
|
| 114 | + self::getAimeos()->getCustomPaths('client/html/templates'), |
|
| 115 | + self::getAimeos()->getCustomPaths('controller/jobs/templates') |
|
| 116 | 116 | ); |
| 117 | 117 | |
| 118 | - $view = new \Aimeos\MW\View\Standard( $tmplpaths ); |
|
| 118 | + $view = new \Aimeos\MW\View\Standard($tmplpaths); |
|
| 119 | 119 | |
| 120 | - $trans = new \Aimeos\MW\Translation\None( 'de_DE' ); |
|
| 121 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans ); |
|
| 122 | - $view->addHelper( 'translate', $helper ); |
|
| 120 | + $trans = new \Aimeos\MW\Translation\None('de_DE'); |
|
| 121 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans); |
|
| 122 | + $view->addHelper('translate', $helper); |
|
| 123 | 123 | |
| 124 | - $helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' ); |
|
| 125 | - $view->addHelper( 'url', $helper ); |
|
| 124 | + $helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl'); |
|
| 125 | + $view->addHelper('url', $helper); |
|
| 126 | 126 | |
| 127 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' ); |
|
| 128 | - $view->addHelper( 'number', $helper ); |
|
| 127 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', ''); |
|
| 128 | + $view->addHelper('number', $helper); |
|
| 129 | 129 | |
| 130 | - $helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' ); |
|
| 131 | - $view->addHelper( 'date', $helper ); |
|
| 130 | + $helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d'); |
|
| 131 | + $view->addHelper('date', $helper); |
|
| 132 | 132 | |
| 133 | - $config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'controller/jobs', 'client/html' ) ); |
|
| 134 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 135 | - $view->addHelper( 'config', $helper ); |
|
| 133 | + $config = new \Aimeos\MW\Config\Decorator\Protect($config, array('controller/jobs', 'client/html')); |
|
| 134 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 135 | + $view->addHelper('config', $helper); |
|
| 136 | 136 | |
| 137 | 137 | return $view; |
| 138 | 138 | } |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | $context = \TestHelperJobs::getContext(); |
| 17 | 17 | $aimeos = \TestHelperJobs::getAimeos(); |
| 18 | 18 | |
| 19 | - $obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos ); |
|
| 20 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj ); |
|
| 19 | + $obj = \Aimeos\Controller\Jobs\Order\Export\Csv\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\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
| 29 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 30 | + \Aimeos\Controller\Jobs\Order\Export\Csv\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\Order\Export\Csv\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
| 39 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 40 | + \Aimeos\Controller\Jobs\Order\Export\Csv\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\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Factory' ); |
|
| 49 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
| 50 | + \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Factory'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -121,8 +121,7 @@ |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $this->export( $processors, $data, $maxcnt ); |
| 124 | - } |
|
| 125 | - catch( \Exception $e ) |
|
| 124 | + } catch( \Exception $e ) |
|
| 126 | 125 | { |
| 127 | 126 | $logger->log( 'Order export error: ' . $e->getMessage() ); |
| 128 | 127 | $logger->log( $e->getTraceAsString() ); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function getName() |
| 30 | 30 | { |
| 31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order export CSV' ); |
|
| 31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Order export CSV'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getDescription() |
| 41 | 41 | { |
| 42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports orders to CSV file' ); |
|
| 42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports orders to CSV file'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | * @category Developer |
| 74 | 74 | * @see controller/common/order/export/csv/max-size |
| 75 | 75 | */ |
| 76 | - $mappings = $config->get( 'controller/common/order/export/csv/mapping', $mappings ); |
|
| 76 | + $mappings = $config->get('controller/common/order/export/csv/mapping', $mappings); |
|
| 77 | 77 | |
| 78 | 78 | /** controller/jobs/order/export/csv/mapping |
| 79 | 79 | * List of mappings between the position in the CSV file and item keys |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @category Developer |
| 89 | 89 | * @see controller/common/order/export/csv/max-size |
| 90 | 90 | */ |
| 91 | - $mappings = $config->get( 'controller/jobs/order/export/csv/mapping', $mappings ); |
|
| 91 | + $mappings = $config->get('controller/jobs/order/export/csv/mapping', $mappings); |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | /** controller/common/order/export/csv/max-size |
@@ -106,29 +106,29 @@ discard block |
||
| 106 | 106 | * @category Developer |
| 107 | 107 | * @see controller/common/order/export/csv/mapping |
| 108 | 108 | */ |
| 109 | - $maxcnt = (int) $config->get( 'controller/common/order/export/csv/max-size', 1000 ); |
|
| 109 | + $maxcnt = (int) $config->get('controller/common/order/export/csv/max-size', 1000); |
|
| 110 | 110 | |
| 111 | 111 | |
| 112 | - $processors = $this->getProcessors( $mappings ); |
|
| 113 | - $mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'order-export' ); |
|
| 112 | + $processors = $this->getProcessors($mappings); |
|
| 113 | + $mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('order-export'); |
|
| 114 | 114 | |
| 115 | - while( ( $msg = $mq->get() ) !== null ) |
|
| 115 | + while (($msg = $mq->get()) !== null) |
|
| 116 | 116 | { |
| 117 | 117 | try |
| 118 | 118 | { |
| 119 | - if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) { |
|
| 120 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %1$s', $msg->getBody() ) ); |
|
| 119 | + if (($data = json_decode($msg->getBody(), true)) === null) { |
|
| 120 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %1$s', $msg->getBody())); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $this->export( $processors, $data, $maxcnt ); |
|
| 123 | + $this->export($processors, $data, $maxcnt); |
|
| 124 | 124 | } |
| 125 | - catch( \Exception $e ) |
|
| 125 | + catch (\Exception $e) |
|
| 126 | 126 | { |
| 127 | - $logger->log( 'Order export error: ' . $e->getMessage() ); |
|
| 128 | - $logger->log( $e->getTraceAsString() ); |
|
| 127 | + $logger->log('Order export error: ' . $e->getMessage()); |
|
| 128 | + $logger->log($e->getTraceAsString()); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - $mq->del( $msg ); |
|
| 131 | + $mq->del($msg); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
@@ -139,15 +139,15 @@ discard block |
||
| 139 | 139 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
| 140 | 140 | * @param string $path Absolute path to the exported file |
| 141 | 141 | */ |
| 142 | - protected function addJob( $context, $path ) |
|
| 142 | + protected function addJob($context, $path) |
|
| 143 | 143 | { |
| 144 | - $manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' ); |
|
| 144 | + $manager = \Aimeos\MAdmin\Factory::createManager($context, 'job'); |
|
| 145 | 145 | |
| 146 | 146 | $item = $manager->createItem(); |
| 147 | - $item->setResult( ['file' => $path] ); |
|
| 148 | - $item->setLabel( $path ); |
|
| 147 | + $item->setResult(['file' => $path]); |
|
| 148 | + $item->setLabel($path); |
|
| 149 | 149 | |
| 150 | - $manager->saveItem( $item, false ); |
|
| 150 | + $manager->saveItem($item, false); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @see controller/jobs/order/export/csv/container/content |
| 178 | 178 | * @see controller/jobs/order/export/csv/container/options |
| 179 | 179 | */ |
| 180 | - $location = $config->get( 'controller/jobs/order/export/csv/location', sys_get_temp_dir() ); |
|
| 180 | + $location = $config->get('controller/jobs/order/export/csv/location', sys_get_temp_dir()); |
|
| 181 | 181 | |
| 182 | 182 | /** controller/jobs/order/export/csv/container/type |
| 183 | 183 | * Nave of the container type to read the data from |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | * @see controller/jobs/order/export/csv/container/content |
| 201 | 201 | * @see controller/jobs/order/export/csv/container/options |
| 202 | 202 | */ |
| 203 | - $container = $config->get( 'controller/jobs/order/export/csv/container/type', 'Directory' ); |
|
| 203 | + $container = $config->get('controller/jobs/order/export/csv/container/type', 'Directory'); |
|
| 204 | 204 | |
| 205 | 205 | /** controller/jobs/order/export/csv/container/content |
| 206 | 206 | * Name of the content type inside the container to read the data from |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @see controller/jobs/order/export/csv/container/type |
| 222 | 222 | * @see controller/jobs/order/export/csv/container/options |
| 223 | 223 | */ |
| 224 | - $content = $config->get( 'controller/jobs/order/export/csv/container/content', 'CSV' ); |
|
| 224 | + $content = $config->get('controller/jobs/order/export/csv/container/content', 'CSV'); |
|
| 225 | 225 | |
| 226 | 226 | /** controller/jobs/order/export/csv/container/options |
| 227 | 227 | * List of file container options for the order export files |
@@ -239,9 +239,9 @@ discard block |
||
| 239 | 239 | * @see controller/jobs/order/export/csv/container/content |
| 240 | 240 | * @see controller/jobs/order/export/csv/container/type |
| 241 | 241 | */ |
| 242 | - $options = $config->get( 'controller/jobs/order/export/csv/container/options', [] ); |
|
| 242 | + $options = $config->get('controller/jobs/order/export/csv/container/options', []); |
|
| 243 | 243 | |
| 244 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
| 244 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | |
@@ -253,56 +253,56 @@ discard block |
||
| 253 | 253 | * @param integer $maxcnt Maximum number of retrieved orders at once |
| 254 | 254 | * @return string Path of the file containing the exported data |
| 255 | 255 | */ |
| 256 | - protected function export( array $processors, $msg, $maxcnt ) |
|
| 256 | + protected function export(array $processors, $msg, $maxcnt) |
|
| 257 | 257 | { |
| 258 | - $lcontext = $this->getLocaleContext( $msg ); |
|
| 258 | + $lcontext = $this->getLocaleContext($msg); |
|
| 259 | 259 | $baseRef = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service']; |
| 260 | 260 | |
| 261 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order' ); |
|
| 262 | - $baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' ); |
|
| 261 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'order'); |
|
| 262 | + $baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base'); |
|
| 263 | 263 | |
| 264 | 264 | $container = $this->getContainer(); |
| 265 | - $content = $container->create( 'order-export_' . date( 'Y-m-d_H-i-s' ) ); |
|
| 266 | - $search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg ); |
|
| 265 | + $content = $container->create('order-export_' . date('Y-m-d_H-i-s')); |
|
| 266 | + $search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg); |
|
| 267 | 267 | $start = 0; |
| 268 | 268 | |
| 269 | 269 | do |
| 270 | 270 | { |
| 271 | 271 | $baseIds = []; |
| 272 | - $search->setSlice( $start, $maxcnt ); |
|
| 273 | - $items = $manager->searchItems( $search ); |
|
| 272 | + $search->setSlice($start, $maxcnt); |
|
| 273 | + $items = $manager->searchItems($search); |
|
| 274 | 274 | |
| 275 | - foreach( $items as $item ) { |
|
| 275 | + foreach ($items as $item) { |
|
| 276 | 276 | $baseIds[] = $item->getBaseId(); |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | $baseSearch = $baseManager->createSearch(); |
| 280 | - $baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) ); |
|
| 281 | - $baseSearch->setSlice( 0, count( $baseIds ) ); |
|
| 280 | + $baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds)); |
|
| 281 | + $baseSearch->setSlice(0, count($baseIds)); |
|
| 282 | 282 | |
| 283 | - $baseItems = $baseManager->searchItems( $baseSearch, $baseRef ); |
|
| 283 | + $baseItems = $baseManager->searchItems($baseSearch, $baseRef); |
|
| 284 | 284 | |
| 285 | - foreach( $items as $id => $item ) |
|
| 285 | + foreach ($items as $id => $item) |
|
| 286 | 286 | { |
| 287 | - foreach( $processors as $type => $processor ) |
|
| 287 | + foreach ($processors as $type => $processor) |
|
| 288 | 288 | { |
| 289 | - foreach( $processor->process( $item, $baseItems[$item->getBaseId()] ) as $line ) { |
|
| 290 | - $content->add( [0 => $type, 1 => $id] + $line ); |
|
| 289 | + foreach ($processor->process($item, $baseItems[$item->getBaseId()]) as $line) { |
|
| 290 | + $content->add([0 => $type, 1 => $id] + $line); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - $count = count( $items ); |
|
| 295 | + $count = count($items); |
|
| 296 | 296 | $start += $count; |
| 297 | 297 | } |
| 298 | - while( $count === $search->getSliceSize() ); |
|
| 298 | + while ($count === $search->getSliceSize()); |
|
| 299 | 299 | |
| 300 | 300 | $path = $content->getResource(); |
| 301 | - $container->add( $content ); |
|
| 301 | + $container->add($content); |
|
| 302 | 302 | $container->close(); |
| 303 | 303 | |
| 304 | - $path = $this->moveFile( $lcontext, $path ); |
|
| 305 | - $this->addJob( $lcontext, $path ); |
|
| 304 | + $path = $this->moveFile($lcontext, $path); |
|
| 305 | + $this->addJob($lcontext, $path); |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | |
@@ -312,15 +312,15 @@ discard block |
||
| 312 | 312 | * @param array $msg Message data including a "sitecode" value |
| 313 | 313 | * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale |
| 314 | 314 | */ |
| 315 | - protected function getLocaleContext( array $msg ) |
|
| 315 | + protected function getLocaleContext(array $msg) |
|
| 316 | 316 | { |
| 317 | 317 | $lcontext = clone $this->getContext(); |
| 318 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' ); |
|
| 318 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale'); |
|
| 319 | 319 | |
| 320 | - $sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' ); |
|
| 321 | - $localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE ); |
|
| 320 | + $sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default'); |
|
| 321 | + $localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE); |
|
| 322 | 322 | |
| 323 | - return $lcontext->setLocale( $localeItem ); |
|
| 323 | + return $lcontext->setLocale($localeItem); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | * @param array $msg Message data |
| 332 | 332 | * @return \Aimeos\MW\Criteria\Iface Initialized criteria object |
| 333 | 333 | */ |
| 334 | - protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg ) |
|
| 334 | + protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg) |
|
| 335 | 335 | { |
| 336 | - if( isset( $msg['filter'] ) ) { |
|
| 337 | - $criteria->setConditions( $criteria->toConditions( $msg['filter'] ) ); |
|
| 336 | + if (isset($msg['filter'])) { |
|
| 337 | + $criteria->setConditions($criteria->toConditions($msg['filter'])); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - if( isset( $msg['sort'] ) ) { |
|
| 341 | - $criteria->setSortations( $criteria->toSortations( $msg['sort'] ) ); |
|
| 340 | + if (isset($msg['sort'])) { |
|
| 341 | + $criteria->setSortations($criteria->toSortations($msg['sort'])); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | return $criteria; |
@@ -352,12 +352,12 @@ discard block |
||
| 352 | 352 | * @param string $path Absolute path to the exported file |
| 353 | 353 | * @return string Relative path of the file in the storage |
| 354 | 354 | */ |
| 355 | - protected function moveFile( $context, $path ) |
|
| 355 | + protected function moveFile($context, $path) |
|
| 356 | 356 | { |
| 357 | - $filename = basename( $path ); |
|
| 358 | - $context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path ); |
|
| 357 | + $filename = basename($path); |
|
| 358 | + $context->getFileSystemManager()->get('fs-admin')->writef($filename, $path); |
|
| 359 | 359 | |
| 360 | - unlink( $path ); |
|
| 360 | + unlink($path); |
|
| 361 | 361 | return $filename; |
| 362 | 362 | } |
| 363 | 363 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param string|null $name Name of the controller or "Standard" if null |
| 30 | 30 | * @return \Aimeos\Controller\Jobs\Iface New controller object |
| 31 | 31 | */ |
| 32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null ) |
|
| 32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null) |
|
| 33 | 33 | { |
| 34 | 34 | /** controller/jobs/order/export/csv/name |
| 35 | 35 | * Class name of the used order suggestions scheduler controller implementation |
@@ -64,20 +64,20 @@ discard block |
||
| 64 | 64 | * @since 2015.01 |
| 65 | 65 | * @category Developer |
| 66 | 66 | */ |
| 67 | - if ( $name === null ) { |
|
| 67 | + if ($name === null) { |
|
| 68 | 68 | $name = $context->getConfig()->get('controller/jobs/order/export/csv/name', 'Standard'); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if ( ctype_alnum($name) === false ) |
|
| 71 | + if (ctype_alnum($name) === false) |
|
| 72 | 72 | { |
| 73 | 73 | $classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Order\\Export\\Csv\\' . $name : '<not a string>'; |
| 74 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 74 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $iface = '\\Aimeos\\Controller\\Jobs\\Iface'; |
| 78 | 78 | $classname = '\\Aimeos\\Controller\\Jobs\\Order\\Export\\Csv\\' . $name; |
| 79 | 79 | |
| 80 | - $controller = self::createControllerBase( $context, $aimeos, $classname, $iface ); |
|
| 80 | + $controller = self::createControllerBase($context, $aimeos, $classname, $iface); |
|
| 81 | 81 | |
| 82 | 82 | /** controller/jobs/order/export/csv/decorators/excludes |
| 83 | 83 | * Excludes decorators added by the "common" option from the order export CSV job controller |
@@ -154,6 +154,6 @@ discard block |
||
| 154 | 154 | * @see controller/jobs/order/export/csv/decorators/excludes |
| 155 | 155 | * @see controller/jobs/order/export/csv/decorators/global |
| 156 | 156 | */ |
| 157 | - return self::addControllerDecorators( $context, $aimeos, $controller, 'order/export/csv' ); |
|
| 157 | + return self::addControllerDecorators($context, $aimeos, $controller, 'order/export/csv'); |
|
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | \ No newline at end of file |
@@ -18,37 +18,37 @@ |
||
| 18 | 18 | ); |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard( $context, $mapping ); |
|
| 21 | + $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard($context, $mapping); |
|
| 22 | 22 | |
| 23 | - $invoice = $this->getInvoice( $context ); |
|
| 24 | - $order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() ); |
|
| 23 | + $invoice = $this->getInvoice($context); |
|
| 24 | + $order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId()); |
|
| 25 | 25 | |
| 26 | - $data = $object->process( $invoice, $order ); |
|
| 26 | + $data = $object->process($invoice, $order); |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | - $this->assertEquals( 2, count( $data ) ); |
|
| 29 | + $this->assertEquals(2, count($data)); |
|
| 30 | 30 | |
| 31 | - $this->assertEquals( 1, count( $data[0] ) ); |
|
| 32 | - $this->assertEquals( '5678', $data[0][0] ); |
|
| 31 | + $this->assertEquals(1, count($data[0])); |
|
| 32 | + $this->assertEquals('5678', $data[0][0]); |
|
| 33 | 33 | |
| 34 | - $this->assertEquals( 1, count( $data[1] ) ); |
|
| 35 | - $this->assertEquals( 'OPQR', $data[1][0] ); |
|
| 34 | + $this->assertEquals(1, count($data[1])); |
|
| 35 | + $this->assertEquals('OPQR', $data[1][0]); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | - protected function getInvoice( $context ) |
|
| 39 | + protected function getInvoice($context) |
|
| 40 | 40 | { |
| 41 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 41 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 42 | 42 | |
| 43 | 43 | $search = $manager->createSearch(); |
| 44 | - $search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) ); |
|
| 44 | + $search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56')); |
|
| 45 | 45 | |
| 46 | - $items = $manager->searchItems( $search ); |
|
| 46 | + $items = $manager->searchItems($search); |
|
| 47 | 47 | |
| 48 | - if( ( $item = reset( $items ) ) !== false ) { |
|
| 48 | + if (($item = reset($items)) !== false) { |
|
| 49 | 49 | return $item; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - throw new \Exception( 'No order item found' ); |
|
| 52 | + throw new \Exception('No order item found'); |
|
| 53 | 53 | } |
| 54 | 54 | } |