NEXT-21203 - Remove DAL deprecations

Author: keulinho

ecs.php

@@ -13,6 +13,7 @@
 use PhpCsFixer\Fixer\FunctionNotation\SingleLineThrowFixer;
 use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\ExplicitIndirectVariableFixer;
+use PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer;
 use PhpCsFixer\Fixer\Operator\ConcatSpaceFixer;
 use PhpCsFixer\Fixer\Operator\OperatorLinebreakFixer;
 use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
@@ -100,6 +101,13 @@
     $ecsConfig->ruleWithConfiguration(NoSuperfluousPhpdocTagsFixer::class, ['allow_unused_params' => true, 'allow_mixed' => true]);
     $ecsConfig->ruleWithConfiguration(PhpUnitDedicateAssertFixer::class, ['target' => 'newest']);
     $ecsConfig->ruleWithConfiguration(SingleQuoteFixer::class, ['strings_containing_single_quote_chars' => true]);
+    // workaround for https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/5495
+    $ecsConfig->ruleWithConfiguration(BinaryOperatorSpacesFixer::class, [
+        'operators' => [
+            '|' => null,
+            '&' => null,
+        ],
+    ]);
 
     $parameters = $ecsConfig->parameters();
     $parameters->set(Option::CACHE_DIRECTORY, $_SERVER['SHOPWARE_TOOL_CACHE_ECS'] ?? 'var/cache/cs_fixer');

phpstan-baseline.neon

@@ -66,7 +66,7 @@ protected function defineFields(): FieldCollection
             (new StringField('status', 'status'))->addFlags(new Required()),
             (new StringField('message', 'message'))->addFlags(new Required()),
             new BoolField('admin_only', 'adminOnly'),
-            (new ListField('required_privileges', 'requiredPrivileges'))->setStrict(true),
+            new ListField('required_privileges', 'requiredPrivileges'),
 
             new FkField('created_by_integration_id', 'createdByIntegrationId', IntegrationDefinition::class),
             new FkField('created_by_user_id', 'createdByUserId', UserDefinition::class),

src/Administration/Notification/NotificationDefinition.php

@@ -103,7 +103,7 @@ protected function defineFields(): FieldCollection
             (new PasswordField('password', 'password'))->removeFlag(ApiAware::class),
             (new EmailField('email', 'email'))->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::MIDDLE_SEARCH_RANKING, false)),
             (new StringField('title', 'title'))->addFlags(new ApiAware()),
-            (new ListField('vat_ids', 'vatIds', StringField::class))->setStrict(true)->addFlags(new ApiAware()),
+            (new ListField('vat_ids', 'vatIds', StringField::class))->addFlags(new ApiAware()),
             (new StringField('affiliate_code', 'affiliateCode'))->addFlags(new ApiAware()),
             (new StringField('campaign_code', 'campaignCode'))->addFlags(new ApiAware()),
             (new BoolField('active', 'active'))->addFlags(new ApiAware()),

src/Core/Checkout/Customer/CustomerDefinition.php

@@ -11,7 +11,6 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexer;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexingMessage;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\ManyToManyIdFieldUpdater;
-use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -54,20 +53,8 @@ public function getName(): string
         return 'customer.indexer';
     }
 
-    /**
-     * @param array<string, string>|null $offset
-     *
-     * @deprecated tag:v6.5.0 The parameter $offset will be native typed
-     */
-    public function iterate(/*?array */$offset): ?EntityIndexingMessage
+    public function iterate(?array $offset): ?EntityIndexingMessage
     {
-        if ($offset !== null && !\is_array($offset)) {
-            Feature::triggerDeprecationOrThrow(
-                'v6.5.0.0',
-                'Parameter `$offset` of method "iterate()" in class "CustomerIndexer" will be natively typed to `?array` in v6.5.0.0.'
-            );
-        }
-
         $iterator = $this->iteratorFactory->createIterator($this->repository->getDefinition(), $offset);
 
         $ids = $iterator->fetch();

src/Core/Checkout/Customer/DataAbstractionLayer/CustomerIndexer.php

@@ -67,7 +67,7 @@ protected function defineFields(): FieldCollection
             (new StringField('last_name', 'lastName'))->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::HIGH_SEARCH_RANKING)),
             (new StringField('company', 'company'))->addFlags(new ApiAware(), new SearchRanking(SearchRanking::MIDDLE_SEARCH_RANKING)),
             (new StringField('title', 'title'))->addFlags(new ApiAware()),
-            (new ListField('vat_ids', 'vatIds', StringField::class))->setStrict(true)->addFlags(new ApiAware()),
+            (new ListField('vat_ids', 'vatIds', StringField::class))->addFlags(new ApiAware()),
             (new StringField('customer_number', 'customerNumber'))->addFlags(new ApiAware(), new SearchRanking(SearchRanking::HIGH_SEARCH_RANKING)),
             (new CustomFields())->addFlags(new ApiAware()),
             new OneToOneAssociationField('order', 'order_id', 'id', OrderDefinition::class, false),

