Some more fixes

ecs.php

@@ -6,6 +6,7 @@
 use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
 use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
 use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
+use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
@@ -16,7 +17,6 @@
 
     $ecsConfig->rules([
         DeclareStrictTypesFixer::class,
-        LineLengthFixer::class,
     ]);
 
     $ecsConfig->skip([
@@ -38,6 +38,10 @@
         'less_and_greater' => false,
     ]);
 
+    $ecsConfig->ruleWithConfiguration(LineLengthFixer::class, [
+        'inline_short_lines' => false,
+    ]);
+
     $ecsConfig->ruleWithConfiguration(TrailingCommaInMultilineFixer::class, [
         'elements' => ['arguments', 'arrays', 'match', 'parameters'],
     ]);

src/Api/Controller/NostoCategoriesController.php

@@ -55,7 +55,7 @@ public function sync(Request $request, Context $context): JsonResponse
         $criteria->getAssociation('seoUrls');
         $criteria->addFilter(new EqualsFilter(
             'active',
-            true
+            true,
         ));
 
         $appToken = $this->configProvider->getAppToken(

src/Decorator/Core/Content/Product/SalesChannel/Listing/ProductListingRoute.php

@@ -68,7 +68,7 @@ public function load(
         /** @var CategoryEntity $category */
         $category = $this->categoryRepository->search(
             new Criteria([$categoryId]),
-            $context->getContext()
+            $context->getContext(),
         )->first();
 
         $streamId = $this->extendCriteria($context, $criteria, $category);
@@ -144,7 +144,7 @@ private function extendCriteria(
         }
 
         $criteria->addFilter(
-            new EqualsFilter('product.categoriesRo.id', $category->getId())
+            new EqualsFilter('product.categoriesRo.id', $category->getId()),
         );
 
         return null;

src/Decorator/Storefront/Controller/CmsController.php

@@ -88,7 +88,7 @@ public function filter(string $navigationId, Request $request, SalesChannelConte
         }
 
         return new JsonResponse(
-            $this->filterHandler->handleAvailableFilters($criteria)
+            $this->filterHandler->handleAvailableFilters($criteria),
         );
     }
 

src/Decorator/Storefront/Controller/SearchController.php

@@ -142,7 +142,7 @@ public function filter(Request $request, SalesChannelContext $salesChannelContex
         }
 
         return new JsonResponse(
-            $this->filterHandler->handleAvailableFilters($criteria)
+            $this->filterHandler->handleAvailableFilters($criteria),
         );
     }
 }

src/Decorator/Storefront/Theme/Twig/ThemeInheritanceBuilderDecorator.php

@@ -27,7 +27,7 @@ public function build(array $bundles, array $themes): array
                 [
                     self::PLUGIN_TECH_NAME => 1,
                 ],
-                $result
+                $result,
             );
         }
 

src/EventListener/CmsPageLoaderListener.php

@@ -30,7 +30,7 @@ public function __construct(
         RequestStack $requestStack,
         SessionLookupResolver $sessionLookupResolver,
         NostoCacheResolver $cacheResolver,
-        LoggerInterface $logger
+        LoggerInterface $logger,
     ) {
         $this->requestStack = $requestStack;
         $this->sessionLookupResolver = $sessionLookupResolver;
@@ -73,7 +73,7 @@ public function onKernelResponse(ResponseEvent $event): void
             $this->logger->error(
                 sprintf(
                     'Unable to load resolve session, reason: %s',
-                    $throwable->getMessage()
+                    $throwable->getMessage(),
                 ),
                 ContextHelper::createContextFromException($throwable),
             );

src/Model/Nosto/Account/Provider.php

@@ -14,6 +14,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\System\SalesChannel\SalesChannelEntity;
+use Throwable;
 
 class Provider
 {
@@ -80,7 +81,7 @@ public function all(Context $context): array
                         new Token(Token::API_GRAPHQL, $this->configProvider->getAppToken($channelId, $languageId)),
                     ]);
                     $this->accounts[] = new Account($channelId, $languageId, $accountName, $keyChain);
