Skip to content

Commit 41e424b

Browse files
ENGCOM-5327: #687 Remove Redundant 'isset' #749
- Merge Pull Request magento/graphql-ce#749 from magento/graphql-ce:687-Redundant-isset - Merged commits: 1. aeec8f7
2 parents bcfe16f + aeec8f7 commit 41e424b

19 files changed

+31
-31
lines changed

app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function resolve(
5151
array $value = null,
5252
array $args = null
5353
) {
54-
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
54+
if (empty($args['input']) || !is_array($args['input'])) {
5555
throw new GraphQlInputException(__('"input" value should be specified'));
5656
}
5757

app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function resolve(
6060
array $value = null,
6161
array $args = null
6262
) {
63-
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
63+
if (empty($args['input']) || !is_array($args['input'])) {
6464
throw new GraphQlInputException(__('"input" value should be specified'));
6565
}
6666

app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function resolve(
6060
array $value = null,
6161
array $args = null
6262
) {
63-
if (!isset($args['id']) || empty($args['id'])) {
63+
if (empty($args['id'])) {
6464
throw new GraphQlInputException(__('Address "id" value should be specified'));
6565
}
6666

app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public function resolve(
4444
array $value = null,
4545
array $args = null
4646
) {
47-
if (!isset($args['email']) || empty($args['email'])) {
47+
if (empty($args['email'])) {
4848
throw new GraphQlInputException(__('Specify the "email" value.'));
4949
}
5050

51-
if (!isset($args['password']) || empty($args['password'])) {
51+
if (empty($args['password'])) {
5252
throw new GraphQlInputException(__('Specify the "password" value.'));
5353
}
5454

app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function resolve(
5252
array $value = null,
5353
array $args = null
5454
) {
55-
if (!isset($args['email']) || empty($args['email'])) {
55+
if (empty($args['email'])) {
5656
throw new GraphQlInputException(__('Email must be specified'));
5757
}
5858

app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function resolve(
6060
array $value = null,
6161
array $args = null
6262
) {
63-
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
63+
if (empty($args['input']) || !is_array($args['input'])) {
6464
throw new GraphQlInputException(__('"input" value should be specified'));
6565
}
6666

app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public function resolve(
6969
array $value = null,
7070
array $args = null
7171
) {
72-
if (!isset($args['id']) || empty($args['id'])) {
72+
if (empty($args['id'])) {
7373
throw new GraphQlInputException(__('Address "id" value must be specified'));
7474
}
7575

76-
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
76+
if (empty($args['input']) || !is_array($args['input'])) {
7777
throw new GraphQlInputException(__('"input" value must be specified'));
7878
}
7979

app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public function __construct(
4747
*/
4848
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4949
{
50-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
50+
if (empty($args['input']['cart_id'])) {
5151
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5252
}
5353
$maskedCartId = $args['input']['cart_id'];
5454

55-
if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
55+
if (empty($args['input']['cart_items'])
5656
|| !is_array($args['input']['cart_items'])
5757
) {
5858
throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));

app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public function __construct(
5050
*/
5151
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
5252
{
53-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
53+
if (empty($args['input']['cart_id'])) {
5454
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5555
}
5656
$maskedCartId = $args['input']['cart_id'];
5757

58-
if (!isset($args['input']['coupon_code']) || empty($args['input']['coupon_code'])) {
58+
if (empty($args['input']['coupon_code'])) {
5959
throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
6060
}
6161
$couponCode = $args['input']['coupon_code'];

app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
*/
3838
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
3939
{
40-
if (!isset($args['cart_id']) || empty($args['cart_id'])) {
40+
if (empty($args['cart_id'])) {
4141
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
4242
}
4343
$maskedCartId = $args['cart_id'];

app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct(
5858
*/
5959
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
6060
{
61-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
61+
if (empty($args['input']['cart_id'])) {
6262
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
6363
}
6464
$maskedCartId = $args['input']['cart_id'];

app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
*/
5151
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
5252
{
53-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
53+
if (empty($args['input']['cart_id'])) {
5454
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5555
}
5656
$maskedCartId = $args['input']['cart_id'];

app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public function __construct(
4949
*/
5050
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
5151
{
52-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
52+
if (empty($args['input']['cart_id'])) {
5353
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
5454
}
5555
$maskedCartId = $args['input']['cart_id'];
5656

57-
if (!isset($args['input']['cart_item_id']) || empty($args['input']['cart_item_id'])) {
57+
if (empty($args['input']['cart_item_id'])) {
5858
throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing.'));
5959
}
6060
$itemId = $args['input']['cart_item_id'];

app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public function __construct(
4646
*/
4747
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4848
{
49-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
49+
if (empty($args['input']['cart_id'])) {
5050
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5151
}
5252
$maskedCartId = $args['input']['cart_id'];
5353

54-
if (!isset($args['input']['billing_address']) || empty($args['input']['billing_address'])) {
54+
if (empty($args['input']['billing_address'])) {
5555
throw new GraphQlInputException(__('Required parameter "billing_address" is missing'));
5656
}
5757
$billingAddress = $args['input']['billing_address'];

app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public function __construct(
5757
*/
5858
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
5959
{
60-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
60+
if (empty($args['input']['cart_id'])) {
6161
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
6262
}
6363
$maskedCartId = $args['input']['cart_id'];
6464

65-
if (!isset($args['input']['email']) || empty($args['input']['email'])) {
65+
if (empty($args['input']['email'])) {
6666
throw new GraphQlInputException(__('Required parameter "email" is missing'));
6767
}
6868

app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public function __construct(
7070
*/
7171
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
7272
{
73-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
73+
if (empty($args['input']['cart_id'])) {
7474
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
7575
}
7676
$maskedCartId = $args['input']['cart_id'];
7777

78-
if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
78+
if (empty($args['input']['payment_method']['code'])) {
7979
throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
8080
}
8181
$paymentMethodCode = $args['input']['payment_method']['code'];

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public function __construct(
4646
*/
4747
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4848
{
49-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
49+
if (empty($args['input']['cart_id'])) {
5050
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5151
}
5252
$maskedCartId = $args['input']['cart_id'];
5353

54-
if (!isset($args['input']['shipping_addresses']) || empty($args['input']['shipping_addresses'])) {
54+
if (empty($args['input']['shipping_addresses'])) {
5555
throw new GraphQlInputException(__('Required parameter "shipping_addresses" is missing'));
5656
}
5757
$shippingAddresses = $args['input']['shipping_addresses'];

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public function __construct(
4646
*/
4747
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4848
{
49-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
49+
if (empty($args['input']['cart_id'])) {
5050
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
5151
}
5252
$maskedCartId = $args['input']['cart_id'];
5353

54-
if (!isset($args['input']['shipping_methods']) || empty($args['input']['shipping_methods'])) {
54+
if (empty($args['input']['shipping_methods'])) {
5555
throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
5656
}
5757
$shippingMethods = $args['input']['shipping_methods'];

app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ public function __construct(
5151
*/
5252
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
5353
{
54-
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
54+
if (empty($args['input']['cart_id'])) {
5555
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
5656
}
5757
$maskedCartId = $args['input']['cart_id'];
5858

59-
if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
59+
if (empty($args['input']['cart_items'])
6060
|| !is_array($args['input']['cart_items'])
6161
) {
6262
throw new GraphQlInputException(__('Required parameter "cart_items" is missing.'));
@@ -91,7 +91,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
9191
private function processCartItems(Quote $cart, array $items): void
9292
{
9393
foreach ($items as $item) {
94-
if (!isset($item['cart_item_id']) || empty($item['cart_item_id'])) {
94+
if (empty($item['cart_item_id'])) {
9595
throw new GraphQlInputException(__('Required parameter "cart_item_id" for "cart_items" is missing.'));
9696
}
9797
$itemId = $item['cart_item_id'];

0 commit comments

Comments
 (0)