[TASK] Update ssch/typo3-rector and phpstan/phpstan

Related: extcode#403
pixelant · Oct 11, 2022 · 4ffa6f4 · 4ffa6f4
1 parent 64fd318
commit 4ffa6f4
Show file tree

Hide file tree

Showing 49 changed files with 366 additions and 346 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -109,10 +109,16 @@ phpstan:analyse:
     - php -r "if (hash_file('SHA384', 'composer-setup.php') === trim(file_get_contents('installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
     - php composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer
     - php -r "unlink('composer-setup.php'); unlink('installer.sig');"
+    - >
+      if [[ "$TYPO3_VERSION" == "^10.4" ]]; then
+        sed -i 's/ || \^11\.5//g' composer.json
+      fi
     - composer config --no-plugins allow-plugins.typo3/cms-composer-installers true
     - composer config --no-plugins allow-plugins.typo3/class-alias-loader true
+    - composer remove --dev ssch/typo3-rector
     - composer require typo3/cms-core="${TYPO3_VERSION}"
-    - composer require typo3/cms-dashboard="${TYPO3_VERSION}"
+    - composer require typo3/cms-form="${TYPO3_VERSION}"
+    - composer require --dev typo3/cms-dashboard="${TYPO3_VERSION}"
   script:
     - >
       if [[ "$COVERAGE" == "0" ]]; then

diff --git a/Classes/Controller/Backend/Order/OrderController.php b/Classes/Controller/Backend/Order/OrderController.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please read the
  * LICENSE file that was distributed with this source code.
  */
-
 use Extcode\Cart\Controller\Backend\ActionController;
 use Extcode\Cart\Domain\Model\Cart\Cart;
 use Extcode\Cart\Domain\Model\Order\Item;
