[!!!][TASK] Added TYPO3 1.5 compatibility

uniwue-rz · Sep 22, 2023 · fa43062 · fa43062
1 parent a14acb3
commit fa43062
Show file tree

Hide file tree

Showing 49 changed files with 423 additions and 1,216 deletions.
diff --git a/Classes/Analyzers/AbstractAnalyzer.php b/Classes/Analyzers/AbstractAnalyzer.php
@@ -3,12 +3,13 @@
 namespace UniWue\UwA11yCheck\Analyzers;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Database\QueryGenerator;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use UniWue\UwA11yCheck\Check\Preset;
 use UniWue\UwA11yCheck\Check\ResultSet;
 use UniWue\UwA11yCheck\Tests\TestInterface;
+use UniWue\UwA11yCheck\Utility\QueryGenerator;
 
 /**
  * Class AbstractAnalyzer
@@ -17,29 +18,15 @@ abstract class AbstractAnalyzer implements AnalyzerInterface
 {
     public const TYPE_INTERNAL = 'internal';
 
-    /**
-     * @var string
-     */
-    protected $type = '';
+    protected string $type = '';
+    protected array $pageUids = [];
 
-    /**
-     * @var array
-     */
-    protected $pageUids = [];
-
-    /**
-     * @return string
-     */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
     /**
      * Runs all tests for the given preset and recordUid
-     *
-     * @param Preset $preset
-     * @param int $recordUid
-     * @return ResultSet
      */
     public function runTests(Preset $preset, int $recordUid): ResultSet
     {
@@ -58,7 +45,7 @@ public function runTests(Preset $preset, int $recordUid): ResultSet
                 $result = $test->run($html, $recordUid);
                 $results[] = $result;
             }
-        } catch (\GuzzleHttp\Exception\ClientException $e) {
+        } catch (ClientException $e) {
             $resultSet->setFailed(true);
             $resultSet->setFailedMessage($e->getMessage());
         }
@@ -75,16 +62,13 @@ public function runTests(Preset $preset, int $recordUid): ResultSet
 
     /**
      * Initializes the pageUids to check
-     *
-     * @param int $pageUid
-     * @param int $levels
      */
     public function initializePageUids(int $pageUid, int $levels = 0): void
     {
         $pageUids = [$pageUid];
         if ($levels > 0) {
             $queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class);
-            $pidList = $queryGenerator->getTreeList($pageUid, $levels, 0, 1);
+            $pidList = $queryGenerator->getTreeList($pageUid, $levels, 0);
             $pageUids = GeneralUtility::intExplode(',', $pidList, true);
         }
 
@@ -93,10 +77,6 @@ public function initializePageUids(int $pageUid, int $levels = 0): void
 
     /**
      * Returns the PID of the record
-     *
-     * @param string $table
-     * @param int $recordUid
-     * @return int
      */
     protected function getPidByRecordUid(string $table, int $recordUid): int
     {
@@ -110,9 +90,6 @@ protected function getPidByRecordUid(string $table, int $recordUid): int
 
     /**
      * Fetches the resulting HTML from the given URL
-     *
-     * @param string $url
-     * @return string
      */
     protected function fetchHtml(string $url): string
     {

diff --git a/Classes/Analyzers/NewsAnalyzer.php b/Classes/Analyzers/NewsAnalyzer.php
@@ -16,13 +16,10 @@ 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
-     *
-     * @param Preset $preset
-     * @return array
      */
     public function getCheckRecordUids(Preset $preset): array
     {
@@ -43,11 +40,8 @@ public function getCheckRecordUids(Preset $preset): array
 
     /**
      * Returns all news UIDs matching the given demand
-     *
-     * @param SingleTableDemand $demand
-     * @return array
      */
-    protected function getNewsRecordUids(SingleTableDemand $demand)
+    protected function getNewsRecordUids(SingleTableDemand $demand): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($demand->getTableName());
@@ -84,7 +78,7 @@ protected function getNewsRecordUids(SingleTableDemand $demand)
             $query->setMaxResults($demand->getMaxResults());
         }
 
-        $queryResult = $query->execute()->fetchAll();
+        $queryResult = $query->execute()->fetchAllAssociative();
 
         $uidList = [];
         foreach ($queryResult as $record) {

diff --git a/Classes/Analyzers/PageContentAnalyzer.php b/Classes/Analyzers/PageContentAnalyzer.php
@@ -9,16 +9,10 @@
  */
 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
-     *
-     * @param Preset $preset
-     * @return array
      */
     public function getCheckRecordUids(Preset $preset): array
     {

diff --git a/Classes/Check/A11yCheck.php b/Classes/Check/A11yCheck.php
@@ -7,15 +7,10 @@
  */
 class A11yCheck
 {
-    /**
-     * @var Preset
-     */
-    protected $preset;
+    protected Preset $preset;
 
     /**
      * A11yCheck constructor.
-     *
-     * @param Preset $preset
      */
     public function __construct(Preset $preset)
     {
@@ -24,10 +19,6 @@ public function __construct(Preset $preset)
 
     /**
      * Executes the check and returns the result as objectStorage
-     *
-     * @param int $id
-     * @param int $levels
-     * @return array
      */
     public function executeCheck(int $id, int $levels = 0): array
     {

diff --git a/Classes/Check/Preset.php b/Classes/Check/Preset.php
@@ -10,35 +10,12 @@
  */
 class Preset
 {
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * @var AbstractAnalyzer
-     */
-    protected $analyzer;
-
-    /**
-     * @var AbstractCheckUrlGenerator
-     */
-    protected $checkUrlGenerator;
-
-    /**
-     * @var TestSuite
-     */
-    protected $testSuite;
+    protected string $id = '';
+    protected string $name = '';
+    protected string $description = '';
+    protected AbstractAnalyzer $analyzer;
+    protected AbstractCheckUrlGenerator $checkUrlGenerator;
+    protected TestSuite $testSuite;
 
     /**
      * Preset constructor.
@@ -65,73 +42,48 @@ public function __construct(
         $this->testSuite = $testSuite;
     }
 
-    /**
-     * @return string
-     */
-    public function getId()
+    public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @return string
-     */
     public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * @return string
-     */
     public function getCheckTableName(): string
     {
         return $this->checkUrlGenerator->getTableName();
     }
 
-    /**
-     * @return string
-     */
     public function getEditRecordTableName(): string
     {
         return $this->checkUrlGenerator->getEditRecordTable();
     }
 
     /**
      * Returns the check URL
-     *
-     * @param int $id
-     * @return string
      */
     public function getCheckUrl(int $id): string
     {
         return $this->checkUrlGenerator->getCheckUrl($id);
     }
 
-    /**
-     * @return TestSuite
-     */
     public function getTestSuite(): TestSuite
     {
         return $this->testSuite;
     }
 
     /**
      * Executes the testSuite configured in the preset by the given page UID and recursive levels
-     *
-     * @param int $pageUid
-     * @param int $levels
-     * @return array
      */
-    public function executeTestSuiteByPageUid(int $pageUid, int $levels)
+    public function executeTestSuiteByPageUid(int $pageUid, int $levels): array
     {
         $result = [];
         $this->analyzer->initializePageUids($pageUid, $levels);
@@ -145,9 +97,6 @@ public function executeTestSuiteByPageUid(int $pageUid, int $levels)
 
     /**
      * Executes the testSuite configured in the preset by the given array of record UIDs
-     *
-     * @param array $recordUids
-     * @return array
      */
     public function executeTestSuiteByRecordUids(array $recordUids): array
     {