Skip to content

Commit ce33146

Browse files
committed
Avoid literal string that are not static analysable
1 parent dd61fe9 commit ce33146

9 files changed

Lines changed: 19 additions & 10 deletions

File tree

server/Application/Api/Field/Mutation/ConfirmRegistration.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
namespace Application\Api\Field\Mutation;
66

77
use Application\Api\Helper;
8+
use Application\Api\Input\ConfirmRegistrationInputType;
89
use Application\Model\Organization;
910
use Application\Model\User;
1011
use Application\Repository\OrganizationRepository;
1112
use Application\Repository\UserRepository;
1213
use Application\Service\MessageQueuer;
1314
use Ecodev\Felix\Api\ExceptionWithoutMailLogging;
1415
use Ecodev\Felix\Api\Field\FieldInterface;
16+
use Ecodev\Felix\Api\Scalar\TokenType;
1517
use Ecodev\Felix\Service\Mailer;
1618
use GraphQL\Type\Definition\Type;
1719
use Mezzio\Session\SessionInterface;
@@ -24,8 +26,8 @@ public static function build(): iterable
2426
'type' => Type::nonNull(Type::boolean()),
2527
'description' => 'Second step to register as a new user.',
2628
'args' => [
27-
'token' => Type::nonNull(_types()->get('Token')),
28-
'input' => Type::nonNull(_types()->get('ConfirmRegistrationInput')),
29+
'token' => Type::nonNull(_types()->get(TokenType::class)),
30+
'input' => Type::nonNull(_types()->get(ConfirmRegistrationInputType::class)),
2931
],
3032
'resolve' => function ($root, array $args, SessionInterface $session): bool {
3133
global $container;

server/Application/Api/Field/Mutation/CreateOrder.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Application\Api\Field\Mutation;
66

77
use Application\Api\Helper;
8+
use Application\Api\Input\OrderInputType;
89
use Application\Enum\PaymentMethod;
910
use Application\Model\Order;
1011
use Application\Service\Invoicer;
@@ -23,7 +24,7 @@ public static function build(): iterable
2324
'type' => _types()->getOutput(Order::class),
2425
'description' => 'Make an order to the shop.',
2526
'args' => [
26-
'input' => Type::nonNull(_types()->get('OrderInput')),
27+
'input' => Type::nonNull(_types()->get(OrderInputType::class)),
2728
],
2829
'resolve' => function ($root, array $args, SessionInterface $session): ?Order {
2930
global $container;

server/Application/Api/Field/Mutation/Import.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Application\Api\Field\Mutation;
66

77
use Application\Api\Helper;
8+
use Application\Api\Output\ImportResultType;
89
use Application\Model\Organization;
910
use Application\Service\Importer;
1011
use Ecodev\Felix\Api\Field\FieldInterface;
@@ -18,7 +19,7 @@ abstract class Import implements FieldInterface
1819
public static function build(): iterable
1920
{
2021
yield 'import' => fn () => [
21-
'type' => Type::nonNull(_types()->get('ImportResult')),
22+
'type' => Type::nonNull(_types()->get(ImportResultType::class)),
2223
'description' => 'Import a CSV file containing users',
2324
'args' => [
2425
'file' => Type::nonNull(_types()->get(UploadType::class)),

server/Application/Api/Field/Mutation/Register.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Application\Service\MessageQueuer;
1212
use Ecodev\Felix\Api\ExceptionWithoutMailLogging;
1313
use Ecodev\Felix\Api\Field\FieldInterface;
14+
use Ecodev\Felix\Api\Scalar\EmailType;
1415
use Ecodev\Felix\Service\Mailer;
1516
use GraphQL\Type\Definition\Type;
1617
use Mezzio\Session\SessionInterface;
@@ -23,7 +24,7 @@ public static function build(): iterable
2324
'type' => Type::nonNull(Type::boolean()),
2425
'description' => 'First step to register as a new user.',
2526
'args' => [
26-
'email' => Type::nonNull(_types()->get('Email')),
27+
'email' => Type::nonNull(_types()->get(EmailType::class)),
2728
],
2829
'resolve' => function ($root, array $args, SessionInterface $session): bool {
2930
global $container;

server/Application/Api/Field/Mutation/UpdateOrderLine.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Application\Api\Field\Mutation;
66

77
use Application\Api\Helper;
8+
use Application\Api\Input\OrderLineInputType;
89
use Application\Model\OrderLine;
910
use Application\Service\Invoicer;
1011
use Ecodev\Felix\Api\Field\FieldInterface;
@@ -21,7 +22,7 @@ public static function build(): iterable
2122
'description' => 'Update an existing orderLine.',
2223
'args' => [
2324
'id' => Type::nonNull(_types()->getId(OrderLine::class)),
24-
'input' => Type::nonNull(_types()->get('OrderLineInput')),
25+
'input' => Type::nonNull(_types()->get(OrderLineInputType::class)),
2526
],
2627
'resolve' => function ($root, array $args, SessionInterface $session): OrderLine {
2728
global $container;

server/Application/Api/Field/Query/UserByToken.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Application\Repository\UserRepository;
99
use Ecodev\Felix\Api\ExceptionWithoutMailLogging;
1010
use Ecodev\Felix\Api\Field\FieldInterface;
11+
use Ecodev\Felix\Api\Scalar\TokenType;
1112
use GraphQL\Type\Definition\Type;
1213

1314
abstract class UserByToken implements FieldInterface
@@ -18,7 +19,7 @@ public static function build(): iterable
1819
'type' => Type::nonNull(_types()->getOutput(User::class)),
1920
'description' => 'Get a user by its temporary token',
2021
'args' => [
21-
'token' => Type::nonNull(_types()->get('Token')),
22+
'token' => Type::nonNull(_types()->get(TokenType::class)),
2223
],
2324
'resolve' => function ($root, array $args): User {
2425
/** @var UserRepository $repository */

server/Application/Api/Input/ConfirmRegistrationInputType.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Application\Api\Input;
66

77
use Application\Model\Country;
8+
use Ecodev\Felix\Api\Scalar\PasswordType;
89
use GraphQL\Type\Definition\InputObjectType;
910

1011
class ConfirmRegistrationInputType extends InputObjectType
@@ -15,7 +16,7 @@ public function __construct()
1516
'description' => 'Mandatory fields to complete a user registration',
1617
'fields' => fn (): array => [
1718
'password' => [
18-
'type' => self::nonNull(_types()->get('Password')),
19+
'type' => self::nonNull(_types()->get(PasswordType::class)),
1920
],
2021
'firstName' => [
2122
'type' => self::nonNull(self::string()),

server/Application/Api/Input/OrderInputType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function __construct()
1919
'type' => self::nonNull(_types()->get('PaymentMethod')),
2020
],
2121
'orderLines' => [
22-
'type' => Type::nonNull(Type::listOf(Type::nonNull(_types()->get('OrderLineInput')))),
22+
'type' => Type::nonNull(Type::listOf(Type::nonNull(_types()->get(OrderLineInputType::class)))),
2323
],
2424

2525
// Billing address

server/Application/Api/Input/OrderLineInputType.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Application\Model\Product;
88
use Application\Model\Subscription;
99
use Ecodev\Felix\Api\Scalar\CHFType;
10+
use Ecodev\Felix\Api\Scalar\EmailType;
1011
use GraphQL\Type\Definition\InputObjectType;
1112

1213
class OrderLineInputType extends InputObjectType
@@ -32,7 +33,7 @@ public function __construct()
3233
'type' => _types()->getId(Subscription::class),
3334
],
3435
'additionalEmails' => [
35-
'type' => self::listOf(self::nonNull(_types()->get('Email'))),
36+
'type' => self::listOf(self::nonNull(_types()->get(EmailType::class))),
3637
'defaultValue' => [],
3738
],
3839
'pricePerUnit' => [

0 commit comments

Comments
 (0)