Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f4b5099

Browse files
pamilpamil
committed
[Psalm] Fix the build
1 parent cd4b232 commit f4b5099

7 files changed

Lines changed: 81 additions & 19 deletions

File tree

‎psalm.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@
112112
</errorLevel>
113113
</DeprecatedMethod>
114114

115+
<InternalMethod>
116+
<errorLevel type="info">
117+
<referencedMethod name="Symfony\Bundle\SecurityBundle\Security\_FirewallMap::getFirewallConfig" />
118+
</errorLevel>
119+
</InternalMethod>
120+
115121
<MissingReturnType errorLevel="info" />
116122

117123
<PropertyNotSetInConstructor errorLevel="info" />

‎src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
use Sylius\Bundle\AdminApiBundle\Model\AccessTokenInterface;
1717
use Sylius\Bundle\AdminApiBundle\Model\ClientInterface;
18-
use Sylius\Bundle\AdminApiBundle\Model\UserInterface;
1918
use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory;
2019
use Sylius\Bundle\CoreBundle\Fixture\OptionsResolver\LazyOption;
2120
use Sylius\Component\Resource\Factory\FactoryInterface;
2221
use Sylius\Component\Resource\Repository\RepositoryInterface;
22+
use Sylius\Component\User\Model\UserInterface;
2323
use Sylius\Component\User\Repository\UserRepositoryInterface;
2424
use Symfony\Component\OptionsResolver\Options;
2525
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -31,7 +31,7 @@ class ApiAccessTokenExampleFactory extends AbstractExampleFactory
3131
private $accessTokenFactory;
3232

3333
/** @var UserRepositoryInterface */
34-
private $userRepository;
34+
private $adminApiUserRepository;
3535

3636
/** @var RepositoryInterface */
3737
private $clientRepository;
@@ -44,11 +44,11 @@ class ApiAccessTokenExampleFactory extends AbstractExampleFactory
4444

