[BUGFIX] Make Extension Compatible to TYPO3 v10.4 and v11.5

Resolves: #83

Author: extcode

.gitlab-ci.yml

@@ -20,21 +20,24 @@ before_script:
 stages:
   - lint
   - test
+  - documentation
   - analysis
 
 lint:cgl:
-  image: composer:1.6
+  image: composer:2
   stage: lint
   before_script:
+    - composer config platform.php 7.4
     - composer remove typo3/cms-core --no-update
     - composer install --no-progress --no-ansi --no-interaction
   script:
-    - .build/bin/php-cs-fixer fix --config=Build/.php_cs.dist -v --dry-run --using-cache=no --path-mode=intersection ./
+    - .build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --using-cache=no --path-mode=intersection ./
 
 lint:typoscriptcgl:
   stage: lint
-  image: composer:1.6
+  image: composer:2
   script:
+    - composer config platform.php 7.4
     - composer remove typo3/cms-core --no-update
     - composer install --no-progress --no-ansi --no-interaction
     - .build/bin/typoscript-lint -c Build/typoscriptlint.yaml Configuration
@@ -45,7 +48,7 @@ lint:yaml:
   before_script:
     - pip install yamllint==1.10.0
   script:
-    - yamllint -c Build/yamllint.yaml Configuration/ Resources/ .travis.yml
+    - yamllint -c Build/yamllint.yaml Configuration/ Resources/
 
 lint:php72:
   stage: lint
@@ -65,6 +68,18 @@ lint:php74:
   script:
     - find . -name \*.php -exec php -l "{}" \;
 
+lint:php80:
+  stage: lint
+  image: php:8.0-alpine
+  script:
+    - find . -name \*.php -exec php -l "{}" \;
+
+lint:php81:
+  stage: lint
+  image: php:8.1-alpine
+  script:
+    - find . -name \*.php -exec php -l "{}" \;
+
 .test: &test_php
   stage: test
   services:
@@ -104,30 +119,68 @@ lint:php74:
     expire_in: 1 day
     when: always
 
-# Build in PHP 7.2 and TYPO3 9.5
-test:php72:typo3_9:
+# Build in PHP 7.2 and TYPO3 10.4
+test:php72:typo3_10:
   <<: *test_php
   variables:
     DOCKER_TAG: 7.2-alpine
-    TYPO3_VERSION: ^9.5
+    TYPO3_VERSION: ^10.4
     COVERAGE: 0
 
-# Build in PHP 7.3 and TYPO3 9.5
-test:php73:typo3_9:
+# Build in PHP 7.3 and TYPO3 10.4
+test:php73:typo3_10:
   <<: *test_php
   variables:
     DOCKER_TAG: 7.3-alpine
-    TYPO3_VERSION: ^9.5
+    TYPO3_VERSION: ^10.4
     COVERAGE: 0
 
-# Build in PHP 7.4 and TYPO3 9.5
-test:php74:typo3_9:
+# Build in PHP 7.4 and TYPO3 10.4
+test:php74:typo3_10:
   <<: *test_php
   variables:
     DOCKER_TAG: 7.4-alpine
-    TYPO3_VERSION: ^9.5
+    TYPO3_VERSION: ^10.4
+    COVERAGE: 0
+
+test:php74:typo3_11:
+  <<: *test_php
+  variables:
+    DOCKER_TAG: 7.4-alpine
+    TYPO3_VERSION: ^11.5
+    COVERAGE: 0
+
+test:php80:typo3_11:
+  <<: *test_php
+  variables:
+    DOCKER_TAG: 8.0-alpine
+    TYPO3_VERSION: ^11.5
+    COVERAGE: 0
+
+test:php81:typo3_11:
+  <<: *test_php
+  variables:
+    DOCKER_TAG: 8.1-alpine
+    TYPO3_VERSION: ^11.5
     COVERAGE: 1
 
+documentation:
+  stage: documentation
+  image:
+    name: t3docs/render-documentation:v2.4.0
+    entrypoint: [""]
+  before_script:
+    - cp -a ${CI_PROJECT_DIR}/. /PROJECT
+    - mkdir -p ${CI_PROJECT_DIR}/Documentation-GENERATED-temp
+  script:
+    - cd /ALL/venv
+    - /ALL/Menu/mainmenu.sh makehtml-no-cache -c resultdir ${CI_PROJECT_DIR}/Documentation-GENERATED-temp
+  artifacts:
+    paths:
+      - ${CI_PROJECT_DIR}/Documentation-GENERATED-temp/Result/project/0.0.0
+    expire_in: 1 day
+    when: always
+
 sonarqube:
   stage: analysis
   image: ciricihq/gitlab-sonar-scanner
@@ -140,7 +193,7 @@ sonarqube:
     SONAR_SOURCES: "./Classes"
     SONAR_GITLAB_PROJECT_ID: "$CI_PROJECT_ID"
   script:
