Completed
Push — master ( 7df475...e67815 )
by Aimeos
02:48
created
admin/jsonadm/src/Admin/JsonAdm/Price/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -107,17 +107,17 @@
 block discarded – undo
107 107
 	 * @param array $include List of resource types that should be fetched
108 108
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
109 109
 	 */
110
-	protected function getListItems( array $items, array $include )
110
+	protected function getListItems(array $items, array $include)
111 111
 	{
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price/lists' );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price/lists');
113 113
 
114 114
 		$search = $manager->createSearch();
115 115
 		$expr = array(
116
-			$search->compare( '==', 'price.lists.parentid', array_keys( $items ) ),
117
-			$search->compare( '==', 'price.lists.domain', $include ),
116
+			$search->compare('==', 'price.lists.parentid', array_keys($items)),
117
+			$search->compare('==', 'price.lists.domain', $include),
118 118
 		);
119
-		$search->setConditions( $search->combine( '&&', $expr ) );
119
+		$search->setConditions($search->combine('&&', $expr));
120 120
 
121
-		return $manager->searchItems( $search );
121
+		return $manager->searchItems($search);
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Attribute/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -107,17 +107,17 @@
 block discarded – undo
107 107
 	 * @param array $include List of resource types that should be fetched
108 108
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
109 109
 	 */
110
-	protected function getListItems( array $items, array $include )
110
+	protected function getListItems(array $items, array $include)
111 111
 	{
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/lists' );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/lists');
113 113
 
114 114
 		$search = $manager->createSearch();
115 115
 		$expr = array(
116
-			$search->compare( '==', 'attribute.lists.parentid', array_keys( $items ) ),
117
-			$search->compare( '==', 'attribute.lists.domain', $include ),
116
+			$search->compare('==', 'attribute.lists.parentid', array_keys($items)),
117
+			$search->compare('==', 'attribute.lists.domain', $include),
118 118
 		);
119
-		$search->setConditions( $search->combine( '&&', $expr ) );
119
+		$search->setConditions($search->combine('&&', $expr));
120 120
 
121
-		return $manager->searchItems( $search );
121
+		return $manager->searchItems($search);
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Service/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -107,17 +107,17 @@
 block discarded – undo
107 107
 	 * @param array $include List of resource types that should be fetched
108 108
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
109 109
 	 */
110
-	protected function getListItems( array $items, array $include )
110
+	protected function getListItems(array $items, array $include)
111 111
 	{
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/lists' );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/lists');
113 113
 
114 114
 		$search = $manager->createSearch();
115 115
 		$expr = array(
116
-			$search->compare( '==', 'service.lists.parentid', array_keys( $items ) ),
117
-			$search->compare( '==', 'service.lists.domain', $include ),
116
+			$search->compare('==', 'service.lists.parentid', array_keys($items)),
117
+			$search->compare('==', 'service.lists.domain', $include),
118 118
 		);
119
-		$search->setConditions( $search->combine( '&&', $expr ) );
119
+		$search->setConditions($search->combine('&&', $expr));
120 120
 
121
-		return $manager->searchItems( $search );
121
+		return $manager->searchItems($search);
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Media/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -107,17 +107,17 @@
 block discarded – undo
107 107
 	 * @param array $include List of resource types that should be fetched
108 108
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
109 109
 	 */
110
-	protected function getListItems( array $items, array $include )
110
+	protected function getListItems(array $items, array $include)
111 111
 	{
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/lists' );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/lists');
113 113
 
114 114
 		$search = $manager->createSearch();
115 115
 		$expr = array(
116
-			$search->compare( '==', 'media.lists.parentid', array_keys( $items ) ),
117
-			$search->compare( '==', 'media.lists.domain', $include ),
116
+			$search->compare('==', 'media.lists.parentid', array_keys($items)),
117
+			$search->compare('==', 'media.lists.domain', $include),
118 118
 		);
119
-		$search->setConditions( $search->combine( '&&', $expr ) );
119
+		$search->setConditions($search->combine('&&', $expr));
120 120
 
121
-		return $manager->searchItems( $search );
121
+		return $manager->searchItems($search);
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/data-standard.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $options = 0;
4
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
4
+if (defined('JSON_PRETTY_PRINT')) {
5 5
 	$options = JSON_PRETTY_PRINT;
6 6
 }
7 7
 
8 8
 
