Skip to content

Commit ac93407

Browse files
author
Valeriy Nayda
committed
GraphQL-189: Replace GraphQlInputException on LocalizedException
1 parent 7664d93 commit ac93407

File tree

24 files changed

+51
-57
lines changed

24 files changed

+51
-57
lines changed

app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\BundleGraphQl\Model\Resolver;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
1313
use Magento\Framework\GraphQl\Config\Element\Field;
@@ -47,7 +47,7 @@ public function __construct(
4747
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4848
{
4949
if (!isset($value['option_id']) || !isset($value['parent_id'])) {
50-
throw new GraphQlInputException(__('"option_id" and "parent_id" values should be specified'));
50+
throw new LocalizedException(__('"option_id" and "parent_id" values should be specified'));
5151
}
5252

5353
$this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\BundleGraphQl\Model\Resolver\Options;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
1313
use Magento\Framework\GraphQl\Config\Element\Field;
@@ -50,7 +50,7 @@ public function resolve(
5050
array $args = null
5151
) {
5252
if (!isset($value['sku'])) {
53-
throw new GraphQlInputException(__('"sku" value should be specified'));
53+
throw new LocalizedException(__('"sku" value should be specified'));
5454
}
5555

5656
$this->product->addProductSku($value['sku']);

app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(array $typeResolvers = [])
3131
}
3232

3333
/**
34-
* {@inheritdoc}
34+
* @inheritdoc
3535
*/
3636
public function resolveType(array $data) : string
3737
{
@@ -42,8 +42,6 @@ public function resolveType(array $data) : string
4242
return $resolvedType;
4343
}
4444
}
45-
if (empty($resolvedType)) {
46-
throw new \LogicException('Cannot resolve layered filter type');
47-
}
45+
throw new GraphQlInputException(__('Cannot resolve layered filter type'));
4846
}
4947
}

app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public function __construct(array $productLinksTypeNameResolvers = [])
2929
}
3030

3131
/**
32-
* {@inheritdoc}
33-
* @throws GraphQlInputException
32+
* @inheritdoc
3433
*/
3534
public function resolveType(array $data) : string
3635
{
@@ -48,9 +47,6 @@ public function resolveType(array $data) : string
4847
return $resolvedType;
4948
}
5049
}
51-
52-
if (!$resolvedType) {
53-
throw new \LogicException('Cannot resolve type');
54-
}
50+
throw new GraphQlInputException(__('Cannot resolve type'));
5551
}
5652
}

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\CatalogGraphQl\Model\Resolver;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\Catalog\Api\Data\CategoryInterface;
1313
use Magento\Catalog\Model\ResourceModel\Category\Collection;
@@ -85,7 +85,7 @@ public function __construct(
8585
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
8686
{
8787
if (!isset($value['model'])) {
88-
throw new GraphQlInputException(__('"model" value should be specified'));
88+
throw new LocalizedException(__('"model" value should be specified'));
8989
}
9090

9191
/** @var \Magento\Catalog\Model\Product $product */

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Magento\CatalogGraphQl\Model\Resolver\Category;
99

1010
use Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider\Breadcrumbs as BreadcrumbsDataProvider;
11-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
11+
use Magento\Framework\Exception\LocalizedException;
1212
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1313
use Magento\Framework\GraphQl\Config\Element\Field;
1414
use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -38,7 +38,7 @@ public function __construct(
3838
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
3939
{
4040
if (!isset($value['path'])) {
41-
throw new GraphQlInputException(__('"path" value should be specified'));
41+
throw new LocalizedException(__('"path" value should be specified'));
4242
}
4343

4444
$breadcrumbsData = $this->breadcrumbsDataProvider->getData($value['path']);

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
namespace Magento\CatalogGraphQl\Model\Resolver\Product;
99

1010
use Magento\Catalog\Model\Product;
11+
use Magento\Framework\Exception\LocalizedException;
1112
use Magento\Framework\GraphQl\Config\Element\Field;
12-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1313
use Magento\Framework\GraphQl\Query\ResolverInterface;
1414
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1515

@@ -29,7 +29,7 @@ public function resolve(
2929
array $args = null
3030
) {
3131
if (!isset($value['model'])) {
32-
throw new GraphQlInputException(__('"model" value should be specified'));
32+
throw new LocalizedException(__('"model" value should be specified'));
3333
}
3434

3535
/* @var $product Product */

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\CatalogGraphQl\Model\Resolver\Product;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\Catalog\Api\Data\ProductInterface;
1313
use Magento\Catalog\Model\Product;
@@ -46,7 +46,7 @@ public function resolve(
4646
array $args = null
4747
) {
4848
if (!isset($value['model'])) {
49-
throw new GraphQlInputException(__('"model" value should be specified'));
49+
throw new LocalizedException(__('"model" value should be specified'));
5050
}
5151

5252
/** @var Product $product */

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\CatalogGraphQl\Model\Resolver\Product;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\Catalog\Model\Product;
1313
use Magento\Framework\GraphQl\Config\Element\Field;
@@ -31,7 +31,7 @@ public function resolve(
3131
array $args = null
3232
) {
3333
if (!isset($value['model'])) {
34-
throw new GraphQlInputException(__('"model" value should be specified'));
34+
throw new LocalizedException(__('"model" value should be specified'));
3535
}
3636

3737
/** @var Product $product */

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\CatalogGraphQl\Model\Resolver\Product;
99

10-
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
10+
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1212
use Magento\Catalog\Model\Product;
1313
use Magento\Framework\GraphQl\Config\Element\Field;
@@ -31,7 +31,7 @@ public function resolve(
3131
array $args = null
3232
) {
3333
if (!isset($value['model'])) {
34-
throw new GraphQlInputException(__('"model" value should be specified'));
34+
throw new LocalizedException(__('"model" value should be specified'));
3535
}
3636

3737
/** @var Product $product */

0 commit comments

Comments
 (0)