-  - echo "sonar.projectKey=contacts-3.x" > sonar-project.properties
+  - echo "sonar.projectKey=contacts-4.x" > sonar-project.properties
   - gitlab-sonar-scanner -Dsonar.php.coverage.reportPath=phpunit.coverage.xml -Dsonar.php.tests.reportPath=phpunit.report.xml
   allow_failure: true
 
@@ -155,5 +208,5 @@ sonarqube-reports:
     SONAR_ANALYSIS_MODE: "publish"
     SONAR_SOURCES: "./Classes"
   script:
-  - echo "sonar.projectKey=contacts-3.x" > sonar-project.properties
+  - echo "sonar.projectKey=contacts-4.x" > sonar-project.properties
   - gitlab-sonar-scanner -Dsonar.php.coverage.reportPath=phpunit.coverage.xml -Dsonar.php.tests.reportPath=phpunit.report.xml

.travis.yml

@@ -4,7 +4,11 @@
     die('This script supports command line usage only. Please check your command.');
 }
 
-return PhpCsFixer\Config::create()
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/../');
+
+$config = new PhpCsFixer\Config();
+$config
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
@@ -17,14 +21,14 @@
         'ordered_imports' => true,
         'single_quote' => true,
         'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
+        'no_extra_blank_lines' => true,
         'phpdoc_no_package' => true,
         'phpdoc_scalar' => true,
         'no_blank_lines_after_phpdoc' => true,
         'array_syntax' => ['syntax' => 'short'],
         'whitespace_after_comma_in_array' => true,
         'function_typehint_space' => true,
-        'hash_to_slash_comment' => true,
+        'single_line_comment_style' => true,
         'no_alias_functions' => true,
         'lowercase_cast' => true,
         'no_leading_namespace_whitespace' => true,
@@ -35,13 +39,7 @@
         'phpdoc_no_empty_return' => true,
         'phpdoc_trim' => true
     ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__ . '/../')
-            ->exclude('.Build')
-            ->exclude('Documentation')
-            ->exclude('Resources')
-            ->notName('ext_emconf.php')
-            ->notName('ext_localconf.php')
-            ->notName('ext_tables.php')
-    );
+    ->setUsingCache(false)
+    ->setFinder($finder);
+
+return $config;

Build/.php_cs.dist Build/.php-cs-fixer.dist.phpBuild/.php_cs.dist renamed to Build/.php-cs-fixer.dist.php

@@ -13,12 +13,12 @@
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class GeocodeCommand extends Command
 {
-
     /**
      * @var string
      */
@@ -29,31 +29,23 @@ class GeocodeCommand extends Command
      */
     protected $googleMapsApiKey = '';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Geocode addresses of contact extension');
         $this->setHelp('Try to geocode all addresses of contact extension, where latitude and longitude are not set. It uses the google maps API. A valid API key is required!');
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     */
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         parent::initialize($input, $output);
 
-        $extensionConfiguration = new \TYPO3\CMS\Core\Configuration\ExtensionConfiguration();
+        $extensionConfiguration = new ExtensionConfiguration();
         $contactsConfiguration = $extensionConfiguration->get('contacts');
 
         $this->googleMapsApiKey = $contactsConfiguration['googleMapsApiKey'];
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $output->writeln('');
 
@@ -140,11 +132,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $progress->finish();
     }
 
-    /**
-     * @param string $address
-     *
-     * @return array
-     */
     protected function geocode(string $address): array
     {
         $address = urlencode($address);

Classes/Command/GeocodeCommand.php

@@ -11,7 +11,8 @@
 
 use Extcode\Contacts\Domain\Model\Dto\Demand;
 use Extcode\Contacts\Domain\Repository\CategoryRepository;
-use TYPO3\CMS\Frontend\Page\PageRepository;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
 {
@@ -21,7 +22,7 @@ class ActionController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
     protected $categoryRepository;
 
     /**
-     * @var PageRepository
+     * @var \TYPO3\CMS\Core\Domain\Repository\PageRepository
      */
     protected $pageRepository;
 
@@ -34,7 +35,7 @@ public function injectCategoryRepository(CategoryRepository $categoryRepository)
     }
 
     /**
-     * @param PageRepository $pageRepository
+     * @param \TYPO3\CMS\Core\Domain\Repository\PageRepository $pageRepository
      */
     public function injectPageRepository(PageRepository $pageRepository)
     {
@@ -82,7 +83,7 @@ protected function createDemandObjectFromSettings(array $settings) : Demand
     protected function addCategoriesToDemandObjectFromSettings(&$demand)
     {
         if ($this->settings['categoriesList']) {
-            $selectedCategories = \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(
+            $selectedCategories = GeneralUtility::intExplode(
                 ',',
                 $this->settings['categoriesList'],
                 true