View GitHub Repository aimeos-symfony

Schedule Inspection
Subscribe
Completed
Push — master ( ca74c2...6e8af4 )
by Aimeos
15:56
created
Status
Category
Toggle Patches
Controller/JqadmController.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch 
@@ -29,35 +29,35 @@  discard block
 
 block discarded – undo
29 29 
 	 * @param $type File type, i.e. "css" or "js"
30 30 
 	 * @return Response Response object
31 31 
 	 */
32 
-	public function fileAction( $type )
32 
+	public function fileAction($type)
33 33 
 	{
34 34 
 		$contents = '';
35 35 
 		$files = array();
36 
-		$aimeos = $this->get( 'aimeos' )->get();
36 
+		$aimeos = $this->get('aimeos')->get();
37 37
38 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
38 
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
39 39 
 		{
40 
-			foreach( $paths as $path )
40 
+			foreach ($paths as $path)
41 41 
 			{
42 
-				$jsbAbsPath = $base . '/' . $path;
43 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
44 
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
42 
+				$jsbAbsPath = $base.'/'.$path;
43 
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
44 
+				$files = array_merge($files, $jsb2->getFiles($type));
45 45 
 			}
46 46 
 		}
47 47
48 
-		foreach( $files as $file )
48 
+		foreach ($files as $file)
49 49 
 		{
50 
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
50 
+			if (($content = file_get_contents($file)) !== false) {
51 51 
 				$contents .= $content;
52 52 
 			}
53 53 
 		}
54 54
55 
-		$response = new Response( $contents );
55 
+		$response = new Response($contents);
56 56
57 
-		if( $type === 'js' ) {
58 
-			$response->headers->set( 'Content-Type', 'application/javascript' );
59 
-		} elseif( $type === 'css' ) {
60 
-			$response->headers->set( 'Content-Type', 'text/css' );
57 
+		if ($type === 'js') {
58 
+			$response->headers->set('Content-Type', 'application/javascript');
59 
+		} elseif ($type === 'css') {
60 
+			$response->headers->set('Content-Type', 'text/css');
61 61 
 		}
62 62
63 63 
 		return $response;
 
@@ -72,15 +72,15 @@  discard block
 
 block discarded – undo
72 72 
 	 * @param string $site Unique site code
73 73 
 	 * @return Response Generated output
74 74 
 	 */
75 
-	public function copyAction( Request $request, $resource, $site = 'default' )
75 
+	public function copyAction(Request $request, $resource, $site = 'default')
76 76 
 	{
77 
-		$cntl = $this->createClient( $request, $site, $resource );
77 
+		$cntl = $this->createClient($request, $site, $resource);
78 78
79 
-		if( ( $html = $cntl->copy() ) == '' ) {
79 
+		if (($html = $cntl->copy()) == '') {
80 80 
 			return $cntl->getView()->response();
81 81 
 		}
82 82
83 
-		return $this->getHtml( $html );
83 
+		return $this->getHtml($html);
84 84 
 	}
85 85
86 86 
 
@@ -92,15 +92,15 @@  discard block
 
 block discarded – undo
92 92 
 	 * @param string $site Unique site code
93 93 
 	 * @return Response Generated output
94 94 
 	 */
95 
-	public function createAction( Request $request, $resource, $site = 'default' )
95 
+	public function createAction(Request $request, $resource, $site = 'default')
96 96 
 	{
97 
-		$cntl = $this->createClient( $request, $site, $resource );
97 
+		$cntl = $this->createClient($request, $site, $resource);
98 98
99 
-		if( ( $html = $cntl->create() ) == '' ) {
99 
+		if (($html = $cntl->create()) == '') {
100 100 
 			return $cntl->getView()->response();
101 101 
 		}
102 102
103 
-		return $this->getHtml( $html );
103 
+		return $this->getHtml($html);
104 104 
 	}
105 105
106 106 
 
@@ -112,15 +112,15 @@  discard block
 
 block discarded – undo
112 112 
 	 * @param string $site Unique site code
113 113 
 	 * @return Response Generated output
114 114 
 	 */
115 
-	public function deleteAction( Request $request, $resource, $site = 'default' )
115 
+	public function deleteAction(Request $request, $resource, $site = 'default')
116 116 
 	{
117 
-		$cntl = $this->createClient( $request, $site, $resource );
117 
+		$cntl = $this->createClient($request, $site, $resource);
118 118
119 
-		if( ( $html = $cntl->delete() ) == '' ) {
119 
+		if (($html = $cntl->delete()) == '') {
120 120 
 			return $cntl->getView()->response();
121 121 
 		}
122 122
123 
-		return $this->getHtml( $html );
123 
+		return $this->getHtml($html);
124 124 
 	}
125 125
126 126 
 
@@ -132,15 +132,15 @@  discard block
 
 block discarded – undo
132 132 
 	 * @param string $site Unique site code
133 133 
 	 * @return Response Generated output
134 134 
 	 */
135 
-	public function exportAction( Request $request, $resource, $site = 'default' )
135 
+	public function exportAction(Request $request, $resource, $site = 'default')
136 136 
 	{
137 
-		$cntl = $this->createClient( $request, $site, $resource );
137 
+		$cntl = $this->createClient($request, $site, $resource);
138 138
139 
-		if( ( $html = $cntl->export() ) == '' ) {
139 
+		if (($html = $cntl->export()) == '') {
140 140 
 			return $cntl->getView()->response();
141 141 
 		}
142 142
143 
-		return $this->getHtml( $html );
143 
+		return $this->getHtml($html);
144 144 
 	}
145 145
146 146 
 
@@ -152,15 +152,15 @@  discard block
 
 block discarded – undo
152 152 
 	 * @param string $site Unique site code
153 153 
 	 * @return Response Generated output
154 154 
 	 */
155 
-	public function getAction( Request $request, $resource, $site = 'default' )
155 
+	public function getAction(Request $request, $resource, $site = 'default')
156 156 
 	{
157 
-		$cntl = $this->createClient( $request, $site, $resource );
157 
+		$cntl = $this->createClient($request, $site, $resource);
158 158
159 
-		if( ( $html = $cntl->get() ) == '' ) {
159 
+		if (($html = $cntl->get()) == '') {
160 160 
 			return $cntl->getView()->response();
161 161 
 		}
162 162
163 
-		return $this->getHtml( $html );
163 
+		return $this->getHtml($html);
164 164 
 	}
165 165
166 166 
 
@@ -172,15 +172,15 @@  discard block
 
 block discarded – undo
172 172 
 	 * @param string $site Unique site code
173 173 
 	 * @return Response Generated output
174 174 
 	 */
175 
-	public function saveAction( Request $request, $resource, $site = 'default' )
175 
+	public function saveAction(Request $request, $resource, $site = 'default')
176 176 
 	{
177 
-		$cntl = $this->createClient( $request, $site, $resource );
177 
+		$cntl = $this->createClient($request, $site, $resource);
178 178
179 
-		if( ( $html = $cntl->save() ) == '' ) {
179 
+		if (($html = $cntl->save()) == '') {
180 180 
 			return $cntl->getView()->response();
181 181 
 		}
182 182
183 
-		return $this->getHtml( $html );
183 
+		return $this->getHtml($html);
184 184 
 	}
185 185
186 186 
 
@@ -192,15 +192,15 @@  discard block
 
 block discarded – undo
192 192 
 	 * @param string $site Unique site code
193 193 
 	 * @return Response Generated output
194 194 
 	 */
195 
-	public function searchAction( Request $request, $resource, $site = 'default' )
195 
+	public function searchAction(Request $request, $resource, $site = 'default')
196 196 
 	{
197 
-		$cntl = $this->createClient( $request, $site, $resource );
197 
+		$cntl = $this->createClient($request, $site, $resource);
198 198
199 
-		if( ( $html = $cntl->search() ) == '' ) {
199 
+		if (($html = $cntl->search()) == '') {
200 200 
 			return $cntl->getView()->response();
201 201 
 		}
202 202
203 
-		return $this->getHtml( $html );
203 
+		return $this->getHtml($html);
204 204 
 	}
205 205
206 206 
 
@@ -212,21 +212,21 @@  discard block
 
 block discarded – undo
212 212 
 	 * @param string $resource Resource location, e.g. "product"
213 213 
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
214 214 
 	 */
215 
-	protected function createClient( Request $request, $site, $resource )
215 
+	protected function createClient(Request $request, $site, $resource)
216 216 
 	{
217 
-		$lang = $request->get( 'lang', 'en' );
217 
+		$lang = $request->get('lang', 'en');
218 218
219 
-		$aimeos = $this->get( 'aimeos' )->get();
220 
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
219 
+		$aimeos = $this->get('aimeos')->get();
220 
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
221 221
222 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
223 
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
224 
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
222 
+		$context = $this->get('aimeos_context')->get(false, 'backend');
223 
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
224 
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
225 225
226 
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
227 
-		$context->setView( $view );
226 
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
227 
+		$context->setView($view);
228 228
229 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource )->setAimeos( $aimeos );
229 
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource)->setAimeos($aimeos);
230 230 
 	}
231 231
232 232 
 
@@ -236,12 +236,12 @@  discard block
 
 block discarded – undo
236 236 
 	 * @param string $content Content from admin client
237 237 
 	 * @return Response View for rendering the output
238 238 
 	 */
239 
-	protected function getHtml( $content )
239 
+	protected function getHtml($content)
240 240 
 	{
241 
-		$version = $this->get( 'aimeos' )->getVersion();
242 
-		$extnames = implode( ',', $this->get( 'aimeos' )->get()->getExtensions() );
243 
-		$content = str_replace( ['{type}', '{version}', '{extensions}'], ['Symfony', $version, $extnames], $content );
241 
+		$version = $this->get('aimeos')->getVersion();
242 
+		$extnames = implode(',', $this->get('aimeos')->get()->getExtensions());
243 
+		$content = str_replace(['{type}', '{version}', '{extensions}'], ['Symfony', $version, $extnames], $content);
244 244
245 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
245 
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
246 246 
 	}
247 247 
 }
Please login to merge, or discard this patch.
Tests/Controller/JqadmControllerTest.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch 
@@ -12,12 +12,12 @@  discard block
 
 block discarded – undo
12 12 
 		$client = static::createClient(array(), array(
13 13 
 			'PHP_AUTH_USER' => 'admin',
14 14 
 			'PHP_AUTH_PW'   => 'adminpass',
15 
-		) );
15 
+		));
16 16
17 
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
17 
+		$client->request('GET', '/unittest/jqadm/file/css');
18 18
19 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
20 
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
19 
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
20 
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
21 21 
 	}
22 22
23 23 
 
@@ -26,12 +26,12 @@  discard block
 
 block discarded – undo
26 26 
 		$client = static::createClient(array(), array(
27 27 
 			'PHP_AUTH_USER' => 'admin',
28 28 
 			'PHP_AUTH_PW'   => 'adminpass',
29 
-		) );
29 
+		));
30 30
31 
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
31 
+		$client->request('GET', '/unittest/jqadm/file/js');
32 32
33 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
34 
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
33 
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
34 
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
35 35 
 	}
