Completed
Push — master ( 7ad21f...0bf26f )
by Aimeos
01:53
created
admin/jsonadm/templates/put-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,9 @@
 block discarded – undo
10 10
 
11 11
 ?>
12 12
 {
13
-	<?php if( isset( $this->errors ) ) : ?>
13
+	<?php if (isset($this->errors)) : ?>
14 14
 
15
-		"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
15
+		"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
16 16
 
17 17
 	<?php endif; ?>
18 18
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/options-standard.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,32 +8,32 @@  discard block
 block discarded – undo
8 8
  */
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jsonadm/url/target' );
12
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
13
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
14
-$config = $this->config( 'admin/jsonadm/url/config', [] );
11
+$target = $this->config('admin/jsonadm/url/target');
12
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
13
+$action = $this->config('admin/jsonadm/url/action', 'get');
14
+$config = $this->config('admin/jsonadm/url/config', []);
15 15
 
16 16
 
17 17
 $resources = $attributes = [];
18
-$site = $this->param( 'site', 'default' );
18
+$site = $this->param('site', 'default');
19 19
 
20
-foreach( $this->get( 'resources', [] ) as $resource ) {
21
-	$resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config );
20
+foreach ($this->get('resources', []) as $resource) {
21
+	$resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config);
22 22
 }
23 23
 
24
-foreach( $this->get( 'attributes', [] ) as $attr ) {
25
-	$attributes[$attr->getCode()] = $attr->toArray( true );
24
+foreach ($this->get('attributes', []) as $attr) {
25
+	$attributes[$attr->getCode()] = $attr->toArray(true);
26 26
 }
27 27
 
28 28
 
29 29
 ?>
30 30
 {
31 31
 	"meta": {
32
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
33
-		"resources": <?= json_encode( $resources ); ?>,
34
-		"attributes": <?= json_encode( $attributes ); ?>
32
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
33
+		"resources": <?= json_encode($resources); ?>,
34
+		"attributes": <?= json_encode($attributes); ?>
35 35
 
36
-		<?php if( $this->csrf()->name() != '' ) : ?>
36
+		<?php if ($this->csrf()->name() != '') : ?>
37 37
 			, "csrf": {
38 38
 				"name": "<?= $this->csrf()->name(); ?>",
39 39
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
 		<?php endif; ?>
42 42
 	}
43 43
 
44
-	<?php if( isset( $this->errors ) ) : ?>
44
+	<?php if (isset($this->errors)) : ?>
45 45
 
46
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
46
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
47 47
 
48 48
 	<?php endif; ?>
49 49
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/post-standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
22 22
 
23 23
 	}
24 24
 
25
-	<?php if( isset( $this->errors ) ) : ?>
25
+	<?php if (isset($this->errors)) : ?>
26 26
 
27
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
28 28
 
29
-	<?php elseif( isset( $this->data ) ) : ?>
29
+	<?php elseif (isset($this->data)) : ?>
30 30
 
31
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
31
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
32 32
 
33 33
 	<?php endif; ?>
34 34
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/delete-standard.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 
23 23
 	}
24 24
 
25
-	<?php if( isset( $this->errors ) ) : ?>
25
+	<?php if (isset($this->errors)) : ?>
26 26
 
27
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
28 28
 
29 29
 	<?php endif; ?>
30 30
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/patch-standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
22 22
 
23 23
 	}
24 24
 
25
-	<?php if( isset( $this->errors ) ) : ?>
25
+	<?php if (isset($this->errors)) : ?>
26 26
 
27
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
28 28
 
29
-	<?php elseif( isset( $this->data ) ) : ?>
29
+	<?php elseif (isset($this->data)) : ?>
30 30
 
31
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
31
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
32 32
 
33 33
 	<?php endif; ?>
34 34
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/aggregate-standard.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@  discard block
 block discarded – undo
8 8
  */
9 9
 
10 10
 
11
-$data = $this->get( 'data', [] );
11
+$data = $this->get('data', []);
12 12
 $entries = [];
13 13
 
