Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

#687 Remove Redundant 'isset' #749

Merged
merged 1 commit into from
Jun 21, 2019
Merged

#687 Remove Redundant 'isset' #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
if (empty($args['input']) || !is_array($args['input'])) {
throw new GraphQlInputException(__('"input" value should be specified'));
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
if (empty($args['input']) || !is_array($args['input'])) {
throw new GraphQlInputException(__('"input" value should be specified'));
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['id']) || empty($args['id'])) {
if (empty($args['id'])) {
throw new GraphQlInputException(__('Address "id" value should be specified'));
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['email']) || empty($args['email'])) {
if (empty($args['email'])) {
throw new GraphQlInputException(__('Specify the "email" value.'));
}

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

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['email']) || empty($args['email'])) {
if (empty($args['email'])) {
throw new GraphQlInputException(__('Email must be specified'));
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
if (empty($args['input']) || !is_array($args['input'])) {
throw new GraphQlInputException(__('"input" value should be specified'));
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public function resolve(
array $value = null,
array $args = null
) {
if (!isset($args['id']) || empty($args['id'])) {
if (empty($args['id'])) {
throw new GraphQlInputException(__('Address "id" value must be specified'));
}

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

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
if (empty($args['input']['cart_items'])
|| !is_array($args['input']['cart_items'])
) {
throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['coupon_code']) || empty($args['input']['coupon_code'])) {
if (empty($args['input']['coupon_code'])) {
throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
}
$couponCode = $args['input']['coupon_code'];
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['cart_id']) || empty($args['cart_id'])) {
if (empty($args['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['cart_id'];
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['cart_item_id']) || empty($args['input']['cart_item_id'])) {
if (empty($args['input']['cart_item_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing.'));
}
$itemId = $args['input']['cart_item_id'];
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['billing_address']) || empty($args['input']['billing_address'])) {
if (empty($args['input']['billing_address'])) {
throw new GraphQlInputException(__('Required parameter "billing_address" is missing'));
}
$billingAddress = $args['input']['billing_address'];
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

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

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
if (empty($args['input']['payment_method']['code'])) {
throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
}
$paymentMethodCode = $args['input']['payment_method']['code'];
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['shipping_addresses']) || empty($args['input']['shipping_addresses'])) {
if (empty($args['input']['shipping_addresses'])) {
throw new GraphQlInputException(__('Required parameter "shipping_addresses" is missing'));
}
$shippingAddresses = $args['input']['shipping_addresses'];
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
}
$maskedCartId = $args['input']['cart_id'];

if (!isset($args['input']['shipping_methods']) || empty($args['input']['shipping_methods'])) {
if (empty($args['input']['shipping_methods'])) {
throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
}
$shippingMethods = $args['input']['shipping_methods'];
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ public function __construct(
*/
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
{
if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
if (empty($args['input']['cart_id'])) {
throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
}
$maskedCartId = $args['input']['cart_id'];

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