36 36
37 37 
 
@@ -40,13 +40,13 @@  discard block
 
 block discarded – undo
40 40 
 		$client = static::createClient(array(), array(
41 41 
 			'PHP_AUTH_USER' => 'admin',
42 42 
 			'PHP_AUTH_PW'   => 'adminpass',
43 
-		) );
43 
+		));
44 44
45 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/0' );
45 
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
46 46 
 		$response = $client->getResponse();
47 47
48 
-		$this->assertEquals( 200, $response->getStatusCode() );
49 
-		$this->assertContains( 'item-product', $response->getContent() );
48 
+		$this->assertEquals(200, $response->getStatusCode());
49 
+		$this->assertContains('item-product', $response->getContent());
50 50 
 	}
51 51
52 52 
 
@@ -55,13 +55,13 @@  discard block
 
 block discarded – undo
55 55 
 		$client = static::createClient(array(), array(
56 56 
 			'PHP_AUTH_USER' => 'admin',
57 57 
 			'PHP_AUTH_PW'   => 'adminpass',
58 
-		) );
58 
+		));
59 59
60 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
60 
+		$client->request('GET', '/unittest/jqadm/create/product');
61 61 
 		$response = $client->getResponse();
62 62
63 
-		$this->assertEquals( 200, $response->getStatusCode() );
64 
-		$this->assertContains( 'item-product', $response->getContent() );
63 
+		$this->assertEquals(200, $response->getStatusCode());
64 
+		$this->assertContains('item-product', $response->getContent());
65 65 
 	}
