[TASK] Apply more and newer php-cs-fixer rules

Author: extcode

Build/.php-cs-fixer.dist.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use TYPO3\CMS\Core\Cache\Backend\NullBackend;
 use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
 use TYPO3\CMS\Core\Configuration\ConfigurationManager;
@@ -39,7 +41,7 @@
  * according script within TYPO3 core's Build/Scripts directory and
  * adapt to extensions needs.
  */
-(static function () {
+(static function (): void {
     $testbase = new Testbase();
 
     // These if's are for core testing (package typo3/cms) only. cms-composer-installer does

Build/UnitTestsBootstrap.php

@@ -2427,7 +2427,7 @@ parameters:
 		-
 			message: '#^Cannot access offset 0 on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
+			count: 4
 			path: ../Classes/Domain/Validator/OrderItemValidator.php
 
 		-
@@ -4197,7 +4197,7 @@ parameters:
 		-
 			message: '#^Cannot access offset ''templateLayouts\.'' on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
+			count: 3
 			path: ../Classes/Utility/TemplateLayout.php
 
 		-
@@ -4393,8 +4393,8 @@ parameters:
 			path: ../Classes/ViewHelpers/Format/CurrencyViewHelper.php
 
 		-
-			message: '#^Binary operation "/" between float and mixed results in an error\.$#'
-			identifier: binaryOp.invalid
+			message: '#^Binary operation "/\=" between float and mixed results in an error\.$#'
+			identifier: assignOp.invalid
 			count: 1
 			path: ../Classes/ViewHelpers/Format/CurrencyViewHelper.php
 
@@ -4903,8 +4903,8 @@ parameters:
 			path: ../Tests/Functional/Command/OrderItemCleanupCommandTest.php
 
 		-
-			message: '#^Method Extcode\\Cart\\Tests\\Functional\\Command\\OrderItemCleanupCommandTest\:\:wrongCutOffDateDataProvider\(\) has no return type specified\.$#'
-			identifier: missingType.return
+			message: '#^Method Extcode\\Cart\\Tests\\Functional\\Command\\OrderItemCleanupCommandTest\:\:wrongCutOffDateDataProvider\(\) return type has no value type specified in iterable type iterable\.$#'
+			identifier: missingType.iterableValue
 			count: 1
 			path: ../Tests/Functional/Command/OrderItemCleanupCommandTest.php
 
@@ -4975,7 +4975,7 @@ parameters:
 			path: ../Tests/Unit/Controller/ProductControllerTest.php
 
 		-
-			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Controller\\ProductControllerTest\:\:getHighestSeverityDataProvider\(\) return type has no value type specified in iterable type Traversable\.$#'
+			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Controller\\ProductControllerTest\:\:getHighestSeverityDataProvider\(\) return type has no value type specified in iterable type iterable\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: ../Tests/Unit/Controller/ProductControllerTest.php
@@ -4987,7 +4987,7 @@ parameters:
 			path: ../Tests/Unit/Controller/ProductControllerTest.php
 
 		-
-			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Controller\\ProductControllerTest\:\:getLastHighestSeverityDataProvider\(\) return type has no value type specified in iterable type Traversable\.$#'
+			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Controller\\ProductControllerTest\:\:getLastHighestSeverityDataProvider\(\) return type has no value type specified in iterable type iterable\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: ../Tests/Unit/Controller/ProductControllerTest.php
@@ -5323,7 +5323,7 @@ parameters:
 			path: ../Tests/Unit/Domain/Model/Product/MeasureTraitTest.php
 
 		-
-			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Domain\\Model\\Product\\MeasureTraitTest\:\:measureUnitsProvider\(\) return type has no value type specified in iterable type array\.$#'
+			message: '#^Method Extcode\\Cart\\Tests\\Unit\\Domain\\Model\\Product\\MeasureTraitTest\:\:measureUnitsProvider\(\) return type has no value type specified in iterable type iterable\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: ../Tests/Unit/Domain/Model/Product/MeasureTraitTest.php

Build/phpstan-baseline.neon

@@ -27,7 +27,7 @@ public function __construct(
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Will remove all old orders');
         $this->addArgument(
@@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $cutOffDate = $input->getArgument('cutOffDate');
 
-        if (is_string($cutOffDate) === false || $this->isCutOffDateValid($cutOffDate) === false) {
+        if (is_string($cutOffDate) === false || self::isCutOffDateValid($cutOffDate) === false) {
             $output->writeln('The cutOffDate argument must follow the pattern YYYY-MM-DD.');
 
             return Command::FAILURE;
@@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return Command::SUCCESS;
     }
 
-    private function isCutOffDateValid(string $cutOffDate): bool
+    private static function isCutOffDateValid(string $cutOffDate): bool
     {
         $pattern = '/^\d{4}-\d{2}-\d{2}$/';
 

Classes/Command/OrderItemCleanupCommand.php

@@ -19,5 +19,6 @@ class Constants
     public const DOKTYPE_CART_CART = 181;
 
     public const LANGUAGE_PATH = 'LLL:EXT:cart/Resources/Private/Language/locallang.xlf';
+
     public const LANGUAGE_BE_PATH = 'LLL:EXT:cart/Resources/Private/Language/locallang_be.xlf';
 }

Classes/Constants.php

@@ -18,9 +18,11 @@
 class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
 {
     protected array $pluginSettings = [];
+
     public function __construct(
         protected ConfigurationManagerInterface $configurationManager
-    ) {}
+    ) {
+    }
 
     protected function initializeAction(): void
     {
@@ -29,7 +31,7 @@ protected function initializeAction(): void
                 ConfigurationManager::CONFIGURATION_TYPE_FRAMEWORK
             );
 
-        $pageId = (int)($this->request->getQueryParams()['id'] ?? 1);
+        $pageId = (int) ($this->request->getQueryParams()['id'] ?? 1);
 
         BackendUtility::readPageAccess(
             $pageId,

Classes/Controller/Backend/ActionController.php

@@ -28,7 +28,8 @@ class DocumentController extends ActionController
     public function __construct(
         protected readonly PersistenceManager $persistenceManager,
         protected readonly ItemRepository $itemRepository
-    ) {}
+    ) {
+    }
 
     public function createAction(Item $orderItem, string $pdfType): ResponseInterface
     {
@@ -79,12 +80,13 @@ public function downloadAction(Item $orderItem, string $pdfType): ResponseInterf
                 ->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                 ->withHeader('Content-Description', 'File Transfer')
                 ->withHeader('Content-Disposition', 'attachment; filename="' . $originalPdf->getName() . '"')
-                ->withHeader('Content-Length', (string)$originalPdf->getSize())
+                ->withHeader('Content-Length', (string) $originalPdf->getSize())
                 ->withHeader('Content-Transfer-Encoding', 'binary')
                 ->withHeader('Content-Type', 'application/pdf')
                 ->withHeader('Expires', '0')
                 ->withHeader('Pragma', 'public')
-                ->withBody($this->streamFactory->createStream($originalPdf->getContents()));
+                ->withBody($this->streamFactory->createStream($originalPdf->getContents()))
+            ;
         }
 
         return $this->htmlResponse();

Classes/Controller/Backend/Order/DocumentController.php

@@ -33,31 +33,24 @@
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use stdClass;
 
 class OrderController extends ActionController
 {
     private const LANG_FILE = 'LLL:EXT:cart/Resources/Private/Language/locallang.xlf:';
 
-    private ModuleTemplate $moduleTemplate;
-
     protected array $searchArguments = [];
 
+    private ModuleTemplate $moduleTemplate;
+
     public function __construct(
         protected readonly ModuleTemplateFactory $moduleTemplateFactory,
         protected readonly IconFactory $iconFactory,
         protected readonly PersistenceManager $persistenceManager,
         protected readonly ItemRepository $itemRepository,
         private readonly PageRenderer $pageRenderer,
         private readonly ComponentFactory $componentFactory
-    ) {}
-
-    protected function initializeAction(): void
-    {
-        parent::initializeAction();
-
-        if ($this->request->hasArgument('search')) {
-            $this->searchArguments = $this->request->getArgument('search');
-        }
+    ) {
     }
 
     public function listAction(int $currentPage = 1): ResponseInterface
@@ -70,7 +63,7 @@ public function listAction(int $currentPage = 1): ResponseInterface
         $this->moduleTemplate->assign('settings', $this->settings);
         $this->moduleTemplate->assign('searchArguments', $this->searchArguments);
 
-        $itemsPerPage = (isset($this->settings['itemsPerPage']) && is_numeric($this->settings['itemsPerPage'])) ? (int)$this->settings['itemsPerPage'] : 20;
+        $itemsPerPage = (isset($this->settings['itemsPerPage']) && is_numeric($this->settings['itemsPerPage'])) ? (int) $this->settings['itemsPerPage'] : 20;
 
         $orderItems = $this->itemRepository->findAll($this->searchArguments);
         $arrayPaginator = new QueryResultPaginator(
@@ -156,7 +149,8 @@ public function exportAction(): ResponseInterface
             ->withAddedHeader('Content-Type', 'text/' . $format)
             ->withAddedHeader('Content-Description', 'File transfer')
             ->withAddedHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
-            ->withBody($this->streamFactory->createStream($this->view->render()));
+            ->withBody($this->streamFactory->createStream($this->view->render()))
+        ;
     }
 
     public function generateNumberAction(Item $orderItem, string $numberType): ResponseInterface
@@ -194,7 +188,7 @@ public function getPaymentStatus(): array
     {
         $paymentStatusArray = [];
 
-        $paymentStatus = new \stdClass();
+        $paymentStatus = new stdClass();
         $paymentStatus->key = '';
         $paymentStatus->value = LocalizationUtility::translate(
             'tx_cart_domain_model_order_payment.status.all',
@@ -204,22 +198,23 @@ public function getPaymentStatus(): array
 
         $entries = ['open', 'pending', 'paid', 'canceled'];
         foreach ($entries as $entry) {
-            $paymentStatus = new \stdClass();
+            $paymentStatus = new stdClass();
             $paymentStatus->key = $entry;
             $paymentStatus->value = LocalizationUtility::translate(
                 'tx_cart_domain_model_order_payment.status.' . $entry,
                 'Cart'
             );
             $paymentStatusArray[] = $paymentStatus;
         }
+
         return $paymentStatusArray;
     }
 
     public function getShippingStatus(): array
     {
         $shippingStatusArray = [];
 
-        $shippingStatus = new \stdClass();
+        $shippingStatus = new stdClass();
         $shippingStatus->key = '';
         $shippingStatus->value = LocalizationUtility::translate(
             'tx_cart_domain_model_order_shipping.status.all',
@@ -229,17 +224,27 @@ public function getShippingStatus(): array
 
         $entries = ['open', 'on_hold', 'in_process', 'shipped'];
         foreach ($entries as $entry) {
-            $shippingStatus = new \stdClass();
+            $shippingStatus = new stdClass();
             $shippingStatus->key = $entry;
             $shippingStatus->value = LocalizationUtility::translate(
                 'tx_cart_domain_model_order_shipping.status.' . $entry,
                 'Cart'
             );
             $shippingStatusArray[] = $shippingStatus;
         }
+
         return $shippingStatusArray;
     }
 
+    protected function initializeAction(): void
+    {
+        parent::initializeAction();
+
+        if ($this->request->hasArgument('search')) {
+            $this->searchArguments = $this->request->getArgument('search');
+        }
+    }
+
     protected function getLanguageService(): LanguageService
     {
         return $GLOBALS['LANG'];
@@ -282,7 +287,8 @@ private function setDocHeader(array $buttons): void
                 ->setHref($button['link'])
                 ->setTitle($title)
                 ->setShowLabelText($button['showLabel'])
-                ->setIcon($icon);
+                ->setIcon($icon)
+            ;
             $buttonBar->addButton($viewButton, ButtonBar::BUTTON_POSITION_LEFT, $button['group']);
         }
     }

Classes/Controller/Backend/Order/OrderController.php

@@ -26,14 +26,15 @@ class PaymentController extends ActionController
     public function __construct(
         private readonly PaymentRepository $paymentRepository,
         private readonly LogServiceInterface $logService,
-    ) {}
+    ) {
+    }
 
     public function updateAction(Payment $payment): ResponseInterface
     {
         $this->paymentRepository->update($payment);
         $this->logService->write(
             Log::info(
-                $this->getOrderItemUid($payment),
+                self::getOrderItemUid($payment),
                 'updatePayment',
                 'Payment was set to ' . $payment->getStatus() . '.',
                 [
@@ -55,7 +56,7 @@ public function updateAction(Payment $payment): ResponseInterface
         return $this->redirect('show', 'Backend\Order\Order', null, ['orderItem' => $payment->getItem()]);
     }
 
-    private function getOrderItemUid(Payment $payment): int
+    private static function getOrderItemUid(Payment $payment): int
     {
         $orderItemUid = $payment->getItem()?->getUid();
 

Classes/Controller/Backend/Order/PaymentController.php

@@ -26,14 +26,15 @@ class ShippingController extends ActionController
     public function __construct(
         private readonly ShippingRepository $shippingRepository,
         private readonly LogServiceInterface $logService,
-    ) {}
+    ) {
+    }
 
     public function updateAction(Shipping $shipping): ResponseInterface
     {
         $this->shippingRepository->update($shipping);
         $this->logService->write(
             Log::info(
-                $this->getOrderItemUid($shipping),
+                self::getOrderItemUid($shipping),
                 'updateShipping',
                 'Shipping was set to ' . $shipping->getStatus() . '.',
                 [
@@ -55,7 +56,7 @@ public function updateAction(Shipping $shipping): ResponseInterface
         return $this->redirect('show', 'Backend\Order\Order', null, ['orderItem' => $shipping->getItem()]);
     }
 
-    private function getOrderItemUid(Shipping $shipping): int
+    private static function getOrderItemUid(Shipping $shipping): int
     {
         $orderItemUid = $shipping->getItem()?->getUid();