14
-foreach( $data as $key => $value ) {
15
-	$entries[] = array( 'id' => $key, 'type' => 'aggregate', 'attributes' => $value );
14
+foreach ($data as $key => $value) {
15
+	$entries[] = array('id' => $key, 'type' => 'aggregate', 'attributes' => $value);
16 16
 }
17 17
 
18 18
 ?>
19 19
 {
20 20
 	"meta": {
21
-		"total": <?= count( $data ); ?>
21
+		"total": <?= count($data); ?>
22 22
 
23
-		<?php if( $this->csrf()->name() != '' ) : ?>
23
+		<?php if ($this->csrf()->name() != '') : ?>
24 24
 			, "csrf": {
25 25
 				"name": "<?= $this->csrf()->name(); ?>",
26 26
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 
30 30
 	},
31 31
 
32
-	<?php if( isset( $this->errors ) ) : ?>
32
+	<?php if (isset($this->errors)) : ?>
33 33
 
34
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
34
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
35 35
 
36
-	<?php elseif( isset( $this->data ) ) : ?>
36
+	<?php elseif (isset($this->data)) : ?>
37 37
 
38
-		"data": <?= json_encode( $entries ); ?>
38
+		"data": <?= json_encode($entries); ?>
39 39
 
40 40
 	<?php endif; ?>
41 41
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/config-standard.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,29 +9,29 @@  discard block
 block discarded – undo
9 9
 
10 10
 
11 11
 $options = 0;
12
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
12
+if (defined('JSON_PRETTY_PRINT')) {
13 13
 	$options = JSON_PRETTY_PRINT;
14 14
 }
15 15
 
16 16
 
17
-$fields = $this->param( 'fields', [] );
17
+$fields = $this->param('fields', []);
18 18
 
19
-foreach( (array) $fields as $resource => $list ) {
20
-	$fields[$resource] = array_flip( explode( ',', $list ) );
19
+foreach ((array) $fields as $resource => $list) {
20
+	$fields[$resource] = array_flip(explode(',', $list));
21 21
 }
22 22
 
23 23
 
24
-$build = function( array $attrItems, $id ) use ( $fields )
24
+$build = function(array $attrItems, $id) use ($fields)
25 25
 {
26 26
 	$result = [];
27 27
 	$type = 'criteria/attribute';
28 28
 
29
-	foreach( $attrItems as $attrItem )
29
+	foreach ($attrItems as $attrItem)
30 30
 	{
31
-		$attributes = $attrItem->toArray( true );
31
+		$attributes = $attrItem->toArray(true);
32 32
 
33
-		if( isset( $fields[$type] ) ) {
34
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
33
+		if (isset($fields[$type])) {
34
+			$attributes = array_intersect_key($attributes, $fields[$type]);
35 35
 		}
36 36
 
37 37
 		$result[] = array(
@@ -45,23 +45,23 @@  discard block
 block discarded – undo
45 45
 };
46 46
 
47 47
 
48
-$configItems = $this->get( 'configItems', [] );
48
+$configItems = $this->get('configItems', []);
49 49
 
50 50
 
51 51
 ?>
52 52
 {
53 53
 	"meta": {
54
-		"total": <?= count( $configItems ); ?>
54
+		"total": <?= count($configItems); ?>
55 55
 
56 56
 	}
57 57
 
58
-	<?php if( isset( $this->errors ) ) : ?>
58
+	<?php if (isset($this->errors)) : ?>
59 59
 
60
-		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
60
+		, "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
61 61
 
62 62
 	<?php else : ?>
63 63
 
64
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
64
+		, "data": <?= json_encode($build($configItems, $this->param('id')), $options); ?>
65 65
 
66 66
 	<?php endif; ?>
67 67
 }
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,9 +59,12 @@
 block discarded – undo
59 59
 
60 60
 		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
61 61
 
62
-	<?php else : ?>
62
+	<?php else {
63
+	: ?>
63 64
 
64
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
65
+		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options );
66
+}
67
+?>
65 68
 
66 69
 	<?php endif; ?>
67 70
 }
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Price/StandardTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 		$this->context = \TestHelperJadm::getContext();
22 22
 		$this->view = $this->context->getView();
23 23
 
24
-		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard( $this->context, 'price' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard($this->context, 'price');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,26 +31,26 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'price.value' => '12.95' )
34
+				'==' => array('price.value' => '12.95')
35 35
 			),
36 36
 			'include' => 'attribute'
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40 40
 
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43 43
 
44 44
 
45
-		$this->assertEquals( 200, $response->getStatusCode() );
46
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
45
+		$this->assertEquals(200, $response->getStatusCode());
46
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
47 47
 
48
-		$this->assertGreaterThan( 1, $result['meta']['total'] );
49
-		$this->assertGreaterThan( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'price', $result['data'][0]['type'] );
51
-		$this->assertEquals( 0, count( $result['data'][0]['relationships'] ) );
52
-		$this->assertEquals( 0, count( $result['included'] ) );
48
+		$this->assertGreaterThan(1, $result['meta']['total']);
49
+		$this->assertGreaterThan(1, count($result['data']));
50
+		$this->assertEquals('price', $result['data'][0]['type']);
51
+		$this->assertEquals(0, count($result['data'][0]['relationships']));
52
+		$this->assertEquals(0, count($result['included']));
53 53
 
54
-		$this->assertArrayNotHasKey( 'errors', $result );
54
+		$this->assertArrayNotHasKey('errors', $result);
55 55
 	}
56 56
 }
57 57
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Coupon/StandardTest.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 		$this->context = \TestHelperJadm::getContext();
22 22
 		$this->view = $this->context->getView();
23 23
 
24
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Standard( $this->context, 'coupon' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Standard($this->context, 'coupon');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,27 +31,27 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'coupon.code.code' => '90AB' )
34
+				'==' => array('coupon.code.code' => '90AB')
35 35
 			),
36 36
 			'include' => 'coupon/code'
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40 40
 
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43 43
 
44 44
 
45
-		$this->assertEquals( 200, $response->getStatusCode() );
46
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
45
+		$this->assertEquals(200, $response->getStatusCode());
46
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
47 47
 
48
-		$this->assertEquals( 1, $result['meta']['total'] );
49
-		$this->assertEquals( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
51
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
52
-		$this->assertEquals( 1, count( $result['included'] ) );
48
+		$this->assertEquals(1, $result['meta']['total']);
49
+		$this->assertEquals(1, count($result['data']));
50
+		$this->assertEquals('coupon', $result['data'][0]['type']);
51
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
52
+		$this->assertEquals(1, count($result['included']));
53 53
 
54
-		$this->assertArrayNotHasKey( 'errors', $result );
54
+		$this->assertArrayNotHasKey('errors', $result);
55 55
 	}
56 56
 
57 57
 
@@ -64,22 +64,22 @@  discard block
 block discarded – undo
64 64
 			'sort' => 'coupon.id',
65 65
 			'include' => 'coupon/code'
66 66
 		);
