Completed
Push — master ( 8238b8...39728a )
by Aimeos
01:53
created
admin/jsonadm/tests/Admin/JsonAdmTest.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 		$context = \TestHelperJadm::getContext();
17 17
 		$aimeos = \TestHelperJadm::getAimeos();
18 18
 
19
-		$client = \Aimeos\Admin\JsonAdm::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::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
 block discarded – undo
27 27
 		$context = \TestHelperJadm::getContext();
28 28
 		$aimeos = \TestHelperJadm::getAimeos();
29 29
 
30
-		$client = \Aimeos\Admin\JsonAdm::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::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
 block discarded – undo
38 38
 		$context = \TestHelperJadm::getContext();
39 39
 		$aimeos = \TestHelperJadm::getAimeos();
40 40
 
41
-		$client = \Aimeos\Admin\JsonAdm::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::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
 block discarded – undo
49 49
 		$context = \TestHelperJadm::getContext();
50 50
 		$aimeos = \TestHelperJadm::getAimeos();
51 51
 
52
-		$client = \Aimeos\Admin\JsonAdm::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::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
 block discarded – undo
60 60
 		$context = \TestHelperJadm::getContext();
61 61
 		$aimeos = \TestHelperJadm::getAimeos();
62 62
 
63
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
64
-		\Aimeos\Admin\JsonAdm::create( $context, $aimeos, '%^' );
63
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
64
+		\Aimeos\Admin\JsonAdm::create($context, $aimeos, '%^');
65 65
 	}
66 66
 
67 67
 
@@ -70,69 +70,69 @@  discard block
 block discarded – undo
70 70
 		$context = \TestHelperJadm::getContext();
71 71
 		$aimeos = \TestHelperJadm::getAimeos();
72 72
 
73
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
74
-		\Aimeos\Admin\JsonAdm::create( $context, $aimeos, '', '%^' );
73
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
74
+		\Aimeos\Admin\JsonAdm::create($context, $aimeos, '', '%^');
75 75
 	}
76 76
 
77 77
 
78 78
 	public function testClear()
79 79
 	{
80
-		$cache = \Aimeos\Admin\JsonAdm::cache( true );
80
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
81 81
 
82 82
 		$context = \TestHelperJadm::getContext();
83 83
 		$aimeos = \TestHelperJadm::getAimeos();
84 84
 
85
-		$client1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
85
+		$client1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
86 86
 		\Aimeos\Admin\JsonAdm::clear();
87
-		$client2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
87
+		$client2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
88 88
 
89
-		\Aimeos\Admin\JsonAdm::cache( $cache );
89
+		\Aimeos\Admin\JsonAdm::cache($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::cache( true );
97
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
98 98
 
99 99
 		$context = \TestHelperJadm::getContext();
100 100
 		$aimeos = \TestHelperJadm::getAimeos();
101 101
 
102
-		$cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
103
-		$cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
102
+		$cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
103
+		$cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
104 104
 
105
-		\Aimeos\Admin\JsonAdm::clear( (string) $context );
105
+		\Aimeos\Admin\JsonAdm::clear((string) $context);
106 106
 
107
-		$cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
108
-		$cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
107
+		$cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
108
+		$cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
109 109
 
110
-		\Aimeos\Admin\JsonAdm::cache( $cache );
110
+		\Aimeos\Admin\JsonAdm::cache($cache);
111 111
 
112
-		$this->assertNotSame( $cntlA1, $cntlA2 );
113
-		$this->assertNotSame( $cntlB1, $cntlB2 );
112
+		$this->assertNotSame($cntlA1, $cntlA2);
113
+		$this->assertNotSame($cntlB1, $cntlB2);
114 114
 	}
115 115
 
116 116
 
117 117
 	public function testClearSpecific()
118 118
 	{
119
-		$cache = \Aimeos\Admin\JsonAdm::cache( true );
119
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
120 120
 
121 121
 		$context = \TestHelperJadm::getContext();
122 122
 		$aimeos = \TestHelperJadm::getAimeos();
123 123
 
124
-		$cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
125
-		$cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
124
+		$cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
125
+		$cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
126 126
 
127
-		\Aimeos\Admin\JsonAdm::clear( (string) $context, 'order' );
127
+		\Aimeos\Admin\JsonAdm::clear((string) $context, 'order');
128 128
 
129
-		$cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
130
-		$cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
129
+		$cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
130
+		$cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
131 131
 
132
-		\Aimeos\Admin\JsonAdm::cache( $cache );
132
+		\Aimeos\Admin\JsonAdm::cache($cache);
133 133
 
134
-		$this->assertNotSame( $cntlA1, $cntlA2 );
135
-		$this->assertSame( $cntlB1, $cntlB2 );
134
+		$this->assertNotSame($cntlA1, $cntlA2);
135
+		$this->assertSame($cntlB1, $cntlB2);
136 136
 	}
137 137
 
138 138
 }
139 139
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Factory.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
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 createClient( \Aimeos\MShop\Context\Item\Iface $context,
36
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
35
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
36
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
37 37
 	{
38
-		return self::create( $context, $aimeos, $path, $name );
38
+		return self::create($context, $aimeos, $path, $name);
39 39
 	}
40 40
 
41 41
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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::createClientBase( $classname, $iface, $context, $path );
154
-		$client = self::addClientDecorators( $client, $context, $path );
153
+		$client = self::createClientBase($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
 block discarded – undo
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
 block discarded – undo
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::createClientBase( $classname, $iface, $context, $path );
220
+		$client = self::createClientBase($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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.