@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface) |
34 | 34 | * @param string $path Path describing the client to clear, e.g. "product/lists/type" |
35 | 35 | */ |
36 | - static public function clear( $id = null, $path = null ) |
|
36 | + static public function clear($id = null, $path = null) |
|
37 | 37 | { |
38 | - if( $id !== null ) |
|
38 | + if ($id !== null) |
|
39 | 39 | { |
40 | - if( $path !== null ) { |
|
40 | + if ($path !== null) { |
|
41 | 41 | self::$clients[$id][$path] = null; |
42 | 42 | } else { |
43 | 43 | self::$clients[$id] = []; |
@@ -65,18 +65,18 @@ discard block |
||
65 | 65 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
66 | 66 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
67 | 67 | */ |
68 | - static public function createClient( \Aimeos\MShop\Context\Item\Iface $context, |
|
69 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
68 | + static public function createClient(\Aimeos\MShop\Context\Item\Iface $context, |
|
69 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
70 | 70 | { |
71 | - $path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) ); |
|
71 | + $path = strtolower(trim($path, "/ \n\t\r\0\x0B")); |
|
72 | 72 | $id = (string) $context; |
73 | 73 | |
74 | - if( self::$cache === false || !isset( self::$clients[$id][$path] ) ) |
|
74 | + if (self::$cache === false || !isset(self::$clients[$id][$path])) |
|
75 | 75 | { |
76 | - if( empty( $path ) ) { |
|
77 | - self::$clients[$id][$path] = self::createClientRoot( $context, $aimeos, $path, $name ); |
|
76 | + if (empty($path)) { |
|
77 | + self::$clients[$id][$path] = self::createClientRoot($context, $aimeos, $path, $name); |
|
78 | 78 | } else { |
79 | - self::$clients[$id][$path] = self::createClientNew( $context, $aimeos, $path, $name ); |
|
79 | + self::$clients[$id][$path] = self::createClientNew($context, $aimeos, $path, $name); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * @param boolean $value True to enable caching, false to disable it. |
91 | 91 | * @return boolean Previous cache setting |
92 | 92 | */ |
93 | - static public function setCache( $value ) |
|
93 | + static public function setCache($value) |
|
94 | 94 | { |
95 | 95 | $old = self::$cache; |
96 | 96 | self::$cache = (boolean) $value; |
@@ -109,53 +109,53 @@ discard block |
||
109 | 109 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
110 | 110 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
111 | 111 | */ |
112 | - protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context, |
|
113 | - \Aimeos\Bootstrap $aimeos, $path, $name ) |
|
112 | + protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context, |
|
113 | + \Aimeos\Bootstrap $aimeos, $path, $name) |
|
114 | 114 | { |
115 | 115 | $pname = $name; |
116 | - $parts = explode( '/', $path ); |
|
116 | + $parts = explode('/', $path); |
|
117 | 117 | |
118 | - foreach( $parts as $key => $part ) |
|
118 | + foreach ($parts as $key => $part) |
|
119 | 119 | { |
120 | - if( ctype_alnum( $part ) === false ) |
|
120 | + if (ctype_alnum($part) === false) |
|
121 | 121 | { |
122 | - $msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path ); |
|
123 | - throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 ); |
|
122 | + $msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path); |
|
123 | + throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400); |
|
124 | 124 | } |
125 | 125 | |
126 | - $parts[$key] = ucwords( $part ); |
|
126 | + $parts[$key] = ucwords($part); |
|
127 | 127 | } |
128 | 128 | |
129 | - if( $pname === null ) { |
|
130 | - $pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ); |
|
129 | + if ($pname === null) { |
|
130 | + $pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard'); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | $view = $context->getView(); |
134 | 134 | $config = $context->getConfig(); |
135 | 135 | |
136 | - if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) { |
|
137 | - throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) ); |
|
136 | + if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) { |
|
137 | + throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path)); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | |
141 | 141 | $view = $context->getView(); |
142 | 142 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
143 | - $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname; |
|
143 | + $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname; |
|
144 | 144 | |
145 | - if( ctype_alnum( $pname ) === false ) |
|
145 | + if (ctype_alnum($pname) === false) |
|
146 | 146 | { |
147 | - $classname = is_string( $pname ) ? $classname : '<not a string>'; |
|
148 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
147 | + $classname = is_string($pname) ? $classname : '<not a string>'; |
|
148 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
149 | 149 | } |
150 | 150 | |
151 | - if( class_exists( $classname ) === false ) { |
|
152 | - return self::createClientRoot( $context, $aimeos, $path, $name ); |
|
151 | + if (class_exists($classname) === false) { |
|
152 | + return self::createClientRoot($context, $aimeos, $path, $name); |
|
153 | 153 | } |
154 | 154 | |
155 | - $client = self::createClientBase( $classname, $iface, $context, $path ); |
|
156 | - $client = self::addClientDecorators( $client, $context, $path ); |
|
155 | + $client = self::createClientBase($classname, $iface, $context, $path); |
|
156 | + $client = self::addClientDecorators($client, $context, $path); |
|
157 | 157 | |
158 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
158 | + return $client->setAimeos($aimeos)->setView($view); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
170 | 170 | * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created |
171 | 171 | */ |
172 | - protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context, |
|
173 | - \Aimeos\Bootstrap $aimeos, $path, $name = null ) |
|
172 | + protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context, |
|
173 | + \Aimeos\Bootstrap $aimeos, $path, $name = null) |
|
174 | 174 | { |
175 | 175 | /** admin/jsonadm/name |
176 | 176 | * Class name of the used JSON API client implementation |
@@ -205,21 +205,21 @@ discard block |
||
205 | 205 | * @since 2015.12 |
206 | 206 | * @category Developer |
207 | 207 | */ |
208 | - if( $name === null ) { |
|
209 | - $name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' ); |
|
208 | + if ($name === null) { |
|
209 | + $name = $context->getConfig()->get('admin/jsonadm/name', 'Standard'); |
|
210 | 210 | } |
211 | 211 | |
212 | - if( ctype_alnum( $name ) === false ) |
|
212 | + if (ctype_alnum($name) === false) |
|
213 | 213 | { |
214 | - $classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
215 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
214 | + $classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
215 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | $view = $context->getView(); |
219 | 219 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
220 | 220 | $classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name; |
221 | 221 | |
222 | - $client = self::createClientBase( $classname, $iface, $context, $aimeos, $path ); |
|
222 | + $client = self::createClientBase($classname, $iface, $context, $aimeos, $path); |
|
223 | 223 | |
224 | 224 | /** admin/jsonadm/decorators/excludes |
225 | 225 | * Excludes decorators added by the "common" option from the JSON API clients |
@@ -299,8 +299,8 @@ discard block |
||
299 | 299 | * @see admin/jsonadm/decorators/global |
300 | 300 | */ |
301 | 301 | |
302 | - $client = self::addClientDecorators( $client, $context, $aimeos, $path ); |
|
302 | + $client = self::addClientDecorators($client, $context, $aimeos, $path); |
|
303 | 303 | |
304 | - return $client->setAimeos( $aimeos )->setView( $view ); |
|
304 | + return $client->setAimeos($aimeos)->setView($view); |
|
305 | 305 | } |
306 | 306 | } |
@@ -26,5 +26,5 @@ |
||
26 | 26 | * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object |
27 | 27 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
28 | 28 | */ |
29 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path ); |
|
29 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path); |
|
30 | 30 | } |
@@ -27,5 +27,5 @@ |
||
27 | 27 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects |
28 | 28 | * @param string $path Name of the client separated by slashes, e.g "product/stock" |
29 | 29 | */ |
30 | - public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path ); |
|
30 | + public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path); |
|
31 | 31 | } |
32 | 32 | \ No newline at end of file |
@@ -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 createClient( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null ); |
|
31 | + public static function createClient(\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,29 +120,29 @@ 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 | 126 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface'; |
127 | 127 | |
128 | - foreach( $decorators as $name ) |
|
128 | + foreach ($decorators as $name) |
|
129 | 129 | { |
130 | - if( ctype_alnum( $name ) === false ) |
|
130 | + if (ctype_alnum($name) === false) |
|
131 | 131 | { |
132 | - $classname = is_string( $name ) ? $classprefix . $name : '<not a string>'; |
|
133 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 ); |
|
132 | + $classname = is_string($name) ? $classprefix . $name : '<not a string>'; |
|
133 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | $classname = $classprefix . $name; |
137 | 137 | |
138 | - if( class_exists( $classname ) === false ) { |
|
139 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
138 | + if (class_exists($classname) === false) { |
|
139 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
140 | 140 | } |
141 | 141 | |
142 | - $client = new $classname( $client, $context, $path ); |
|
142 | + $client = new $classname($client, $context, $path); |
|
143 | 143 | |
144 | - if( !( $client instanceof $iface ) ) { |
|
145 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ), 404 ); |
|
144 | + if (!($client instanceof $iface)) { |
|
145 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface), 404); |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
@@ -159,20 +159,20 @@ discard block |
||
159 | 159 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
160 | 160 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
161 | 161 | */ |
162 | - protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path ) |
|
162 | + protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path) |
|
163 | 163 | { |
164 | - if( isset( self::$objects[$classname] ) ) { |
|
164 | + if (isset(self::$objects[$classname])) { |
|
165 | 165 | return self::$objects[$classname]; |
166 | 166 | } |
167 | 167 | |
168 | - if( class_exists( $classname ) === false ) { |
|
169 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
168 | + if (class_exists($classname) === false) { |
|
169 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
170 | 170 | } |
171 | 171 | |
172 | - $client = new $classname( $context, $path ); |
|
172 | + $client = new $classname($context, $path); |
|
173 | 173 | |
174 | - if( !( $client instanceof $interface ) ) { |
|
175 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $interface ), 500 ); |
|
174 | + if (!($client instanceof $interface)) { |
|
175 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $interface), 500); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | return $client; |
@@ -99,8 +99,7 @@ |
||
99 | 99 | $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
100 | 100 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |
101 | 101 | } |
102 | - } |
|
103 | - else |
|
102 | + } else |
|
104 | 103 | { |
105 | 104 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
106 | 105 | $client = self::addDecorators( $client, $decorators, $classprefix, $context, $path ); |