4545
public function __construct(
4646
FactoryInterface $accessTokenFactory,
47-
UserRepositoryInterface $userRepository,
47+
UserRepositoryInterface $adminApiUserRepository,
4848
RepositoryInterface $clientRepository
4949
) {
5050
$this->accessTokenFactory = $accessTokenFactory;
51-
$this->userRepository = $userRepository;
51+
$this->adminApiUserRepository = $adminApiUserRepository;
5252
$this->clientRepository = $clientRepository;
5353

5454
$this->faker = \Faker\Factory::create();
@@ -84,14 +84,14 @@ public function create(array $options = []): AccessTokenInterface
8484
protected function configureOptions(OptionsResolver $resolver): void
8585
{
8686
$resolver
87-
->setDefault('user', LazyOption::randomOne($this->userRepository))
87+
->setDefault('user', LazyOption::randomOne($this->adminApiUserRepository))
8888
->setAllowedTypes('user', ['string', UserInterface::class, 'null'])
8989
->setNormalizer('user', function (Options $options, string $userEmail): ?UserInterface {
9090
if (null === $userEmail) {
9191
return null;
9292
}
9393

94-
$user = $this->userRepository->findOneByEmail($userEmail);
94+
$user = $this->adminApiUserRepository->findOneByEmail($userEmail);
9595

9696
Assert::isInstanceOf($user, UserInterface::class);
9797

‎src/Sylius/Bundle/UserBundle/Security/UserPasswordEncoder.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
use Sylius\Component\User\Model\CredentialsHolderInterface;
1717
use Sylius\Component\User\Security\UserPasswordEncoderInterface;
1818
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
19-
use Symfony\Component\Security\Core\User\UserInterface;
20-
use Webmozart\Assert\Assert;
2119

2220
class UserPasswordEncoder implements UserPasswordEncoderInterface
2321
{
@@ -34,8 +32,7 @@ public function __construct(EncoderFactoryInterface $encoderFactory)
3432
*/
3533
public function encode(CredentialsHolderInterface $user): string
3634
{
37-
Assert::isInstanceOf($user, UserInterface::class);
38-
35+
/** @psalm-suppress InvalidArgument */
3936
$encoder = $this->encoderFactory->getEncoder($user);
4037

4138
return $encoder->encodePassword($user->getPlainPassword(), $user->getSalt());

‎src/Sylius/Component/Core/Model/Order.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Sylius\Component\Core\OrderPaymentStates;
2121
use Sylius\Component\Core\OrderShippingStates;
2222
use Sylius\Component\Customer\Model\CustomerInterface as BaseCustomerInterface;
23+
use Sylius\Component\Order\Model\AdjustmentInterface as BaseAdjustmentInterface;
2324
use Sylius\Component\Order\Model\Order as BaseOrder;
2425
use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
2526
use Sylius\Component\Promotion\Model\PromotionCouponInterface as BaseCouponInterface;
@@ -478,9 +479,6 @@ public function getTaxTotal(): int
478479
$taxTotal = 0;
479480

480481
foreach ($this->getAdjustments(AdjustmentInterface::TAX_ADJUSTMENT) as $taxAdjustment) {
481-
/** @var AdjustmentInterface $taxAdjustment */
482-
Assert::isInstanceOf($taxAdjustment, AdjustmentInterface::class);
483-
484482
$taxTotal += $taxAdjustment->getAmount();
485483
}
486484
foreach ($this->items as $item) {

‎src/Sylius/Component/Core/Model/OrderItem.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,9 @@ public function getTaxTotal(): int
9999
$taxTotal = 0;
100100

101101
foreach ($this->getAdjustments(AdjustmentInterface::TAX_ADJUSTMENT) as $taxAdjustment) {
102-
/** @var AdjustmentInterface $taxAdjustment */
103-
Assert::isInstanceOf($taxAdjustment, AdjustmentInterface::class);
104-
105102
$taxTotal += $taxAdjustment->getAmount();
106103
}
107104

108-
109-
110105
foreach ($this->units as $unit) {
111106
/** @var OrderItemUnitInterface $unit */
112107
Assert::isInstanceOf($unit, OrderItemUnitInterface::class);

‎src/Sylius/Component/Order/Model/AdjustableInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
interface AdjustableInterface
1919
{
2020
/**
21-
* @return Collection|AdjustmentInterface[]
21+
* @return AdjustmentInterface[]
2222
*
2323
* @psalm-return Collection<array-key, AdjustmentInterface>
2424
*/

‎symfony.lock‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"akeneo/phpspec-skip-example-extension": {
3+
"version": "v4.0.0"
4+
},
25
"amphp/amp": {
36
"version": "v2.1.2"
47
},
@@ -242,6 +245,9 @@
242245
"lakion/mink-debug-extension": {
243246
"version": "v1.2.3"
244247
},
248+
"lchrusciel/api-test-case": {
249+
"version": "v3.1.4"
250+
},
245251
"league/uri": {
246252
"version": "5.3.0"
247253
},
@@ -302,9 +308,21 @@
302308
"netresearch/jsonmapper": {
303309
"version": "v1.4.0"
304310
},
311+
"nette/bootstrap": {
312+
"version": "v3.0.1"
313+
},
314+
"nette/di": {
315+
"version": "v3.0.1"
316+
},
305317
"nette/finder": {
306318
"version": "v2.4.2"
307319
},
320+
"nette/neon": {
321+
"version": "v3.0.0"
322+
},
323+
"nette/php-generator": {
324+
"version": "v3.2.3"
325+
},
308326
"nette/robot-loader": {
309327
"version": "v3.0.4"
310328
},
@@ -314,6 +332,9 @@
314332
"nette/utils": {
315333
"version": "v2.5.2"
316334
},
335+
"nikic/php-parser": {
336+
"version": "v4.2.5"
337+
},
317338
"ocramius/package-versions": {
318339
"version": "1.3.0"
319340
},
@@ -398,6 +419,12 @@
398419
"phpspec/prophecy": {
399420
"version": "1.8.0"
400421
},
422+
"phpstan/phpdoc-parser": {
423+
"version": "0.3.5"
424+
},
425+
"phpstan/phpstan": {
426+
"version": "0.11.19"
427+
},
401428
"phpstan/phpstan-doctrine": {
402429
"version": "0.10"
403430
},
@@ -452,6 +479,9 @@
452479
"psr/simple-cache": {
453480
"version": "1.0.1"
454481
},
482+
"ralouphie/getallheaders": {
483+
"version": "3.0.3"
484+
},
455485
"ramsey/uuid": {
456486
"version": "3.8.0"
457487
},
@@ -518,6 +548,9 @@
518548
"sonata-project/datagrid-bundle": {
519549
"version": "2.3.1"
520550
},
551+
"sonata-project/doctrine-extensions": {
552+
"version": "1.3.1"
553+
},
521554
"sonata-project/intl-bundle": {
522555
"version": "2.5.0"
523556
},
@@ -551,9 +584,18 @@
551584
"sylius/fixtures-bundle": {
552585
"version": "v1.4.1"
553586
},
587+
"sylius/grid-bundle": {
588+
"version": "v1.7.3"
589+
},
590+
"sylius/mailer-bundle": {
591+
"version": "v1.4.4"
592+
},
554593
"sylius/registry": {
555594
"version": "v1.4.0"
556595
},
596+
"sylius/resource-bundle": {
597+
"version": "v1.6.1"
598+
},
557599
"sylius/theme-bundle": {
558600
"version": "v1.4.2"
559601
},
@@ -566,6 +608,9 @@
566608
"symfony/cache": {
567609
"version": "v4.1.3"
568610
},
611+
"symfony/cache-contracts": {
612+
"version": "v1.1.7"
613+
},
569614
"symfony/class-loader": {
570615
"version": "v3.4.14"
571616
},
@@ -611,6 +656,9 @@
611656
"symfony/event-dispatcher": {
612657
"version": "v4.1.3"
613658
},
659+
"symfony/event-dispatcher-contracts": {
660+
"version": "v1.1.7"
661+
},
614662
"symfony/expression-language": {
615663
"version": "v4.1.3"
616664
},
@@ -653,6 +701,9 @@
653701
"symfony/intl": {
654702
"version": "v4.1.3"
655703
},
704+
"symfony/mime": {
705+
"version": "v4.3.6"
706+
},
656707
"symfony/monolog-bridge": {
657708
"version": "v4.1.3"
658709
},
@@ -677,12 +728,21 @@
677728
"symfony/polyfill-intl-icu": {
678729
"version": "v1.9.0"
679730
},
731+
"symfony/polyfill-intl-idn": {
732+
"version": "v1.12.0"
733+
},
680734
"symfony/polyfill-mbstring": {
681735
"version": "v1.9.0"
682736
},
683737
"symfony/polyfill-php70": {
684738
"version": "v1.9.0"
685739
},
740+
"symfony/polyfill-php72": {
741+
"version": "v1.12.0"
742+
},
743+
"symfony/polyfill-php73": {
744+
"version": "v1.12.0"
745+
},
686746
"symfony/process": {
687747
"version": "v4.1.3"
688748
},
@@ -713,6 +773,9 @@
713773
"ref": "f8a63faa0d9521526499c0a8f403c9964ecb0527"
714774
}
715775
},
776+
"symfony/service-contracts": {
777+
"version": "v1.1.7"
778+
},
716779
"symfony/stopwatch": {
717780
"version": "v4.1.3"
718781
},
@@ -740,6 +803,9 @@
740803
"ref": "6bcd6c570c017ea6ae5a7a6a027c929fd3542cd8"
741804
}
742805
},
806+
"symfony/translation-contracts": {
807+
"version": "v1.1.7"
808+
},
743809
"symfony/twig-bridge": {
744810
"version": "v4.1.3"
745811
},

0 commit comments

Comments
 (0)