Skip to content

Commit 93269c6

Browse files
authored
Merge pull request #97 from Setono/upgrade-test-application
Upgrade test application
2 parents 6470853 + b1b3c41 commit 93269c6

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"lexik/jwt-authentication-bundle": "^2.17",
5757
"matthiasnoback/symfony-config-test": "^4.3 || ^5.1",
5858
"setono/client-bundle": "^1.1",
59-
"setono/sylius-plugin-pack": "^1.12",
59+
"setono/sylius-plugin-pack": "^1.14",
60+
"sylius-labs/polyfill-symfony-security": "^1.1.2",
6061
"symfony/debug-bundle": "^6.4 || ^7.0",
6162
"symfony/dotenv": "^6.4 || ^7.0",
6263
"symfony/intl": "^6.4 || ^7.0",
@@ -66,6 +67,9 @@
6667
"weirdan/doctrine-psalm-plugin": "^2.9",
6768
"willdurand/negotiation": "^3.1"
6869
},
70+
"conflict": {
71+
"symfony/serializer": "6.4.23"
72+
},
6973
"prefer-stable": true,
7074
"autoload": {
7175
"psr-4": {

psalm.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
66
phpVersion="8.1"
77
errorLevel="1"
8-
findUnusedBaselineEntry="true"
9-
findUnusedPsalmSuppress="true"
8+
findUnusedBaselineEntry="false"
9+
findUnusedPsalmSuppress="false"
1010
findUnusedCode="false"
11-
findUnusedVariablesAndParams="true"
11+
findUnusedVariablesAndParams="false"
1212
>
1313
<projectFiles>
1414
<directory name="src"/>

src/Controller/Action/SetupMapCustomerIdAction.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,11 @@ private function createConversionAction(GoogleAdsClient $googleAdsClient, string
163163
->setResponseContentType(ResponseContentType::MUTABLE_RESOURCE),
164164
);
165165

166-
/** @var MutateConversionActionResult $result */
166+
/**
167+
* @psalm-suppress RawObjectIteration,DeprecatedClass
168+
*
169+
* @var MutateConversionActionResult $result
170+
*/
167171
foreach ($response->getResults() as $result) {
168172
$conversionAction = $result->getConversionAction();
169173
if (null === $conversionAction) {

src/Resolver/CustomerIdsResolver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public function getCustomerIdsFromConnection(ConnectionInterface $connection): a
4747
throw $e;
4848
}
4949

50+
/** @psalm-suppress RawObjectIteration,DeprecatedClass */
5051
foreach ($customersResponse->getResourceNames() as $customerResourceName) {
5152
Assert::string($customerResourceName);
5253
$rootCustomerIds[] = (string) CustomerServiceClient::parseName($customerResourceName)['customer_id'];

tests/Application/config/bundles.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
99
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
1010
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
11+
Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true],
1112
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
1213
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
1314
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],

0 commit comments

Comments
 (0)