Completed
Push — master ( 10ff4e...12c65b )
by Aimeos
02:25
created
controller/frontend/src/Controller/Frontend/Product/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
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 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/product/name
34 34
 		 * Class name of the used product frontend controller implementation
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
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::createControllerBase( $context, $classname, $iface );
79
+		$manager = self::createControllerBase($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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Factory.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
30 30
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
31 31
 	 * @param string $path Path describing the controller to clear, e.g. "basket"
32 32
 	 */
33
-	static public function clear( $id = null, $path = null )
33
+	static public function clear($id = null, $path = null)
34 34
 	{
35
-		if( $id !== null )
35
+		if ($id !== null)
36 36
 		{
37
-			if( $path !== null ) {
37
+			if ($path !== null) {
38 38
 				self::$controllers[$id][$path] = null;
39 39
 			} else {
40 40
 				self::$controllers[$id] = array();
@@ -62,37 +62,37 @@  discard block
 block discarded – undo
62 62
 	 * @return \Aimeos\Controller\Frontend\Iface New frontend controller
63 63
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
64 64
 	 */
65
-	static public function createController( \Aimeos\MShop\Context\Item\Iface $context, $path )
65
+	static public function createController(\Aimeos\MShop\Context\Item\Iface $context, $path)
66 66
 	{
67
-		if( empty( $path ) ) {
68
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
67
+		if (empty($path)) {
68
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
69 69
 		}
70 70
 
71 71
 		$id = (string) $context;
72 72
 
73
-		if( self::$cache === false || !isset( self::$controllers[$id][$path] ) )
73
+		if (self::$cache === false || !isset(self::$controllers[$id][$path]))
74 74
 		{
75
-			$parts = explode( '/', $path );
75
+			$parts = explode('/', $path);
76 76
 
77
-			foreach( $parts as $key => $part )
77
+			foreach ($parts as $key => $part)
78 78
 			{
79
-				if( ctype_alnum( $part ) === false ) {
80
-					throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) );
79
+				if (ctype_alnum($part) === false) {
80
+					throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s" in "%2$s"', $part, $path));
81 81
 				}
82 82
 
83
-				$parts[$key] = ucwords( $part );
83
+				$parts[$key] = ucwords($part);
84 84
 			}
85 85
 
86
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory';
86
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . join('\\', $parts) . '\\Factory';
87 87
 
88
-			if( class_exists( $factory ) === false ) {
89
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
88
+			if (class_exists($factory) === false) {
89
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
90 90
 			}
91 91
 
92
-			$manager = call_user_func_array( array( $factory, 'createController' ), array( $context ) );
92
+			$manager = call_user_func_array(array($factory, 'createController'), array($context));
93 93
 
94
-			if( $manager === false ) {
95
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
94
+			if ($manager === false) {
95
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
96 96
 			}
97 97
 
98 98
 			self::$controllers[$id][$path] = $manager;
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param boolean $value True to enable caching, false to disable it.
109 109
 	 * @return boolean Previous cache setting
110 110
 	 */
111
-	static public function setCache( $value )
111
+	static public function setCache($value)
112 112
 	{
113 113
 		$old = self::$cache;
114 114
 		self::$cache = (boolean) $value;
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Common/Factory/BaseTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,33 +20,33 @@
 block discarded – undo
20 20
 		$this->context = \TestHelperFrontend::getContext();
21 21
 		$config = $this->context->getConfig();
22 22
 
23
-		$config->set( 'controller/frontend/common/decorators/default', array() );
24
-		$config->set( 'controller/frontend/catalog/decorators/global', array() );
25
-		$config->set( 'controller/frontend/catalog/decorators/local', array() );
23
+		$config->set('controller/frontend/common/decorators/default', array());
24
+		$config->set('controller/frontend/catalog/decorators/global', array());
25
+		$config->set('controller/frontend/catalog/decorators/local', array());
26 26
 
27 27
 	}
28 28
 
29 29
 
30 30
 	public function testInjectController()
31 31
 	{
32
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
33
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
32
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
33
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
34 34
 
35
-		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
35
+		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
36 36
 
37
-		$this->assertSame( $controller, $injectedController );
37
+		$this->assertSame($controller, $injectedController);
38 38
 	}
39 39
 
40 40
 
41 41
 	public function testInjectControllerReset()
42 42
 	{
43
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
44
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
45
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null );
43
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
44
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
45
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null);
46 46
 
47
-		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
47
+		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
48 48
 
49
-		$this->assertNotSame( $controller, $new );
49
+		$this->assertNotSame($controller, $new);
50 50
 	}
51 51
 
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Stock/FactoryTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,31 +15,31 @@
 block discarded – undo
15 15
 	{
16 16
 		$target = '\\Aimeos\\Controller\\Frontend\\Stock\\Iface';
17 17
 
18
-		$controller = \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext() );
19
-		$this->assertInstanceOf( $target, $controller );
18
+		$controller = \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext());
19
+		$this->assertInstanceOf($target, $controller);
20 20
 
21
-		$controller = \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
22
-		$this->assertInstanceOf( $target, $controller );
21
+		$controller = \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
22
+		$this->assertInstanceOf($target, $controller);
23 23
 	}
24 24
 
25 25
 
26 26
 	public function testCreateControllerInvalidImplementation()
27 27
 	{
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
29
-		\Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
29
+		\Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
30 30
 	}
31 31
 
32 32
 
33 33
 	public function testCreateControllerInvalidName()
34 34
 	{
35
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
36
-		\Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
35
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
36
+		\Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), '%^');
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testCreateControllerNotExisting()
41 41
 	{
42
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
43
-		\Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
42
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
43
+		\Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Stock/StandardTest.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
 
17 17
 	protected function setUp()
18 18
 	{
19
-		$this->object = new \Aimeos\Controller\Frontend\Stock\Standard( \TestHelperFrontend::getContext() );
19
+		$this->object = new \Aimeos\Controller\Frontend\Stock\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,66 +30,66 @@  discard block
 block discarded – undo
30 30
 	{
31 31
 		$filter = $this->object->createFilter();
32 32
 
33
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
34
-		$this->assertEquals( array(), $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(array(), $filter->getSortations());
35
+		$this->assertEquals(0, $filter->getSliceStart());
36
+		$this->assertEquals(100, $filter->getSliceSize());
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testAddFilterCodes()
41 41
 	{
42 42
 		$filter = $this->object->createFilter();
43
-		$filter = $this->object->addFilterCodes( $filter, ['CNC', 'CNE'] );
43
+		$filter = $this->object->addFilterCodes($filter, ['CNC', 'CNE']);
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( 'stock.productcode', $list[0]->getName() );
52
-		$this->assertEquals( 2, count( $list[0]->getValue() ) );
51
+		$this->assertEquals('stock.productcode', $list[0]->getName());
52
+		$this->assertEquals(2, count($list[0]->getValue()));
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testAddFilterTypes()
57 57
 	{
58 58
 		$filter = $this->object->createFilter();
59
-		$filter = $this->object->addFilterTypes( $filter, ['default'] );
59
+		$filter = $this->object->addFilterTypes($filter, ['default']);
60 60
 
61 61
 		$list = $filter->getConditions()->getExpressions();
62 62
 
63
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
64
-			throw new \RuntimeException( 'Wrong expression' );
63
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
64
+			throw new \RuntimeException('Wrong expression');
65 65
 		}
66 66
 
67
-		$this->assertEquals( 'stock.type.code', $list[0]->getName() );
68
-		$this->assertEquals( 1, count( $list[0]->getValue() ) );
67
+		$this->assertEquals('stock.type.code', $list[0]->getName());
68
+		$this->assertEquals(1, count($list[0]->getValue()));
69 69
 	}
70 70
 
71 71
 
72 72
 	public function testGetItem()
73 73
 	{
74 74
 		$context = \TestHelperFrontend::getContext();
75
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'stock' );
76
-		$id = $manager->findItem( 'CNC', [], 'product', 'default' )->getId();
75
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'stock');
76
+		$id = $manager->findItem('CNC', [], 'product', 'default')->getId();
77 77
 
78
-		$result = $this->object->getItem( $id );
78
+		$result = $this->object->getItem($id);
79 79
 
80
-		$this->assertInstanceOf( '\Aimeos\MShop\Stock\Item\Iface', $result );
80
+		$this->assertInstanceOf('\Aimeos\MShop\Stock\Item\Iface', $result);
81 81
 	}
82 82
 
83 83
 
84 84
 	public function testSearchItems()
85 85
 	{
86 86
 		$filter = $this->object->createFilter();
87
-		$filter = $this->object->addFilterCodes( $filter, ['CNC', 'CNE'] );
87
+		$filter = $this->object->addFilterCodes($filter, ['CNC', 'CNE']);
88 88
 
89 89
 		$total = 0;
90
-		$results = $this->object->searchItems( $filter, $total );
90
+		$results = $this->object->searchItems($filter, $total);
91 91
 
92
-		$this->assertEquals( 2, $total );
93
-		$this->assertEquals( 2, count( $results ) );
92
+		$this->assertEquals(2, $total);
93
+		$this->assertEquals(2, count($results));
94 94
 	}
95 95
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Iface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @param string $name Name of the manager
27 27
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
28 28
 	 */
29
-	public function createManager( $name );
29
+	public function createManager($name);
30 30
 
31 31
 
32 32
 	/**
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
47 47
 	 * @since 2017.03
48 48
 	 */
49
-	public function getPath( $id, array $domains = array( 'text', 'media' ) );
49
+	public function getPath($id, array $domains = array('text', 'media'));
50 50
 
51 51
 
52 52
 	/**
@@ -60,6 +60,6 @@  discard block
 block discarded – undo
60 60
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
61 61
 	 * @since 2017.03
62 62
 	 */
63
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
64
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null );
63
+	public function getTree($id = null, array $domains = array('text', 'media'),
64
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null);
65 65
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 2 patches
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
30 30
 	 * @since 2015.08
31 31
 	 */
32
-	public function createManager( $name )
32
+	public function createManager($name)
33 33
 	{
34
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), $name );
34
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), $name);
35 35
 	}
36 36
 
37 37
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function createFilter()
45 45
 	{
46
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
46
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
47 47
 	}
48 48
 
49 49
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
56 56
 	 * @since 2017.03
57 57
 	 */
58
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
58
+	public function getPath($id, array $domains = array('text', 'media'))
59 59
 	{
60
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
60
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
61 61
 	}
62 62
 
63 63
 
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
73 73
 	 * @since 2017.03
74 74
 	 */
75
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
76
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
75
+	public function getTree($id = null, array $domains = array('text', 'media'),
76
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
77 77
 	{
78
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
78
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
79 79
 	}
80 80
 
81 81
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @since 2015.08
88 88
 	 * @deprecated Use createFilter() instead
89 89
 	 */
90
-	public function createCatalogFilter( $default = true )
90
+	public function createCatalogFilter($default = true)
91 91
 	{
92 92
 		return $this->createFilter();
93 93
 	}
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	 * @since 2015.08
103 103
 	 * @deprecated Use getPath() instead
104 104
 	 */
105
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
105
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
106 106
 	{
107
-		return $this->getPath( $id, $domains );
107
+		return $this->getPath($id, $domains);
108 108
 	}
109 109
 
110 110
 
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
 	 * @since 2015.08
121 121
 	 * @deprecated Use getTree() instead
122 122
 	 */
123
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
124
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
123
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
124
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
125 125
 	{
126
-		return $this->getTree( $id, $domains, $level, $search );
126
+		return $this->getTree($id, $domains, $level, $search);
127 127
 	}
128 128
 
129 129
 
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 	 * @since 2015.08
138 138
 	 * @deprecated Use getItems() method in index controller instead
139 139
 	 */
140
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
140
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
141 141
 	{
142
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
143
-		return $cntl->getItems( $ids, $domains );
142
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
143
+		return $cntl->getItems($ids, $domains);
144 144
 	}
145 145
 
146 146
 
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	 * @since 2015.08
154 154
 	 * @deprecated Use method in index controller instead
155 155
 	 */
156
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
156
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
157 157
 	{
158
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
159
-		return $cntl->aggregate( $filter, $key );
158
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
159
+		return $cntl->aggregate($filter, $key);
160 160
 	}
161 161
 
162 162
 
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 	 * @since 2015.08
173 173
 	 * @deprecated Use method in index controller instead
174 174
 	 */
175
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
175
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
176 176
 	{
177
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
178
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
177
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
178
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
179 179
 	}
180 180
 
181 181
 
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
 	 * @since 2015.08
193 193
 	 * @deprecated Use createIndexFilter() and addIndexFilterCategory() instead
194 194
 	 */
195
-	public function createIndexFilterCategory( $catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
195
+	public function createIndexFilterCategory($catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
196 196
 	{
197
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
197
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
198 198
 
199
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
200
-		$filter = $cntl->addFilterCategory( $filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype );
199
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
200
+		$filter = $cntl->addFilterCategory($filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype);
201 201
 
202 202
 		return $filter;
203 203
 	}
@@ -216,12 +216,12 @@  discard block
 block discarded – undo
216 216
 	 * @since 2015.08
217 217
 	 * @deprecated Use createIndexFilter() and addIndexFilterText() instead
218 218
 	 */
219
-	public function createIndexFilterText( $input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
219
+	public function createIndexFilterText($input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
220 220
 	{
221
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
221
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
222 222
 
223
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
224
-		$filter = $cntl->addFilterText( $filter, $input, $sort, $direction, $listtype );
223
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
224
+		$filter = $cntl->addFilterText($filter, $input, $sort, $direction, $listtype);
225 225
 
226 226
 		return $filter;
227 227
 	}
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 	 * @since 2015.08
237 237
 	 * @deprecated Use method in index controller instead
238 238
 	 */
239
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
239
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
240 240
 	{
241
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
242
-		return $cntl->addFilterCategory( $search, $catid );
241
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
242
+		return $cntl->addFilterCategory($search, $catid);
243 243
 	}
244 244
 
245 245
 
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 	 * @since 2015.08
254 254
 	 * @deprecated Use method in index controller instead
255 255
 	 */
256
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
256
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
257 257
 	{
258
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
259
-		return $cntl->addFilterText( $search, $input, $listtype );
258
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
259
+		return $cntl->addFilterText($search, $input, $listtype);
260 260
 	}
261 261
 
262 262
 
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
 	 * @since 2015.08
271 271
 	 * @deprecated Use method in index controller instead
272 272
 	 */
273
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
273
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
274 274
 	{
275
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
276
-		return $cntl->searchItems( $filter, $domains, $total );
275
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
276
+		return $cntl->searchItems($filter, $domains, $total);
277 277
 	}
278 278
 
279 279
 
@@ -290,37 +290,37 @@  discard block
 block discarded – undo
290 290
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
291 291
 	 * @deprecated Use createFilter() method in index controller instead
292 292
 	 */
293
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
293
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
294 294
 	{
295 295
 		$locale = $this->getContext()->getLocale();
296 296
 		$langid = $locale->getLanguageId();
297 297
 
298
-		$search = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->createSearch( true );
298
+		$search = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->createSearch(true);
299 299
 
300 300
 		$expr = array(
301
-			$search->compare( '>', $search->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) ), 0 ),
302
-			$search->compare( '>', $search->createFunction( 'index.text.value', array( $listtype, $langid, $type, 'product' ) ), '' ),
301
+			$search->compare('>', $search->createFunction('index.text.relevance', array($listtype, $langid, $input)), 0),
302
+			$search->compare('>', $search->createFunction('index.text.value', array($listtype, $langid, $type, 'product')), ''),
303 303
 		);
304 304
 
305 305
 		$sortations = array();
306 306
 
307
-		switch( $sort )
307
+		switch ($sort)
308 308
 		{
309 309
 			case 'name':
310
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
311
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
310
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
311
+				$expr[] = $search->compare('>=', $cmpfunc, '');
312 312
 
313
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
314
-				$sortations[] = $search->sort( $direction, $sortfunc );
313
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
314
+				$sortations[] = $search->sort($direction, $sortfunc);
315 315
 				break;
316 316
 
317 317
 			case 'relevance':
318 318
 				// we don't need to sort by 'sort:index.text.relevance' because it's a boolean match (relevance is either 0 or 1)
319 319
 		}
320 320
 
321
-		$search->setConditions( $search->combine( '&&', $expr ) );
322
-		$search->setSortations( $sortations );
323
-		$search->setSlice( $start, $size );
321
+		$search->setConditions($search->combine('&&', $expr));
322
+		$search->setSortations($sortations);
323
+		$search->setSlice($start, $size);
324 324
 
325 325
 		return $search;
326 326
 	}
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
 	 * @return array Associative list of the product ID as key and the product text as value
334 334
 	 * @deprecated Use searchItems() method in index controller to retrieve product items instead
335 335
 	 */
336
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
336
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
337 337
 	{
338
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->searchTexts( $filter );
338
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->searchTexts($filter);
339 339
 	}
340 340
 }
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	/**
131 131
 	 * Returns the product item for the given ID if it's available
132 132
 	 *
133
-	 * @param array $ids List of product IDs
133
+	 * @param integer[] $ids List of product IDs
134 134
 	 * @param array $domains Domain names of items that are associated with the products and that should be fetched too
135 135
 	 * @return string[] List of product items implementing \Aimeos\MShop\Product\Item\Iface
136 136
 	 * @throws \Aimeos\Controller\Frontend\Catalog\Exception If product isn't available
@@ -266,6 +266,7 @@  discard block
 block discarded – undo
266 266
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
267 267
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
268 268
 	 * @param integer &$total Parameter where the total number of found products will be stored in
269
+	 * @param integer $total
269 270
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
270 271
 	 * @since 2015.08
271 272
 	 * @deprecated Use method in index controller instead
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Stock/Iface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
28 28
 	 * @since 2017.03
29 29
 	 */
30
-	public function addFilterCodes( \Aimeos\MW\Criteria\Iface $filter, array $codes );
30
+	public function addFilterCodes(\Aimeos\MW\Criteria\Iface $filter, array $codes);
31 31
 
32 32
 
33 33
 	/**
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
39 39
 	 * @since 2017.03
40 40
 	 */
41
-	public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes );
41
+	public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes);
42 42
 
43 43
 
44 44
 	/**
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	 * @return \Aimeos\MShop\Stock\Item\Iface Stock item including the referenced domains items
59 59
 	 * @since 2017.03
60 60
 	 */
61
-	public function getItem( $id );
61
+	public function getItem($id);
62 62
 
63 63
 
64 64
 	/**
@@ -69,5 +69,5 @@  discard block
 block discarded – undo
69 69
 	 * @return array Ordered list of stock items implementing \Aimeos\MShop\Stock\Item\Iface
70 70
 	 * @since 2017.03
71 71
 	 */
72
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
72
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
73 73
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Stock/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
29 29
 	 * @return \Aimeos\Controller\Frontend\Stock\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/stock/name
34 34
 		 * Class name of the used stock frontend controller implementation
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 		 * @since 2017.03
64 64
 		 * @category Developer
65 65
 		 */
66
-		if( $name === null ) {
67
-			$name = $context->getConfig()->get( 'controller/frontend/stock/name', 'Standard' );
66
+		if ($name === null) {
67
+			$name = $context->getConfig()->get('controller/frontend/stock/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\\Stock\\' . $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\\Stock\\' . $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\\Stock\\Iface';
77 77
 		$classname = '\\Aimeos\\Controller\\Frontend\\Stock\\' . $name;
78 78
 
79
-		$manager = self::createControllerBase( $context, $classname, $iface );
79
+		$manager = self::createControllerBase($context, $classname, $iface);
80 80
 
81 81
 		/** controller/frontend/stock/decorators/excludes
82 82
 		 * Excludes decorators added by the "common" option from the stock frontend controllers
@@ -152,6 +152,6 @@  discard block
 block discarded – undo
152 152
 		 * @see controller/frontend/stock/decorators/excludes
153 153
 		 * @see controller/frontend/stock/decorators/global
154 154
 		 */
155
-		return self::addControllerDecorators( $context, $manager, 'stock' );
155
+		return self::addControllerDecorators($context, $manager, 'stock');
156 156
 	}
157 157
 }
Please login to merge, or discard this patch.