66 66
67 67 
 
@@ -70,13 +70,13 @@  discard block
 
 block discarded – undo
70 70 
 		$client = static::createClient(array(), array(
71 71 
 			'PHP_AUTH_USER' => 'admin',
72 72 
 			'PHP_AUTH_PW'   => 'adminpass',
73 
-		) );
73 
+		));
74 74
75 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
75 
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
76 76 
 		$response = $client->getResponse();
77 77
78 
-		$this->assertEquals( 200, $response->getStatusCode() );
79 
-		$this->assertContains( 'list-items', $response->getContent() );
78 
+		$this->assertEquals(200, $response->getStatusCode());
79 
+		$this->assertContains('list-items', $response->getContent());
80 80 
 	}
81 81
82 82 
 
@@ -85,13 +85,13 @@  discard block
 
 block discarded – undo
85 85 
 		$client = static::createClient(array(), array(
86 86 
 			'PHP_AUTH_USER' => 'admin',
87 87 
 			'PHP_AUTH_PW'   => 'adminpass',
88 
-		) );
88 
+		));
89 89
90 
-		$client->request( 'GET', '/unittest/jqadm/export/order' );
90 
+		$client->request('GET', '/unittest/jqadm/export/order');
91 91 
 		$response = $client->getResponse();
92 92
93 
-		$this->assertEquals( 200, $response->getStatusCode() );
94 
-		$this->assertContains( 'list-items', $response->getContent() );
93 
+		$this->assertEquals(200, $response->getStatusCode());
94 
+		$this->assertContains('list-items', $response->getContent());
95 95 
 	}