src/Core/Checkout/Order/Aggregate/OrderCustomer/OrderCustomerDefinition.php

@@ -80,7 +80,7 @@ protected function defineFields(): FieldCollection
             (new StateMachineStateField('state_id', 'stateId', OrderDeliveryStates::STATE_MACHINE))->addFlags(new ApiAware(), new Required()),
             (new ManyToOneAssociationField('stateMachineState', 'state_id', StateMachineStateDefinition::class, 'id', true))->addFlags(new ApiAware()),
 
-            (new ListField('tracking_codes', 'trackingCodes', StringField::class))->setStrict(true)->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::HIGH_SEARCH_RANKING)),
+            (new ListField('tracking_codes', 'trackingCodes', StringField::class))->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::HIGH_SEARCH_RANKING)),
             (new DateTimeField('shipping_date_earliest', 'shippingDateEarliest'))->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::MIDDLE_SEARCH_RANKING)),
             (new DateTimeField('shipping_date_latest', 'shippingDateLatest'))->addFlags(new ApiAware(), new Required(), new SearchRanking(SearchRanking::MIDDLE_SEARCH_RANKING)),
             (new CalculatedPriceField('shipping_costs', 'shippingCosts'))->addFlags(new ApiAware()),

src/Core/Checkout/Order/Aggregate/OrderDelivery/OrderDeliveryDefinition.php

@@ -105,7 +105,7 @@ protected function defineFields(): FieldCollection
 
             (new StateMachineStateField('state_id', 'stateId', OrderStates::STATE_MACHINE))->addFlags(new Required()),
             (new ManyToOneAssociationField('stateMachineState', 'state_id', StateMachineStateDefinition::class, 'id', true))->addFlags(new ApiAware()),
-            (new ListField('rule_ids', 'ruleIds', StringField::class))->setStrict(true),
+            new ListField('rule_ids', 'ruleIds', StringField::class),
             (new CustomFields())->addFlags(new ApiAware()),
             (new CreatedByField())->addFlags(new ApiAware()),
             (new UpdatedByField())->addFlags(new ApiAware()),

src/Core/Checkout/Order/OrderDefinition.php

@@ -34,23 +34,14 @@
  */
 class OrderRoute extends AbstractOrderRoute
 {
-    private EntityRepository $orderRepository;
-
-    private EntityRepository $promotionRepository;
-
-    private RateLimiter $rateLimiter;
-
     /**
      * @internal
      */
     public function __construct(
-        EntityRepository $orderRepository,
-        EntityRepository $promotionRepository,
-        RateLimiter $rateLimiter
+        private EntityRepository $orderRepository,
+        private EntityRepository $promotionRepository,
+        private  RateLimiter $rateLimiter
     ) {
-        $this->orderRepository = $orderRepository;
-        $this->promotionRepository = $promotionRepository;
-        $this->rateLimiter = $rateLimiter;
     }
 
     public function getDecorated(): AbstractOrderRoute
@@ -98,7 +89,7 @@ public function load(Request $request, SalesChannelContext $context, Criteria $c
         // Handle guest authentication if deeplink is set
         if (!$context->getCustomer() && $deepLinkFilter !== null) {
             try {
-                $cacheKey = strtolower($deepLinkFilter->getValue()) . '-' . $request->getClientIp();
+                $cacheKey = strtolower((string) $deepLinkFilter->getValue()) . '-' . $request->getClientIp();
 
                 $this->rateLimiter->ensureAccepted(RateLimiter::GUEST_LOGIN, $cacheKey);
             } catch (RateLimitExceededException $exception) {

src/Core/Checkout/Order/SalesChannel/OrderRoute.php

@@ -9,7 +9,6 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexer;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexingMessage;
-use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -46,20 +45,8 @@ public function getName(): string
         return 'payment_method.indexer';
     }
 
-    /**
-     * @param array|null $offset
-     *
-     * @deprecated tag:v6.5.0 The parameter $offset will be native typed
-     */
-    public function iterate(/*?array*/ $offset): ?EntityIndexingMessage
+    public function iterate(?array $offset): ?EntityIndexingMessage
     {
-        if ($offset !== null && !\is_array($offset)) {
-            Feature::triggerDeprecationOrThrow(
-                'v6.5.0.0',
-                'Parameter `$offset` of method "iterate()" in class "PaymentMethodIndexer" will be natively typed to `?array` in v6.5.0.0.'
-            );
-        }
-
         $iterator = $this->iteratorFactory->createIterator($this->paymentMethodRepository->getDefinition(), $offset);
 
         $ids = $iterator->fetch();