@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | |
17 | 17 | protected function setUp() |
18 | 18 | { |
19 | - $this->object = new \Aimeos\Controller\Frontend\Attribute\Standard( \TestHelperFrontend::getContext() ); |
|
19 | + $this->object = new \Aimeos\Controller\Frontend\Attribute\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,57 +30,57 @@ 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 testAddFilterTypes() |
41 | 41 | { |
42 | 42 | $filter = $this->object->createFilter(); |
43 | - $filter = $this->object->addFilterTypes( $filter, ['size'] ); |
|
43 | + $filter = $this->object->addFilterTypes($filter, ['size']); |
|
44 | 44 | |
45 | 45 | $list = $filter->getConditions()->getExpressions(); |
46 | 46 | |
47 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
48 | - throw new \RuntimeException( 'Wrong expression' ); |
|
47 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
48 | + throw new \RuntimeException('Wrong expression'); |
|
49 | 49 | } |
50 | 50 | |
51 | - $this->assertEquals( 'attribute.type', $list[0]->getName() ); |
|
52 | - $this->assertEquals( 1, count( $list[0]->getValue() ) ); |
|
51 | + $this->assertEquals('attribute.type', $list[0]->getName()); |
|
52 | + $this->assertEquals(1, count($list[0]->getValue())); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testGetItem() |
57 | 57 | { |
58 | 58 | $context = \TestHelperFrontend::getContext(); |
59 | - $manager = \Aimeos\MShop::create( $context, 'attribute' ); |
|
60 | - $id = $manager->findItem( 'xs', [], 'product', 'size' )->getId(); |
|
59 | + $manager = \Aimeos\MShop::create($context, 'attribute'); |
|
60 | + $id = $manager->findItem('xs', [], 'product', 'size')->getId(); |
|
61 | 61 | |
62 | - $result = $this->object->getItem( $id, ['text'] ); |
|
62 | + $result = $this->object->getItem($id, ['text']); |
|
63 | 63 | |
64 | - $this->assertInstanceOf( \Aimeos\MShop\Attribute\Item\Iface::class, $result ); |
|
65 | - $this->assertEquals( 3, count( $result->getRefItems( 'text' ) ) ); |
|
64 | + $this->assertInstanceOf(\Aimeos\MShop\Attribute\Item\Iface::class, $result); |
|
65 | + $this->assertEquals(3, count($result->getRefItems('text'))); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
69 | 69 | public function testGetItems() |
70 | 70 | { |
71 | 71 | $context = \TestHelperFrontend::getContext(); |
72 | - $manager = \Aimeos\MShop::create( $context, 'attribute' ); |
|
73 | - $id = $manager->findItem( 'xs', [], 'product', 'size' )->getId(); |
|
72 | + $manager = \Aimeos\MShop::create($context, 'attribute'); |
|
73 | + $id = $manager->findItem('xs', [], 'product', 'size')->getId(); |
|
74 | 74 | |
75 | - $result = $this->object->getItems( [$id], ['text'] ); |
|
75 | + $result = $this->object->getItems([$id], ['text']); |
|
76 | 76 | |
77 | - $this->assertInternalType( 'array', $result ); |
|
78 | - $this->assertEquals( 1, count( $result ) ); |
|
77 | + $this->assertInternalType('array', $result); |
|
78 | + $this->assertEquals(1, count($result)); |
|
79 | 79 | |
80 | - foreach( $result as $attrItem ) |
|
80 | + foreach ($result as $attrItem) |
|
81 | 81 | { |
82 | - $this->assertInstanceOf( \Aimeos\MShop\Attribute\Item\Iface::class, $attrItem ); |
|
83 | - $this->assertEquals( 3, count( $attrItem->getRefItems( 'text' ) ) ); |
|
82 | + $this->assertInstanceOf(\Aimeos\MShop\Attribute\Item\Iface::class, $attrItem); |
|
83 | + $this->assertEquals(3, count($attrItem->getRefItems('text'))); |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | public function testSearchItems() |
89 | 89 | { |
90 | 90 | $filter = $this->object->createFilter(); |
91 | - $filter = $this->object->addFilterTypes( $filter, ['size'] ); |
|
91 | + $filter = $this->object->addFilterTypes($filter, ['size']); |
|
92 | 92 | |
93 | 93 | $total = 0; |
94 | - $results = $this->object->searchItems( $filter, ['text'], $total ); |
|
94 | + $results = $this->object->searchItems($filter, ['text'], $total); |
|
95 | 95 | |
96 | - $this->assertEquals( 6, $total ); |
|
97 | - $this->assertEquals( 6, count( $results ) ); |
|
96 | + $this->assertEquals(6, $total); |
|
97 | + $this->assertEquals(6, count($results)); |
|
98 | 98 | } |
99 | 99 | } |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | public static function bootstrap() |
16 | 16 | { |
17 | 17 | self::getAimeos(); |
18 | - \Aimeos\MShop::cache( false ); |
|
19 | - \Aimeos\Controller\Frontend\Factory::setCache( false ); |
|
18 | + \Aimeos\MShop::cache(false); |
|
19 | + \Aimeos\Controller\Frontend\Factory::setCache(false); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
23 | - public static function getContext( $site = 'unittest' ) |
|
23 | + public static function getContext($site = 'unittest') |
|
24 | 24 | { |
25 | - if( !isset( self::$context[$site] ) ) { |
|
26 | - self::$context[$site] = self::createContext( $site ); |
|
25 | + if (!isset(self::$context[$site])) { |
|
26 | + self::$context[$site] = self::createContext($site); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | return clone self::$context[$site]; |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | |
33 | 33 | private static function getAimeos() |
34 | 34 | { |
35 | - if( !isset( self::$aimeos ) ) |
|
35 | + if (!isset(self::$aimeos)) |
|
36 | 36 | { |
37 | 37 | require_once 'Bootstrap.php'; |
38 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
38 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
39 | 39 | |
40 | - $extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); |
|
41 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
40 | + $extdir = dirname(dirname(dirname(dirname(dirname(__FILE__))))); |
|
41 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | return self::$aimeos; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | /** |
49 | 49 | * @param string $site |
50 | 50 | */ |
51 | - private static function createContext( $site ) |
|
51 | + private static function createContext($site) |
|
52 | 52 | { |
53 | 53 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
54 | 54 | $aimeos = self::getAimeos(); |
@@ -58,38 +58,38 @@ discard block |
||
58 | 58 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
59 | 59 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
60 | 60 | |
61 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
62 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
63 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
64 | - $ctx->setConfig( $conf ); |
|
61 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
62 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
63 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
64 | + $ctx->setConfig($conf); |
|
65 | 65 | |
66 | 66 | |
67 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
68 | - $ctx->setDatabaseManager( $dbm ); |
|
67 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
68 | + $ctx->setDatabaseManager($dbm); |
|
69 | 69 | |
70 | 70 | |
71 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf ); |
|
72 | - $ctx->setMessageQueueManager( $mq ); |
|
71 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($conf); |
|
72 | + $ctx->setMessageQueueManager($mq); |
|
73 | 73 | |
74 | 74 | |
75 | - $logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
76 | - $ctx->setLogger( $logger ); |
|
75 | + $logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
76 | + $ctx->setLogger($logger); |
|
77 | 77 | |
78 | 78 | |
79 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
80 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
79 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
80 | + $ctx->setI18n(array('de' => $i18n)); |
|
81 | 81 | |
82 | 82 | |
83 | 83 | $session = new \Aimeos\MW\Session\None(); |
84 | - $ctx->setSession( $session ); |
|
84 | + $ctx->setSession($session); |
|
85 | 85 | |
86 | 86 | |
87 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $ctx ); |
|
88 | - $locale = $localeManager->bootstrap( $site, '', '', false ); |
|
89 | - $ctx->setLocale( $locale ); |
|
87 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::create($ctx); |
|
88 | + $locale = $localeManager->bootstrap($site, '', '', false); |
|
89 | + $ctx->setLocale($locale); |
|
90 | 90 | |
91 | 91 | |
92 | - $ctx->setEditor( 'core:controller/frontend' ); |
|
92 | + $ctx->setEditor('core:controller/frontend'); |
|
93 | 93 | |
94 | 94 | return $ctx; |
95 | 95 | } |
@@ -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\Product\Iface Controller object |
30 | 30 | */ |
31 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
31 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
32 | 32 | { |
33 | 33 | /** controller/frontend/product/name |
34 | 34 | * Class name of the used product frontend controller implementation |
@@ -63,20 +63,20 @@ discard block |
||
63 | 63 | * @since 2017.03 |
64 | 64 | * @category Developer |
65 | 65 | */ |
66 | - if( $name === null ) { |
|
67 | - $name = $context->getConfig()->get( 'controller/frontend/product/name', 'Standard' ); |
|
66 | + if ($name === null) { |
|
67 | + $name = $context->getConfig()->get('controller/frontend/product/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\\Product\\' . $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\\Product\\' . $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\\Product\\Iface'; |
77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Product\\' . $name; |
78 | 78 | |
79 | - $manager = self::createController( $context, $classname, $iface ); |
|
79 | + $manager = self::createController($context, $classname, $iface); |
|
80 | 80 | |
81 | 81 | /** controller/frontend/product/decorators/excludes |
82 | 82 | * Excludes decorators added by the "common" option from the product frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
152 | 152 | * @see controller/frontend/product/decorators/excludes |
153 | 153 | * @see controller/frontend/product/decorators/global |
154 | 154 | */ |
155 | - return self::addControllerDecorators( $context, $manager, 'product' ); |
|
155 | + return self::addControllerDecorators($context, $manager, 'product'); |
|
156 | 156 | } |
157 | 157 | } |
@@ -31,36 +31,36 @@ discard block |
||
31 | 31 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
32 | 32 | * @since 2017.03 |
33 | 33 | */ |
34 | - public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds ) |
|
34 | + public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds) |
|
35 | 35 | { |
36 | - if( ( $attrIds = $this->validateIds( $attrIds ) ) !== [] ) |
|
36 | + if (($attrIds = $this->validateIds($attrIds)) !== []) |
|
37 | 37 | { |
38 | - $func = $filter->createFunction( 'index.attribute:all', [$attrIds] ); |
|
38 | + $func = $filter->createFunction('index.attribute:all', [$attrIds]); |
|
39 | 39 | $expr = array( |
40 | - $filter->compare( '!=', $func, null ), |
|
40 | + $filter->compare('!=', $func, null), |
|
41 | 41 | $filter->getConditions(), |
42 | 42 | ); |
43 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
43 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
44 | 44 | } |
45 | 45 | |
46 | - if( ( $optIds = $this->validateIds( $optIds ) ) !== [] ) |
|
46 | + if (($optIds = $this->validateIds($optIds)) !== []) |
|
47 | 47 | { |
48 | 48 | $expr = array( |
49 | - $filter->compare( '==', 'index.attribute.id', $optIds ), |
|
49 | + $filter->compare('==', 'index.attribute.id', $optIds), |
|
50 | 50 | $filter->getConditions(), |
51 | 51 | ); |
52 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
52 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
53 | 53 | } |
54 | 54 | |
55 | - foreach( $oneIds as $type => $list ) |
|
55 | + foreach ($oneIds as $type => $list) |
|
56 | 56 | { |
57 | - if( ( $list = $this->validateIds( (array) $list ) ) !== [] ) |
|
57 | + if (($list = $this->validateIds((array) $list)) !== []) |
|
58 | 58 | { |
59 | 59 | $expr = array( |
60 | - $filter->compare( '==', 'index.attribute.id', $list ), |
|
60 | + $filter->compare('==', 'index.attribute.id', $list), |
|
61 | 61 | $filter->getConditions(), |
62 | 62 | ); |
63 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
63 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
@@ -78,42 +78,42 @@ discard block |
||
78 | 78 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
79 | 79 | * @since 2017.03 |
80 | 80 | */ |
81 | - public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default', |
|
82 | - $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) |
|
81 | + public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default', |
|
82 | + $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE) |
|
83 | 83 | { |
84 | - if( ( $catIds = $this->validateIds( (array) $catIds ) ) === [] ) { |
|
84 | + if (($catIds = $this->validateIds((array) $catIds)) === []) { |
|
85 | 85 | return $filter; |
86 | 86 | } |
87 | 87 | |
88 | - if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) |
|
88 | + if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE) |
|
89 | 89 | { |
90 | 90 | $list = []; |
91 | - $cntl = \Aimeos\Controller\Frontend\Factory::create( $this->getContext(), 'catalog' ); |
|
91 | + $cntl = \Aimeos\Controller\Frontend\Factory::create($this->getContext(), 'catalog'); |
|
92 | 92 | |
93 | - foreach( $catIds as $catId ) |
|
93 | + foreach ($catIds as $catId) |
|
94 | 94 | { |
95 | - $tree = $cntl->getTree( $catId, [], $level ); |
|
96 | - $list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) ); |
|
95 | + $tree = $cntl->getTree($catId, [], $level); |
|
96 | + $list = array_merge($list, $this->getCatalogIdsFromTree($tree)); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $catIds = $list; |
100 | 100 | } |
101 | 101 | |
102 | 102 | $expr = [$filter->getConditions()]; |
103 | - $expr[] = $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ); |
|
103 | + $expr[] = $filter->compare('==', 'index.catalog.id', array_unique($catIds)); |
|
104 | 104 | |
105 | - if( isset( $filter->sortname ) && $filter->sortname === 'relevance' ) |
|
105 | + if (isset($filter->sortname) && $filter->sortname === 'relevance') |
|
106 | 106 | { |
107 | - $dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' ); |
|
107 | + $dir = (isset($filter->sortdir) ? $filter->sortdir : '+'); |
|
108 | 108 | |
109 | - $cmpfunc = $filter->createFunction( 'index.catalog:position', [$listtype, $catIds] ); |
|
110 | - $expr[] = $filter->compare( '>=', $cmpfunc, 0 ); |
|
109 | + $cmpfunc = $filter->createFunction('index.catalog:position', [$listtype, $catIds]); |
|
110 | + $expr[] = $filter->compare('>=', $cmpfunc, 0); |
|
111 | 111 | |
112 | - $sortfunc = $filter->createFunction( 'sort:index.catalog:position', [$listtype, $catIds] ); |
|
113 | - $filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] ); |
|
112 | + $sortfunc = $filter->createFunction('sort:index.catalog:position', [$listtype, $catIds]); |
|
113 | + $filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]); |
|
114 | 114 | } |
115 | 115 | |
116 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
116 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
117 | 117 | |
118 | 118 | return $filter; |
119 | 119 | } |
@@ -128,27 +128,27 @@ discard block |
||
128 | 128 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
129 | 129 | * @since 2018.07 |
130 | 130 | */ |
131 | - public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default' ) |
|
131 | + public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default') |
|
132 | 132 | { |
133 | - if( ( $supIds = $this->validateIds( (array) $supIds ) ) === [] ) { |
|
133 | + if (($supIds = $this->validateIds((array) $supIds)) === []) { |
|
134 | 134 | return $filter; |
135 | 135 | } |
136 | 136 | |
137 | 137 | $expr = [$filter->getConditions()]; |
138 | - $expr[] = $filter->compare( '==', 'index.supplier.id', array_unique( $supIds ) ); |
|
138 | + $expr[] = $filter->compare('==', 'index.supplier.id', array_unique($supIds)); |
|
139 | 139 | |
140 | - if( isset( $filter->sortname ) && $filter->sortname === 'relevance' ) |
|
140 | + if (isset($filter->sortname) && $filter->sortname === 'relevance') |
|
141 | 141 | { |
142 | - $dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' ); |
|
142 | + $dir = (isset($filter->sortdir) ? $filter->sortdir : '+'); |
|
143 | 143 | |
144 | - $cmpfunc = $filter->createFunction( 'index.supplier:position', [$listtype, $supIds] ); |
|
145 | - $expr[] = $filter->compare( '>=', $cmpfunc, 0 ); |
|
144 | + $cmpfunc = $filter->createFunction('index.supplier:position', [$listtype, $supIds]); |
|
145 | + $expr[] = $filter->compare('>=', $cmpfunc, 0); |
|
146 | 146 | |
147 | - $sortfunc = $filter->createFunction( 'sort:index.supplier:position', [$listtype, $supIds] ); |
|
148 | - $filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] ); |
|
147 | + $sortfunc = $filter->createFunction('sort:index.supplier:position', [$listtype, $supIds]); |
|
148 | + $filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]); |
|
149 | 149 | } |
150 | 150 | |
151 | - return $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
151 | + return $filter->setConditions($filter->combine('&&', $expr)); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -160,13 +160,13 @@ discard block |
||
160 | 160 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
161 | 161 | * @since 2017.03 |
162 | 162 | */ |
163 | - public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input ) |
|
163 | + public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input) |
|
164 | 164 | { |
165 | 165 | $langid = $this->getContext()->getLocale()->getLanguageId(); |
166 | - $cmpfunc = $filter->createFunction( 'index.text:relevance', [$langid, $input] ); |
|
167 | - $expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() ); |
|
166 | + $cmpfunc = $filter->createFunction('index.text:relevance', [$langid, $input]); |
|
167 | + $expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions()); |
|
168 | 168 | |
169 | - return $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
169 | + return $filter->setConditions($filter->combine('&&', $expr)); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | * @return array Associative list of key values as key and the product count for this key as value |
179 | 179 | * @since 2017.03 |
180 | 180 | */ |
181 | - public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key ) |
|
181 | + public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key) |
|
182 | 182 | { |
183 | - return \Aimeos\MShop::create( $this->getContext(), 'index' )->aggregate( $filter, $key ); |
|
183 | + return \Aimeos\MShop::create($this->getContext(), 'index')->aggregate($filter, $key); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
@@ -194,11 +194,11 @@ discard block |
||
194 | 194 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
195 | 195 | * @since 2017.03 |
196 | 196 | */ |
197 | - public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100 ) |
|
197 | + public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100) |
|
198 | 198 | { |
199 | 199 | $sortations = []; |
200 | 200 | $context = $this->getContext(); |
201 | - $manager = \Aimeos\MShop::create( $context, 'index' ); |
|
201 | + $manager = \Aimeos\MShop::create($context, 'index'); |
|
202 | 202 | |
203 | 203 | |
204 | 204 | /** controller/frontend/product/ignore-dates |
@@ -213,55 +213,55 @@ discard block |
||
213 | 213 | * @since 2017.10 |
214 | 214 | * @category Developer |
215 | 215 | */ |
216 | - if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) |
|
216 | + if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) |
|
217 | 217 | { |
218 | 218 | $search = $manager->createSearch(); |
219 | - $search->setConditions( $search->compare( '>', 'product.status', 0 ) ); |
|
219 | + $search->setConditions($search->compare('>', 'product.status', 0)); |
|
220 | 220 | } |
221 | 221 | else |
222 | 222 | { |
223 | - $search = $manager->createSearch( true ); |
|
223 | + $search = $manager->createSearch(true); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
227 | - $expr = array( $search->compare( '!=', 'index.catalog.id', null ) ); |
|
227 | + $expr = array($search->compare('!=', 'index.catalog.id', null)); |
|
228 | 228 | |
229 | - switch( $sort ) |
|
229 | + switch ($sort) |
|
230 | 230 | { |
231 | 231 | case 'code': |
232 | - $sortations[] = $search->sort( $direction, 'product.code' ); |
|
232 | + $sortations[] = $search->sort($direction, 'product.code'); |
|
233 | 233 | break; |
234 | 234 | |
235 | 235 | case 'ctime': |
236 | - $sortations[] = $search->sort( $direction, 'product.ctime' ); |
|
236 | + $sortations[] = $search->sort($direction, 'product.ctime'); |
|
237 | 237 | break; |
238 | 238 | |
239 | 239 | case 'name': |
240 | 240 | $langid = $context->getLocale()->getLanguageId(); |
241 | 241 | |
242 | - $cmpfunc = $search->createFunction( 'index.text:name', [$langid] ); |
|
243 | - $expr[] = $search->compare( '!=', $cmpfunc, null ); |
|
242 | + $cmpfunc = $search->createFunction('index.text:name', [$langid]); |
|
243 | + $expr[] = $search->compare('!=', $cmpfunc, null); |
|
244 | 244 | |
245 | - $sortfunc = $search->createFunction( 'sort:index.text:name', [$langid] ); |
|
246 | - $sortations[] = $search->sort( $direction, $sortfunc ); |
|
245 | + $sortfunc = $search->createFunction('sort:index.text:name', [$langid]); |
|
246 | + $sortations[] = $search->sort($direction, $sortfunc); |
|
247 | 247 | break; |
248 | 248 | |
249 | 249 | case 'price': |
250 | 250 | $currencyid = $context->getLocale()->getCurrencyId(); |
251 | 251 | |
252 | - $cmpfunc = $search->createFunction( 'index.price:value', [$currencyid] ); |
|
253 | - $expr[] = $search->compare( '!=', $cmpfunc, null ); |
|
252 | + $cmpfunc = $search->createFunction('index.price:value', [$currencyid]); |
|
253 | + $expr[] = $search->compare('!=', $cmpfunc, null); |
|
254 | 254 | |
255 | - $sortfunc = $search->createFunction( 'sort:index.price:value', [$currencyid] ); |
|
256 | - $sortations[] = $search->sort( $direction, $sortfunc ); |
|
255 | + $sortfunc = $search->createFunction('sort:index.price:value', [$currencyid]); |
|
256 | + $sortations[] = $search->sort($direction, $sortfunc); |
|
257 | 257 | break; |
258 | 258 | } |
259 | 259 | |
260 | 260 | $expr[] = $search->getConditions(); |
261 | 261 | |
262 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
263 | - $search->setSortations( $sortations ); |
|
264 | - $search->setSlice( $start, $size ); |
|
262 | + $search->setConditions($search->combine('&&', $expr)); |
|
263 | + $search->setSortations($sortations); |
|
264 | + $search->setSlice($start, $size); |
|
265 | 265 | $search->sortdir = $direction; |
266 | 266 | $search->sortname = $sort; |
267 | 267 | |
@@ -277,15 +277,15 @@ discard block |
||
277 | 277 | * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items |
278 | 278 | * @since 2017.03 |
279 | 279 | */ |
280 | - public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) ) |
|
280 | + public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text')) |
|
281 | 281 | { |
282 | - $items = $this->getItems( [$productId], $domains ); |
|
282 | + $items = $this->getItems([$productId], $domains); |
|
283 | 283 | |
284 | - if( ( $item = reset( $items ) ) !== false ) { |
|
284 | + if (($item = reset($items)) !== false) { |
|
285 | 285 | return $item; |
286 | 286 | } |
287 | 287 | |
288 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Product item with ID "%1$s" not found', $productId ) ); |
|
288 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Product item with ID "%1$s" not found', $productId)); |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values |
298 | 298 | * @since 2017.03 |
299 | 299 | */ |
300 | - public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) ) |
|
300 | + public function getItems(array $productIds, array $domains = array('media', 'price', 'text')) |
|
301 | 301 | { |
302 | 302 | $context = $this->getContext(); |
303 | - $manager = \Aimeos\MShop::create( $context, 'product' ); |
|
303 | + $manager = \Aimeos\MShop::create($context, 'product'); |
|
304 | 304 | |
305 | 305 | /** controller/frontend/order/ignore-dates |
306 | 306 | * Ignore start and end dates of products |
@@ -314,24 +314,24 @@ discard block |
||
314 | 314 | * @since 2017.08 |
315 | 315 | * @category Developer |
316 | 316 | */ |
317 | - if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) |
|
317 | + if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) |
|
318 | 318 | { |
319 | 319 | $search = $manager->createSearch(); |
320 | - $search->setConditions( $search->compare( '>', 'product.status', 0 ) ); |
|
320 | + $search->setConditions($search->compare('>', 'product.status', 0)); |
|
321 | 321 | } |
322 | 322 | else |
323 | 323 | { |
324 | - $search = $manager->createSearch( true ); |
|
324 | + $search = $manager->createSearch(true); |
|
325 | 325 | } |
326 | 326 | |
327 | 327 | $expr = array( |
328 | - $search->compare( '==', 'product.id', $productIds ), |
|
328 | + $search->compare('==', 'product.id', $productIds), |
|
329 | 329 | $search->getConditions(), |
330 | 330 | ); |
331 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
332 | - $search->setSlice( 0, count( $productIds ) ); |
|
331 | + $search->setConditions($search->combine('&&', $expr)); |
|
332 | + $search->setSlice(0, count($productIds)); |
|
333 | 333 | |
334 | - return $manager->searchItems( $search, $domains ); |
|
334 | + return $manager->searchItems($search, $domains); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | |
@@ -344,9 +344,9 @@ discard block |
||
344 | 344 | * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface |
345 | 345 | * @since 2017.03 |
346 | 346 | */ |
347 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null ) |
|
347 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null) |
|
348 | 348 | { |
349 | - return \Aimeos\MShop::create( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total ); |
|
349 | + return \Aimeos\MShop::create($this->getContext(), 'index')->searchItems($filter, $domains, $total); |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | |
@@ -356,16 +356,16 @@ discard block |
||
356 | 356 | * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children |
357 | 357 | * @return array List of catalog IDs |
358 | 358 | */ |
359 | - protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item ) |
|
359 | + protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item) |
|
360 | 360 | { |
361 | - if( $item->getStatus() < 1 ) { |
|
361 | + if ($item->getStatus() < 1) { |
|
362 | 362 | return []; |
363 | 363 | } |
364 | 364 | |
365 | - $list = [ $item->getId() ]; |
|
365 | + $list = [$item->getId()]; |
|
366 | 366 | |
367 | - foreach( $item->getChildren() as $child ) { |
|
368 | - $list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) ); |
|
367 | + foreach ($item->getChildren() as $child) { |
|
368 | + $list = array_merge($list, $this->getCatalogIdsFromTree($child)); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | return $list; |
@@ -378,13 +378,13 @@ discard block |
||
378 | 378 | * @param array $ids List of IDs to validate |
379 | 379 | * @return array List of validated IDs |
380 | 380 | */ |
381 | - protected function validateIds( array $ids ) |
|
381 | + protected function validateIds(array $ids) |
|
382 | 382 | { |
383 | 383 | $list = []; |
384 | 384 | |
385 | - foreach( $ids as $id ) |
|
385 | + foreach ($ids as $id) |
|
386 | 386 | { |
387 | - if( $id != '' && preg_match( '/^[A-Za-z0-9\-\_]+$/', $id ) === 1 ) { |
|
387 | + if ($id != '' && preg_match('/^[A-Za-z0-9\-\_]+$/', $id) === 1) { |
|
388 | 388 | $list[] = (string) $id; |
389 | 389 | } |
390 | 390 | } |
@@ -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\Subscription\Iface Controller object |
30 | 30 | */ |
31 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
31 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
32 | 32 | { |
33 | 33 | /** controller/frontend/subscription/name |
34 | 34 | * Class name of the used subscription frontend controller implementation |
@@ -63,19 +63,19 @@ discard block |
||
63 | 63 | * @since 2018.04 |
64 | 64 | * @category Developer |
65 | 65 | */ |
66 | - if( $name === null ) { |
|
67 | - $name = $context->getConfig()->get( 'controller/frontend/subscription/name', 'Standard' ); |
|
66 | + if ($name === null) { |
|
67 | + $name = $context->getConfig()->get('controller/frontend/subscription/name', 'Standard'); |
|
68 | 68 | } |
69 | 69 | |
70 | - if( ctype_alnum( $name ) === false ) { |
|
71 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>'; |
|
72 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
70 | + if (ctype_alnum($name) === false) { |
|
71 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>'; |
|
72 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $iface = '\\Aimeos\\Controller\\Frontend\\Subscription\\Iface'; |
76 | 76 | $classname = '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name; |
77 | 77 | |
78 | - $manager = self::createController( $context, $classname, $iface ); |
|
78 | + $manager = self::createController($context, $classname, $iface); |
|
79 | 79 | |
80 | 80 | /** controller/frontend/subscription/decorators/excludes |
81 | 81 | * Excludes decorators added by the "common" option from the subscription frontend controllers |
@@ -151,6 +151,6 @@ discard block |
||
151 | 151 | * @see controller/frontend/subscription/decorators/excludes |
152 | 152 | * @see controller/frontend/subscription/decorators/global |
153 | 153 | */ |
154 | - return self::addControllerDecorators( $context, $manager, 'subscription' ); |
|
154 | + return self::addControllerDecorators($context, $manager, 'subscription'); |
|
155 | 155 | } |
156 | 156 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
30 | 30 | * @return \Aimeos\Controller\Frontend\Service\Iface Controller object |
31 | 31 | */ |
32 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
32 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
33 | 33 | { |
34 | 34 | /** controller/frontend/service/name |
35 | 35 | * Class name of the used service frontend controller implementation |
@@ -64,19 +64,19 @@ discard block |
||
64 | 64 | * @since 2014.03 |
65 | 65 | * @category Developer |
66 | 66 | */ |
67 | - if( $name === null ) { |
|
68 | - $name = $context->getConfig()->get( 'controller/frontend/service/name', 'Standard' ); |
|
67 | + if ($name === null) { |
|
68 | + $name = $context->getConfig()->get('controller/frontend/service/name', 'Standard'); |
|
69 | 69 | } |
70 | 70 | |
71 | - if( ctype_alnum( $name ) === false ) { |
|
72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $name : '<not a string>'; |
|
73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
71 | + if (ctype_alnum($name) === false) { |
|
72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $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\\Service\\Iface'; |
77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Service\\' . $name; |
78 | 78 | |
79 | - $manager = self::createController( $context, $classname, $iface ); |
|
79 | + $manager = self::createController($context, $classname, $iface); |
|
80 | 80 | |
81 | 81 | /** controller/frontend/service/decorators/excludes |
82 | 82 | * Excludes decorators added by the "common" option from the service frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
152 | 152 | * @see controller/frontend/service/decorators/excludes |
153 | 153 | * @see controller/frontend/service/decorators/global |
154 | 154 | */ |
155 | - return self::addControllerDecorators( $context, $manager, 'service' ); |
|
155 | + return self::addControllerDecorators($context, $manager, 'service'); |
|
156 | 156 | } |
157 | 157 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
30 | 30 | * @return \Aimeos\Controller\Frontend\Order\Iface Controller object |
31 | 31 | */ |
32 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
32 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
33 | 33 | { |
34 | 34 | /** controller/frontend/order/name |
35 | 35 | * Class name of the used order frontend controller implementation |
@@ -64,19 +64,19 @@ discard block |
||
64 | 64 | * @since 2014.03 |
65 | 65 | * @category Developer |
66 | 66 | */ |
67 | - if( $name === null ) { |
|
68 | - $name = $context->getConfig()->get( 'controller/frontend/order/name', 'Standard' ); |
|
67 | + if ($name === null) { |
|
68 | + $name = $context->getConfig()->get('controller/frontend/order/name', 'Standard'); |
|
69 | 69 | } |
70 | 70 | |
71 | - if( ctype_alnum( $name ) === false ) { |
|
72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>'; |
|
73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
71 | + if (ctype_alnum($name) === false) { |
|
72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $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\\Order\\Iface'; |
77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Order\\' . $name; |
78 | 78 | |
79 | - $manager = self::createController( $context, $classname, $iface ); |
|
79 | + $manager = self::createController($context, $classname, $iface); |
|
80 | 80 | |
81 | 81 | /** controller/frontend/order/decorators/excludes |
82 | 82 | * Excludes decorators added by the "common" option from the order frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
152 | 152 | * @see controller/frontend/order/decorators/excludes |
153 | 153 | * @see controller/frontend/order/decorators/global |
154 | 154 | */ |
155 | - return self::addControllerDecorators( $context, $manager, 'order' ); |
|
155 | + return self::addControllerDecorators($context, $manager, 'order'); |
|
156 | 156 | } |
157 | 157 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | * @param string $type Arbitrary order type (max. eight chars) |
30 | 30 | * @return \Aimeos\MShop\Order\Item\Iface Created order object |
31 | 31 | */ |
32 | - public function addItem( $baseId, $type ) |
|
32 | + public function addItem($baseId, $type) |
|
33 | 33 | { |
34 | 34 | $total = 0; |
35 | 35 | $context = $this->getContext(); |
36 | - $manager = \Aimeos\MShop::create( $context, 'order' ); |
|
36 | + $manager = \Aimeos\MShop::create($context, 'order'); |
|
37 | 37 | |
38 | 38 | /** controller/frontend/order/limit-seconds |
39 | 39 | * Order limitation time frame in seconds |
@@ -51,24 +51,24 @@ discard block |
||
51 | 51 | * @see controller/frontend/basket/limit-count |
52 | 52 | * @see controller/frontend/basket/limit-seconds |
53 | 53 | */ |
54 | - $seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 ); |
|
54 | + $seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300); |
|
55 | 55 | |
56 | 56 | $search = $manager->createSearch(); |
57 | 57 | $expr = [ |
58 | - $search->compare( '==', 'order.baseid', $baseId ), |
|
59 | - $search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ), |
|
58 | + $search->compare('==', 'order.baseid', $baseId), |
|
59 | + $search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)), |
|
60 | 60 | ]; |
61 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
62 | - $search->setSlice( 0, 0 ); |
|
61 | + $search->setConditions($search->combine('&&', $expr)); |
|
62 | + $search->setSlice(0, 0); |
|
63 | 63 | |
64 | - $manager->searchItems( $search, [], $total ); |
|
64 | + $manager->searchItems($search, [], $total); |
|
65 | 65 | |
66 | - if( $total > 0 ) { |
|
67 | - throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) ); |
|
66 | + if ($total > 0) { |
|
67 | + throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created')); |
|
68 | 68 | } |
69 | 69 | |
70 | - $item = $manager->createItem()->setBaseId( $baseId )->setType( $type ); |
|
71 | - return $manager->saveItem( $item ); |
|
70 | + $item = $manager->createItem()->setBaseId($baseId)->setType($type); |
|
71 | + return $manager->saveItem($item); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function createFilter() |
81 | 81 | { |
82 | - return \Aimeos\MShop::create( $this->getContext(), 'order' )->createSearch( true ); |
|
82 | + return \Aimeos\MShop::create($this->getContext(), 'order')->createSearch(true); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
@@ -90,30 +90,30 @@ discard block |
||
90 | 90 | * @param boolean $default Use default criteria to limit orders |
91 | 91 | * @return \Aimeos\MShop\Order\Item\Iface Order object |
92 | 92 | */ |
93 | - public function getItem( $id, $default = true ) |
|
93 | + public function getItem($id, $default = true) |
|
94 | 94 | { |
95 | 95 | $context = $this->getContext(); |
96 | - $manager = \Aimeos\MShop::create( $context, 'order' ); |
|
96 | + $manager = \Aimeos\MShop::create($context, 'order'); |
|
97 | 97 | |
98 | - $search = $manager->createSearch( true ); |
|
98 | + $search = $manager->createSearch(true); |
|
99 | 99 | $expr = [ |
100 | - $search->compare( '==', 'order.id', $id ), |
|
100 | + $search->compare('==', 'order.id', $id), |
|
101 | 101 | $search->getConditions(), |
102 | 102 | ]; |
103 | 103 | |
104 | - if( $default !== false ) { |
|
105 | - $expr[] = $search->compare( '==', 'order.editor', $context->getEditor() ); |
|
104 | + if ($default !== false) { |
|
105 | + $expr[] = $search->compare('==', 'order.editor', $context->getEditor()); |
|
106 | 106 | } |
107 | 107 | |
108 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
108 | + $search->setConditions($search->combine('&&', $expr)); |
|
109 | 109 | |
110 | - $items = $manager->searchItems( $search ); |
|
110 | + $items = $manager->searchItems($search); |
|
111 | 111 | |
112 | - if( ( $item = reset( $items ) ) !== false ) { |
|
112 | + if (($item = reset($items)) !== false) { |
|
113 | 113 | return $item; |
114 | 114 | } |
115 | 115 | |
116 | - throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) ); |
|
116 | + throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | |
@@ -123,10 +123,10 @@ discard block |
||
123 | 123 | * @param \Aimeos\MShop\Order\Item\Iface $item Order object |
124 | 124 | * @return \Aimeos\MShop\Order\Item\Iface Saved order item |
125 | 125 | */ |
126 | - public function saveItem( \Aimeos\MShop\Order\Item\Iface $item ) |
|
126 | + public function saveItem(\Aimeos\MShop\Order\Item\Iface $item) |
|
127 | 127 | { |
128 | - $manager = \Aimeos\MShop::create( $this->getContext(), 'order' ); |
|
129 | - return $manager->saveItem( $item ); |
|
128 | + $manager = \Aimeos\MShop::create($this->getContext(), 'order'); |
|
129 | + return $manager->saveItem($item); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
@@ -137,18 +137,18 @@ discard block |
||
137 | 137 | * @param integer|null &$total Variable that will contain the total number of available items |
138 | 138 | * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values |
139 | 139 | */ |
140 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null ) |
|
140 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null) |
|
141 | 141 | { |
142 | 142 | $context = $this->getContext(); |
143 | - $manager = \Aimeos\MShop::create( $context, 'order' ); |
|
143 | + $manager = \Aimeos\MShop::create($context, 'order'); |
|
144 | 144 | |
145 | 145 | $expr = [ |
146 | 146 | $filter->getConditions(), |
147 | - $filter->compare( '==', 'order.base.customerid', $context->getUserId() ), |
|
147 | + $filter->compare('==', 'order.base.customerid', $context->getUserId()), |
|
148 | 148 | ]; |
149 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
149 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
150 | 150 | |
151 | - return $manager->searchItems( $filter, [], $total ); |
|
151 | + return $manager->searchItems($filter, [], $total); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | * |
171 | 171 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
172 | 172 | */ |
173 | - public function block( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
173 | + public function block(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
174 | 174 | { |
175 | - \Aimeos\Controller\Common\Order\Factory::create( $this->getContext() )->block( $orderItem ); |
|
175 | + \Aimeos\Controller\Common\Order\Factory::create($this->getContext())->block($orderItem); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | |
@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
196 | 196 | */ |
197 | - public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
197 | + public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
198 | 198 | { |
199 | - \Aimeos\Controller\Common\Order\Factory::create( $this->getContext() )->unblock( $orderItem ); |
|
199 | + \Aimeos\Controller\Common\Order\Factory::create($this->getContext())->unblock($orderItem); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | * |
215 | 215 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
216 | 216 | */ |
217 | - public function update( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
217 | + public function update(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
218 | 218 | { |
219 | - \Aimeos\Controller\Common\Order\Factory::create( $this->getContext() )->update( $orderItem ); |
|
219 | + \Aimeos\Controller\Common\Order\Factory::create($this->getContext())->update($orderItem); |
|
220 | 220 | } |
221 | 221 | } |
@@ -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\Customer\Iface Controller object |
30 | 30 | */ |
31 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
31 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
32 | 32 | { |
33 | 33 | /** controller/frontend/customer/name |
34 | 34 | * Class name of the used customer 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/customer/name', 'Standard' ); |
|
66 | + if ($name === null) { |
|
67 | + $name = $context->getConfig()->get('controller/frontend/customer/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\\Customer\\' . $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\\Customer\\' . $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\\Customer\\Iface'; |
77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Customer\\' . $name; |
78 | 78 | |
79 | - $manager = self::createController( $context, $classname, $iface ); |
|
79 | + $manager = self::createController($context, $classname, $iface); |
|
80 | 80 | |
81 | 81 | /** controller/frontend/customer/decorators/excludes |
82 | 82 | * Excludes decorators added by the "common" option from the customer frontend controllers |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * @see controller/frontend/customer/decorators/excludes |
153 | 153 | * @see controller/frontend/customer/decorators/global |
154 | 154 | */ |
155 | - return self::addControllerDecorators( $context, $manager, 'customer' ); |
|
155 | + return self::addControllerDecorators($context, $manager, 'customer'); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | } |