@@ -140,7 +140,7 @@ |
||
| 140 | 140 | /** |
| 141 | 141 | * Returns the frontend controller |
| 142 | 142 | * |
| 143 | - * @return \Aimeos\Controller\Frontend\Stock\Iface Frontend controller object |
|
| 143 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 144 | 144 | */ |
| 145 | 145 | protected function getController() |
| 146 | 146 | { |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | * @param \Aimeos\Controller\Frontend\Iface $controller Controller object |
| 31 | 31 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects |
| 32 | 32 | */ |
| 33 | - public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 33 | + public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 34 | 34 | { |
| 35 | - \Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Frontend\\Stock\\Iface', $controller ); |
|
| 35 | + \Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Frontend\\Stock\\Iface', $controller); |
|
| 36 | 36 | |
| 37 | 37 | $this->controller = $controller; |
| 38 | 38 | |
| 39 | - parent::__construct( $context ); |
|
| 39 | + parent::__construct($context); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | * @return mixed Returns the value of the called method |
| 49 | 49 | * @throws \Aimeos\Controller\Frontend\Exception If method call failed |
| 50 | 50 | */ |
| 51 | - public function __call( $name, array $param ) |
|
| 51 | + public function __call($name, array $param) |
|
| 52 | 52 | { |
| 53 | - return @call_user_func_array( array( $this->controller, $name ), $param ); |
|
| 53 | + return @call_user_func_array(array($this->controller, $name), $param); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
| 63 | 63 | * @since 2017.03 |
| 64 | 64 | */ |
| 65 | - public function addFilterCodes( \Aimeos\MW\Criteria\Iface $filter, array $codes ) |
|
| 65 | + public function addFilterCodes(\Aimeos\MW\Criteria\Iface $filter, array $codes) |
|
| 66 | 66 | { |
| 67 | - return $this->controller->addFilterCodes( $filter, $codes ); |
|
| 67 | + return $this->controller->addFilterCodes($filter, $codes); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
| 77 | 77 | * @since 2017.03 |
| 78 | 78 | */ |
| 79 | - public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes ) |
|
| 79 | + public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes) |
|
| 80 | 80 | { |
| 81 | - return $this->controller->addFilterTypes( $filter, $codes ); |
|
| 81 | + return $this->controller->addFilterTypes($filter, $codes); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | * @return \Aimeos\MShop\Stock\Item\Iface Stock item including the referenced domains items |
| 103 | 103 | * @since 2017.03 |
| 104 | 104 | */ |
| 105 | - public function getItem( $id ) |
|
| 105 | + public function getItem($id) |
|
| 106 | 106 | { |
| 107 | - return $this->controller->getItem( $id ); |
|
| 107 | + return $this->controller->getItem($id); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | * @return array Ordered list of stock items implementing \Aimeos\MShop\Stock\Item\Iface |
| 117 | 117 | * @since 2017.03 |
| 118 | 118 | */ |
| 119 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null ) |
|
| 119 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null) |
|
| 120 | 120 | { |
| 121 | - return $this->controller->searchItems( $filter, $total ); |
|
| 121 | + return $this->controller->searchItems($filter, $total); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 29 | 29 | * @return \Aimeos\Controller\Frontend\Attribute\Iface Controller object |
| 30 | 30 | */ |
| 31 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 31 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 32 | 32 | { |
| 33 | 33 | /** controller/frontend/attribute/name |
| 34 | 34 | * Class name of the used attribute frontend controller implementation |
@@ -63,20 +63,20 @@ discard block |
||
| 63 | 63 | * @since 2014.03 |
| 64 | 64 | * @category Developer |
| 65 | 65 | */ |
| 66 | - if( $name === null ) { |
|
| 67 | - $name = $context->getConfig()->get( 'controller/frontend/attribute/name', 'Standard' ); |
|
| 66 | + if ($name === null) { |
|
| 67 | + $name = $context->getConfig()->get('controller/frontend/attribute/name', 'Standard'); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( ctype_alnum( $name ) === false ) |
|
| 70 | + if (ctype_alnum($name) === false) |
|
| 71 | 71 | { |
| 72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name : '<not a string>'; |
|
| 73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name : '<not a string>'; |
|
| 73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Attribute\\Iface'; |
| 77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name; |
| 78 | 78 | |
| 79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 80 | 80 | |
| 81 | 81 | /** controller/frontend/attribute/decorators/excludes |
| 82 | 82 | * Excludes decorators added by the "common" option from the attribute frontend controllers |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * @see controller/frontend/attribute/decorators/excludes |
| 153 | 153 | * @see controller/frontend/attribute/decorators/global |
| 154 | 154 | */ |
| 155 | - return self::addControllerDecorators( $context, $manager, 'attribute' ); |
|
| 155 | + return self::addControllerDecorators($context, $manager, 'attribute'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | } |
@@ -18,31 +18,31 @@ |
||
| 18 | 18 | { |
| 19 | 19 | $context = \TestHelperFrontend::getContext(); |
| 20 | 20 | |
| 21 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Base' ) |
|
| 22 | - ->setConstructorArgs( [$context] ) |
|
| 21 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Base') |
|
| 22 | + ->setConstructorArgs([$context]) |
|
| 23 | 23 | ->getMockForAbstractClass(); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | protected function tearDown() |
| 28 | 28 | { |
| 29 | - unset( $this->object ); |
|
| 29 | + unset($this->object); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | public function testGetContext() |
| 34 | 34 | { |
| 35 | - $result = $this->access( 'getContext' )->invokeArgs( $this->object, [] ); |
|
| 35 | + $result = $this->access('getContext')->invokeArgs($this->object, []); |
|
| 36 | 36 | |
| 37 | - $this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $result ); |
|
| 37 | + $this->assertInstanceOf('\Aimeos\MShop\Context\Item\Iface', $result); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | - protected function access( $name ) |
|
| 41 | + protected function access($name) |
|
| 42 | 42 | { |
| 43 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Base' ); |
|
| 44 | - $method = $class->getMethod( $name ); |
|
| 45 | - $method->setAccessible( true ); |
|
| 43 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Base'); |
|
| 44 | + $method = $class->getMethod($name); |
|
| 45 | + $method->setAccessible(true); |
|
| 46 | 46 | |
| 47 | 47 | return $method; |
| 48 | 48 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
| 28 | 28 | * @since 2017.03 |
| 29 | 29 | */ |
| 30 | - public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes ); |
|
| 30 | + public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes); |
|
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items |
| 48 | 48 | * @since 2017.03 |
| 49 | 49 | */ |
| 50 | - public function getItem( $id, array $domains = array( 'media', 'price', 'text' ) ); |
|
| 50 | + public function getItem($id, array $domains = array('media', 'price', 'text')); |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute item including the referenced domains items |
| 59 | 59 | * @since 2017.03 |
| 60 | 60 | */ |
| 61 | - public function getItems( array $ids, array $domains = array( 'media', 'price', 'text' ) ); |
|
| 61 | + public function getItems(array $ids, array $domains = array('media', 'price', 'text')); |
|
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -70,5 +70,5 @@ discard block |
||
| 70 | 70 | * @return array Ordered list of attribute items implementing \Aimeos\MShop\Attribute\Item\Iface |
| 71 | 71 | * @since 2017.03 |
| 72 | 72 | */ |
| 73 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null ); |
|
| 73 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null); |
|
| 74 | 74 | } |
@@ -14,92 +14,92 @@ |
||
| 14 | 14 | { |
| 15 | 15 | public function testCreateController() |
| 16 | 16 | { |
| 17 | - $controller = \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket' ); |
|
| 18 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller ); |
|
| 17 | + $controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket'); |
|
| 18 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
| 22 | 22 | public function testCreateControllerEmpty() |
| 23 | 23 | { |
| 24 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 25 | - \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '' ); |
|
| 24 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 25 | + \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), ''); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | public function testCreateControllerInvalidName() |
| 30 | 30 | { |
| 31 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 32 | - \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '%^' ); |
|
| 31 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 32 | + \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '%^'); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | public function testCreateControllerNotExisting() |
| 37 | 37 | { |
| 38 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 39 | - \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' ); |
|
| 38 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 39 | + \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'notexist'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | public function testCreateSubControllerNotExisting() |
| 44 | 44 | { |
| 45 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 46 | - \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket/notexist' ); |
|
| 45 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 46 | + \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket/notexist'); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testClear() |
| 51 | 51 | { |
| 52 | - $cache = \Aimeos\Controller\Frontend\Factory::setCache( true ); |
|
| 52 | + $cache = \Aimeos\Controller\Frontend\Factory::setCache(true); |
|
| 53 | 53 | |
| 54 | 54 | $context = \TestHelperFrontend::getContext(); |
| 55 | 55 | |
| 56 | - $controller1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 56 | + $controller1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 57 | 57 | \Aimeos\Controller\Frontend\Factory::clear(); |
| 58 | - $controller2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 58 | + $controller2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 59 | 59 | |
| 60 | - \Aimeos\Controller\Frontend\Factory::setCache( $cache ); |
|
| 60 | + \Aimeos\Controller\Frontend\Factory::setCache($cache); |
|
| 61 | 61 | |
| 62 | - $this->assertNotSame( $controller1, $controller2 ); |
|
| 62 | + $this->assertNotSame($controller1, $controller2); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
| 66 | 66 | public function testClearSite() |
| 67 | 67 | { |
| 68 | - $cache = \Aimeos\Controller\Frontend\Factory::setCache( true ); |
|
| 68 | + $cache = \Aimeos\Controller\Frontend\Factory::setCache(true); |
|
| 69 | 69 | |
| 70 | 70 | $context = \TestHelperFrontend::getContext(); |
| 71 | 71 | |
| 72 | - $basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 73 | - $catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' ); |
|
| 74 | - \Aimeos\Controller\Frontend\Factory::clear( (string) $context ); |
|
| 72 | + $basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 73 | + $catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog'); |
|
| 74 | + \Aimeos\Controller\Frontend\Factory::clear((string) $context); |
|
| 75 | 75 | |
| 76 | - $basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 77 | - $catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' ); |
|
| 76 | + $basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 77 | + $catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog'); |
|
| 78 | 78 | |
| 79 | - \Aimeos\Controller\Frontend\Factory::setCache( $cache ); |
|
| 79 | + \Aimeos\Controller\Frontend\Factory::setCache($cache); |
|
| 80 | 80 | |
| 81 | - $this->assertNotSame( $basket1, $basket2 ); |
|
| 82 | - $this->assertNotSame( $catalog1, $catalog2 ); |
|
| 81 | + $this->assertNotSame($basket1, $basket2); |
|
| 82 | + $this->assertNotSame($catalog1, $catalog2); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | public function testClearSpecific() |
| 87 | 87 | { |
| 88 | - $cache = \Aimeos\Controller\Frontend\Factory::setCache( true ); |
|
| 88 | + $cache = \Aimeos\Controller\Frontend\Factory::setCache(true); |
|
| 89 | 89 | |
| 90 | 90 | $context = \TestHelperFrontend::getContext(); |
| 91 | 91 | |
| 92 | - $basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 93 | - $catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' ); |
|
| 94 | - \Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' ); |
|
| 92 | + $basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 93 | + $catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog'); |
|
| 94 | + \Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket'); |
|
| 95 | 95 | |
| 96 | - $basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
|
| 97 | - $catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' ); |
|
| 96 | + $basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket'); |
|
| 97 | + $catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog'); |
|
| 98 | 98 | |
| 99 | - \Aimeos\Controller\Frontend\Factory::setCache( $cache ); |
|
| 99 | + \Aimeos\Controller\Frontend\Factory::setCache($cache); |
|
| 100 | 100 | |
| 101 | - $this->assertNotSame( $basket1, $basket2 ); |
|
| 102 | - $this->assertSame( $catalog1, $catalog2 ); |
|
| 101 | + $this->assertNotSame($basket1, $basket2); |
|
| 102 | + $this->assertSame($catalog1, $catalog2); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | } |
| 106 | 106 | \ No newline at end of file |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | /** |
| 105 | 105 | * Returns the frontend controller |
| 106 | 106 | * |
| 107 | - * @return \Aimeos\Controller\Frontend\Locale\Iface Frontend controller object |
|
| 107 | + * @return \Aimeos\Controller\Frontend\Iface Frontend controller object |
|
| 108 | 108 | */ |
| 109 | 109 | protected function getController() |
| 110 | 110 | { |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | * @param \Aimeos\Controller\Frontend\Iface $controller Controller object |
| 31 | 31 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects |
| 32 | 32 | */ |
| 33 | - public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 33 | + public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context) |
|
| 34 | 34 | { |
| 35 | - \Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Frontend\\Locale\\Iface', $controller ); |
|
| 35 | + \Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Frontend\\Locale\\Iface', $controller); |
|
| 36 | 36 | |
| 37 | 37 | $this->controller = $controller; |
| 38 | 38 | |
| 39 | - parent::__construct( $context ); |
|
| 39 | + parent::__construct($context); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | * @return mixed Returns the value of the called method |
| 49 | 49 | * @throws \Aimeos\Controller\Frontend\Exception If method call failed |
| 50 | 50 | */ |
| 51 | - public function __call( $name, array $param ) |
|
| 51 | + public function __call($name, array $param) |
|
| 52 | 52 | { |
| 53 | - return @call_user_func_array( array( $this->controller, $name ), $param ); |
|
| 53 | + return @call_user_func_array(array($this->controller, $name), $param); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | |
@@ -75,9 +75,9 @@ discard block |
||
| 75 | 75 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items |
| 76 | 76 | * @since 2017.03 |
| 77 | 77 | */ |
| 78 | - public function getItem( $id, array $domains = [] ) |
|
| 78 | + public function getItem($id, array $domains = []) |
|
| 79 | 79 | { |
| 80 | - return $this->controller->getItem( $id, $domains ); |
|
| 80 | + return $this->controller->getItem($id, $domains); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | |
@@ -90,9 +90,9 @@ discard block |
||
| 90 | 90 | * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface |
| 91 | 91 | * @since 2017.03 |
| 92 | 92 | */ |
| 93 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null ) |
|
| 93 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null) |
|
| 94 | 94 | { |
| 95 | - return $this->controller->searchItems( $filter, $domains, $total ); |
|
| 95 | + return $this->controller->searchItems($filter, $domains, $total); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 29 | 29 | * @return \Aimeos\Controller\Frontend\Locale\Iface Controller object |
| 30 | 30 | */ |
| 31 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 31 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 32 | 32 | { |
| 33 | 33 | /** controller/frontend/locale/name |
| 34 | 34 | * Class name of the used locale frontend controller implementation |
@@ -63,20 +63,20 @@ discard block |
||
| 63 | 63 | * @since 2014.03 |
| 64 | 64 | * @category Developer |
| 65 | 65 | */ |
| 66 | - if( $name === null ) { |
|
| 67 | - $name = $context->getConfig()->get( 'controller/frontend/locale/name', 'Standard' ); |
|
| 66 | + if ($name === null) { |
|
| 67 | + $name = $context->getConfig()->get('controller/frontend/locale/name', 'Standard'); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( ctype_alnum( $name ) === false ) |
|
| 70 | + if (ctype_alnum($name) === false) |
|
| 71 | 71 | { |
| 72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>'; |
|
| 73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>'; |
|
| 73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface'; |
| 77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name; |
| 78 | 78 | |
| 79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 80 | 80 | |
| 81 | 81 | /** controller/frontend/locale/decorators/excludes |
| 82 | 82 | * Excludes decorators added by the "common" option from the locale frontend controllers |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * @see controller/frontend/locale/decorators/excludes |
| 153 | 153 | * @see controller/frontend/locale/decorators/global |
| 154 | 154 | */ |
| 155 | - return self::addControllerDecorators( $context, $manager, 'locale' ); |
|
| 155 | + return self::addControllerDecorators($context, $manager, 'locale'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | } |
@@ -276,6 +276,9 @@ |
||
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | |
| 279 | + /** |
|
| 280 | + * @param string $name |
|
| 281 | + */ |
|
| 279 | 282 | protected function access( $name ) |
| 280 | 283 | { |
| 281 | 284 | $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' ); |
@@ -16,53 +16,53 @@ discard block |
||
| 16 | 16 | protected function setUp() |
| 17 | 17 | { |
| 18 | 18 | $this->context = \TestHelperFrontend::getContext(); |
| 19 | - \Aimeos\MShop\Factory::setCache( true ); |
|
| 19 | + \Aimeos\MShop\Factory::setCache(true); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | protected function tearDown() |
| 24 | 24 | { |
| 25 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 26 | - $this->context->getSession()->set( 'aimeos', [] ); |
|
| 25 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 26 | + $this->context->getSession()->set('aimeos', []); |
|
| 27 | 27 | |
| 28 | - unset( $this->context ); |
|
| 28 | + unset($this->context); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testCheckLocale() |
| 33 | 33 | { |
| 34 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 35 | - ->setConstructorArgs( [$this->context] ) |
|
| 36 | - ->setMethods( null ) |
|
| 34 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 35 | + ->setConstructorArgs([$this->context]) |
|
| 36 | + ->setMethods(null) |
|
| 37 | 37 | ->getMock(); |
| 38 | 38 | |
| 39 | - $this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' ); |
|
| 40 | - $this->access( 'checkLocale' )->invokeArgs( $object, [$this->context->getLocale(), 'unittest'] ); |
|
| 39 | + $this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR'); |
|
| 40 | + $this->access('checkLocale')->invokeArgs($object, [$this->context->getLocale(), 'unittest']); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testCopyAddresses() |
| 45 | 45 | { |
| 46 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 46 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 47 | 47 | $ordBaseItem = $manager->createItem(); |
| 48 | 48 | |
| 49 | - $address = $this->getAddress( 'Example company' ); |
|
| 50 | - $ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 49 | + $address = $this->getAddress('Example company'); |
|
| 50 | + $ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 54 | - ->setConstructorArgs( [$this->context] ) |
|
| 55 | - ->setMethods( null ) |
|
| 53 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 54 | + ->setConstructorArgs([$this->context]) |
|
| 55 | + ->setMethods(null) |
|
| 56 | 56 | ->getMock(); |
| 57 | 57 | |
| 58 | - $result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 58 | + $result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | - $this->assertEquals( ['test'], $result ); |
|
| 62 | - $this->assertEquals( 1, count( $object->get()->getAddresses() ) ); |
|
| 61 | + $this->assertEquals(['test'], $result); |
|
| 62 | + $this->assertEquals(1, count($object->get()->getAddresses())); |
|
| 63 | 63 | |
| 64 | - $addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 65 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr ); |
|
| 64 | + $addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 65 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr); |
|
| 66 | 66 | |
| 67 | 67 | $object->clear(); |
| 68 | 68 | } |
@@ -70,54 +70,54 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | public function testCopyAddressesException() |
| 72 | 72 | { |
| 73 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 73 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 74 | 74 | $ordBaseItem = $manager->createItem(); |
| 75 | 75 | |
| 76 | - $address = $this->getAddress( 'Example company' ); |
|
| 77 | - $ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 76 | + $address = $this->getAddress('Example company'); |
|
| 77 | + $ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 81 | - ->setConstructorArgs( [$this->context] ) |
|
| 82 | - ->setMethods( ['setAddress'] ) |
|
| 80 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 81 | + ->setConstructorArgs([$this->context]) |
|
| 82 | + ->setMethods(['setAddress']) |
|
| 83 | 83 | ->getMock(); |
| 84 | 84 | |
| 85 | - $object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) ); |
|
| 85 | + $object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception())); |
|
| 86 | 86 | |
| 87 | - $result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 87 | + $result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 88 | 88 | |
| 89 | - $this->assertEquals( 1, count( $result ) ); |
|
| 90 | - $this->assertArrayHasKey( 'address', $result ); |
|
| 89 | + $this->assertEquals(1, count($result)); |
|
| 90 | + $this->assertArrayHasKey('address', $result); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | public function testCopyCoupon() |
| 95 | 95 | { |
| 96 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 96 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 97 | 97 | $ordBaseItem = $manager->createItem(); |
| 98 | 98 | |
| 99 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC', ['price'] ); |
|
| 100 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 101 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 99 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC', ['price']); |
|
| 100 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 101 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 102 | 102 | |
| 103 | - $priceItems = $product->getRefItems( 'price' ); |
|
| 104 | - $ordProdItem->setPrice( reset( $priceItems ) ); |
|
| 103 | + $priceItems = $product->getRefItems('price'); |
|
| 104 | + $ordProdItem->setPrice(reset($priceItems)); |
|
| 105 | 105 | |
| 106 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 107 | - $ordBaseItem->addCoupon( 'OPQR', [] ); |
|
| 106 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 107 | + $ordBaseItem->addCoupon('OPQR', []); |
|
| 108 | 108 | |
| 109 | 109 | |
| 110 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 111 | - ->setConstructorArgs( [$this->context] ) |
|
| 112 | - ->setMethods( null ) |
|
| 110 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 111 | + ->setConstructorArgs([$this->context]) |
|
| 112 | + ->setMethods(null) |
|
| 113 | 113 | ->getMock(); |
| 114 | 114 | |
| 115 | - $object->addProduct( $product->getId() ); |
|
| 115 | + $object->addProduct($product->getId()); |
|
| 116 | 116 | |
| 117 | - $result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 117 | + $result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 118 | 118 | |
| 119 | 119 | |
| 120 | - $this->assertEquals( ['test'], $result ); |
|
| 120 | + $this->assertEquals(['test'], $result); |
|
| 121 | 121 | |
| 122 | 122 | $object->clear(); |
| 123 | 123 | } |
@@ -125,48 +125,48 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | public function testCopyCouponException() |
| 127 | 127 | { |
| 128 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 128 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 129 | 129 | $ordBaseItem = $manager->createItem(); |
| 130 | 130 | |
| 131 | - $ordBaseItem->addCoupon( '90AB', [] ); |
|
| 131 | + $ordBaseItem->addCoupon('90AB', []); |
|
| 132 | 132 | |
| 133 | 133 | |
| 134 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 135 | - ->setConstructorArgs( [$this->context] ) |
|
| 136 | - ->setMethods( ['addCoupon'] ) |
|
| 134 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 135 | + ->setConstructorArgs([$this->context]) |
|
| 136 | + ->setMethods(['addCoupon']) |
|
| 137 | 137 | ->getMock(); |
| 138 | 138 | |
| 139 | - $object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) ); |
|
| 139 | + $object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception())); |
|
| 140 | 140 | |
| 141 | - $result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 141 | + $result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 142 | 142 | |
| 143 | - $this->assertEquals( 1, count( $result ) ); |
|
| 144 | - $this->assertArrayHasKey( 'coupon', $result ); |
|
| 143 | + $this->assertEquals(1, count($result)); |
|
| 144 | + $this->assertArrayHasKey('coupon', $result); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | public function testCopyProduct() |
| 149 | 149 | { |
| 150 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 150 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 151 | 151 | $ordBaseItem = $manager->createItem(); |
| 152 | 152 | |
| 153 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' ); |
|
| 154 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 155 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 156 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 153 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC'); |
|
| 154 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 155 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 156 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 160 | - ->setConstructorArgs( [$this->context] ) |
|
| 161 | - ->setMethods( null ) |
|
| 159 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 160 | + ->setConstructorArgs([$this->context]) |
|
| 161 | + ->setMethods(null) |
|
| 162 | 162 | ->getMock(); |
| 163 | 163 | |
| 164 | - $result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 164 | + $result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 165 | 165 | |
| 166 | 166 | |
| 167 | - $this->assertEquals( ['test'], $result ); |
|
| 168 | - $this->assertEquals( 1, count( $object->get()->getProducts() ) ); |
|
| 169 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct( 0 ) ); |
|
| 167 | + $this->assertEquals(['test'], $result); |
|
| 168 | + $this->assertEquals(1, count($object->get()->getProducts())); |
|
| 169 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct(0)); |
|
| 170 | 170 | |
| 171 | 171 | $object->clear(); |
| 172 | 172 | } |
@@ -174,58 +174,58 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | public function testCopyProductException() |
| 176 | 176 | { |
| 177 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 177 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 178 | 178 | $ordBaseItem = $manager->createItem(); |
| 179 | 179 | |
| 180 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' ); |
|
| 181 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 182 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 183 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 180 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC'); |
|
| 181 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 182 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 183 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 184 | 184 | |
| 185 | 185 | |
| 186 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 187 | - ->setConstructorArgs( [$this->context] ) |
|
| 188 | - ->setMethods( ['addProduct'] ) |
|
| 186 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 187 | + ->setConstructorArgs([$this->context]) |
|
| 188 | + ->setMethods(['addProduct']) |
|
| 189 | 189 | ->getMock(); |
| 190 | 190 | |
| 191 | - $object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) ); |
|
| 191 | + $object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception())); |
|
| 192 | 192 | |
| 193 | - $result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 193 | + $result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 194 | 194 | |
| 195 | - $this->assertEquals( 1, count( $result ) ); |
|
| 196 | - $this->assertArrayHasKey( 'product', $result ); |
|
| 195 | + $this->assertEquals(1, count($result)); |
|
| 196 | + $this->assertArrayHasKey('product', $result); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | |
| 200 | 200 | public function testCopyServices() |
| 201 | 201 | { |
| 202 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 202 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 203 | 203 | $ordBaseItem = $manager->createItem(); |
| 204 | 204 | |
| 205 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' ); |
|
| 206 | - $ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' ); |
|
| 205 | + $serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service'); |
|
| 206 | + $ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service'); |
|
| 207 | 207 | |
| 208 | - $serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' ); |
|
| 209 | - $ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem ); |
|
| 208 | + $serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery'); |
|
| 209 | + $ordServItem = $ordServManager->createItem()->copyFrom($serviceItem); |
|
| 210 | 210 | |
| 211 | - $ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 211 | + $ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 212 | 212 | |
| 213 | 213 | |
| 214 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 215 | - ->setConstructorArgs( [$this->context] ) |
|
| 216 | - ->setMethods( null ) |
|
| 214 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 215 | + ->setConstructorArgs([$this->context]) |
|
| 216 | + ->setMethods(null) |
|
| 217 | 217 | ->getMock(); |
| 218 | 218 | |
| 219 | - $result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 219 | + $result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 220 | 220 | |
| 221 | 221 | |
| 222 | - $this->assertEquals( ['test'], $result ); |
|
| 223 | - $this->assertEquals( 1, count( $object->get()->getServices() ) ); |
|
| 222 | + $this->assertEquals(['test'], $result); |
|
| 223 | + $this->assertEquals(1, count($object->get()->getServices())); |
|
| 224 | 224 | |
| 225 | - $services = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 225 | + $services = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 226 | 226 | |
| 227 | - foreach( $services as $service ) { |
|
| 228 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Service\Iface', $service ); |
|
| 227 | + foreach ($services as $service) { |
|
| 228 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Service\Iface', $service); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | $object->clear(); |
@@ -234,106 +234,106 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | public function testCopyServicesException() |
| 236 | 236 | { |
| 237 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 237 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 238 | 238 | $ordBaseItem = $manager->createItem(); |
| 239 | 239 | |
| 240 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' ); |
|
| 241 | - $ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' ); |
|
| 240 | + $serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service'); |
|
| 241 | + $ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service'); |
|
| 242 | 242 | |
| 243 | - $serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' ); |
|
| 244 | - $ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem ); |
|
| 243 | + $serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery'); |
|
| 244 | + $ordServItem = $ordServManager->createItem()->copyFrom($serviceItem); |
|
| 245 | 245 | |
| 246 | - $ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 246 | + $ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 247 | 247 | |
| 248 | 248 | |
| 249 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 250 | - ->setConstructorArgs( [$this->context] ) |
|
| 251 | - ->setMethods( ['addService'] ) |
|
| 249 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 250 | + ->setConstructorArgs([$this->context]) |
|
| 251 | + ->setMethods(['addService']) |
|
| 252 | 252 | ->getMock(); |
| 253 | 253 | |
| 254 | - $object->expects( $this->once() )->method( 'addService' )->will( $this->throwException( new \Exception() ) ); |
|
| 254 | + $object->expects($this->once())->method('addService')->will($this->throwException(new \Exception())); |
|
| 255 | 255 | |
| 256 | - $result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 256 | + $result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 257 | 257 | |
| 258 | - $this->assertEquals( 0, count( $result ) ); |
|
| 258 | + $this->assertEquals(0, count($result)); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
| 262 | 262 | public function testCreateSubscriptions() |
| 263 | 263 | { |
| 264 | - $baseManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' ); |
|
| 264 | + $baseManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base'); |
|
| 265 | 265 | |
| 266 | 266 | $search = $baseManager->createSearch(); |
| 267 | - $search->setConditions( $search->compare( '==', 'order.base.price', '53.50' ) ); |
|
| 267 | + $search->setConditions($search->compare('==', 'order.base.price', '53.50')); |
|
| 268 | 268 | |
| 269 | - $items = $baseManager->searchItems( $search, ['order/base/product'] ); |
|
| 269 | + $items = $baseManager->searchItems($search, ['order/base/product']); |
|
| 270 | 270 | |
| 271 | - if( ( $basket = reset( $items ) ) === false ) { |
|
| 272 | - throw new \Exception( sprintf( 'No order base item found for price "%1$s"', '53,50' ) ); |
|
| 271 | + if (($basket = reset($items)) === false) { |
|
| 272 | + throw new \Exception(sprintf('No order base item found for price "%1$s"', '53,50')); |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 276 | - ->setConstructorArgs( [$this->context] ) |
|
| 277 | - ->setMethods( ['getAttributes'] ) |
|
| 275 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 276 | + ->setConstructorArgs([$this->context]) |
|
| 277 | + ->setMethods(['getAttributes']) |
|
| 278 | 278 | ->getMock(); |
| 279 | 279 | |
| 280 | - $stub = $this->getMockBuilder( '\Aimeos\MShop\Subscription\Manager\Standard' ) |
|
| 281 | - ->setConstructorArgs( [$this->context] ) |
|
| 282 | - ->setMethods( ['saveItem'] ) |
|
| 280 | + $stub = $this->getMockBuilder('\Aimeos\MShop\Subscription\Manager\Standard') |
|
| 281 | + ->setConstructorArgs([$this->context]) |
|
| 282 | + ->setMethods(['saveItem']) |
|
| 283 | 283 | ->getMock(); |
| 284 | 284 | |
| 285 | - \Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $stub ); |
|
| 285 | + \Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $stub); |
|
| 286 | 286 | |
| 287 | - $stub->expects( $this->exactly( 2 ) )->method( 'saveItem' ); |
|
| 287 | + $stub->expects($this->exactly(2))->method('saveItem'); |
|
| 288 | 288 | |
| 289 | - $this->access( 'createSubscriptions' )->invokeArgs( $object, [$basket] ); |
|
| 289 | + $this->access('createSubscriptions')->invokeArgs($object, [$basket]); |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | |
| 293 | 293 | public function testGetOrderProductAttributes() |
| 294 | 294 | { |
| 295 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 296 | - ->setConstructorArgs( [$this->context] ) |
|
| 297 | - ->setMethods( ['getAttributes'] ) |
|
| 295 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 296 | + ->setConstructorArgs([$this->context]) |
|
| 297 | + ->setMethods(['getAttributes']) |
|
| 298 | 298 | ->getMock(); |
| 299 | 299 | |
| 300 | - $list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )]; |
|
| 301 | - $object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) ); |
|
| 300 | + $list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])]; |
|
| 301 | + $object->expects($this->once())->method('getAttributes')->will($this->returnValue($list)); |
|
| 302 | 302 | |
| 303 | - $result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], ['1' => 'test']] ); |
|
| 303 | + $result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], ['1' => 'test']]); |
|
| 304 | 304 | |
| 305 | - $this->assertEquals( 1, count( $result ) ); |
|
| 306 | - $this->assertEquals( 'test', $result[0]->getValue() ); |
|
| 305 | + $this->assertEquals(1, count($result)); |
|
| 306 | + $this->assertEquals('test', $result[0]->getValue()); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | |
| 310 | 310 | /** |
| 311 | 311 | * @param string $company |
| 312 | 312 | */ |
| 313 | - protected function getAddress( $company ) |
|
| 313 | + protected function getAddress($company) |
|
| 314 | 314 | { |
| 315 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'customer/address' ); |
|
| 315 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'customer/address'); |
|
| 316 | 316 | |
| 317 | 317 | $search = $manager->createSearch(); |
| 318 | - $search->setConditions( $search->compare( '==', 'customer.address.company', $company ) ); |
|
| 319 | - $items = $manager->searchItems( $search ); |
|
| 318 | + $search->setConditions($search->compare('==', 'customer.address.company', $company)); |
|
| 319 | + $items = $manager->searchItems($search); |
|
| 320 | 320 | |
| 321 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 322 | - throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) ); |
|
| 321 | + if (($item = reset($items)) === false) { |
|
| 322 | + throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company)); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - $ordAddrManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base/address' ); |
|
| 326 | - $ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item ); |
|
| 325 | + $ordAddrManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base/address'); |
|
| 326 | + $ordAddrItem = $ordAddrManager->createItem()->copyFrom($item); |
|
| 327 | 327 | |
| 328 | 328 | return $ordAddrItem; |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | |
| 332 | - protected function access( $name ) |
|
| 332 | + protected function access($name) |
|
| 333 | 333 | { |
| 334 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' ); |
|
| 335 | - $method = $class->getMethod( $name ); |
|
| 336 | - $method->setAccessible( true ); |
|
| 334 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Base'); |
|
| 335 | + $method = $class->getMethod($name); |
|
| 336 | + $method->setAccessible(true); |
|
| 337 | 337 | |
| 338 | 338 | return $method; |
| 339 | 339 | } |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | protected function setUp() |
| 18 | 18 | { |
| 19 | - $this->object = new \Aimeos\Controller\Frontend\Locale\Standard( \TestHelperFrontend::getContext() ); |
|
| 19 | + $this->object = new \Aimeos\Controller\Frontend\Locale\Standard(\TestHelperFrontend::getContext()); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | protected function tearDown() |
| 24 | 24 | { |
| 25 | - unset( $this->object ); |
|
| 25 | + unset($this->object); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
@@ -30,29 +30,29 @@ discard block |
||
| 30 | 30 | { |
| 31 | 31 | $filter = $this->object->createFilter(); |
| 32 | 32 | |
| 33 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
| 34 | - $this->assertEquals( 1, count( $filter->getSortations() ) ); |
|
| 35 | - $this->assertEquals( 0, $filter->getSliceStart() ); |
|
| 36 | - $this->assertEquals( 100, $filter->getSliceSize() ); |
|
| 33 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
| 34 | + $this->assertEquals(1, count($filter->getSortations())); |
|
| 35 | + $this->assertEquals(0, $filter->getSliceStart()); |
|
| 36 | + $this->assertEquals(100, $filter->getSliceSize()); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | public function testGetItem() |
| 41 | 41 | { |
| 42 | - $localeManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'locale' ); |
|
| 43 | - $search = $localeManager->createSearch( true ); |
|
| 44 | - $search->setSortations( [$search->sort( '+', 'locale.position' )] ); |
|
| 45 | - $search->setSlice( 0, 1 ); |
|
| 46 | - $localeItems = $localeManager->searchItems( $search ); |
|
| 47 | - |
|
| 48 | - if( ( $localeItem = reset( $localeItems ) ) === false ) { |
|
| 49 | - throw new \Exception( 'No locale item found' ); |
|
| 42 | + $localeManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'locale'); |
|
| 43 | + $search = $localeManager->createSearch(true); |
|
| 44 | + $search->setSortations([$search->sort('+', 'locale.position')]); |
|
| 45 | + $search->setSlice(0, 1); |
|
| 46 | + $localeItems = $localeManager->searchItems($search); |
|
| 47 | + |
|
| 48 | + if (($localeItem = reset($localeItems)) === false) { |
|
| 49 | + throw new \Exception('No locale item found'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - $result = $this->object->getItem( $localeItem->getId() ); |
|
| 53 | + $result = $this->object->getItem($localeItem->getId()); |
|
| 54 | 54 | |
| 55 | - $this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $result ); |
|
| 55 | + $this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $result); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | { |
| 61 | 61 | $total = 0; |
| 62 | 62 | $filter = $this->object->createFilter(); |
| 63 | - $results = $this->object->searchItems( $filter, [], $total ); |
|
| 63 | + $results = $this->object->searchItems($filter, [], $total); |
|
| 64 | 64 | |
| 65 | - $this->assertEquals( 1, $total ); |
|
| 66 | - $this->assertEquals( 1, count( $results ) ); |
|
| 65 | + $this->assertEquals(1, $total); |
|
| 66 | + $this->assertEquals(1, count($results)); |
|
| 67 | 67 | } |
| 68 | 68 | } |