[TASK] Manual fixes for v11

Classes/Analyzers/AbstractAnalyzer.php

@@ -18,7 +18,7 @@ abstract class AbstractAnalyzer implements AnalyzerInterface
 {
     final const TYPE_INTERNAL = 'internal';
 
-    protected string $type = '';
+    protected  string $type = '';
 
     /**
      * @var array

Classes/Analyzers/NewsAnalyzer.php

@@ -13,10 +13,7 @@
  */
 class NewsAnalyzer extends AbstractAnalyzer
 {
-    /**
-     * @var string
-     */
-    protected $type = AbstractAnalyzer::TYPE_INTERNAL;
+    protected string $type = AbstractAnalyzer::TYPE_INTERNAL;
 
     /**
      * Return an aray of news record Uids to check

Classes/Analyzers/PageContentAnalyzer.php

@@ -9,10 +9,7 @@
  */
 class PageContentAnalyzer extends AbstractAnalyzer
 {
-    /**
-     * @var string
-     */
-    protected $type = AbstractAnalyzer::TYPE_INTERNAL;
+    protected string $type = AbstractAnalyzer::TYPE_INTERNAL;
 
     /**
      * Return an aray of page record Uids to check

Classes/CheckUrlGenerators/AbstractCheckUrlGenerator.php

@@ -10,9 +10,9 @@
 abstract class AbstractCheckUrlGenerator
 {
     /**
-     * @var array
+     * @var array[]
      */
-    protected $requiredConfiguration = [];
+    protected array $requiredConfiguration = [];
 
     protected string $tableName = '';
 

Classes/CheckUrlGenerators/NewsDetail.php

@@ -12,9 +12,9 @@
 class NewsDetail extends AbstractCheckUrlGenerator
 {
     /**
-     * @var array
+     * @var array[]
      */
-    protected $requiredConfiguration = ['targetPid'];
+    protected array $requiredConfiguration = ['targetPid'];
 
     /**
      * @var int

Classes/CheckUrlGenerators/Page.php

@@ -13,7 +13,7 @@ class Page extends AbstractCheckUrlGenerator
     /**
      * Page constructor.
      *
-     * @param array $configuration
+     * @param array[] $configuration
      */
     public function __construct(array $configuration)
     {

Classes/CheckUrlGenerators/PageContent.php

@@ -12,14 +12,11 @@
 class PageContent extends AbstractCheckUrlGenerator
 {
     /**
-     * @var array
+     * @var array[]
      */
-    protected $requiredConfiguration = ['targetPid'];
+    protected array $requiredConfiguration = ['targetPid'];
 
-    /**
-     * @var int
-     */
-    protected $targetPid = 0;
+    protected int $targetPid = 0;
 
     protected array $ignoredContentTypes = [];
 

Classes/Command/PresetByPageUidCommand.php

@@ -3,14 +3,14 @@
 declare(strict_types=1);
 namespace UniWue\UwA11yCheck\Command;
 
+use TYPO3\CMS\Extbase\Object\ObjectManager;
 use UniWue\UwA11yCheck\Check\Preset;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 use UniWue\UwA11yCheck\Check\Result\Impact;
 use UniWue\UwA11yCheck\Check\ResultSet;
 use UniWue\UwA11yCheck\Service\PresetService;

Classes/Controller/A11yCheckController.php

@@ -17,7 +17,10 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
+use TYPO3\CMS\Fluid\View\TemplateView;
 use UniWue\UwA11yCheck\Domain\Model\Dto\CheckDemand;
 use UniWue\UwA11yCheck\Service\PresetService;
 use UniWue\UwA11yCheck\Service\ResultsService;
@@ -30,36 +33,30 @@ class A11yCheckController extends ActionController
     final const LANG_CORE = 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:';
     final const LANG_LOCAL = 'LLL:EXT:uw_a11y_check/Resources/Private/Language/locallang.xlf:';
 
+    protected PresetService $presetService;
+
+    private ModuleTemplateFactory $moduleTemplateFactory;
+
+
     /**
-     * @var PresetService
+     * The current page uid
      */
-    protected $presetService;
-    public function __construct(private ModuleTemplateFactory $moduleTemplateFactory)
+    protected int $pid = 0;
+
+    protected IconFactory $iconFactory;
+
+    protected ResultsService $resultsService;
+
+    public function __construct(ModuleTemplateFactory $moduleTemplateFactory)
     {
+        $this->moduleTemplateFactory = $moduleTemplateFactory;
     }
 
     public function injectPresetService(PresetService $presetService): void
     {
         $this->presetService = $presetService;
     }
 
-    /**
-     * The current page uid
-     *
-     * @var int
-     */
-    protected $pid = 0;
-
-    /**
-     * @var IconFactory
-     */
-    protected $iconFactory;
-
-    /**
-     * @var ResultsService
-     */
-    protected $resultsService;
-
     /**
      * Set up the doc header properly here
      */
@@ -70,10 +67,10 @@ protected function initializeView(ViewInterface $view): void
         parent::initializeView($view);
 
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->resultsService = $this->objectManager->get(ResultsService::class);
+        $this->resultsService =GeneralUtility::makeInstance(ObjectManager::class)->get(ResultsService::class);
 
         $moduleTemplate->setFlashMessageQueue($this->controllerContext->getFlashMessageQueue());
-        if ($view instanceof BackendTemplateView) {
+        if ($view instanceof TemplateView) {
             $moduleTemplate->getPageRenderer()->addCssFile(
                 'EXT:uw_a11y_check/Resources/Public/Css/a11y_check.css'
             );
@@ -94,10 +91,9 @@ public function initializeAction(): void
     /**
      * Index action
      *
-     * @param CheckDemand $checkDemand
      * @IgnoreValidation("checkDemand")
      */
-    public function indexAction($checkDemand = null): ResponseInterface
+    public function indexAction(CheckDemand $checkDemand = null): ResponseInterface
     {
         $moduleTemplate = $this->moduleTemplateFactory->create($this->request);
         if ($checkDemand === null) {
@@ -115,7 +111,6 @@ public function indexAction($checkDemand = null): ResponseInterface
                 ]
             );
         }
-
         $this->view->assignMultiple([
             'checkDemand' => $checkDemand,
             'presets' => $this->presetService->getPresets(),
@@ -197,7 +192,7 @@ public function acknowledgeResultAction(int $pageUid): ResponseInterface
     protected function createMenu(): void
     {
         $moduleTemplate = $this->moduleTemplateFactory->create($this->request);
-        $uriBuilder = $this->objectManager->get(UriBuilder::class);
+        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
         $uriBuilder->setRequest($this->request);
 
         $menu = $moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
@@ -229,8 +224,8 @@ protected function createDefaultButtons(): void
         // Shortcut
         if ($this->getBackendUser()->mayMakeShortcut()) {
             $shortcutButton = $buttonBar->makeShortcutButton()
-                ->setModuleName('web_UwA11yCheckTxUwa11ycheckM1')
-                ->setGetVariables(['route', 'module', 'id'])
+                ->setRouteIdentifier('web_UwA11yCheckTxUwa11ycheckM1')
+                ->setArguments(['route', 'module', 'id'])
                 ->setDisplayName('Shortcut');
             $buttonBar->addButton($shortcutButton, ButtonBar::BUTTON_POSITION_RIGHT);
         }

Classes/Controller/ContentElementsController.php

@@ -34,7 +34,7 @@ public function showAction(int $pageUid, string $ignoreContentTypes, string $hma
         $expectedHmac = GeneralUtility::hmac($hmacString, 'page_content');
 
         if ($expectedHmac !== $hmac) {
-            throw new Exception('HMAC does not match', 1_572_608_738_828);
+            throw new Exception('HMAC does not match', 1572608738828);
         }
 
         $whereCondition = 'colPos >= 0';

Classes/Domain/Model/Dto/CheckDemand.php

@@ -10,11 +10,20 @@
  */
 class CheckDemand extends AbstractEntity
 {
-    protected string $analyze = '';
+    /**
+     * @var string
+     */
+    protected $analyze = '';
 
-    protected ?Preset $preset = null;
+    /**
+     * @var \UniWue\UwA11yCheck\Check\Preset|null
+     */
+    protected $preset = null;
 
-    protected int $level = 0;
+    /**
+     * @var int
+     */
+    protected $level = 0;
 
     public function getAnalyze(): string
     {

Classes/Domain/Model/Dto/SingleTableDemand.php

@@ -11,13 +11,17 @@ class SingleTableDemand extends AbstractEntity
 {
     /**
      * The tablename for the query
+     *
+     * @var int
      */
-    protected string $tableName = '';
+    protected $tableName = '';
 
     /**
      * Max results of records to return. Default is 50
+     *
+     * @var int
      */
-    protected int $maxResults = 50;
+    protected $maxResults = 50;
 
     public function getTableName(): string
     {

Classes/Property/TypeConverter/PresetTypeConverter.php

@@ -2,6 +2,7 @@
 
 namespace UniWue\UwA11yCheck\Property\TypeConverter;
 
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Error\Error;
 use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface;
 use TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter;
@@ -13,15 +14,8 @@
  */
 class PresetTypeConverter extends AbstractTypeConverter
 {
-    /**
-     * @var PresetService
-     */
-    protected $presetService;
+    protected PresetService $presetService;
 
-    public function injectConfigurationService(PresetService $presetService): void
-    {
-        $this->presetService = $presetService;
-    }
 
     /**
      * @var array
@@ -38,22 +32,26 @@ public function injectConfigurationService(PresetService $presetService): void
      */
     protected $priority = 1;
 
+    public function injectConfigurationService(PresetService $presetService): void
+    {
+        $this->presetService = $presetService;
+    }
+
     /**
      * @param mixed $source
-     * @param string $targetType
      * @param PropertyMappingConfigurationInterface|null $configuration
      * @return mixed|object|Error|Preset
      */
     public function convertFrom(
         $source,
-        $targetType,
+        string $targetType,
         array $convertedChildProperties = [],
         PropertyMappingConfigurationInterface $configuration = null
     ): Error|Preset {
         $preset = $this->presetService->getPresetById($source);
 
         if (!$preset instanceof Preset) {
-            return $this->objectManager->get(Error::class, 'Preset not found', 1_573_053_017_102);
+            return GeneralUtility::makeInstance(Error::class, 'Preset not found', 1573053017102);
         }
 
         return $preset;

Classes/Service/PresetService.php

@@ -22,10 +22,7 @@
  */
 class PresetService
 {
-    /**
-     * @var YamlFileLoader
-     */
-    protected $yamlFileLoader;
+    protected YamlFileLoader $yamlFileLoader;
 
     protected ObjectManager $objectManager;
 

Classes/Service/ResultsService.php

@@ -13,15 +13,9 @@
  */
 class ResultsService
 {
-    /**
-     * @var SerializationService
-     */
-    protected $serializationService;
+    protected SerializationService $serializationService;
 
-    /**
-     * @var PresetService
-     */
-    protected $presetService;
+    protected PresetService $presetService;
 
     public function injectSerializationService(SerializationService $serializationService): void
     {

Classes/Tests/AbstractTest.php

@@ -13,15 +13,15 @@
  */
 abstract class AbstractTest implements TestInterface
 {
-    protected string $id = '';
+    protected $id = '';
 
-    protected string $description = '';
+    protected $description = '';
 
-    protected string $help = '';
+    protected $help = '';
 
-    protected string $helpUrl = '';
+    protected $helpUrl = '';
 
-    protected int $impact = 0;
+    protected $impact = 0;
 
     public function getId(): string
     {

Resources/Private/Partials/Results.html

@@ -11,7 +11,7 @@ <h3>
     <div class="panel panel-default panel-a11y">
       <div class="panel-heading impact-{resultSet.impact}" role="tab" id="heading-{preset.id}-{i.index}">
         <h2 class="panel-title">
-          <a href="#resultset-{preset.id}-{i.index}" class="{f:if(condition: '{results -> f:count()} > 1', then: 'collapsed', else: '')}" data-toggle="collapse" aria-controls="#resultset-{i.index}">
+          <a href="#resultset-{preset.id}-{i.index}" class="{f:if(condition: '{results -> f:count()} > 1', then: 'collapsed', else: '')}" data-bs-toggle="collapse" aria-controls="#resultset-{i.index}">
             <span class="caret"></span>
             <strong>{resultSet.table} - {resultSet.uid}</strong>
           </a>
@@ -88,4 +88,4 @@ <h2 class="panel-title">
   </f:for>
 </div>
 
-</html>
+</html>