67
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
68
-		$this->view->addHelper( 'param', $helper );
67
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
68
+		$this->view->addHelper('param', $helper);
69 69
 
70
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
71
-		$result = json_decode( (string) $response->getBody(), true );
70
+		$response = $this->object->get($this->view->request(), $this->view->response());
71
+		$result = json_decode((string) $response->getBody(), true);
72 72
 
73 73
 
74
-		$this->assertEquals( 200, $response->getStatusCode() );
75
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
74
+		$this->assertEquals(200, $response->getStatusCode());
75
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
76 76
 
77
-		$this->assertEquals( 6, $result['meta']['total'] );
78
-		$this->assertEquals( 6, count( $result['data'] ) );
79
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
80
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
81
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
82
-		$this->assertEquals( 5, count( $result['included'] ) );
83
-		$this->assertArrayNotHasKey( 'errors', $result );
77
+		$this->assertEquals(6, $result['meta']['total']);
78
+		$this->assertEquals(6, count($result['data']));
79
+		$this->assertEquals('coupon', $result['data'][0]['type']);
80
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
81
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
82
+		$this->assertEquals(5, count($result['included']));
83
+		$this->assertArrayNotHasKey('errors', $result);
84 84
 	}
85 85
 }
86 86
\ No newline at end of file
Please login to merge, or discard this patch.