-                } catch (\Throwable $throwable) {
+                } catch (Throwable $throwable) {
                     $this->logger->error(
                         $throwable->getMessage(),
                         ContextHelper::createContextFromException($throwable),

src/Model/Nosto/Entity/Helper/ProductHelper.php

@@ -116,7 +116,7 @@ public function loadExistingParentProducts(
 
     public function loadProducts(
         array $productIds,
-        SalesChannelContext $context
+        SalesChannelContext $context,
     ): ProductCollection {
         $criteria = new Criteria();
         $criteria->addFilter(new EqualsAnyFilter('id', $productIds));

src/Model/Nosto/Entity/Order/Status/Builder.php

@@ -27,7 +27,7 @@ public function build(OrderEntity $order): ?NostoOrderStatus
                 $orderNumber,
                 $orderStatus,
                 $paymentProvider,
-                $updatedAt
+                $updatedAt,
             );
 
             return $nostoOrderStatus;

src/Model/Nosto/Entity/Product/CrossSelling/CrossSellingBuilder.php

@@ -58,7 +58,9 @@ public function build(string $productId, SalesChannelContext $context): array
         $result = [];
         foreach ($crossSellings as $crossSelling) {
             $result[$this->createKeyFromName($crossSelling->getName())] = [
-                'productIds' => $this->useProductStream($crossSelling) ? $this->loadByStream($crossSelling, $context, new Criteria()) : $this->loadByIds($crossSelling, $context, new Criteria()),
+                'productIds' => $this->useProductStream($crossSelling)
+                    ? $this->loadByStream($crossSelling, $context, new Criteria())
+                    : $this->loadByIds($crossSelling, $context, new Criteria()),
                 'position' => $crossSelling->getPosition(),
                 'sortBy' => $crossSelling->getSortBy(),
                 'sortDirection' => $crossSelling->getSortDirection(),
@@ -112,7 +114,7 @@ protected function loadByStream(
 
         $filters = $this->productStreamBuilder->buildFilters(
             $productStreamId,
-            $context->getContext()
+            $context->getContext(),
         );
 
         $criteria->addFilter(...$filters)

src/Model/Operation/EntityChangelogSyncHandler.php

@@ -56,7 +56,11 @@ public function execute(object $message): JobResult
     private function processMarketingPermissionEvents(Context $context, JobResult $result, string $parentJobId)
     {
         $type = EventsWriter::NEWSLETTER_ENTITY_NAME;
-        $this->processEventBatches($context, $type, function (array $subscriberIds) use ($parentJobId, $result, $context) {
+        $this->processEventBatches($context, $type, function (array $subscriberIds) use (
+            $parentJobId,
+            $result,
+            $context
+        ) {
             $jobMessage = new MarketingPermissionSyncMessage(Uuid::randomHex(), $parentJobId, $subscriberIds, $context);
             $this->jobScheduler->schedule($jobMessage);
             $result->addMessage(new InfoMessage(

src/Model/Operation/MarketingPermissionSyncHandler.php

@@ -68,7 +68,7 @@ private function doOperation(AccountInterface $account, Context $context, array
                 [
                     NewsletterSubscribeRoute::OPTION_DIRECT,
                     NewsletterSubscribeRoute::STATUS_OPT_IN,
-                ]
+                ],
             );
             try {
                 $this->eventDispatcher->dispatch(

src/Model/Operation/ProductSyncHandler.php

@@ -359,7 +359,7 @@ private function getCategoriesTreeCollection($allProductCategoryPaths, $context)
 
         $criteria = new Criteria();
         $criteria->addFilter(
-            new EqualsAnyFilter('id', $categoriesPaths)
+            new EqualsAnyFilter('id', $categoriesPaths),
         );
 
         return $this->categoryRepository->search($criteria, $context)->getEntities();

src/Search/Api/SearchService.php

@@ -109,7 +109,7 @@ protected function fetchFilters(
             $nostoService->disable();
 
             $this->logger->error(
-                sprintf('Error while fetching all filters: %s', $e->getMessage())
+                sprintf('Error while fetching all filters: %s', $e->getMessage()),
             );
         }
     }
@@ -131,7 +131,7 @@ protected function fetchSelectableFilters(
             $nostoService->disable();
 
             $this->logger->error(
-                sprintf('Error while fetching the available filters: %s', $e->getMessage())
+                sprintf('Error while fetching the available filters: %s', $e->getMessage()),
             );
         }
     }

src/Search/Request/Handler/AbstractRequestHandler.php

@@ -46,7 +46,7 @@ public function fetchProducts(Request $request, Criteria $criteria, SalesChannel
             $responseParser = new GraphQLResponseParser($response);
         } catch (Throwable $e) {
             $this->logger->error(
-                sprintf('Error while fetching the products: %s', $e->getMessage())
+                sprintf('Error while fetching the products: %s', $e->getMessage()),
             );
             return;
         }

src/Search/Request/Handler/SearchRequestHandler.php

@@ -31,7 +31,7 @@ protected function handleRedirect(SalesChannelContext $context, Redirect $redire
     {
         $context->getContext()->addExtension(
             'nostoRedirect',
-            $redirectExtension
+            $redirectExtension,
         );
     }
 }

src/Search/Request/Handler/SortHandlers/SortingHandlerInterface.php

@@ -13,6 +13,6 @@ public function supportsSorting(FieldSorting $fieldSorting): bool;
 
     public function generateSorting(
         FieldSorting $fieldSorting,
-        SearchRequest $searchNavigationRequest
+        SearchRequest $searchNavigationRequest,
     ): void;
 }

src/Search/Request/SearchRequest.php

@@ -96,7 +96,7 @@ public function addRangeFilter(string $filterField, ?string $min = null, ?string
         if (array_key_exists($filterField, $this->filters)) {
             $this->filters[$filterField]['range'] = array_merge(
                 $this->filters[$filterField]['range'],
-                $range
+                $range,
             );
         } else {
             $this->filters[$filterField] = [

src/Service/CategoryMerchandising/MerchandisingSearchApi.php

@@ -71,9 +71,9 @@ public function searchIds(Criteria $criteria, SalesChannelContext $salesChannelC
             $this->logger->error(
                 sprintf(
                     'Unable to load resolve session, reason: %s',
-                    $throwable->getMessage()
+                    $throwable->getMessage(),
                 ),
-                ContextHelper::createContextFromException($throwable)
+                ContextHelper::createContextFromException($throwable),
             );
         }
 
@@ -155,7 +155,7 @@ public function searchIds(Criteria $criteria, SalesChannelContext $salesChannelC
         } catch (Exception $e) {
             $this->logger->error(
                 $e->getMessage(),
-                ContextHelper::createContextFromException($e)
+                ContextHelper::createContextFromException($e),
             );
 
             return $this->repository->searchIds($criteria, $salesChannelContext);

src/Service/CategoryMerchandising/Translator/PriceFilterTranslator.php

@@ -13,7 +13,7 @@ class PriceFilterTranslator implements TranslatorInterface
 
     public function translate(
         IncludeFilters $includeFilters,
-        RangeFilter $filters = null
+        RangeFilter $filters = null,
     ): IncludeFilters {
         if ($filters) {
             $includeFilters->setPrice($filters->getParameter("gte"), $filters->getParameter("lte"));

src/Service/ScheduledTask/DailyProductSyncScheduledTaskHandler.php

@@ -70,9 +70,9 @@ public function run(): void
                 $this->logger->error(
                     sprintf(
                         'Unable to sync job, the reason is: %s',
-                        $e->getMessage()
+                        $e->getMessage(),
                     ),
-                    ContextHelper::createContextFromException($e)
+                    ContextHelper::createContextFromException($e),
                 );
             }
         }

src/Storefront/Checkout/Cart/RestorerService/RestorerService.php

@@ -17,6 +17,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Throwable;
 
 class RestorerService implements RestorerServiceInterface
 {

src/Twig/Extension/NostoExtension.php

@@ -13,6 +13,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\System\SalesChannel\Entity\SalesChannelRepository;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Throwable;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -50,10 +51,10 @@ public function getNostoProduct(?SalesChannelProductEntity $product, SalesChanne
     {
         try {
             return $product === null ? null : $this->productProvider->get($product, $context);
-        } catch (\Throwable $throwable) {
+        } catch (Throwable $throwable) {
             $this->logger->error(
                 $throwable->getMessage(),
-                ContextHelper::createContextFromException($throwable)
+                ContextHelper::createContextFromException($throwable),
             );
             return null;
         }