9
-$build = function( \Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems, array $listItems )
9
+$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems, array $listItems)
10 10
 {
11 11
 	$id = $item->getId();
12 12
 	$attributes = $item->toArray();
13 13
 	$type = $item->getResourceType();
14 14
 
15
-	if( isset( $fields[$type] ) ) {
16
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
15
+	if (isset($fields[$type])) {
16
+		$attributes = array_intersect_key($attributes, $fields[$type]);
17 17
 	}
18 18
 
19 19
 	$result = array(
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
 		'relationships' => array()
24 24
 	);
25 25
 
26
-	foreach( $childItems as $childItem )
26
+	foreach ($childItems as $childItem)
27 27
 	{
28
-		if( $childItem->getParentId() == $id )
28
+		if ($childItem->getParentId() == $id)
29 29
 		{
30 30
 			$type = $childItem->getResourceType();
31
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
31
+			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
32 32
 		}
33 33
 	}
34 34
 
35
-	foreach( $listItems as $listItem )
35
+	foreach ($listItems as $listItem)
36 36
 	{
37
-		if( $listItem->getParentId() == $id )
37
+		if ($listItem->getParentId() == $id)
38 38
 		{
39 39
 			$type = $listItem->getDomain();
40
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $listItem->getRefId(), 'type' => $type, 'attributes' => $listItem->toArray() ) );
40
+			$result['relationships'][$type][] = array('data' => array('id' => $listItem->getRefId(), 'type' => $type, 'attributes' => $listItem->toArray()));
41 41
 		}
42 42
 	}
43 43
 
@@ -45,28 +45,28 @@  discard block
 block discarded – undo
45 45
 };
46 46
 
47 47
 
48
-$fields = $this->param( 'fields', array() );
48
+$fields = $this->param('fields', array());
49 49
 
50
-foreach( (array) $fields as $resource => $list ) {
51
-	$fields[$resource] = array_flip( explode( ',', $list ) );
50
+foreach ((array) $fields as $resource => $list) {
51
+	$fields[$resource] = array_flip(explode(',', $list));
52 52
 }
53 53
 
54 54
 
55
-$data = $this->get( 'data', array() );
56
-$childItems = $this->get( 'childItems', array() );
57
-$listItems = $this->get( 'listItems', array() );
55
+$data = $this->get('data', array());
56
+$childItems = $this->get('childItems', array());
57
+$listItems = $this->get('listItems', array());
58 58
 
59
-if( is_array( $data ) )
59
+if (is_array($data))
60 60
 {
61 61
 	$response = array();
62 62
 
63
-	foreach( $data as $item ) {
64
-		$response[] = $build( $item, $fields, $childItems, $listItems );
63
+	foreach ($data as $item) {
64
+		$response[] = $build($item, $fields, $childItems, $listItems);
65 65
 	}
66 66
 }
67
-elseif( $data !== null )
67
+elseif ($data !== null)
68 68
 {
69
-	$response = $build( $data, $fields, $childItems, $listItems );
69
+	$response = $build($data, $fields, $childItems, $listItems);
70 70
 }
71 71
 else
72 72
 {
@@ -74,4 +74,4 @@  discard block
 block discarded – undo
74 74
 }
75 75
 
76 76
 
77
-echo json_encode( $response, $options );
78 77
\ No newline at end of file
78
+echo json_encode($response, $options);
79 79
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,12 +52,10 @@
 block discarded – undo
52 52
 	foreach( $data as $item ) {
53 53
 		$response[] = $build( $item, $fields, $childItems );
54 54
 	}
55
-}
56
-elseif( $data !== null )
55
+} elseif( $data !== null )
57 56
 {
58 57
 	$response = $build( $data, $fields, $childItems );
59
-}
60
-else
58
+} else
61 59
 {
62 60
 	$response = null;
63 61
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/errors-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $options = 0;
4
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
4
+if (defined('JSON_PRETTY_PRINT')) {
5 5
 	$options = JSON_PRETTY_PRINT;
6 6
 }
7 7
 
8 8
 
9
-echo json_encode( $this->get( 'errors', array() ), $options );
10 9
\ No newline at end of file
10
+echo json_encode($this->get('errors', array()), $options);
11 11
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/included-standard.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $options = 0;
4
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
4
+if (defined('JSON_PRETTY_PRINT')) {
5 5
 	$options = JSON_PRETTY_PRINT;
6 6
 }
7 7
 
8 8
 
9
-$build = function( \Aimeos\MW\View\Iface $view, array $items, array $fields )
9
+$build = function(\Aimeos\MW\View\Iface $view, array $items, array $fields)
10 10
 {
11 11
 	$list = array();
12 12
 
13
-	$target = $view->config( 'admin/jsonadm/url/target' );
14
-	$cntl = $view->config( 'admin/jsonadm/url/controller', 'jsonadm' );
15
-	$action = $view->config( 'admin/jsonadm/url/action', 'get' );
16
-	$config = $view->config( 'admin/jsonadm/url/config', array() );
13
+	$target = $view->config('admin/jsonadm/url/target');
14
+	$cntl = $view->config('admin/jsonadm/url/controller', 'jsonadm');
15
+	$action = $view->config('admin/jsonadm/url/action', 'get');
16
+	$config = $view->config('admin/jsonadm/url/config', array());
17 17
 
18
-	foreach( (array) $items as $item )
18
+	foreach ((array) $items as $item)
19 19
 	{
20 20
 		$id = $item->getId();
21 21
 		$attributes = $item->toArray();
22 22
 		$type = $item->getResourceType();
23 23
 
24
-		if( isset( $fields[$type] ) ) {
25
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
24
+		if (isset($fields[$type])) {
25
+			$attributes = array_intersect_key($attributes, $fields[$type]);
26 26
 		}
27 27
 
28 28
 		$list[] = array(
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 			'type' => $type,
31 31
 			'attributes' => $attributes,
32 32
 			'links' => array(
33
-				'self' => $view->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => $id ), array(), $config ),
33
+				'self' => $view->url($target, $cntl, $action, array('resource' => $type, 'id' => $id), array(), $config),
34 34
 				'related' => array(
35
-					'href' => $view->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => null ), array(), $config )
35
+					'href' => $view->url($target, $cntl, $action, array('resource' => $type, 'id' => null), array(), $config)
36 36
 				)
37 37
 			)
38 38
 		);
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 
44 44
 
