@@ -16,31 +16,31 @@ |
||
16 | 16 | { |
17 | 17 | $target = '\\Aimeos\\Controller\\Frontend\\Order\\Iface'; |
18 | 18 | |
19 | - $controller = \Aimeos\Controller\Frontend\Order\Factory::create( \TestHelperFrontend::getContext() ); |
|
20 | - $this->assertInstanceOf( $target, $controller ); |
|
19 | + $controller = \Aimeos\Controller\Frontend\Order\Factory::create(\TestHelperFrontend::getContext()); |
|
20 | + $this->assertInstanceOf($target, $controller); |
|
21 | 21 | |
22 | - $controller = \Aimeos\Controller\Frontend\Order\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
23 | - $this->assertInstanceOf( $target, $controller ); |
|
22 | + $controller = \Aimeos\Controller\Frontend\Order\Factory::create(\TestHelperFrontend::getContext(), 'Standard'); |
|
23 | + $this->assertInstanceOf($target, $controller); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | 27 | public function testCreateControllerInvalidImplementation() |
28 | 28 | { |
29 | - $this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' ); |
|
30 | - \Aimeos\Controller\Frontend\Order\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
29 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
30 | + \Aimeos\Controller\Frontend\Order\Factory::create(\TestHelperFrontend::getContext(), 'Invalid'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
34 | 34 | public function testCreateControllerInvalidName() |
35 | 35 | { |
36 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
37 | - \Aimeos\Controller\Frontend\Order\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
36 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
37 | + \Aimeos\Controller\Frontend\Order\Factory::create(\TestHelperFrontend::getContext(), '%^'); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testCreateControllerNotExisting() |
42 | 42 | { |
43 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
44 | - \Aimeos\Controller\Frontend\Order\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
43 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
44 | + \Aimeos\Controller\Frontend\Order\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
45 | 45 | } |
46 | 46 | } |
@@ -15,31 +15,31 @@ |
||
15 | 15 | { |
16 | 16 | $target = '\\Aimeos\\Controller\\Frontend\\Customer\\Iface'; |
17 | 17 | |
18 | - $controller = \Aimeos\Controller\Frontend\Customer\Factory::create( \TestHelperFrontend::getContext() ); |
|
19 | - $this->assertInstanceOf( $target, $controller ); |
|
18 | + $controller = \Aimeos\Controller\Frontend\Customer\Factory::create(\TestHelperFrontend::getContext()); |
|
19 | + $this->assertInstanceOf($target, $controller); |
|
20 | 20 | |
21 | - $controller = \Aimeos\Controller\Frontend\Customer\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
22 | - $this->assertInstanceOf( $target, $controller ); |
|
21 | + $controller = \Aimeos\Controller\Frontend\Customer\Factory::create(\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\\MW\\Common\\Exception' ); |
|
29 | - \Aimeos\Controller\Frontend\Customer\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
28 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
29 | + \Aimeos\Controller\Frontend\Customer\Factory::create(\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\Customer\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
35 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
36 | + \Aimeos\Controller\Frontend\Customer\Factory::create(\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\Customer\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
42 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
43 | + \Aimeos\Controller\Frontend\Customer\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
44 | 44 | } |
45 | 45 | } |
@@ -20,33 +20,33 @@ |
||
20 | 20 | $this->context = \TestHelperFrontend::getContext(); |
21 | 21 | $config = $this->context->getConfig(); |
22 | 22 | |
23 | - $config->set( 'controller/frontend/common/decorators/default', [] ); |
|
24 | - $config->set( 'controller/frontend/catalog/decorators/global', [] ); |
|
25 | - $config->set( 'controller/frontend/catalog/decorators/local', [] ); |
|
23 | + $config->set('controller/frontend/common/decorators/default', []); |
|
24 | + $config->set('controller/frontend/catalog/decorators/global', []); |
|
25 | + $config->set('controller/frontend/catalog/decorators/local', []); |
|
26 | 26 | |
27 | 27 | } |
28 | 28 | |
29 | 29 | |
30 | 30 | public function testInjectController() |
31 | 31 | { |
32 | - $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create( $this->context, 'Standard' ); |
|
33 | - \Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller ); |
|
32 | + $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create($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::create( $this->context, 'Standard' ); |
|
35 | + $injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::create($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::create( $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::create($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::create( $this->context, 'Standard' ); |
|
47 | + $new = \Aimeos\Controller\Frontend\Catalog\Factory::create($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 |
@@ -15,31 +15,31 @@ |
||
15 | 15 | { |
16 | 16 | $target = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface'; |
17 | 17 | |
18 | - $controller = \Aimeos\Controller\Frontend\Locale\Factory::create( \TestHelperFrontend::getContext() ); |
|
19 | - $this->assertInstanceOf( $target, $controller ); |
|
18 | + $controller = \Aimeos\Controller\Frontend\Locale\Factory::create(\TestHelperFrontend::getContext()); |
|
19 | + $this->assertInstanceOf($target, $controller); |
|
20 | 20 | |
21 | - $controller = \Aimeos\Controller\Frontend\Locale\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
22 | - $this->assertInstanceOf( $target, $controller ); |
|
21 | + $controller = \Aimeos\Controller\Frontend\Locale\Factory::create(\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\\MW\\Common\\Exception' ); |
|
29 | - \Aimeos\Controller\Frontend\Locale\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
28 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
29 | + \Aimeos\Controller\Frontend\Locale\Factory::create(\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\Locale\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
35 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
36 | + \Aimeos\Controller\Frontend\Locale\Factory::create(\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\Locale\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
42 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
43 | + \Aimeos\Controller\Frontend\Locale\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
44 | 44 | } |
45 | 45 | } |
@@ -14,31 +14,31 @@ |
||
14 | 14 | { |
15 | 15 | $target = '\\Aimeos\\Controller\\Frontend\\Basket\\Iface'; |
16 | 16 | |
17 | - $controller = \Aimeos\Controller\Frontend\Basket\Factory::create( \TestHelperFrontend::getContext() ); |
|
18 | - $this->assertInstanceOf( $target, $controller ); |
|
17 | + $controller = \Aimeos\Controller\Frontend\Basket\Factory::create(\TestHelperFrontend::getContext()); |
|
18 | + $this->assertInstanceOf($target, $controller); |
|
19 | 19 | |
20 | - $controller = \Aimeos\Controller\Frontend\Basket\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
21 | - $this->assertInstanceOf( $target, $controller ); |
|
20 | + $controller = \Aimeos\Controller\Frontend\Basket\Factory::create(\TestHelperFrontend::getContext(), 'Standard'); |
|
21 | + $this->assertInstanceOf($target, $controller); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
25 | 25 | public function testCreateControllerInvalidImplementation() |
26 | 26 | { |
27 | - $this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' ); |
|
28 | - \Aimeos\Controller\Frontend\Basket\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
27 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
28 | + \Aimeos\Controller\Frontend\Basket\Factory::create(\TestHelperFrontend::getContext(), 'Invalid'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCreateControllerInvalidName() |
33 | 33 | { |
34 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
35 | - \Aimeos\Controller\Frontend\Basket\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
34 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
35 | + \Aimeos\Controller\Frontend\Basket\Factory::create(\TestHelperFrontend::getContext(), '%^'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testCreateControllerNotExisting() |
40 | 40 | { |
41 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
42 | - \Aimeos\Controller\Frontend\Basket\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
41 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
42 | + \Aimeos\Controller\Frontend\Basket\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
43 | 43 | } |
44 | 44 | } |
@@ -14,31 +14,31 @@ |
||
14 | 14 | { |
15 | 15 | $target = '\\Aimeos\\Controller\\Frontend\\Catalog\\Iface'; |
16 | 16 | |
17 | - $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create( \TestHelperFrontend::getContext() ); |
|
18 | - $this->assertInstanceOf( $target, $controller ); |
|
17 | + $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create(\TestHelperFrontend::getContext()); |
|
18 | + $this->assertInstanceOf($target, $controller); |
|
19 | 19 | |
20 | - $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
21 | - $this->assertInstanceOf( $target, $controller ); |
|
20 | + $controller = \Aimeos\Controller\Frontend\Catalog\Factory::create(\TestHelperFrontend::getContext(), 'Standard'); |
|
21 | + $this->assertInstanceOf($target, $controller); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
25 | 25 | public function testCreateControllerInvalidImplementation() |
26 | 26 | { |
27 | - $this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' ); |
|
28 | - \Aimeos\Controller\Frontend\Catalog\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
27 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
28 | + \Aimeos\Controller\Frontend\Catalog\Factory::create(\TestHelperFrontend::getContext(), 'Invalid'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCreateControllerInvalidName() |
33 | 33 | { |
34 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
35 | - \Aimeos\Controller\Frontend\Catalog\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
34 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
35 | + \Aimeos\Controller\Frontend\Catalog\Factory::create(\TestHelperFrontend::getContext(), '%^'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testCreateControllerNotExisting() |
40 | 40 | { |
41 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
42 | - \Aimeos\Controller\Frontend\Catalog\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
41 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
42 | + \Aimeos\Controller\Frontend\Catalog\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
43 | 43 | } |
44 | 44 | } |
@@ -14,92 +14,92 @@ |
||
14 | 14 | { |
15 | 15 | public function testCreateController() |
16 | 16 | { |
17 | - $controller = \Aimeos\Controller\Frontend\Factory::create( \TestHelperFrontend::getContext(), 'basket' ); |
|
18 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller ); |
|
17 | + $controller = \Aimeos\Controller\Frontend\Factory::create(\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::create( \TestHelperFrontend::getContext(), '' ); |
|
24 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
25 | + \Aimeos\Controller\Frontend\Factory::create(\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::create( \TestHelperFrontend::getContext(), '%^' ); |
|
31 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
32 | + \Aimeos\Controller\Frontend\Factory::create(\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::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
38 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
39 | + \Aimeos\Controller\Frontend\Factory::create(\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::create( \TestHelperFrontend::getContext(), 'basket/notexist' ); |
|
45 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
46 | + \Aimeos\Controller\Frontend\Factory::create(\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::create( $context, 'basket' ); |
|
56 | + $controller1 = \Aimeos\Controller\Frontend\Factory::create($context, 'basket'); |
|
57 | 57 | \Aimeos\Controller\Frontend\Factory::clear(); |
58 | - $controller2 = \Aimeos\Controller\Frontend\Factory::create( $context, 'basket' ); |
|
58 | + $controller2 = \Aimeos\Controller\Frontend\Factory::create($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::create( $context, 'basket' ); |
|
73 | - $catalog1 = \Aimeos\Controller\Frontend\Factory::create( $context, 'catalog' ); |
|
74 | - \Aimeos\Controller\Frontend\Factory::clear( (string) $context ); |
|
72 | + $basket1 = \Aimeos\Controller\Frontend\Factory::create($context, 'basket'); |
|
73 | + $catalog1 = \Aimeos\Controller\Frontend\Factory::create($context, 'catalog'); |
|
74 | + \Aimeos\Controller\Frontend\Factory::clear((string) $context); |
|
75 | 75 | |
76 | - $basket2 = \Aimeos\Controller\Frontend\Factory::create( $context, 'basket' ); |
|
77 | - $catalog2 = \Aimeos\Controller\Frontend\Factory::create( $context, 'catalog' ); |
|
76 | + $basket2 = \Aimeos\Controller\Frontend\Factory::create($context, 'basket'); |
|
77 | + $catalog2 = \Aimeos\Controller\Frontend\Factory::create($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::create( $context, 'basket' ); |
|
93 | - $catalog1 = \Aimeos\Controller\Frontend\Factory::create( $context, 'catalog' ); |
|
94 | - \Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' ); |
|
92 | + $basket1 = \Aimeos\Controller\Frontend\Factory::create($context, 'basket'); |
|
93 | + $catalog1 = \Aimeos\Controller\Frontend\Factory::create($context, 'catalog'); |
|
94 | + \Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket'); |
|
95 | 95 | |
96 | - $basket2 = \Aimeos\Controller\Frontend\Factory::create( $context, 'basket' ); |
|
97 | - $catalog2 = \Aimeos\Controller\Frontend\Factory::create( $context, 'catalog' ); |
|
96 | + $basket2 = \Aimeos\Controller\Frontend\Factory::create($context, 'basket'); |
|
97 | + $catalog2 = \Aimeos\Controller\Frontend\Factory::create($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 |
@@ -15,31 +15,31 @@ |
||
15 | 15 | { |
16 | 16 | $target = '\\Aimeos\\Controller\\Frontend\\Stock\\Iface'; |
17 | 17 | |
18 | - $controller = \Aimeos\Controller\Frontend\Stock\Factory::create( \TestHelperFrontend::getContext() ); |
|
19 | - $this->assertInstanceOf( $target, $controller ); |
|
18 | + $controller = \Aimeos\Controller\Frontend\Stock\Factory::create(\TestHelperFrontend::getContext()); |
|
19 | + $this->assertInstanceOf($target, $controller); |
|
20 | 20 | |
21 | - $controller = \Aimeos\Controller\Frontend\Stock\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
22 | - $this->assertInstanceOf( $target, $controller ); |
|
21 | + $controller = \Aimeos\Controller\Frontend\Stock\Factory::create(\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\\MW\\Common\\Exception' ); |
|
29 | - \Aimeos\Controller\Frontend\Stock\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
28 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
29 | + \Aimeos\Controller\Frontend\Stock\Factory::create(\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::create( \TestHelperFrontend::getContext(), '%^' ); |
|
35 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
36 | + \Aimeos\Controller\Frontend\Stock\Factory::create(\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::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
42 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
43 | + \Aimeos\Controller\Frontend\Stock\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
44 | 44 | } |
45 | 45 | } |
@@ -15,31 +15,31 @@ |
||
15 | 15 | { |
16 | 16 | $target = '\\Aimeos\\Controller\\Frontend\\Supplier\\Iface'; |
17 | 17 | |
18 | - $controller = \Aimeos\Controller\Frontend\Supplier\Factory::create( \TestHelperFrontend::getContext() ); |
|
19 | - $this->assertInstanceOf( $target, $controller ); |
|
18 | + $controller = \Aimeos\Controller\Frontend\Supplier\Factory::create(\TestHelperFrontend::getContext()); |
|
19 | + $this->assertInstanceOf($target, $controller); |
|
20 | 20 | |
21 | - $controller = \Aimeos\Controller\Frontend\Supplier\Factory::create( \TestHelperFrontend::getContext(), 'Standard' ); |
|
22 | - $this->assertInstanceOf( $target, $controller ); |
|
21 | + $controller = \Aimeos\Controller\Frontend\Supplier\Factory::create(\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\\MW\\Common\\Exception' ); |
|
29 | - \Aimeos\Controller\Frontend\Supplier\Factory::create( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
28 | + $this->setExpectedException('\\Aimeos\\MW\\Common\\Exception'); |
|
29 | + \Aimeos\Controller\Frontend\Supplier\Factory::create(\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\Supplier\Factory::create( \TestHelperFrontend::getContext(), '%^' ); |
|
35 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
36 | + \Aimeos\Controller\Frontend\Supplier\Factory::create(\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\Supplier\Factory::create( \TestHelperFrontend::getContext(), 'notexist' ); |
|
42 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
43 | + \Aimeos\Controller\Frontend\Supplier\Factory::create(\TestHelperFrontend::getContext(), 'notexist'); |
|
44 | 44 | } |
45 | 45 | } |