@@ -330,8 +330,7 @@ discard block |
||
| 330 | 330 | * @see mshop/customer/manager/laravel/count |
| 331 | 331 | */ |
| 332 | 332 | $path = 'mshop/customer/manager/laravel/insert'; |
| 333 | - } |
|
| 334 | - else |
|
| 333 | + } else |
|
| 335 | 334 | { |
| 336 | 335 | /** mshop/customer/manager/laravel/update |
| 337 | 336 | * Updates an existing customer record in the database |
@@ -437,8 +436,7 @@ discard block |
||
| 437 | 436 | } |
| 438 | 437 | |
| 439 | 438 | $dbm->release( $conn, $dbname ); |
| 440 | - } |
|
| 441 | - catch( \Exception $e ) |
|
| 439 | + } catch( \Exception $e ) |
|
| 442 | 440 | { |
| 443 | 441 | $dbm->release( $conn, $dbname ); |
| 444 | 442 | throw $e; |
@@ -474,8 +472,7 @@ discard block |
||
| 474 | 472 | } |
| 475 | 473 | |
| 476 | 474 | $dbm->release( $conn, $dbname ); |
| 477 | - } |
|
| 478 | - catch( \Exception $e ) |
|
| 475 | + } catch( \Exception $e ) |
|
| 479 | 476 | { |
| 480 | 477 | $dbm->release( $conn, $dbname ); |
| 481 | 478 | throw $e; |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | /** |
| 225 | 225 | * Removes old entries from the storage. |
| 226 | 226 | * |
| 227 | - * @param array $siteids List of IDs for sites whose entries should be deleted |
|
| 227 | + * @param integer[] $siteids List of IDs for sites whose entries should be deleted |
|
| 228 | 228 | */ |
| 229 | 229 | public function cleanup( array $siteids ) |
| 230 | 230 | { |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | * |
| 491 | 491 | * @param string $manager Name of the sub manager type in lower case |
| 492 | 492 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 493 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 493 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 494 | 494 | */ |
| 495 | 495 | public function getSubManager( $manager, $name = null ) |
| 496 | 496 | { |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | * |
| 242 | 242 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 243 | 243 | */ |
| 244 | - public function cleanup( array $siteids ) |
|
| 244 | + public function cleanup(array $siteids) |
|
| 245 | 245 | { |
| 246 | 246 | $path = 'mshop/customer/manager/submanagers'; |
| 247 | 247 | $default = ['address', 'group', 'lists', 'property']; |
| 248 | 248 | |
| 249 | - foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) { |
|
| 250 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 249 | + foreach ($this->getContext()->getConfig()->get($path, $default) as $domain) { |
|
| 250 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | * |
| 258 | 258 | * @param array $ids List of IDs |
| 259 | 259 | */ |
| 260 | - public function deleteItems( array $ids ) |
|
| 260 | + public function deleteItems(array $ids) |
|
| 261 | 261 | { |
| 262 | 262 | $path = 'mshop/customer/manager/laravel/delete'; |
| 263 | - $this->deleteItemsBase( $ids, $path, false ); |
|
| 263 | + $this->deleteItemsBase($ids, $path, false); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | |
@@ -270,12 +270,12 @@ discard block |
||
| 270 | 270 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 271 | 271 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 272 | 272 | */ |
| 273 | - public function getSearchAttributes( $withsub = true ) |
|
| 273 | + public function getSearchAttributes($withsub = true) |
|
| 274 | 274 | { |
| 275 | 275 | $path = 'mshop/customer/manager/submanagers'; |
| 276 | 276 | $default = ['address', 'group', 'lists', 'property']; |
| 277 | 277 | |
| 278 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub ); |
|
| 278 | + return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub); |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | |
@@ -286,32 +286,32 @@ discard block |
||
| 286 | 286 | * @param boolean $fetch True if the new ID should be returned in the item |
| 287 | 287 | * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID |
| 288 | 288 | */ |
| 289 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
| 289 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
| 290 | 290 | { |
| 291 | 291 | $iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface'; |
| 292 | - if( !( $item instanceof $iface ) ) { |
|
| 293 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
| 292 | + if (!($item instanceof $iface)) { |
|
| 293 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | - if( !$item->isModified() ) |
|
| 296 | + if (!$item->isModified()) |
|
| 297 | 297 | { |
| 298 | - $item = $this->savePropertyItems( $item, 'customer' ); |
|
| 299 | - $item = $this->saveAddressItems( $item, 'customer' ); |
|
| 300 | - return $this->saveListItems( $item, 'customer' ); |
|
| 298 | + $item = $this->savePropertyItems($item, 'customer'); |
|
| 299 | + $item = $this->saveAddressItems($item, 'customer'); |
|
| 300 | + return $this->saveListItems($item, 'customer'); |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | $context = $this->getContext(); |
| 304 | 304 | $dbm = $context->getDatabaseManager(); |
| 305 | 305 | $dbname = $this->getResourceName(); |
| 306 | - $conn = $dbm->acquire( $dbname ); |
|
| 306 | + $conn = $dbm->acquire($dbname); |
|
| 307 | 307 | |
| 308 | 308 | try |
| 309 | 309 | { |
| 310 | 310 | $id = $item->getId(); |
| 311 | - $date = date( 'Y-m-d H:i:s' ); |
|
| 311 | + $date = date('Y-m-d H:i:s'); |
|
| 312 | 312 | $billingAddress = $item->getPaymentAddress(); |
| 313 | 313 | |
| 314 | - if( $id === null ) |
|
| 314 | + if ($id === null) |
|
| 315 | 315 | { |
| 316 | 316 | /** mshop/customer/manager/laravel/insert |
| 317 | 317 | * Inserts a new customer record into the database table |
@@ -375,48 +375,48 @@ discard block |
||
| 375 | 375 | $path = 'mshop/customer/manager/laravel/update'; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | - $stmt = $this->getCachedStatement( $conn, $path ); |
|
| 379 | - |
|
| 380 | - $stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 381 | - $stmt->bind( 2, $item->getCode() ); |
|
| 382 | - $stmt->bind( 3, $billingAddress->getCompany() ); |
|
| 383 | - $stmt->bind( 4, $billingAddress->getVatID() ); |
|
| 384 | - $stmt->bind( 5, $billingAddress->getSalutation() ); |
|
| 385 | - $stmt->bind( 6, $billingAddress->getTitle() ); |
|
| 386 | - $stmt->bind( 7, $billingAddress->getFirstname() ); |
|
| 387 | - $stmt->bind( 8, $billingAddress->getLastname() ); |
|
| 388 | - $stmt->bind( 9, $billingAddress->getAddress1() ); |
|
| 389 | - $stmt->bind( 10, $billingAddress->getAddress2() ); |
|
| 390 | - $stmt->bind( 11, $billingAddress->getAddress3() ); |
|
| 391 | - $stmt->bind( 12, $billingAddress->getPostal() ); |
|
| 392 | - $stmt->bind( 13, $billingAddress->getCity() ); |
|
| 393 | - $stmt->bind( 14, $billingAddress->getState() ); |
|
| 394 | - $stmt->bind( 15, $billingAddress->getCountryId() ); |
|
| 395 | - $stmt->bind( 16, $billingAddress->getLanguageId() ); |
|
| 396 | - $stmt->bind( 17, $billingAddress->getTelephone() ); |
|
| 397 | - $stmt->bind( 18, $billingAddress->getTelefax() ); |
|
| 398 | - $stmt->bind( 19, $billingAddress->getWebsite() ); |
|
| 399 | - $stmt->bind( 20, $billingAddress->getEmail() ); |
|
| 400 | - $stmt->bind( 21, $billingAddress->getLongitude() ); |
|
| 401 | - $stmt->bind( 22, $billingAddress->getLatitude() ); |
|
| 402 | - $stmt->bind( 23, $item->getLabel() ); |
|
| 403 | - $stmt->bind( 24, $item->getBirthday() ); |
|
| 404 | - $stmt->bind( 25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 405 | - $stmt->bind( 26, $item->getDateVerified() ); |
|
| 406 | - $stmt->bind( 27, $item->getPassword() ); |
|
| 407 | - $stmt->bind( 28, $date ); // Modification time |
|
| 408 | - $stmt->bind( 29, $context->getEditor() ); |
|
| 409 | - |
|
| 410 | - if( $id !== null ) { |
|
| 411 | - $stmt->bind( 30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 412 | - $item->setId( $id ); |
|
| 378 | + $stmt = $this->getCachedStatement($conn, $path); |
|
| 379 | + |
|
| 380 | + $stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 381 | + $stmt->bind(2, $item->getCode()); |
|
| 382 | + $stmt->bind(3, $billingAddress->getCompany()); |
|
| 383 | + $stmt->bind(4, $billingAddress->getVatID()); |
|
| 384 | + $stmt->bind(5, $billingAddress->getSalutation()); |
|
| 385 | + $stmt->bind(6, $billingAddress->getTitle()); |
|
| 386 | + $stmt->bind(7, $billingAddress->getFirstname()); |
|
| 387 | + $stmt->bind(8, $billingAddress->getLastname()); |
|
| 388 | + $stmt->bind(9, $billingAddress->getAddress1()); |
|
| 389 | + $stmt->bind(10, $billingAddress->getAddress2()); |
|
| 390 | + $stmt->bind(11, $billingAddress->getAddress3()); |
|
| 391 | + $stmt->bind(12, $billingAddress->getPostal()); |
|
| 392 | + $stmt->bind(13, $billingAddress->getCity()); |
|
| 393 | + $stmt->bind(14, $billingAddress->getState()); |
|
| 394 | + $stmt->bind(15, $billingAddress->getCountryId()); |
|
| 395 | + $stmt->bind(16, $billingAddress->getLanguageId()); |
|
| 396 | + $stmt->bind(17, $billingAddress->getTelephone()); |
|
| 397 | + $stmt->bind(18, $billingAddress->getTelefax()); |
|
| 398 | + $stmt->bind(19, $billingAddress->getWebsite()); |
|
| 399 | + $stmt->bind(20, $billingAddress->getEmail()); |
|
| 400 | + $stmt->bind(21, $billingAddress->getLongitude()); |
|
| 401 | + $stmt->bind(22, $billingAddress->getLatitude()); |
|
| 402 | + $stmt->bind(23, $item->getLabel()); |
|
| 403 | + $stmt->bind(24, $item->getBirthday()); |
|
| 404 | + $stmt->bind(25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 405 | + $stmt->bind(26, $item->getDateVerified()); |
|
| 406 | + $stmt->bind(27, $item->getPassword()); |
|
| 407 | + $stmt->bind(28, $date); // Modification time |
|
| 408 | + $stmt->bind(29, $context->getEditor()); |
|
| 409 | + |
|
| 410 | + if ($id !== null) { |
|
| 411 | + $stmt->bind(30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 412 | + $item->setId($id); |
|
| 413 | 413 | } else { |
| 414 | - $stmt->bind( 30, $date ); // Creation time |
|
| 414 | + $stmt->bind(30, $date); // Creation time |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | $stmt->execute()->finish(); |
| 418 | 418 | |
| 419 | - if( $id === null && $fetch === true ) |
|
| 419 | + if ($id === null && $fetch === true) |
|
| 420 | 420 | { |
| 421 | 421 | /** mshop/customer/manager/laravel/newid |
| 422 | 422 | * Retrieves the ID generated by the database when inserting a new record |
@@ -449,22 +449,22 @@ discard block |
||
| 449 | 449 | * @see mshop/customer/manager/laravel/count |
| 450 | 450 | */ |
| 451 | 451 | $path = 'mshop/customer/manager/laravel/newid'; |
| 452 | - $item->setId( $this->newId( $conn, $path ) ); |
|
| 452 | + $item->setId($this->newId($conn, $path)); |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $dbm->release( $conn, $dbname ); |
|
| 455 | + $dbm->release($conn, $dbname); |
|
| 456 | 456 | } |
| 457 | - catch( \Exception $e ) |
|
| 457 | + catch (\Exception $e) |
|
| 458 | 458 | { |
| 459 | - $dbm->release( $conn, $dbname ); |
|
| 459 | + $dbm->release($conn, $dbname); |
|
| 460 | 460 | throw $e; |
| 461 | 461 | } |
| 462 | 462 | |
| 463 | - $this->addGroups( $item ); |
|
| 463 | + $this->addGroups($item); |
|
| 464 | 464 | |
| 465 | - $item = $this->savePropertyItems( $item, 'customer' ); |
|
| 466 | - $item = $this->saveAddressItems( $item, 'customer' ); |
|
| 467 | - return $this->saveListItems( $item, 'customer' ); |
|
| 465 | + $item = $this->savePropertyItems($item, 'customer'); |
|
| 466 | + $item = $this->saveAddressItems($item, 'customer'); |
|
| 467 | + return $this->saveListItems($item, 'customer'); |
|
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | |
@@ -476,11 +476,11 @@ discard block |
||
| 476 | 476 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface |
| 477 | 477 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed |
| 478 | 478 | */ |
| 479 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) |
|
| 479 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) |
|
| 480 | 480 | { |
| 481 | 481 | $dbm = $this->getContext()->getDatabaseManager(); |
| 482 | 482 | $dbname = $this->getResourceName(); |
| 483 | - $conn = $dbm->acquire( $dbname ); |
|
| 483 | + $conn = $dbm->acquire($dbname); |
|
| 484 | 484 | $map = []; |
| 485 | 485 | |
| 486 | 486 | try |
@@ -488,32 +488,32 @@ discard block |
||
| 488 | 488 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
| 489 | 489 | $cfgPathSearch = 'mshop/customer/manager/laravel/search'; |
| 490 | 490 | $cfgPathCount = 'mshop/customer/manager/laravel/count'; |
| 491 | - $required = array( 'customer' ); |
|
| 491 | + $required = array('customer'); |
|
| 492 | 492 | |
| 493 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
| 494 | - while( ( $row = $results->fetch() ) !== false ) { |
|
| 495 | - $map[ $row['customer.id'] ] = $row; |
|
| 493 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
| 494 | + while (($row = $results->fetch()) !== false) { |
|
| 495 | + $map[$row['customer.id']] = $row; |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | - $dbm->release( $conn, $dbname ); |
|
| 498 | + $dbm->release($conn, $dbname); |
|
| 499 | 499 | } |
| 500 | - catch( \Exception $e ) |
|
| 500 | + catch (\Exception $e) |
|
| 501 | 501 | { |
| 502 | - $dbm->release( $conn, $dbname ); |
|
| 502 | + $dbm->release($conn, $dbname); |
|
| 503 | 503 | throw $e; |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | $addrItems = []; |
| 507 | - if( in_array( 'customer/address', $ref, true ) ) { |
|
| 508 | - $addrItems = $this->getAddressItems( array_keys( $map ), 'customer' ); |
|
| 507 | + if (in_array('customer/address', $ref, true)) { |
|
| 508 | + $addrItems = $this->getAddressItems(array_keys($map), 'customer'); |
|
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | $propItems = []; |
| 512 | - if( in_array( 'customer/property', $ref, true ) ) { |
|
| 513 | - $propItems = $this->getPropertyItems( array_keys( $map ), 'customer' ); |
|
| 512 | + if (in_array('customer/property', $ref, true)) { |
|
| 513 | + $propItems = $this->getPropertyItems(array_keys($map), 'customer'); |
|
| 514 | 514 | } |
| 515 | 515 | |
| 516 | - return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems ); |
|
| 516 | + return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems); |
|
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | |
@@ -524,8 +524,8 @@ discard block |
||
| 524 | 524 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 525 | 525 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 526 | 526 | */ |
| 527 | - public function getSubManager( $manager, $name = null ) |
|
| 527 | + public function getSubManager($manager, $name = null) |
|
| 528 | 528 | { |
| 529 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
| 529 | + return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Laravel' : $name)); |
|
| 530 | 530 | } |
| 531 | 531 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @param \Illuminate\Contracts\Logging\Log $logger Laravel logger object |
| 31 | 31 | */ |
| 32 | - public function __construct( \Illuminate\Contracts\Logging\Log $logger ) |
|
| 32 | + public function __construct(\Illuminate\Contracts\Logging\Log $logger) |
|
| 33 | 33 | { |
| 34 | 34 | $this->logger = $logger; |
| 35 | 35 | } |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | * @throws \Aimeos\MW\Logger\Exception If an error occurs in Zend_Log |
| 45 | 45 | * @see \Aimeos\MW\Logger\Base for available log level constants |
| 46 | 46 | */ |
| 47 | - public function log( $message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message' ) |
|
| 47 | + public function log($message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message') |
|
| 48 | 48 | { |
| 49 | 49 | try |
| 50 | 50 | { |
| 51 | - if( !is_scalar( $message ) ) { |
|
| 52 | - $message = json_encode( $message ); |
|
| 51 | + if (!is_scalar($message)) { |
|
| 52 | + $message = json_encode($message); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $this->logger->log( $message, $this->translatePriority( $priority ) ); |
|
| 55 | + $this->logger->log($message, $this->translatePriority($priority)); |
|
| 56 | 56 | } |
| 57 | - catch( \Exception $e ) { |
|
| 58 | - throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
|
| 57 | + catch (\Exception $e) { |
|
| 58 | + throw new \Aimeos\MW\Logger\Exception($e->getMessage(), $e->getCode(), $e); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * @return integer Log level from Monolog\Logger |
| 68 | 68 | * @throws \Aimeos\MW\Logger\Exception If log level is unknown |
| 69 | 69 | */ |
| 70 | - protected function translatePriority( $priority ) |
|
| 70 | + protected function translatePriority($priority) |
|
| 71 | 71 | { |
| 72 | - switch( $priority ) |
|
| 72 | + switch ($priority) |
|
| 73 | 73 | { |
| 74 | 74 | case \Aimeos\MW\Logger\Base::EMERG: |
| 75 | 75 | return 'emergency'; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | case \Aimeos\MW\Logger\Base::DEBUG: |
| 89 | 89 | return 'debug'; |
| 90 | 90 | default: |
| 91 | - throw new \Aimeos\MW\Logger\Exception( 'Invalid log level' ); |
|
| 91 | + throw new \Aimeos\MW\Logger\Exception('Invalid log level'); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | \ No newline at end of file |
@@ -53,8 +53,7 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); |
| 56 | - } |
|
| 57 | - catch( \Exception $e ) { |
|
| 56 | + } catch( \Exception $e ) { |
|
| 58 | 57 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
| 59 | 58 | } |
| 60 | 59 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @param string $path Path to the directory |
| 53 | 53 | * @return void |
| 54 | 54 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 55 | - */ |
|
| 55 | + */ |
|
| 56 | 56 | public function mkdir( $path ) |
| 57 | 57 | { |
| 58 | 58 | try { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param string $path Path to the directory |
| 70 | 70 | * @return void |
| 71 | 71 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 72 | - */ |
|
| 72 | + */ |
|
| 73 | 73 | public function rmdir( $path ) |
| 74 | 74 | { |
| 75 | 75 | try { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param \Illuminate\Contracts\Filesystem\Filesystem $fs Laravel file system object |
| 30 | 30 | * @param string $tempdir Directory for storing temporary files |
| 31 | 31 | */ |
| 32 | - public function __construct( \Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir ) |
|
| 32 | + public function __construct(\Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir) |
|
| 33 | 33 | { |
| 34 | 34 | $this->fs = $fs; |
| 35 | 35 | $this->tempdir = $tempdir; |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | * @return boolean True if directory, false if not |
| 44 | 44 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 45 | 45 | */ |
| 46 | - public function isdir( $path ) |
|
| 46 | + public function isdir($path) |
|
| 47 | 47 | { |
| 48 | - return in_array( basename( $path ), $this->fs->directories( dirname( $path ) ) ); |
|
| 48 | + return in_array(basename($path), $this->fs->directories(dirname($path))); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | * @return void |
| 57 | 57 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 58 | 58 | */ |
| 59 | - public function mkdir( $path ) |
|
| 59 | + public function mkdir($path) |
|
| 60 | 60 | { |
| 61 | 61 | try { |
| 62 | - $this->fs->makeDirectory( $path ); |
|
| 63 | - } catch( \Exception $e ) { |
|
| 64 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 62 | + $this->fs->makeDirectory($path); |
|
| 63 | + } catch (\Exception $e) { |
|
| 64 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | * @return void |
| 74 | 74 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 75 | 75 | */ |
| 76 | - public function rmdir( $path ) |
|
| 76 | + public function rmdir($path) |
|
| 77 | 77 | { |
| 78 | 78 | try { |
| 79 | - $this->fs->deleteDirectory( $path ); |
|
| 80 | - } catch( \Exception $e ) { |
|
| 81 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 79 | + $this->fs->deleteDirectory($path); |
|
| 80 | + } catch (\Exception $e) { |
|
| 81 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | * @return \Iterator|array Iterator over the entries or array with entries |
| 93 | 93 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 94 | 94 | */ |
| 95 | - public function scan( $path = null ) |
|
| 95 | + public function scan($path = null) |
|
| 96 | 96 | { |
| 97 | 97 | try { |
| 98 | - return array_merge( $this->fs->directories( $path ), $this->fs->files( $path ) ); |
|
| 99 | - } catch( \Exception $e ) { |
|
| 100 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 98 | + return array_merge($this->fs->directories($path), $this->fs->files($path)); |
|
| 99 | + } catch (\Exception $e) { |
|
| 100 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
@@ -109,12 +109,12 @@ discard block |
||
| 109 | 109 | * @return integer Size in bytes |
| 110 | 110 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 111 | 111 | */ |
| 112 | - public function size( $path ) |
|
| 112 | + public function size($path) |
|
| 113 | 113 | { |
| 114 | 114 | try { |
| 115 | - return $this->fs->size( $path ); |
|
| 116 | - } catch( \Exception $e ) { |
|
| 117 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 115 | + return $this->fs->size($path); |
|
| 116 | + } catch (\Exception $e) { |
|
| 117 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | * @return integer Unix time stamp in seconds |
| 127 | 127 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 128 | 128 | */ |
| 129 | - public function time( $path ) |
|
| 129 | + public function time($path) |
|
| 130 | 130 | { |
| 131 | 131 | try { |
| 132 | - return $this->fs->lastModified( $path ); |
|
| 133 | - } catch( \Exception $e ) { |
|
| 134 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 132 | + return $this->fs->lastModified($path); |
|
| 133 | + } catch (\Exception $e) { |
|
| 134 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | * @return void |
| 144 | 144 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 145 | 145 | */ |
| 146 | - public function rm( $path ) |
|
| 146 | + public function rm($path) |
|
| 147 | 147 | { |
| 148 | 148 | try { |
| 149 | - $this->fs->delete( $path ); |
|
| 150 | - } catch( \Exception $e ) { |
|
| 151 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 149 | + $this->fs->delete($path); |
|
| 150 | + } catch (\Exception $e) { |
|
| 151 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | * @param string $path Path to the file |
| 160 | 160 | * @return boolean True if it exists, false if not |
| 161 | 161 | */ |
| 162 | - public function has( $path ) |
|
| 162 | + public function has($path) |
|
| 163 | 163 | { |
| 164 | - return $this->fs->exists( $path ); |
|
| 164 | + return $this->fs->exists($path); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | * @return string File content |
| 175 | 175 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 176 | 176 | */ |
| 177 | - public function read( $path ) |
|
| 177 | + public function read($path) |
|
| 178 | 178 | { |
| 179 | 179 | try { |
| 180 | - return $this->fs->get( $path ); |
|
| 181 | - } catch( \Exception $e ) { |
|
| 182 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 180 | + return $this->fs->get($path); |
|
| 181 | + } catch (\Exception $e) { |
|
| 182 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |
@@ -191,14 +191,14 @@ discard block |
||
| 191 | 191 | * @return string Path of the local file |
| 192 | 192 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 193 | 193 | */ |
| 194 | - public function readf( $path ) |
|
| 194 | + public function readf($path) |
|
| 195 | 195 | { |
| 196 | - if( ( $filename = tempnam( $this->tempdir, 'ai-' ) ) === false ) { |
|
| 197 | - throw new Exception( sprintf( 'Unable to create file in "%1$s"', $this->tempdir ) ); |
|
| 196 | + if (($filename = tempnam($this->tempdir, 'ai-')) === false) { |
|
| 197 | + throw new Exception(sprintf('Unable to create file in "%1$s"', $this->tempdir)); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - if( @file_put_contents( $filename, $this->fs->get( $path ) ) === false ) { |
|
| 201 | - throw new Exception( sprintf( 'Couldn\'t write file "%1$s"', $filename ) ); |
|
| 200 | + if (@file_put_contents($filename, $this->fs->get($path)) === false) { |
|
| 201 | + throw new Exception(sprintf('Couldn\'t write file "%1$s"', $filename)); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | return $filename; |
@@ -214,24 +214,24 @@ discard block |
||
| 214 | 214 | * @return resource File stream descriptor |
| 215 | 215 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 216 | 216 | */ |
| 217 | - public function reads( $path ) |
|
| 217 | + public function reads($path) |
|
| 218 | 218 | { |
| 219 | 219 | try { |
| 220 | - $content = $this->fs->get( $path ); |
|
| 221 | - } catch( \Exception $e ) { |
|
| 222 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 220 | + $content = $this->fs->get($path); |
|
| 221 | + } catch (\Exception $e) { |
|
| 222 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - if( ( $stream = tmpfile() ) === false ) { |
|
| 226 | - throw new Exception( 'Couldn\'t create temporary file' ); |
|
| 225 | + if (($stream = tmpfile()) === false) { |
|
| 226 | + throw new Exception('Couldn\'t create temporary file'); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - if( fwrite( $stream, $content ) === false ) { |
|
| 230 | - throw new Exception( 'Couldn\'t write to temporary file' ); |
|
| 229 | + if (fwrite($stream, $content) === false) { |
|
| 230 | + throw new Exception('Couldn\'t write to temporary file'); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - if( rewind( $stream ) === false ) { |
|
| 234 | - throw new Exception( 'Couldn\'t rewind temporary file' ); |
|
| 233 | + if (rewind($stream) === false) { |
|
| 234 | + throw new Exception('Couldn\'t rewind temporary file'); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | return $stream; |
@@ -248,12 +248,12 @@ discard block |
||
| 248 | 248 | * @return void |
| 249 | 249 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 250 | 250 | */ |
| 251 | - public function write( $path, $content ) |
|
| 251 | + public function write($path, $content) |
|
| 252 | 252 | { |
| 253 | 253 | try { |
| 254 | - $this->fs->put( $path, $content ); |
|
| 255 | - } catch( \Exception $e ) { |
|
| 256 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 254 | + $this->fs->put($path, $content); |
|
| 255 | + } catch (\Exception $e) { |
|
| 256 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | * @return void |
| 269 | 269 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 270 | 270 | */ |
| 271 | - public function writef( $path, $local ) |
|
| 271 | + public function writef($path, $local) |
|
| 272 | 272 | { |
| 273 | - if( ( $content = @file_get_contents( $local ) ) === false ) { |
|
| 274 | - throw new Exception( sprintf( 'Couldn\'t read file "%1$s"', $local ) ); |
|
| 273 | + if (($content = @file_get_contents($local)) === false) { |
|
| 274 | + throw new Exception(sprintf('Couldn\'t read file "%1$s"', $local)); |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - $this->write( $path, $content ); |
|
| 277 | + $this->write($path, $content); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -288,17 +288,17 @@ discard block |
||
| 288 | 288 | * @return void |
| 289 | 289 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 290 | 290 | */ |
| 291 | - public function writes( $path, $stream ) |
|
| 291 | + public function writes($path, $stream) |
|
| 292 | 292 | { |
| 293 | - if( ( $content = @fread( $stream, 0x7ffffffd ) ) === false ) { |
|
| 293 | + if (($content = @fread($stream, 0x7ffffffd)) === false) { |
|
| 294 | 294 | $error = error_get_last(); |
| 295 | - throw new Exception( $error['message'] ); |
|
| 295 | + throw new Exception($error['message']); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | try { |
| 299 | - $this->fs->put( $path, $content ); |
|
| 300 | - } catch( \Exception $e ) { |
|
| 301 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 299 | + $this->fs->put($path, $content); |
|
| 300 | + } catch (\Exception $e) { |
|
| 301 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 302 | 302 | } |
| 303 | 303 | } |
| 304 | 304 | |
@@ -311,12 +311,12 @@ discard block |
||
| 311 | 311 | * @return void |
| 312 | 312 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 313 | 313 | */ |
| 314 | - public function move( $from, $to ) |
|
| 314 | + public function move($from, $to) |
|
| 315 | 315 | { |
| 316 | 316 | try { |
| 317 | - $this->fs->move( $from, $to ); |
|
| 318 | - } catch( \Exception $e ) { |
|
| 319 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 317 | + $this->fs->move($from, $to); |
|
| 318 | + } catch (\Exception $e) { |
|
| 319 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | * @return void |
| 330 | 330 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 331 | 331 | */ |
| 332 | - public function copy( $from, $to ) |
|
| 332 | + public function copy($from, $to) |
|
| 333 | 333 | { |
| 334 | 334 | try { |
| 335 | - $this->fs->copy( $from, $to ); |
|
| 336 | - } catch( \Exception $e ) { |
|
| 337 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 335 | + $this->fs->copy($from, $to); |
|
| 336 | + } catch (\Exception $e) { |
|
| 337 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 32 | 32 | * @param string $tempdir Directory for storing temporary files |
| 33 | 33 | */ |
| 34 | - public function __construct( \Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir ) |
|
| 34 | + public function __construct(\Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir) |
|
| 35 | 35 | { |
| 36 | - parent::__construct( $config ); |
|
| 36 | + parent::__construct($config); |
|
| 37 | 37 | |
| 38 | 38 | $this->fsm = $fsm; |
| 39 | 39 | $this->tempdir = $tempdir; |
@@ -47,19 +47,19 @@ discard block |
||
| 47 | 47 | * @return \Aimeos\MW\Filesystem\Iface File system object |
| 48 | 48 | * @throws \Aimeos\MW\Filesystem\Exception If an no configuration for that name is found |
| 49 | 49 | */ |
| 50 | - public function get( $name ) |
|
| 50 | + public function get($name) |
|
| 51 | 51 | { |
| 52 | - $key = $this->getConfig( $name ); |
|
| 52 | + $key = $this->getConfig($name); |
|
| 53 | 53 | |
| 54 | - if( is_string( $key ) ) |
|
| 54 | + if (is_string($key)) |
|
| 55 | 55 | { |
| 56 | - if( !isset( $this->objects[$key] ) ) { |
|
| 57 | - $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel( $this->fsm->disk( $key ), $this->tempdir ); |
|
| 56 | + if (!isset($this->objects[$key])) { |
|
| 57 | + $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel($this->fsm->disk($key), $this->tempdir); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $this->objects[$key]; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - return parent::get( $name ); |
|
| 63 | + return parent::get($name); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 28 | 28 | */ |
| 29 | - public function __construct( \Aimeos\MW\View\Iface $view ) |
|
| 29 | + public function __construct(\Aimeos\MW\View\Iface $view) |
|
| 30 | 30 | { |
| 31 | - parent::__construct( $view, new \Zend\Diactoros\Response() ); |
|
| 31 | + parent::__construct($view, new \Zend\Diactoros\Response()); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -17,27 +17,27 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Illuminate\Http\Response' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Illuminate\Http\Response is not available' ); |
|
| 20 | + if (!class_exists('\Illuminate\Http\Response')) { |
|
| 21 | + $this->markTestSkipped('\Illuminate\Http\Response is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 25 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 24 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 25 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
| 29 | - $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 29 | + $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | protected function tearDown() |
| 34 | 34 | { |
| 35 | - unset( $this->object, $this->mock ); |
|
| 35 | + unset($this->object, $this->mock); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testTransform() |
| 40 | 40 | { |
| 41 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform() ); |
|
| 41 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform()); |
|
| 42 | 42 | } |
| 43 | 43 | } |
@@ -249,7 +249,7 @@ |
||
| 249 | 249 | * |
| 250 | 250 | * @param string $manager Name of the sub manager type in lower case |
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 253 | 253 | */ |
| 254 | 254 | public function getSubManager( $manager, $name = null ) |
| 255 | 255 | { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'label' => 'Customer address ID', |
| 26 | 26 | 'code' => 'customer.address.id', |
| 27 | 27 | 'internalcode' => 'lvuad."id"', |
| 28 | - 'internaldeps' => array( 'LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )' ), |
|
| 28 | + 'internaldeps' => array('LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )'), |
|
| 29 | 29 | 'type' => 'integer', |
| 30 | 30 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
| 31 | 31 | 'public' => false, |
@@ -222,14 +222,14 @@ discard block |
||
| 222 | 222 | * |
| 223 | 223 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 224 | 224 | */ |
| 225 | - public function cleanup( array $siteids ) |
|
| 225 | + public function cleanup(array $siteids) |
|
| 226 | 226 | { |
| 227 | 227 | $path = 'mshop/customer/manager/address/submanagers'; |
| 228 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
| 229 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 228 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 229 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/address/laravel/delete' ); |
|
| 232 | + $this->cleanupBase($siteids, 'mshop/customer/manager/address/laravel/delete'); |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | |
@@ -239,11 +239,11 @@ discard block |
||
| 239 | 239 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 240 | 240 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 241 | 241 | */ |
| 242 | - public function getSearchAttributes( $withsub = true ) |
|
| 242 | + public function getSearchAttributes($withsub = true) |
|
| 243 | 243 | { |
| 244 | 244 | $path = 'mshop/customer/manager/address/submanagers'; |
| 245 | 245 | |
| 246 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
| 246 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | |
@@ -254,9 +254,9 @@ discard block |
||
| 254 | 254 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 255 | 255 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 256 | 256 | */ |
| 257 | - public function getSubManager( $manager, $name = null ) |
|
| 257 | + public function getSubManager($manager, $name = null) |
|
| 258 | 258 | { |
| 259 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
| 259 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | /** |
| 32 | 32 | * Initializes the request view helper. |
| 33 | 33 | * |
| 34 | - * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
|
| 34 | + * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
|
| 35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
| 36 | 36 | */ |
| 37 | 37 | public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
@@ -117,8 +117,7 @@ |
||
| 117 | 117 | $value->getClientOriginalName(), |
| 118 | 118 | $value->getClientMimeType() |
| 119 | 119 | ); |
| 120 | - } |
|
| 121 | - elseif( is_array( $value ) ) |
|
| 120 | + } elseif( is_array( $value ) ) |
|
| 122 | 121 | { |
| 123 | 122 | $list[$key] = $this->getFiles( $value ); |
| 124 | 123 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
|
| 37 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request) |
|
| 38 | 38 | { |
| 39 | 39 | $this->request = $request; |
| 40 | 40 | |
| 41 | - parent::__construct( $view, $this->createRequest( $request ) ); |
|
| 41 | + parent::__construct($view, $this->createRequest($request)); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function getTarget() |
| 62 | 62 | { |
| 63 | - if( ( $route = $this->request->route() ) !== null ) { |
|
| 63 | + if (($route = $this->request->route()) !== null) { |
|
| 64 | 64 | return $route->getName(); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param \Illuminate\Http\Request $nativeRequest Laravel request object |
| 73 | 73 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
| 74 | 74 | */ |
| 75 | - protected function createRequest( \Illuminate\Http\Request $nativeRequest ) |
|
| 75 | + protected function createRequest(\Illuminate\Http\Request $nativeRequest) |
|
| 76 | 76 | { |
| 77 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
| 78 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
| 77 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
| 78 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
| 79 | 79 | $headers = $nativeRequest->headers->all(); |
| 80 | 80 | $cookies = $nativeRequest->cookies->all(); |
| 81 | 81 | $post = $nativeRequest->request->all(); |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | $method = $nativeRequest->getMethod(); |
| 84 | 84 | $uri = $nativeRequest->getUri(); |
| 85 | 85 | |
| 86 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
| 87 | - $body->write( $nativeRequest->getContent() ); |
|
| 86 | + $body = new Stream('php://temp', 'wb+'); |
|
| 87 | + $body->write($nativeRequest->getContent()); |
|
| 88 | 88 | |
| 89 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
| 89 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
| 90 | 90 | |
| 91 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
| 92 | - $request = $request->withAttribute( $key, $value ); |
|
| 91 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
| 92 | + $request = $request->withAttribute($key, $value); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | return $request; |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
| 103 | 103 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
| 104 | 104 | */ |
| 105 | - protected function getFiles( array $files ) |
|
| 105 | + protected function getFiles(array $files) |
|
| 106 | 106 | { |
| 107 | 107 | $list = []; |
| 108 | 108 | |
| 109 | - foreach( $files as $key => $value ) |
|
| 109 | + foreach ($files as $key => $value) |
|
| 110 | 110 | { |
| 111 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
| 111 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
| 112 | 112 | { |
| 113 | 113 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 114 | 114 | $value->getRealPath(), |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | $value->getClientMimeType() |
| 119 | 119 | ); |
| 120 | 120 | } |
| 121 | - elseif( is_array( $value ) ) |
|
| 121 | + elseif (is_array($value)) |
|
| 122 | 122 | { |
| 123 | - $list[$key] = $this->getFiles( $value ); |
|
| 123 | + $list[$key] = $this->getFiles($value); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
@@ -11,348 +11,348 @@ |
||
| 11 | 11 | |
| 12 | 12 | protected function setUp() |
| 13 | 13 | { |
| 14 | - if( !interface_exists( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) ) { |
|
| 15 | - $this->markTestSkipped( 'Install Laravel framework first' ); |
|
| 14 | + if (!interface_exists('\\Illuminate\\Contracts\\Filesystem\\Filesystem')) { |
|
| 15 | + $this->markTestSkipped('Install Laravel framework first'); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) |
|
| 18 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Filesystem\\Filesystem') |
|
| 19 | 19 | ->disableOriginalConstructor() |
| 20 | 20 | ->getMock(); |
| 21 | 21 | |
| 22 | - $this->object = new \Aimeos\MW\Filesystem\Laravel( $this->mock, sys_get_temp_dir() ); |
|
| 22 | + $this->object = new \Aimeos\MW\Filesystem\Laravel($this->mock, sys_get_temp_dir()); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | protected function tearDown() |
| 27 | 27 | { |
| 28 | - unset( $this->object ); |
|
| 28 | + unset($this->object); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testIsdir() |
| 33 | 33 | { |
| 34 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
| 35 | - ->will( $this->returnValue( array( 't', 'test', 'es' ) ) ); |
|
| 34 | + $this->mock->expects($this->once())->method('directories') |
|
| 35 | + ->will($this->returnValue(array('t', 'test', 'es'))); |
|
| 36 | 36 | |
| 37 | - $this->assertTrue( $this->object->isdir( 'test' ) ); |
|
| 37 | + $this->assertTrue($this->object->isdir('test')); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | public function testIsdirFalse() |
| 42 | 42 | { |
| 43 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
| 44 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
| 43 | + $this->mock->expects($this->once())->method('directories') |
|
| 44 | + ->will($this->returnValue(array('t', 'es'))); |
|
| 45 | 45 | |
| 46 | - $this->assertFalse( $this->object->isdir( 'test' ) ); |
|
| 46 | + $this->assertFalse($this->object->isdir('test')); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testMkdir() |
| 51 | 51 | { |
| 52 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ); |
|
| 52 | + $this->mock->expects($this->once())->method('makeDirectory'); |
|
| 53 | 53 | |
| 54 | - $this->object->mkdir( 'test' ); |
|
| 54 | + $this->object->mkdir('test'); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | public function testMkdirException() |
| 59 | 59 | { |
| 60 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ) |
|
| 61 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 60 | + $this->mock->expects($this->once())->method('makeDirectory') |
|
| 61 | + ->will($this->throwException(new \RuntimeException())); |
|
| 62 | 62 | |
| 63 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 64 | - $this->object->mkdir( 'test' ); |
|
| 63 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 64 | + $this->object->mkdir('test'); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
| 68 | 68 | public function testRmdir() |
| 69 | 69 | { |
| 70 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ); |
|
| 70 | + $this->mock->expects($this->once())->method('deleteDirectory'); |
|
| 71 | 71 | |
| 72 | - $this->object->rmdir( 'test' ); |
|
| 72 | + $this->object->rmdir('test'); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | public function testRmdirException() |
| 77 | 77 | { |
| 78 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ) |
|
| 79 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 78 | + $this->mock->expects($this->once())->method('deleteDirectory') |
|
| 79 | + ->will($this->throwException(new \RuntimeException())); |
|
| 80 | 80 | |
| 81 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 82 | - $this->object->rmdir( 'test' ); |
|
| 81 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 82 | + $this->object->rmdir('test'); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | public function testScan() |
| 87 | 87 | { |
| 88 | - $list = array( 't', 'es', 'st' ); |
|
| 88 | + $list = array('t', 'es', 'st'); |
|
| 89 | 89 | |
| 90 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
| 91 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
| 90 | + $this->mock->expects($this->once())->method('directories') |
|
| 91 | + ->will($this->returnValue(array('t', 'es'))); |
|
| 92 | 92 | |
| 93 | - $this->mock->expects( $this->once() )->method( 'files' ) |
|
| 94 | - ->will( $this->returnValue( array( 'st' ) ) ); |
|
| 93 | + $this->mock->expects($this->once())->method('files') |
|
| 94 | + ->will($this->returnValue(array('st'))); |
|
| 95 | 95 | |
| 96 | 96 | $result = $this->object->scan(); |
| 97 | 97 | |
| 98 | - $this->assertInternalType( 'array', $result ); |
|
| 98 | + $this->assertInternalType('array', $result); |
|
| 99 | 99 | |
| 100 | - foreach( $result as $entry ) { |
|
| 101 | - $this->assertTrue( in_array( $entry, $list ) ); |
|
| 100 | + foreach ($result as $entry) { |
|
| 101 | + $this->assertTrue(in_array($entry, $list)); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
| 106 | 106 | public function testScanException() |
| 107 | 107 | { |
| 108 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
| 109 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 108 | + $this->mock->expects($this->once())->method('directories') |
|
| 109 | + ->will($this->throwException(new \RuntimeException())); |
|
| 110 | 110 | |
| 111 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 112 | - $this->object->scan( 'test' ); |
|
| 111 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 112 | + $this->object->scan('test'); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | public function testSize() |
| 117 | 117 | { |
| 118 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
| 119 | - ->will( $this->returnValue( 4 ) ); |
|
| 118 | + $this->mock->expects($this->once())->method('size') |
|
| 119 | + ->will($this->returnValue(4)); |
|
| 120 | 120 | |
| 121 | - $result = $this->object->size( 'test' ); |
|
| 121 | + $result = $this->object->size('test'); |
|
| 122 | 122 | |
| 123 | - $this->assertEquals( 4, $result ); |
|
| 123 | + $this->assertEquals(4, $result); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | |
| 127 | 127 | public function testSizeException() |
| 128 | 128 | { |
| 129 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
| 130 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 129 | + $this->mock->expects($this->once())->method('size') |
|
| 130 | + ->will($this->throwException(new \RuntimeException())); |
|
| 131 | 131 | |
| 132 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 133 | - $this->object->size( 'test' ); |
|
| 132 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 133 | + $this->object->size('test'); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
| 137 | 137 | public function testTime() |
| 138 | 138 | { |
| 139 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
| 140 | - ->will( $this->returnValue( 1 ) ); |
|
| 139 | + $this->mock->expects($this->once())->method('lastModified') |
|
| 140 | + ->will($this->returnValue(1)); |
|
| 141 | 141 | |
| 142 | - $result = $this->object->time( 'test' ); |
|
| 142 | + $result = $this->object->time('test'); |
|
| 143 | 143 | |
| 144 | - $this->assertGreaterThan( 0, $result ); |
|
| 144 | + $this->assertGreaterThan(0, $result); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | public function testTimeException() |
| 149 | 149 | { |
| 150 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
| 151 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 150 | + $this->mock->expects($this->once())->method('lastModified') |
|
| 151 | + ->will($this->throwException(new \RuntimeException())); |
|
| 152 | 152 | |
| 153 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 154 | - $this->object->time( 'test' ); |
|
| 153 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 154 | + $this->object->time('test'); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | |
| 158 | 158 | public function testRm() |
| 159 | 159 | { |
| 160 | - $this->mock->expects( $this->once() )->method( 'delete' ); |
|
| 160 | + $this->mock->expects($this->once())->method('delete'); |
|
| 161 | 161 | |
| 162 | - $this->object->rm( 'test' ); |
|
| 162 | + $this->object->rm('test'); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
| 166 | 166 | public function testRmException() |
| 167 | 167 | { |
| 168 | - $this->mock->expects( $this->once() )->method( 'delete' ) |
|
| 169 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 168 | + $this->mock->expects($this->once())->method('delete') |
|
| 169 | + ->will($this->throwException(new \RuntimeException())); |
|
| 170 | 170 | |
| 171 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 172 | - $this->object->rm( 'test' ); |
|
| 171 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 172 | + $this->object->rm('test'); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | public function testHas() |
| 177 | 177 | { |
| 178 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
| 179 | - ->will( $this->returnValue( true ) ); |
|
| 178 | + $this->mock->expects($this->once())->method('exists') |
|
| 179 | + ->will($this->returnValue(true)); |
|
| 180 | 180 | |
| 181 | - $result = $this->object->has( 'test' ); |
|
| 181 | + $result = $this->object->has('test'); |
|
| 182 | 182 | |
| 183 | - $this->assertTrue( $result ); |
|
| 183 | + $this->assertTrue($result); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
| 187 | 187 | public function testHasFalse() |
| 188 | 188 | { |
| 189 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
| 190 | - ->will( $this->returnValue( false ) ); |
|
| 189 | + $this->mock->expects($this->once())->method('exists') |
|
| 190 | + ->will($this->returnValue(false)); |
|
| 191 | 191 | |
| 192 | - $result = $this->object->has( 'test' ); |
|
| 192 | + $result = $this->object->has('test'); |
|
| 193 | 193 | |
| 194 | - $this->assertFalse( $result ); |
|
| 194 | + $this->assertFalse($result); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | |
| 198 | 198 | public function testRead() |
| 199 | 199 | { |
| 200 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
| 201 | - ->will( $this->returnValue( 'test' ) ); |
|
| 200 | + $this->mock->expects($this->once())->method('get') |
|
| 201 | + ->will($this->returnValue('test')); |
|
| 202 | 202 | |
| 203 | - $result = $this->object->read( 'file' ); |
|
| 203 | + $result = $this->object->read('file'); |
|
| 204 | 204 | |
| 205 | - $this->assertEquals( 'test', $result ); |
|
| 205 | + $this->assertEquals('test', $result); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | |
| 209 | 209 | public function testReadException() |
| 210 | 210 | { |
| 211 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
| 212 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 211 | + $this->mock->expects($this->once())->method('get') |
|
| 212 | + ->will($this->throwException(new \RuntimeException())); |
|
| 213 | 213 | |
| 214 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 215 | - $this->object->read( 'readinvalid' ); |
|
| 214 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 215 | + $this->object->read('readinvalid'); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | public function testReadf() |
| 220 | 220 | { |
| 221 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
| 222 | - ->will( $this->returnValue( 'test' ) ); |
|
| 221 | + $this->mock->expects($this->once())->method('get') |
|
| 222 | + ->will($this->returnValue('test')); |
|
| 223 | 223 | |
| 224 | - $result = $this->object->readf( 'file' ); |
|
| 224 | + $result = $this->object->readf('file'); |
|
| 225 | 225 | |
| 226 | - $this->assertEquals( 'test', file_get_contents( $result ) ); |
|
| 227 | - unlink( $result ); |
|
| 226 | + $this->assertEquals('test', file_get_contents($result)); |
|
| 227 | + unlink($result); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | |
| 231 | 231 | public function testReads() |
| 232 | 232 | { |
| 233 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
| 234 | - ->will( $this->returnValue( 'test' ) ); |
|
| 233 | + $this->mock->expects($this->once())->method('get') |
|
| 234 | + ->will($this->returnValue('test')); |
|
| 235 | 235 | |
| 236 | - $handle = $this->object->reads( 'file' ); |
|
| 236 | + $handle = $this->object->reads('file'); |
|
| 237 | 237 | |
| 238 | - $this->assertInternalType( 'resource', $handle ); |
|
| 239 | - $this->assertEquals( 'test', fgets( $handle ) ); |
|
| 238 | + $this->assertInternalType('resource', $handle); |
|
| 239 | + $this->assertEquals('test', fgets($handle)); |
|
| 240 | 240 | |
| 241 | - fclose( $handle ); |
|
| 241 | + fclose($handle); |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | |
| 245 | 245 | public function testReadsException() |
| 246 | 246 | { |
| 247 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
| 248 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 247 | + $this->mock->expects($this->once())->method('get') |
|
| 248 | + ->will($this->throwException(new \RuntimeException())); |
|
| 249 | 249 | |
| 250 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 251 | - $this->object->reads( 'readinvalid' ); |
|
| 250 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 251 | + $this->object->reads('readinvalid'); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | |
| 255 | 255 | public function testWrite() |
| 256 | 256 | { |
| 257 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
| 257 | + $this->mock->expects($this->once())->method('put'); |
|
| 258 | 258 | |
| 259 | - $this->object->write( 'file', 'test' ); |
|
| 259 | + $this->object->write('file', 'test'); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | |
| 263 | 263 | public function testWriteException() |
| 264 | 264 | { |
| 265 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
| 266 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 265 | + $this->mock->expects($this->once())->method('put') |
|
| 266 | + ->will($this->throwException(new \RuntimeException())); |
|
| 267 | 267 | |
| 268 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 269 | - $this->object->write( '', 'test' ); |
|
| 268 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 269 | + $this->object->write('', 'test'); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | |
| 273 | 273 | public function testWritef() |
| 274 | 274 | { |
| 275 | - $file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'file99'; |
|
| 276 | - file_put_contents( $file, 'test' ); |
|
| 275 | + $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'file99'; |
|
| 276 | + file_put_contents($file, 'test'); |
|
| 277 | 277 | |
| 278 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
| 278 | + $this->mock->expects($this->once())->method('put'); |
|
| 279 | 279 | |
| 280 | - $this->object->writef( 'file', $file ); |
|
| 280 | + $this->object->writef('file', $file); |
|
| 281 | 281 | |
| 282 | - unlink( $file ); |
|
| 282 | + unlink($file); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | |
| 286 | 286 | public function testWritefException() |
| 287 | 287 | { |
| 288 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 289 | - $this->object->writef( '', 'invalid' ); |
|
| 288 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 289 | + $this->object->writef('', 'invalid'); |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | |
| 293 | 293 | public function testWrites() |
| 294 | 294 | { |
| 295 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
| 295 | + $this->mock->expects($this->once())->method('put'); |
|
| 296 | 296 | |
| 297 | - $handle = fopen( __FILE__, 'r' ); |
|
| 297 | + $handle = fopen(__FILE__, 'r'); |
|
| 298 | 298 | |
| 299 | - $this->object->writes( 'file', $handle ); |
|
| 299 | + $this->object->writes('file', $handle); |
|
| 300 | 300 | |
| 301 | - fclose( $handle ); |
|
| 301 | + fclose($handle); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | |
| 305 | 305 | public function testWritesException() |
| 306 | 306 | { |
| 307 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
| 308 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 307 | + $this->mock->expects($this->once())->method('put') |
|
| 308 | + ->will($this->throwException(new \RuntimeException())); |
|
| 309 | 309 | |
| 310 | - $handle = fopen( __FILE__, 'r' ); |
|
| 310 | + $handle = fopen(__FILE__, 'r'); |
|
| 311 | 311 | |
| 312 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 313 | - $this->object->writes( 'file', $handle ); |
|
| 312 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 313 | + $this->object->writes('file', $handle); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | |
| 317 | 317 | public function testWritesException2() |
| 318 | 318 | { |
| 319 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 320 | - $this->object->writes( 'file', null ); |
|
| 319 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 320 | + $this->object->writes('file', null); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | |
| 324 | 324 | public function testMove() |
| 325 | 325 | { |
| 326 | - $this->mock->expects( $this->once() )->method( 'move' ); |
|
| 326 | + $this->mock->expects($this->once())->method('move'); |
|
| 327 | 327 | |
| 328 | - $this->object->move( 'file1', 'file2' ); |
|
| 328 | + $this->object->move('file1', 'file2'); |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | |
| 332 | 332 | public function testMoveException() |
| 333 | 333 | { |
| 334 | - $this->mock->expects( $this->once() )->method( 'move' ) |
|
| 335 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 334 | + $this->mock->expects($this->once())->method('move') |
|
| 335 | + ->will($this->throwException(new \RuntimeException())); |
|
| 336 | 336 | |
| 337 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 338 | - $this->object->move( 'file1', 'file2' ); |
|
| 337 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 338 | + $this->object->move('file1', 'file2'); |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | |
| 342 | 342 | public function testCopy() |
| 343 | 343 | { |
| 344 | - $this->mock->expects( $this->once() )->method( 'copy' ); |
|
| 344 | + $this->mock->expects($this->once())->method('copy'); |
|
| 345 | 345 | |
| 346 | - $this->object->copy( 'file1', 'file2' ); |
|
| 346 | + $this->object->copy('file1', 'file2'); |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | |
| 350 | 350 | public function testCopyException() |
| 351 | 351 | { |
| 352 | - $this->mock->expects( $this->once() )->method( 'copy' ) |
|
| 353 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
| 352 | + $this->mock->expects($this->once())->method('copy') |
|
| 353 | + ->will($this->throwException(new \RuntimeException())); |
|
| 354 | 354 | |
| 355 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
| 356 | - $this->object->copy( 'file1', 'file2' ); |
|
| 355 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
| 356 | + $this->object->copy('file1', 'file2'); |
|
| 357 | 357 | } |
| 358 | 358 | } |