96 96
97 97 
 
@@ -100,13 +100,13 @@  discard block
 
 block discarded – undo
100 100 
 		$client = static::createClient(array(), array(
101 101 
 			'PHP_AUTH_USER' => 'admin',
102 102 
 			'PHP_AUTH_PW'   => 'adminpass',
103 
-		) );
103 
+		));
104 104
105 
-		$client->request( 'GET', '/unittest/jqadm/get/product/0' );
105 
+		$client->request('GET', '/unittest/jqadm/get/product/0');
106 106 
 		$response = $client->getResponse();
107 107
108 
-		$this->assertEquals( 200, $response->getStatusCode() );
109 
-		$this->assertContains( 'item-product', $response->getContent() );
108 
+		$this->assertEquals(200, $response->getStatusCode());
109 
+		$this->assertContains('item-product', $response->getContent());
110 110 
 	}
111 111
112 112 
 
@@ -115,13 +115,13 @@  discard block
 
 block discarded – undo
115 115 
 		$client = static::createClient(array(), array(
116 116 
 			'PHP_AUTH_USER' => 'admin',
117 117 
 			'PHP_AUTH_PW'   => 'adminpass',
118 
-		) );
118 
+		));
119 119
120 
-		$client->request( 'POST', '/unittest/jqadm/save/product/0' );
120 
+		$client->request('POST', '/unittest/jqadm/save/product/0');
121 121 
 		$response = $client->getResponse();
122 122
123 
-		$this->assertEquals( 200, $response->getStatusCode() );
124 
-		$this->assertContains( 'item-product', $response->getContent() );
123 
+		$this->assertEquals(200, $response->getStatusCode());
124 
+		$this->assertContains('item-product', $response->getContent());
125 125 
 	}
126 126
127 127 
 
@@ -130,13 +130,13 @@  discard block
 
 block discarded – undo
130 130 
 		$client = static::createClient(array(), array(
131 131 
 			'PHP_AUTH_USER' => 'admin',
132 132 
 			'PHP_AUTH_PW'   => 'adminpass',
133 
-		) );
133 
+		));
134 134
135 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
135 
+		$client->request('GET', '/unittest/jqadm/search/product');
136 136 
 		$response = $client->getResponse();
137 137
138 
-		$this->assertEquals( 200, $response->getStatusCode() );
139 
-		$this->assertContains( 'list-items', $response->getContent() );
138 
+		$this->assertEquals(200, $response->getStatusCode());
139 
+		$this->assertContains('list-items', $response->getContent());
140 140 
 	}
141 141
142 142 
 
@@ -145,11 +145,11 @@  discard block
 
 block discarded – undo
145 145 
 		$client = static::createClient(array(), array(
146 146 
 			'PHP_AUTH_USER' => 'admin',
147 147 
 			'PHP_AUTH_PW'   => 'adminpass',
148 
-		) );
148 
+		));
149 149
150 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
150 
+		$client->request('GET', '/invalid/jqadm/search/product');
151 151 
 		$response = $client->getResponse();
152 152
153 
-		$this->assertEquals( 500, $response->getStatusCode() );
153 
+		$this->assertEquals(500, $response->getStatusCode());
154 154 
 	}
155 155 
 }
Please login to merge, or discard this patch.