Completed
Pull Request — master (#1)
by Aimeos
01:54
created
client/jsonapi/src/Client/JsonApi/Factory.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,7 @@
 block discarded – undo
136 136
 			if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) {
137 137
 				throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 );
138 138
 			}
139
-		}
140
-		else
139
+		} else
141 140
 		{
142 141
 			$client = self::createClientRoot( $context, $view, $templatePaths, $path, $name );
143 142
 		}
Please login to merge, or discard this patch.
client/jsonapi/src/Client/JsonApi/Common/Factory/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 	/**
41 41
 	 * Adds the decorators to the JSON API client object
42 42
 	 *
43
-	 * @param \Aimeos\Client\JsonApi\Common\Iface $client Client object
43
+	 * @param \Aimeos\Client\JsonApi\Iface $client Client object
44 44
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
45 45
 	 * @param \Aimeos\MW\View\Iface $view View object
46 46
 	 * @param array $templatePaths List of file system paths where the templates are stored
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@
 block discarded – undo
101 101
 				$decorators = $config->get( 'client/jsonapi/' . $dpath . 'decorators/local', [] );
102 102
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
103 103
 			}
104
-		}
105
-		else
104
+		} else
106 105
 		{
107 106
 			$classprefix = '\\Aimeos\\Client\\JsonApi\\Common\\Decorator\\';
108 107
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
Please login to merge, or discard this patch.
client/jsonapi/tests/Client/JsonApi/Basket/StandardTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@
 block discarded – undo
268 268
 		$baseManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
269 269
 
270 270
 		$search = $baseManager->createSearch();
271
-		$search->setConditions( $search->compare( '==', 'order.base.price', '672.00') );
271
+		$search->setConditions( $search->compare( '==', 'order.base.price', '672.00' ) );
272 272
 
273 273
 		$items = $baseManager->searchItems( $search );
274 274
 
Please login to merge, or discard this patch.
client/jsonapi/tests/Client/JsonApi/Basket/Coupon/StandardTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -199,6 +199,9 @@
 block discarded – undo
199 199
 	}
200 200
 
201 201
 
202
+	/**
203
+	 * @param string $code
204
+	 */
202 205
 	protected function addProduct( $code )
203 206
 	{
204 207
 		$prodId = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( $code )->getId();
Please login to merge, or discard this patch.
client/jsonapi/templates/locale/standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,8 +83,7 @@
 block discarded – undo
83 83
 				foreach( $items as $localeItem ) {
84 84
 					$data[] = $entryFcn( $localeItem );
85 85
 				}
86
-			}
87
-			else
86
+			} else
88 87
 			{
89 88
 				$data = $entryFcn( $items );
90 89
 			}
Please login to merge, or discard this patch.
client/jsonapi/templates/customer/address/standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,8 +91,7 @@
 block discarded – undo
91 91
 				foreach( $items as $addrItem ) {
92 92
 					$data[] = $entryFcn( $addrItem );
93 93
 				}
94
-			}
95
-			else
94
+			} else
96 95
 			{
97 96
 				$data = $entryFcn( $items );
98 97
 			}
Please login to merge, or discard this patch.
client/jsonapi/templates/service/standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,8 +156,7 @@
 block discarded – undo
156 156
 					$data[] = $entryFcn( $item, $prices, $feConfig );
157 157
 					$included = array_merge( $included, $refFcn( $item ) );
158 158
 				}
159
-			}
160
-			else
159
+			} else
161 160
 			{
162 161
 				$data = $entryFcn( $this->items, $prices, $feConfig );
163 162
 				$included = $refFcn( $this->items );
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 	unset( $attributes['service.config'] ); // don't expose private information
42 42
 
43 43
 	$params = array( 'resource' => $type, 'id' => $id );
44
-	$basketParams = [ 'resource' => 'basket', 'id' => 'default', 'related' => 'service', 'relatedid' => $item->getType() ];
44
+	$basketParams = ['resource' => 'basket', 'id' => 'default', 'related' => 'service', 'relatedid' => $item->getType()];
45 45
 
46 46
 	if( isset( $fields[$type] ) ) {
47 47
 		$attributes = array_intersect_key( $attributes, $fields[$type] );
Please login to merge, or discard this patch.
client/jsonapi/tests/Client/JsonApi/Order/StandardTest.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -313,6 +313,9 @@
 block discarded – undo
313 313
 	}
314 314
 
315 315
 
316
+	/**
317
+	 * @param string $name
318
+	 */
316 319
 	protected function access( $name )
317 320
 	{
318 321
 		$class = new \ReflectionClass( '\Aimeos\Client\JsonApi\Order\Standard' );
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@
 block discarded – undo
268 268
 		$baseManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
269 269
 
270 270
 		$search = $baseManager->createSearch();
271
-		$search->setConditions( $search->compare( '==', 'order.base.price', '672.00') );
271
+		$search->setConditions( $search->compare( '==', 'order.base.price', '672.00' ) );
272 272
 
273 273
 		$items = $baseManager->searchItems( $search );
274 274
 
Please login to merge, or discard this patch.
client/jsonapi/templates/stock/standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@
 block discarded – undo
101 101
 				foreach( $items as $item ) {
102 102
 					$data[] = $entryFcn( $item );
103 103
 				}
104
-			}
105
-			else
104
+			} else
106 105
 			{
107 106
 				$data = $entryFcn( $items );
108 107
 			}
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 $first = ( $offset > 0 ? 0 : null );
24 24
 $prev = ( $offset - $limit >= 0 ? $offset - $limit : null );
25 25
 $next = ( $offset + $limit < $total ? $offset + $limit : null );
26
-$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null );
26
+$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null );
27 27
 
28 28
 
29 29
 $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' );
Please login to merge, or discard this patch.