@@ -17,6 +16,7 @@
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Pagination\SimplePagination;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Extbase\Annotation\IgnoreValidation;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
@@ -130,7 +130,7 @@ public function exportAction(): void
     }
 
     /**
-     * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("orderItem")
+     * @IgnoreValidation("orderItem")
      */
     public function showAction(Item $orderItem): void
     {

diff --git a/Classes/Controller/Cart/ActionController.php b/Classes/Controller/Cart/ActionController.php
@@ -20,21 +20,21 @@ class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
     /**
      * Session Handler
      *
-     * @var \Extcode\Cart\Service\SessionHandler
+     * @var SessionHandler
      */
     protected $sessionHandler;
 
     /**
      * Cart Utility
      *
-     * @var \Extcode\Cart\Utility\CartUtility
+     * @var CartUtility
      */
     protected $cartUtility;
 
     /**
      * Parser Utility
      *
-     * @var \Extcode\Cart\Utility\ParserUtility
+     * @var ParserUtility
      */
     protected $parserUtility;
 
@@ -48,7 +48,7 @@ class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
     /**
      * Cart
      *
-     * @var \Extcode\Cart\Domain\Model\Cart\Cart
+     * @var Cart
      */
     protected $cart;
 
@@ -74,7 +74,7 @@ class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
     protected $specials = [];
 
     /**
-     * @param \Extcode\Cart\Service\SessionHandler $sessionHandler
+     * @param SessionHandler $sessionHandler
      */
     public function injectSessionHandler(
         SessionHandler $sessionHandler
@@ -83,7 +83,7 @@ public function injectSessionHandler(
     }
 
     /**
-     * @param \Extcode\Cart\Utility\CartUtility $cartUtility
+     * @param CartUtility $cartUtility
      */
     public function injectCartUtility(
         CartUtility $cartUtility
@@ -92,7 +92,7 @@ public function injectCartUtility(
     }
 
     /**
-     * @param \Extcode\Cart\Utility\ParserUtility $parserUtility
+     * @param ParserUtility $parserUtility
      */
     public function injectParserUtility(
         ParserUtility $parserUtility

diff --git a/Classes/Controller/Cart/CartController.php b/Classes/Controller/Cart/CartController.php
@@ -51,9 +51,9 @@ protected function initializeView(ViewInterface $view): void
     }
 
     /**
-     * @param \Extcode\Cart\Domain\Model\Order\Item $orderItem
-     * @param \Extcode\Cart\Domain\Model\Order\BillingAddress $billingAddress
-     * @param \Extcode\Cart\Domain\Model\Order\ShippingAddress $shippingAddress
+     * @param Item $orderItem
+     * @param BillingAddress $billingAddress
+     * @param ShippingAddress $shippingAddress
      */
     public function showAction(
         Item $orderItem = null,

diff --git a/Classes/Controller/Cart/CouponController.php b/Classes/Controller/Cart/CouponController.php
@@ -8,8 +8,9 @@
  * For the full copyright and license information, please read the
  * LICENSE file that was distributed with this source code.
  */
-
+use Extcode\Cart\Domain\Model\Cart\CartCoupon;
 use Extcode\Cart\Domain\Model\Cart\CartCouponInterface;
+use Extcode\Cart\Domain\Model\Coupon;
 use Extcode\Cart\Domain\Repository\CouponRepository;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -18,12 +19,12 @@
 class CouponController extends ActionController
 {
     /**
-     * @var \Extcode\Cart\Domain\Repository\CouponRepository
+     * @var CouponRepository
      */
     protected $couponRepository;
 
     /**
-     * @param \Extcode\Cart\Domain\Repository\CouponRepository $couponRepository
+     * @param CouponRepository $couponRepository
      */
     public function injectCouponRepository(
         CouponRepository $couponRepository
@@ -41,15 +42,15 @@ public function addAction()
 
             $couponCode = $this->request->getArgument('couponCode');
 
-            /** @var \Extcode\Cart\Domain\Model\Coupon $coupon */
+            /** @var Coupon $coupon */
             $coupon = $this->couponRepository->findOneByCode($couponCode);
             if ($coupon && $coupon->getIsAvailable()) {
                 $couponType = $coupon->getCouponType();
 
                 // will be removed in version 9.x for TYPO3 v12 and TYPO3 v11
                 // TODO: provide an upgrade wizard to change the coupon_type in Database
                 if ($couponType === 'cartdiscount') {
-                    $couponType = \Extcode\Cart\Domain\Model\Cart\CartCoupon::class;
+                    $couponType = CartCoupon::class;
                 }
 
                 $interfaces = class_implements($couponType);

diff --git a/Classes/Controller/Cart/CurrencyController.php b/Classes/Controller/Cart/CurrencyController.php
@@ -19,12 +19,12 @@ class CurrencyController extends ActionController
     /**
      * Currency Utility
      *
-     * @var \Extcode\Cart\Utility\CurrencyUtility
+     * @var CurrencyUtility
      */
     protected $currencyUtility;
 
     /**
-     * @param \Extcode\Cart\Utility\CurrencyUtility $currencyUtility
+     * @param CurrencyUtility $currencyUtility
      */
     public function injectCurrencyUtility(
         CurrencyUtility $currencyUtility

diff --git a/Classes/Controller/Cart/OrderController.php b/Classes/Controller/Cart/OrderController.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please read the
  * LICENSE file that was distributed with this source code.
  */
-
 use Extcode\Cart\Domain\Model\Order\BillingAddress;
 use Extcode\Cart\Domain\Model\Order\Item;
 use Extcode\Cart\Domain\Model\Order\ShippingAddress;
@@ -22,7 +21,9 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\EventDispatcher\StoppableEventInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Annotation\IgnoreValidation;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException;
 use TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator;
 use TYPO3\CMS\Extbase\Validation\ValidatorResolver;
 
@@ -104,7 +105,7 @@ public function initializeCreateAction()
      * @param BillingAddress $billingAddress
      * @param ShippingAddress $shippingAddress
      *
-     * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("shippingAddress")
+     * @IgnoreValidation("shippingAddress")
      */
     public function createAction(
         Item $orderItem = null,
@@ -183,7 +184,7 @@ public function createAction(
     }
 
     /**
-     * @param \Extcode\Cart\Domain\Model\Order\Item $orderItem
+     * @param Item $orderItem
      */
     public function showAction(Item $orderItem)
     {
@@ -196,12 +197,12 @@ public function showAction(Item $orderItem)
      * @param string $argumentName
      * @param string $propertyName
      * @param array $validatorConf
-     * @throws \TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException
+     * @throws NoSuchValidatorException
      */
     protected function setDynamicValidation($argumentName, $propertyName, $validatorConf)
     {
         // build custom validation chain
-        /** @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver $validatorResolver */
+        /** @var ValidatorResolver $validatorResolver */
         $validatorResolver = GeneralUtility::makeInstance(
             ValidatorResolver::class
         );
@@ -216,7 +217,7 @@ protected function setDynamicValidation($argumentName, $propertyName, $validator
         );
 
         if ($argumentName === 'orderItem') {
-            /** @var \Extcode\Cart\Domain\Validator\OrderItemValidator $modelValidator */
+            /** @var OrderItemValidator $modelValidator */
             $modelValidator = $validatorResolver->createValidator(
                 OrderItemValidator::class
             );
@@ -230,7 +231,7 @@ protected function setDynamicValidation($argumentName, $propertyName, $validator
             $propertyValidator
         );
 
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator $conjunctionValidator */
+        /** @var ConjunctionValidator $conjunctionValidator */
         $conjunctionValidator = $this->arguments->getArgument($argumentName)->getValidator();
         if ($conjunctionValidator === null) {
             $conjunctionValidator = $validatorResolver->createValidator(

diff --git a/Classes/Controller/Order/OrderController.php b/Classes/Controller/Order/OrderController.php
@@ -8,12 +8,12 @@
  * For the full copyright and license information, please read the
  * LICENSE file that was distributed with this source code.
  */
-
 use Extcode\Cart\Domain\Model\Order\Item;
 use Extcode\Cart\Domain\Repository\Order\ItemRepository;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Pagination\SimplePagination;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Extbase\Annotation\IgnoreValidation;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
@@ -24,7 +24,7 @@ class OrderController extends ActionController
     /**
      * Order Item Repository
      *
-     * @var \Extcode\Cart\Domain\Repository\Order\ItemRepository
+     * @var ItemRepository
      */
     protected $itemRepository;
 
@@ -43,7 +43,7 @@ class OrderController extends ActionController
     protected $pluginSettings;
 
     /**
-     * @param \Extcode\Cart\Domain\Repository\Order\ItemRepository $itemRepository
+     * @param ItemRepository $itemRepository
      */
     public function injectItemRepository(
         ItemRepository $itemRepository
@@ -92,9 +92,9 @@ public function listAction(int $currentPage = 1): void
     /**
      * Show Action
      *
-     * @param \Extcode\Cart\Domain\Model\Order\Item $orderItem
+     * @param Item $orderItem
      *
-     * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("orderItem")
+     * @IgnoreValidation("orderItem")
      */
     public function showAction(Item $orderItem)
     {

diff --git a/Classes/Domain/Finisher/Form/AddToCartFinisher.php b/Classes/Domain/Finisher/Form/AddToCartFinisher.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please read the
  * LICENSE file that was distributed with this source code.
  */
-
 use Extcode\Cart\Domain\Model\Cart\Cart;
 use Extcode\Cart\Domain\Model\Cart\Product;
 use Extcode\Cart\Utility\CartUtility;
@@ -22,6 +21,7 @@
 use TYPO3\CMS\Extbase\Service\ExtensionService;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 use TYPO3\CMS\Form\Domain\Finishers\AbstractFinisher;
+use TYPO3\CMS\Install\Service\CoreVersionService;
 
 class AddToCartFinisher extends AbstractFinisher
 {
@@ -109,7 +109,7 @@ protected function executeInternal(): void
                     'severity' => $severity
                 ];
 
-                if (version_compare((new \TYPO3\CMS\Install\Service\CoreVersionService)->getInstalledVersion(), '11.5.0', '>=')) {
+                if (version_compare((new CoreVersionService)->getInstalledVersion(), '11.5.0', '>=')) {
                     $streamFactory = GeneralUtility::makeInstance(StreamFactory::class);
                     $stream = $streamFactory->createStream(json_encode($payload));
                     $response = $this->finisherContext->getFormRuntime()->getResponse()
@@ -130,7 +130,7 @@ protected function executeInternal(): void
                     true
                 );
 
-                if (version_compare((new \TYPO3\CMS\Install\Service\CoreVersionService)->getInstalledVersion(), '11.5.0', '>=')) {
+                if (version_compare((new CoreVersionService)->getInstalledVersion(), '11.5.0', '>=')) {
                     $extensionService = GeneralUtility::makeInstance(ExtensionService::class);
                     $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
 

diff --git a/Classes/Domain/Model/Cart.php b/Classes/Domain/Model/Cart.php
@@ -26,12 +26,12 @@ class Cart extends AbstractEntity
     protected $sHash = '';
 
     /**
-     * @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUser
+     * @var FrontendUser
      */
     protected $feUser = null;
 
     /**
-     * @var \Extcode\Cart\Domain\Model\Order\Item
+     * @var Item
      */
     protected $orderItem = null;
 

diff --git a/Classes/Domain/Model/Cart/BeVariant.php b/Classes/Domain/Model/Cart/BeVariant.php
@@ -19,7 +19,7 @@ class BeVariant
     protected $id = '';
 
     /**
-     * @var \Extcode\Cart\Domain\Model\Cart\Product
+     * @var Product
      */
     protected $product = null;