@@ -16,9 +16,9 @@ discard block |
||
16 | 16 | $context = \TestHelperJadm::getContext(); |
17 | 17 | $aimeos = \TestHelperJadm::getAimeos(); |
18 | 18 | |
19 | - $client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
20 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
21 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client ); |
|
19 | + $client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
20 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
21 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | $context = \TestHelperJadm::getContext(); |
28 | 28 | $aimeos = \TestHelperJadm::getAimeos(); |
29 | 29 | |
30 | - $client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' ); |
|
31 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
32 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client ); |
|
30 | + $client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base'); |
|
31 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
32 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | $context = \TestHelperJadm::getContext(); |
39 | 39 | $aimeos = \TestHelperJadm::getAimeos(); |
40 | 40 | |
41 | - $client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'stock/type' ); |
|
42 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
43 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client ); |
|
41 | + $client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'stock/type'); |
|
42 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
43 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | $context = \TestHelperJadm::getContext(); |
50 | 50 | $aimeos = \TestHelperJadm::getAimeos(); |
51 | 51 | |
52 | - $client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '' ); |
|
53 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
54 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client ); |
|
52 | + $client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, ''); |
|
53 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
54 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | $context = \TestHelperJadm::getContext(); |
61 | 61 | $aimeos = \TestHelperJadm::getAimeos(); |
62 | 62 | |
63 | - $this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
64 | - \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '%^' ); |
|
63 | + $this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
64 | + \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, '%^'); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
@@ -70,68 +70,68 @@ discard block |
||
70 | 70 | $context = \TestHelperJadm::getContext(); |
71 | 71 | $aimeos = \TestHelperJadm::getAimeos(); |
72 | 72 | |
73 | - $this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
74 | - \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '', '%^' ); |
|
73 | + $this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
74 | + \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, '', '%^'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | |
78 | 78 | public function testClear() |
79 | 79 | { |
80 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
80 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
81 | 81 | |
82 | 82 | $context = \TestHelperJadm::getContext(); |
83 | 83 | $aimeos = \TestHelperJadm::getAimeos(); |
84 | 84 | |
85 | - $client1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
85 | + $client1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
86 | 86 | \Aimeos\Admin\JsonAdm\Factory::clear(); |
87 | - $client2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
87 | + $client2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
88 | 88 | |
89 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
89 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
90 | 90 | |
91 | - $this->assertNotSame( $client1, $client2 ); |
|
91 | + $this->assertNotSame($client1, $client2); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | |
95 | 95 | public function testClearSite() |
96 | 96 | { |
97 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
97 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
98 | 98 | |
99 | 99 | $context = \TestHelperJadm::getContext(); |
100 | 100 | $aimeos = \TestHelperJadm::getAimeos(); |
101 | 101 | |
102 | - $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
103 | - $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' ); |
|
104 | - \Aimeos\Admin\JsonAdm\Factory::clear( (string) $context ); |
|
102 | + $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
103 | + $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base'); |
|
104 | + \Aimeos\Admin\JsonAdm\Factory::clear((string) $context); |
|
105 | 105 | |
106 | - $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
107 | - $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' ); |
|
106 | + $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
107 | + $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base'); |
|
108 | 108 | |
109 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
109 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
110 | 110 | |
111 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
112 | - $this->assertNotSame( $cntlB1, $cntlB2 ); |
|
111 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
112 | + $this->assertNotSame($cntlB1, $cntlB2); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
116 | 116 | public function testClearSpecific() |
117 | 117 | { |
118 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
118 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
119 | 119 | |
120 | 120 | $context = \TestHelperJadm::getContext(); |
121 | 121 | $aimeos = \TestHelperJadm::getAimeos(); |
122 | 122 | |
123 | - $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
124 | - $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' ); |
|
123 | + $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
124 | + $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base'); |
|
125 | 125 | |
126 | - \Aimeos\Admin\JsonAdm\Factory::clear( (string) $context, 'order' ); |
|
126 | + \Aimeos\Admin\JsonAdm\Factory::clear((string) $context, 'order'); |
|
127 | 127 | |
128 | - $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' ); |
|
129 | - $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' ); |
|
128 | + $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order'); |
|
129 | + $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base'); |
|
130 | 130 | |
131 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
131 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
132 | 132 | |
133 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
134 | - $this->assertSame( $cntlB1, $cntlB2 ); |
|
133 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
134 | + $this->assertSame($cntlB1, $cntlB2); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | } |
138 | 138 | \ No newline at end of file |
@@ -21,29 +21,29 @@ discard block |
||
21 | 21 | $this->context = \TestHelperJadm::getContext(); |
22 | 22 | $this->view = $this->context->getView(); |
23 | 23 | |
24 | - $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' ); |
|
24 | + $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], ''); |
|
25 | 25 | |
26 | - $this->object = $this->getMockBuilder( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class ) |
|
26 | + $this->object = $this->getMockBuilder(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class) |
|
27 | 27 | ->getMockForAbstractClass(); |
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | 31 | public function testinjectClient() |
32 | 32 | { |
33 | - $this->object->injectClient( 'test', $this->client ); |
|
33 | + $this->object->injectClient('test', $this->client); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
37 | 37 | public function testAddClientDecorators() |
38 | 38 | { |
39 | 39 | $config = $this->context->getConfig(); |
40 | - $config->set( 'client/jsonapi/common/decorators/default', ['Test'] ); |
|
41 | - $config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] ); |
|
40 | + $config->set('client/jsonapi/common/decorators/default', ['Test']); |
|
41 | + $config->set('client/jsonapi/product/decorators/excludes', ['Test']); |
|
42 | 42 | |
43 | 43 | $params = [$this->client, $this->context, $this->view, [], 'product']; |
44 | - $result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params ); |
|
44 | + $result = $this->access('addClientDecorators')->invokeArgs($this->object, $params); |
|
45 | 45 | |
46 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
46 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
53 | 53 | $params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], '']; |
54 | 54 | |
55 | - $result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
55 | + $result = $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
56 | 56 | |
57 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
57 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
64 | 64 | $params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], '']; |
65 | 65 | |
66 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
67 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
66 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
67 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
74 | 74 | $params = [$this->client, [''], $prefix, $this->context, $this->view, [], '']; |
75 | 75 | |
76 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
77 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
76 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
77 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
85 | 85 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
86 | 86 | |
87 | - $result = $this->access( 'createAdmin' )->invokeArgs( $this->object, $params ); |
|
87 | + $result = $this->access('createAdmin')->invokeArgs($this->object, $params); |
|
88 | 88 | |
89 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
89 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
96 | 96 | $params = ['test', $iface, $this->context, $this->view, [], '']; |
97 | 97 | |
98 | - $this->object->injectClient( 'test', $this->client ); |
|
99 | - $result = $this->access( 'createAdmin' )->invokeArgs( $this->object, $params ); |
|
98 | + $this->object->injectClient('test', $this->client); |
|
99 | + $result = $this->access('createAdmin')->invokeArgs($this->object, $params); |
|
100 | 100 | |
101 | - $this->assertSame( $this->client, $result ); |
|
101 | + $this->assertSame($this->client, $result); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
108 | 108 | $params = ['invalid', $iface, $this->context, $this->view, [], '']; |
109 | 109 | |
110 | - $this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class ); |
|
111 | - $this->access( 'createAdmin' )->invokeArgs( $this->object, $params ); |
|
110 | + $this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class); |
|
111 | + $this->access('createAdmin')->invokeArgs($this->object, $params); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
119 | 119 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
120 | 120 | |
121 | - $this->setExpectedException( \Aimeos\MW\Common\Exception::class ); |
|
122 | - $this->access( 'createAdmin' )->invokeArgs( $this->object, $params ); |
|
121 | + $this->setExpectedException(\Aimeos\MW\Common\Exception::class); |
|
122 | + $this->access('createAdmin')->invokeArgs($this->object, $params); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | |
126 | - protected function access( $name ) |
|
126 | + protected function access($name) |
|
127 | 127 | { |
128 | - $class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class ); |
|
129 | - $method = $class->getMethod( $name ); |
|
130 | - $method->setAccessible( true ); |
|
128 | + $class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class); |
|
129 | + $method = $class->getMethod($name); |
|
130 | + $method->setAccessible(true); |
|
131 | 131 | |
132 | 132 | return $method; |
133 | 133 | } |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
33 | 33 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
34 | 34 | */ |
35 | - static public function create( \Aimeos\MShop\Context\Item\Iface $context, |
|
36 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
35 | + static public function create(\Aimeos\MShop\Context\Item\Iface $context, |
|
36 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
37 | 37 | { |
38 | - return parent::create( $context, $aimeos, $path, $name ); |
|
38 | + return parent::create($context, $aimeos, $path, $name); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | * @param boolean $value True to enable caching, false to disable it. |
46 | 46 | * @return boolean Previous cache setting |
47 | 47 | */ |
48 | - static public function setCache( $value ) |
|
48 | + static public function setCache($value) |
|
49 | 49 | { |
50 | - return self::cache( $value ); |
|
50 | + return self::cache($value); |
|
51 | 51 | } |
52 | 52 | } |
@@ -28,5 +28,5 @@ |
||
28 | 28 | * @param string|null $name Name of the client implementation ("Standard" if null) |
29 | 29 | * @return \Aimeos\Admin\JsonAdm\Iface Client Interface |
30 | 30 | */ |
31 | - public static function create( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null ); |
|
31 | + public static function create(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null); |
|
32 | 32 | } |
33 | 33 | \ No newline at end of file |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param string $classname Full name of the class for which the object should be returned |
32 | 32 | * @param \Aimeos\Admin\JsonAdm\Iface|null $client JSON API client object |
33 | 33 | */ |
34 | - public static function injectClient( $classname, \Aimeos\Admin\JsonAdm\Iface $client = null ) |
|
34 | + public static function injectClient($classname, \Aimeos\Admin\JsonAdm\Iface $client = null) |
|
35 | 35 | { |
36 | 36 | self::$objects[$classname] = $client; |
37 | 37 | } |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
46 | 46 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
47 | 47 | */ |
48 | - protected static function addClientDecorators( \Aimeos\Admin\JsonAdm\Iface $client, |
|
49 | - \Aimeos\MShop\Context\Item\Iface $context, $path ) |
|
48 | + protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client, |
|
49 | + \Aimeos\MShop\Context\Item\Iface $context, $path) |
|
50 | 50 | { |
51 | 51 | $config = $context->getConfig(); |
52 | 52 | |
@@ -72,38 +72,38 @@ discard block |
||
72 | 72 | * @since 2015.12 |
73 | 73 | * @category Developer |
74 | 74 | */ |
75 | - $decorators = $config->get( 'admin/jsonadm/common/decorators/default', [] ); |
|
75 | + $decorators = $config->get('admin/jsonadm/common/decorators/default', []); |
|
76 | 76 | |
77 | - if( $path !== null && is_string( $path ) ) |
|
77 | + if ($path !== null && is_string($path)) |
|
78 | 78 | { |
79 | - $dpath = trim( $path, '/' ); |
|
80 | - $dpath = ( $dpath !== '' ? $dpath . '/' : $dpath ); |
|
79 | + $dpath = trim($path, '/'); |
|
80 | + $dpath = ($dpath !== '' ? $dpath . '/' : $dpath); |
|
81 | 81 | |
82 | - $excludes = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/excludes', [] ); |
|
83 | - $localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) ); |
|
82 | + $excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', []); |
|
83 | + $localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path))); |
|
84 | 84 | |
85 | - foreach( $decorators as $key => $name ) |
|
85 | + foreach ($decorators as $key => $name) |
|
86 | 86 | { |
87 | - if( in_array( $name, $excludes ) ) { |
|
88 | - unset( $decorators[$key] ); |
|
87 | + if (in_array($name, $excludes)) { |
|
88 | + unset($decorators[$key]); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | 92 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
93 | - $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/global', [] ); |
|
94 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
|
93 | + $decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', []); |
|
94 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $path); |
|
95 | 95 | |
96 | - if( !empty( $path ) ) |
|
96 | + if (!empty($path)) |
|
97 | 97 | { |
98 | - $classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\'; |
|
99 | - $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
|
100 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
|
98 | + $classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\'; |
|
99 | + $decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', []); |
|
100 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $path); |
|
101 | 101 | } |
102 | 102 | } |
103 | 103 | else |
104 | 104 | { |
105 | 105 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
106 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
|
106 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $path); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | return $client; |
@@ -120,26 +120,26 @@ discard block |
||
120 | 120 | * @param string $path Name of the client separated by slashes, e.g "product/stock" |
121 | 121 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
122 | 122 | */ |
123 | - protected static function addDecorators( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix, |
|
124 | - \Aimeos\MShop\Context\Item\Iface $context, $path ) |
|
123 | + protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix, |
|
124 | + \Aimeos\MShop\Context\Item\Iface $context, $path) |
|
125 | 125 | { |
126 | - foreach( $decorators as $name ) |
|
126 | + foreach ($decorators as $name) |
|
127 | 127 | { |
128 | - if( ctype_alnum( $name ) === false ) |
|
128 | + if (ctype_alnum($name) === false) |
|
129 | 129 | { |
130 | - $classname = is_string( $name ) ? $classprefix . $name : '<not a string>'; |
|
131 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 ); |
|
130 | + $classname = is_string($name) ? $classprefix . $name : '<not a string>'; |
|
131 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404); |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | $classname = $classprefix . $name; |
135 | 135 | |
136 | - if( class_exists( $classname ) === false ) { |
|
137 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
136 | + if (class_exists($classname) === false) { |
|
137 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
138 | 138 | } |
139 | 139 | |
140 | - $client = new $classname( $client, $context, $path ); |
|
140 | + $client = new $classname($client, $context, $path); |
|
141 | 141 | |
142 | - \Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client ); |
|
142 | + \Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | return $client; |
@@ -155,19 +155,19 @@ discard block |
||
155 | 155 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
156 | 156 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
157 | 157 | */ |
158 | - protected static function createAdmin( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path ) |
|
158 | + protected static function createAdmin($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path) |
|
159 | 159 | { |
160 | - if( isset( self::$objects[$classname] ) ) { |
|
160 | + if (isset(self::$objects[$classname])) { |
|
161 | 161 | return self::$objects[$classname]; |
162 | 162 | } |
163 | 163 | |
164 | - if( class_exists( $classname ) === false ) { |
|
165 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
164 | + if (class_exists($classname) === false) { |
|
165 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
166 | 166 | } |
167 | 167 | |
168 | - $client = new $classname( $context, $path ); |
|
168 | + $client = new $classname($context, $path); |
|
169 | 169 | |
170 | - \Aimeos\MW\Common\Base::checkClass( $interface, $client ); |
|
170 | + \Aimeos\MW\Common\Base::checkClass($interface, $client); |
|
171 | 171 | |
172 | 172 | return $client; |
173 | 173 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param boolean $value True to enable caching, false to disable it. |
30 | 30 | * @return boolean Previous cache setting |
31 | 31 | */ |
32 | - static public function cache( $value ) |
|
32 | + static public function cache($value) |
|
33 | 33 | { |
34 | 34 | $old = self::$cache; |
35 | 35 | self::$cache = (boolean) $value; |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface) |
47 | 47 | * @param string $path Path describing the client to clear, e.g. "product/lists/type" |
48 | 48 | */ |
49 | - static public function clear( $id = null, $path = null ) |
|
49 | + static public function clear($id = null, $path = null) |
|
50 | 50 | { |
51 | - if( $id !== null ) |
|
51 | + if ($id !== null) |
|
52 | 52 | { |
53 | - if( $path !== null ) { |
|
53 | + if ($path !== null) { |
|
54 | 54 | self::$clients[$id][$path] = null; |
55 | 55 | } else { |
56 | 56 | self::$clients[$id] = []; |
@@ -78,18 +78,18 @@ discard block |
||
78 | 78 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
79 | 79 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
80 | 80 | */ |
81 | - static public function create( \Aimeos\MShop\Context\Item\Iface $context, |
|
82 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
81 | + static public function create(\Aimeos\MShop\Context\Item\Iface $context, |
|
82 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
83 | 83 | { |
84 | - $path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) ); |
|
84 | + $path = strtolower(trim($path, "/ \n\t\r\0\x0B")); |
|
85 | 85 | $id = (string) $context; |
86 | 86 | |
87 | - if( self::$cache === false || !isset( self::$clients[$id][$path] ) ) |
|
87 | + if (self::$cache === false || !isset(self::$clients[$id][$path])) |
|
88 | 88 | { |
89 | - if( empty( $path ) ) { |
|
90 | - self::$clients[$id][$path] = self::createRoot( $context, $aimeos, $path, $name ); |
|
89 | + if (empty($path)) { |
|
90 | + self::$clients[$id][$path] = self::createRoot($context, $aimeos, $path, $name); |
|
91 | 91 | } else { |
92 | - self::$clients[$id][$path] = self::createNew( $context, $aimeos, $path, $name ); |
|
92 | + self::$clients[$id][$path] = self::createNew($context, $aimeos, $path, $name); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
@@ -107,53 +107,53 @@ discard block |
||
107 | 107 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
108 | 108 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
109 | 109 | */ |
110 | - protected static function createNew( \Aimeos\MShop\Context\Item\Iface $context, |
|
111 | - \Aimeos\Bootstrap $aimeos, $path, $name ) |
|
110 | + protected static function createNew(\Aimeos\MShop\Context\Item\Iface $context, |
|
111 | + \Aimeos\Bootstrap $aimeos, $path, $name) |
|
112 | 112 | { |
113 | 113 | $pname = $name; |
114 | - $parts = explode( '/', $path ); |
|
114 | + $parts = explode('/', $path); |
|
115 | 115 | |
116 | - foreach( $parts as $key => $part ) |
|
116 | + foreach ($parts as $key => $part) |
|
117 | 117 | { |
118 | - if( ctype_alnum( $part ) === false ) |
|
118 | + if (ctype_alnum($part) === false) |
|
119 | 119 | { |
120 | - $msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path ); |
|
121 | - throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 ); |
|
120 | + $msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path); |
|
121 | + throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400); |
|
122 | 122 | } |
123 | 123 | |
124 | - $parts[$key] = ucwords( $part ); |
|
124 | + $parts[$key] = ucwords($part); |
|
125 | 125 | } |
126 | 126 | |
127 | - if( $pname === null ) { |
|
128 | - $pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ); |
|
127 | + if ($pname === null) { |
|
128 | + $pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard'); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | $view = $context->getView(); |
132 | 132 | $config = $context->getConfig(); |
133 | 133 | |
134 | - if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) { |
|
135 | - throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) ); |
|
134 | + if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) { |
|
135 | + throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path)); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | |
139 | 139 | $view = $context->getView(); |
140 | 140 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
141 | - $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname; |
|
141 | + $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname; |
|
142 | 142 | |
143 | - if( ctype_alnum( $pname ) === false ) |
|
143 | + if (ctype_alnum($pname) === false) |
|
144 | 144 | { |
145 | - $classname = is_string( $pname ) ? $classname : '<not a string>'; |
|
146 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
145 | + $classname = is_string($pname) ? $classname : '<not a string>'; |
|
146 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
147 | 147 | } |
148 | 148 | |
149 | - if( class_exists( $classname ) === false ) { |
|
150 | - return self::createRoot( $context, $aimeos, $path, $name ); |
|
149 | + if (class_exists($classname) === false) { |
|
150 | + return self::createRoot($context, $aimeos, $path, $name); |
|
151 | 151 | } |
152 | 152 | |
153 | - $client = self::createAdmin( $classname, $iface, $context, $path ); |
|
154 | - $client = self::addClientDecorators( $client, $context, $path ); |
|
153 | + $client = self::createAdmin($classname, $iface, $context, $path); |
|
154 | + $client = self::addClientDecorators($client, $context, $path); |
|
155 | 155 | |
156 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
156 | + return $client->setAimeos($aimeos)->setView($view); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | |
@@ -167,8 +167,8 @@ discard block |
||
167 | 167 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
168 | 168 | * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created |
169 | 169 | */ |
170 | - protected static function createRoot( \Aimeos\MShop\Context\Item\Iface $context, |
|
171 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
170 | + protected static function createRoot(\Aimeos\MShop\Context\Item\Iface $context, |
|
171 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
172 | 172 | { |
173 | 173 | /** admin/jsonadm/name |
174 | 174 | * Class name of the used JSON API client implementation |
@@ -203,21 +203,21 @@ discard block |
||
203 | 203 | * @since 2015.12 |
204 | 204 | * @category Developer |
205 | 205 | */ |
206 | - if( $name === null ) { |
|
207 | - $name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' ); |
|
206 | + if ($name === null) { |
|
207 | + $name = $context->getConfig()->get('admin/jsonadm/name', 'Standard'); |
|
208 | 208 | } |
209 | 209 | |
210 | - if( ctype_alnum( $name ) === false ) |
|
210 | + if (ctype_alnum($name) === false) |
|
211 | 211 | { |
212 | - $classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
213 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
212 | + $classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
213 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | $view = $context->getView(); |
217 | 217 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
218 | 218 | $classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name; |
219 | 219 | |
220 | - $client = self::createAdmin( $classname, $iface, $context, $path ); |
|
220 | + $client = self::createAdmin($classname, $iface, $context, $path); |
|
221 | 221 | |
222 | 222 | /** admin/jsonadm/decorators/excludes |
223 | 223 | * Excludes decorators added by the "common" option from the JSON API clients |
@@ -297,8 +297,8 @@ discard block |
||
297 | 297 | * @see admin/jsonadm/decorators/global |
298 | 298 | */ |
299 | 299 | |
300 | - $client = self::addClientDecorators( $client, $context, $path ); |
|
300 | + $client = self::addClientDecorators($client, $context, $path); |
|
301 | 301 | |
302 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
302 | + return $client->setAimeos($aimeos)->setView($view); |
|
303 | 303 | } |
304 | 304 | } |