45 45
 $response = array();
46
-$fields = $this->param( 'fields', array() );
46
+$fields = $this->param('fields', array());
47 47
 
48
-foreach( (array) $fields as $resource => $list ) {
49
-	$fields[$resource] = array_flip( explode( ',', $list ) );
48
+foreach ((array) $fields as $resource => $list) {
49
+	$fields[$resource] = array_flip(explode(',', $list));
50 50
 }
51 51
 
52
-$response = $build( $this, $this->get( 'childItems', array() ), $fields );
53
-$response = array_merge( $response, $build( $this, $this->get( 'refItems', array() ), $fields ) );
52
+$response = $build($this, $this->get('childItems', array()), $fields);
53
+$response = array_merge($response, $build($this, $this->get('refItems', array()), $fields));
54 54
 
55 55
 
56
-echo json_encode( $response, $options );
57 56
\ No newline at end of file
57
+echo json_encode($response, $options);
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/order/data-standard.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $options = 0;
4
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
4
+if (defined('JSON_PRETTY_PRINT')) {
5 5
 	$options = JSON_PRETTY_PRINT;
6 6
 }
7 7
 
8
-$build = function( \Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems )
8
+$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems)
9 9
 {
10 10
 	$id = $item->getId();
11 11
 	$baseId = $item->getBaseId();
12 12
 	$attributes = $item->toArray();
13 13
 	$type = $item->getResourceType();
14 14
 
15
-	if( isset( $fields[$type] ) ) {
16
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
15
+	if (isset($fields[$type])) {
16
+		$attributes = array_intersect_key($attributes, $fields[$type]);
17 17
 	}
18 18
 
19 19
 	$result = array(
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 		'relationships' => array()
24 24
 	);
25 25
 
26
-	foreach( $childItems as $childItem )
26
+	foreach ($childItems as $childItem)
27 27
 	{
28
-		if( $childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
28
+		if ($childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
29 29
 			|| $childItem instanceof \Aimeos\MShop\Order\Item\Base\Iface && $childItem->getId() == $baseId
30 30
 		) {
31 31
 			$type = $childItem->getResourceType();
32
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
32
+			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
33 33
 		}
34 34
 	}
35 35
 
@@ -37,27 +37,27 @@  discard block
 block discarded – undo
37 37
 };
38 38
 
39 39
 
40
-$fields = $this->param( 'fields', array() );
40
+$fields = $this->param('fields', array());
41 41
 
42
-foreach( (array) $fields as $resource => $list ) {
43
-	$fields[$resource] = array_flip( explode( ',', $list ) );
42
+foreach ((array) $fields as $resource => $list) {
43
+	$fields[$resource] = array_flip(explode(',', $list));
44 44
 }
45 45
 
46 46
 
47
-$data = $this->get( 'data', array() );
48
-$childItems = $this->get( 'childItems', array() );
47
+$data = $this->get('data', array());
48
+$childItems = $this->get('childItems', array());
49 49
 
50
-if( is_array( $data ) )
50
+if (is_array($data))
51 51
 {
52 52
 	$response = array();
53 53
 
54
-	foreach( $data as $item ) {
55
-		$response[] = $build( $item, $fields, $childItems );
54
+	foreach ($data as $item) {
55
+		$response[] = $build($item, $fields, $childItems);
56 56
 	}
57 57
 }
58
-elseif( $data !== null )
58
+elseif ($data !== null)
59 59
 {
60
-	$response = $build( $data, $fields, $childItems );
60
+	$response = $build($data, $fields, $childItems);
61 61
 }
62 62
 else
63 63
 {
@@ -65,4 +65,4 @@  discard block
 block discarded – undo
65 65
 }
66 66
 
67 67
 
68
-echo json_encode( $response, $options );
69 68
\ No newline at end of file
69
+echo json_encode($response, $options);
70 70
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,12 +52,10 @@
 block discarded – undo
52 52
 	foreach( $data as $item ) {
53 53
 		$response[] = $build( $item, $fields, $childItems );
54 54
 	}
55
-}
56
-elseif( $data !== null )
55
+} elseif( $data !== null )
57 56
 {
58 57
 	$response = $build( $data, $fields, $childItems );
59
-}
60
-else
58
+} else
61 59
 {
62 60
 	$response = null;
63 61
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/order/base/data-standard.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $options = 0;
4
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
4
+if (defined('JSON_PRETTY_PRINT')) {
5 5
 	$options = JSON_PRETTY_PRINT;
6 6
 }
7 7
 
8
-$build = function( \Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems )
8
+$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $fields, array $childItems)
9 9
 {
10 10
 	$id = $item->getId();
11 11
 	$attributes = $item->toArray();
12 12
 	$type = $item->getResourceType();
13 13
 
14
-	if( isset( $fields[$type] ) ) {
15
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
14
+	if (isset($fields[$type])) {
15
+		$attributes = array_intersect_key($attributes, $fields[$type]);
16 16
 	}
17 17
 
18 18
 	$result = array(
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 		'relationships' => array()
23 23
 	);
24 24
 
25
-	foreach( $childItems as $childItem )
25
+	foreach ($childItems as $childItem)
26 26
 	{
27
-		if( $childItem->getBaseId() == $id )
27
+		if ($childItem->getBaseId() == $id)
28 28
 		{
29 29
 			$type = $childItem->getResourceType();
30
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
30
+			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
31 31
 		}
32 32
 	}
33 33
 
@@ -35,27 +35,27 @@  discard block
 block discarded – undo
35 35
 };
36 36
 
37 37
 
38
-$fields = $this->param( 'fields', array() );
38
+$fields = $this->param('fields', array());
39 39
 
40
-foreach( (array) $fields as $resource => $list ) {
41
-	$fields[$resource] = array_flip( explode( ',', $list ) );
40
+foreach ((array) $fields as $resource => $list) {
41
+	$fields[$resource] = array_flip(explode(',', $list));
42 42
 }
43 43
 
44 44
 
45
-$data = $this->get( 'data', array() );
46
-$childItems = $this->get( 'childItems', array() );
45
+$data = $this->get('data', array());
46
+$childItems = $this->get('childItems', array());
47 47
 
48
-if( is_array( $data ) )
48
+if (is_array($data))
49 49
 {
50 50
 	$response = array();
51 51
 
52
-	foreach( $data as $item ) {
53
-		$response[] = $build( $item, $fields, $childItems );
52
+	foreach ($data as $item) {
53
+		$response[] = $build($item, $fields, $childItems);
54 54
 	}
55 55
 }
56
-elseif( $data !== null )
56
+elseif ($data !== null)
57 57
 {
58
-	$response = $build( $data, $fields, $childItems );
58
+	$response = $build($data, $fields, $childItems);
59 59
 }
60 60
 else
61 61
 {
@@ -63,4 +63,4 @@  discard block
 block discarded – undo
63 63
 }
64 64
 
65 65
 
66
-echo json_encode( $response, $options );
67 66
\ No newline at end of file
67
+echo json_encode($response, $options);
68 68
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,12 +52,10 @@
 block discarded – undo
52 52
 	foreach( $data as $item ) {
53 53
 		$response[] = $build( $item, $fields, $childItems );
54 54
 	}
55
-}
56
-elseif( $data !== null )
55
+} elseif( $data !== null )
57 56
 {
58 57
 	$response = $build( $data, $fields, $childItems );
59
-}
60
-else
58
+} else
61 59
 {
62 60
 	$response = null;
63 61
 }
Please login to merge, or discard this patch.