Update TYPO3 CMS to 8.7.29

.gitignore

 .idea
+/var/
 /vendor
 /private
 !/private/typo3conf/LocalConfiguration.php

composer.json

@@ -46,32 +46,32 @@
     }
   ],
   "require": {
-    "typo3/cms-linkvalidator": "*",
-    "helhum/typo3-console": "^5.0",
-    "dmitryd/typo3-realurl": "2.3.0",
-    "t3o/t3olayout": "^3.0",
-    "t3o/certifications": "^2.1",
+    "apache-solr-for-typo3/solr": "^10.0",
+    "clickstorm/cs_seo": "^4.2",
+    "cweagans/composer-patches": "^1.6",
+    "derhansen/sf_event_mgt": "^4.0",
     "georgringer/news": "^7.0",
-    "apache-solr-for-typo3/solr": "^7.5",
-    "reelworx/rx-shariff": "^10.3",
-    "derhansen/sf_event_mgt": "^3.0",
-    "t3o/typo3_roadmap": "^2.0",
-    "t3o/t3o_membership": "^2.0",
+    "gordalina/cachetool": "^4.0",
+    "nitsan/ns-youtube": "^1.1",
+    "reelworx/rx-shariff": "^12.2",
+    "t3g/hubspot-forms": "dev-develop",
+    "t3o/certifications": "^2.2",
     "t3o/randombanners": "^1.0",
-    "clickstorm/cs_seo": "^2.3",
-    "gordalina/cachetool": "^3.2",
-    "cweagans/composer-patches": "^1.6",
-    "typo3/cms-sys-note": "*",
-    "t3g/hubspot-forms": "1.0.0",
-    "helhum/typo3-secure-web": "^0.2.8",
-    "t3o/t3org_layout": "@dev",
     "t3o/t3o_donation": "@dev",
-    "nitsan/ns-youtube": "^1.1"
+    "t3o/t3o_membership": "^2.1",
+    "t3o/t3olayout": "dev-develop-v9",
+    "t3o/t3org_layout": "@dev",
+    "t3o/typo3_roadmap": "^2.2",
+    "typo3/cms-linkvalidator": "^9.5",
+    "typo3/cms-redirects": "^9.5",
+    "typo3/cms-seo": "^9.5",
+    "typo3/cms-sys-note": "^9.5"
   },
   "require-dev": {
     "ichhabrecht/filefill": "^2.0"
   },
   "config": {
+    "sort-packages": true,
     "platform": {
       "php": "7.2.13"
     }

config/sites/t3org/config.yaml

+base: 'https://typo3.org'
+baseVariants:
+  -
+    base: 'https://typo3.org.ddev.site'
+    condition: 'applicationContext == "Development"'
+  -
+    base: 'https://stage.typo3.org'
+    condition: 'applicationContext == "Testing"'
+  -
+    base: 'https://typo3.org'
+    condition: 'applicationContext == "Production"'
+errorHandling:
+  -
+    errorCode: '404'
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=404'
+  -
+    errorCode: '403'
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=720'
+languages:
+  -
+    title: English
+    enabled: true
+    base: /
+    typo3Language: default
+    locale: en_US.UTF-8
+    iso-639-1: en
+    navigationTitle: English
+    hreflang: en-US
+    direction: ''
+    flag: gb
+    solr_core_read: ''
+    languageId: '0'
+rootPageId: 1
+routeEnhancers:
+  News:
+    type: Extbase
+    extension: News
+    plugin: Pi1
+    routes:
+      -
+        routePath: '/{page}'
+        _controller: 'News::list'
+        _arguments:
+          page: '@widget_0/currentPage'
+        requirements:
+          page: \d+
+        defaults:
+          category-name: all
+      -
+        routePath: '/{news-title}'
+        _controller: 'News::detail'
+        _arguments:
+          news-title: news
+      -
+        routePath: '/{category-name}'
+        _controller: 'News::list'
+        _arguments:
+          category-name: overwriteDemand/categories
+      -
+        routePath: '/{category-name}/{page}'
+        _controller: 'News::list'
+        _arguments:
+          category-name: overwriteDemand/categories
+          page: '@widget_0/currentPage'
+      -
+        routePath: '/{tag-name}'
+        _controller: 'News::list'
+        _arguments:
+          tag-name: overwriteDemand/tags
+    defaultController: 'News::list'
+    defaults:
+      page: '0'
+    aspects:
+      news-title:
+        type: PersistedAliasMapper
+        tableName: tx_news_domain_model_news
+        routeFieldName: path_segment
+      page:
+        type: StaticRangeMapper
+        start: '1'
+        end: '100'
+      category-name:
+        type: PersistedAliasMapper
+        tableName: sys_category
+        routeFieldName: slug
+      tag-name:
+        type: PersistedAliasMapper
+        tableName: tx_news_domain_model_tag
+        routeFieldName: slug
+  Membership:
+    type: Extbase
+    extension: t3o_membership
+    plugin: List
+    routes:
+      -
+        routePath: '/{membership-name}'
+        _controller: 'Member::list'
+        _arguments:
+          membership-name: membership
+    aspects:
+      membership-name:
+        type: PersistedAliasMapper
+        tableName: tx_t3omembership_domain_model_membership
+        routeFieldName: slug
+routes:
+  -
+    route: robots.txt
+    type: staticText
+    content: "User-agent: *\r\nAllow: /\r\n\r\n# folders\r\nDisallow: /typo3/\r\nDisallow: /typo3conf/\r\nAllow: /typo3conf/ext/\r\nAllow: /typo3temp/\r\n\r\n# parameters\r\nDisallow: /*?id=*               # non speaking URLs\r\nDisallow: /*cHash               # no cHash\r\nDisallow: /*tx_powermail_pi1    # no powermail thanks pages\r\nDisallow: /*tx_form_formframework    # no forms\r\n\r\n# sitemap\r\nSitemap: https://typo3.org/?type=1533906435\r\n"
+  -
+    route: sitemap.xml
+    type: uri
+    source: 'https://typo3.org/?type=1533906435'
+solr_enabled_read: true
+solr_host_read: localhost
+solr_path_read: /solr/
+solr_port_read: 8983
+solr_scheme_read: http
+solr_use_write_connection: false

extensions/t3o_donation/Classes/Controller/DonationController.php

@@ -5,6 +5,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /**
@@ -30,8 +31,8 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * configurationUtility
      *
      * @var \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $configurationUtility = null;
 
@@ -39,8 +40,8 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * accountRepository
      *
      * @var \T3o\T3oDonation\Domain\Repository\AccountRepository
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $accountRepository = null;
 
@@ -48,8 +49,8 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * donationRepository
      *
      * @var \T3o\T3oDonation\Domain\Repository\DonationRepository
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $donationRepository;
 
@@ -57,8 +58,8 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * ipnService
      *
      * @var \T3o\T3oDonation\Service\PayPalIpn
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $ipnService;
 
@@ -66,8 +67,8 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
      * mailService
      *
      * @var \T3o\T3oDonation\Service\Mail
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $mailService;
 
@@ -79,7 +80,7 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
         /* @var $pageRenderer \TYPO3\CMS\Core\Page\PageRenderer */
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
         $pageRenderer->addJsFooterFile(
-            ExtensionManagementUtility::siteRelPath($this->request->getControllerExtensionKey())
+            PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->request->getControllerExtensionKey()))
             . 'Resources/Public/JavaScript/donation.js'
         );
         parent::initializeAction();

extensions/t3o_donation/Classes/Domain/Model/Account.php

@@ -22,21 +22,21 @@ class Account extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 {
 
     /**
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
      * @var string
      */
     protected $name;
 
     /**
-     * @validate NotEmpty
-     * @validate EmailAddress
+     * @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
      * @var string
      */
     protected $emailNotification;
 
     /**
-     * @validate NotEmpty
-     * @validate EmailAddress
+     * @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
      * @var string
      */
     protected $emailPaypal;

extensions/t3o_donation/Classes/Domain/Model/Donation.php

@@ -67,8 +67,8 @@ class Donation extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     protected $addressCountryCode;
 
     /**
-     * @validate NotEmpty
-     * @validate EmailAddress
+     * @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
      * @var string
      */
     protected $email;

extensions/t3o_donation/Classes/Service/Mail.php

@@ -29,7 +29,7 @@ class Mail implements \TYPO3\CMS\Core\SingletonInterface
      * mailMessage
      *
      * @var \TYPO3\CMS\Core\Mail\MailMessage
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $mailMessage;
 
@@ -37,7 +37,7 @@ class Mail implements \TYPO3\CMS\Core\SingletonInterface
      * objectManager
      *
      * @var \TYPO3\CMS\Extbase\Object\ObjectManager
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $objectManager = null;
 

extensions/t3o_donation/Classes/Service/PayPalIpn.php

@@ -30,7 +30,7 @@ class PayPalIpn implements \TYPO3\CMS\Core\SingletonInterface
      * objectManager
      *
      * @var \TYPO3\CMS\Extbase\Object\ObjectManager
-     * @inject
+     * @TYPO3\CMS\Extbase\Annotation\Inject
      */
     protected $objectManager = null;
 
@@ -38,8 +38,8 @@ class PayPalIpn implements \TYPO3\CMS\Core\SingletonInterface
      * accountRepository
      *
      * @var \T3o\T3oDonation\Domain\Repository\AccountRepository
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $accountRepository = null;
 
@@ -47,8 +47,8 @@ class PayPalIpn implements \TYPO3\CMS\Core\SingletonInterface
      * donationRepository
      *
      * @var \T3o\T3oDonation\Domain\Repository\DonationRepository
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $donationRepository;
 
@@ -56,8 +56,8 @@ class PayPalIpn implements \TYPO3\CMS\Core\SingletonInterface
      * frontendUserRepository
      *
      * @var \TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository
-     * @inject
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $frontendUserRepository;
 

extensions/t3o_donation/Configuration/TCA/tx_t3odonation_domain_model_account.php

@@ -16,7 +16,7 @@ return [
             'disabled' => 'hidden',
         ],
         'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('t3o_donation') . 'Configuration/TCA/tx_t3odonation_domain_model_account.php',
-        'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3o_donation') . 'Resources/Public/Icons/tx_t3odonation_domain_model_account.gif',
+        'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('t3o_donation') . 'Resources/Public/Icons/tx_t3odonation_domain_model_account.gif',
         'dividers2tabs' => true,
     ],
     'interface' => [

extensions/t3o_donation/Configuration/TCA/tx_t3odonation_domain_model_donation.php

@@ -16,7 +16,7 @@ return [
             'disabled' => 'hidden',
         ],
         'dynamicConfigFile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('t3o_donation') . 'Configuration/TCA/tx_t3odonation_domain_model_donation.php',
-        'iconfile'          => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3o_donation') . 'Resources/Public/Icons/tx_t3odonation_domain_model_donation.gif',
+        'iconfile'          => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('t3o_donation') . 'Resources/Public/Icons/tx_t3odonation_domain_model_donation.gif',
         'dividers2tabs'     => true,
         'searchFields'      =>  'name, company, address, address_street, address_city, address_country, email, amount, comment',
     ],

extensions/t3org_layout/Classes/Controller/SolrInstantSearchController.php

@@ -9,7 +9,6 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Frontend\Utility\EidUtility;
 
 /**
  * Search eid for solr
@@ -29,23 +28,21 @@ class SolrInstantSearchController
      */
     public static function suggest($term)
     {
-        EidUtility::initTCA();
         $GLOBALS['TSFE'] = GeneralUtility::makeInstance(
             TypoScriptFrontendController::class,
             $GLOBALS['TYPO3_CONF_VARS'],
             0,
             0
         );
-        $GLOBALS['TSFE']->connectToDB();
-        $GLOBALS['TSFE']->initFEuser();
         $GLOBALS['TSFE']->determineId();
-        $GLOBALS['TSFE']->initTemplate();
         $GLOBALS['TSFE']->getConfigArray();
         $siteRepository = GeneralUtility::makeInstance(SiteRepository::class);
         $site = $siteRepository->getSiteByPageId($GLOBALS['TSFE']->id);
 
         $searchTerm = GeneralUtility::_GP('term');
-        $solrConfiguration = Util::getSolrConfigurationFromPageId($GLOBALS['TSFE']->id, false, $GLOBALS['TSFE']->sys_language_uid);
+        $languageAspect = GeneralUtility::makeInstance(Context::class)->getAspect('language');
+
+        $solrConfiguration = Util::getSolrConfigurationFromPageId($GLOBALS['TSFE']->id, false, $languageAspect->getId());
         $solrConfiguration = $solrConfiguration->getSearchConfiguration();
 
         $query = GeneralUtility::makeInstance(Query::class, $searchTerm . '*');

extensions/t3org_layout/Classes/Domain/Model/Event.php

@@ -14,8 +14,8 @@ namespace T3o\T3orgLayout\Domain\Model;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Service\FlexFormService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Service\FlexFormService;
 
 /**
  * Event

extensions/t3org_layout/ext_emconf.php

@@ -27,8 +27,8 @@ $EM_CONF[$_EXTKEY] = [
         [
             'depends' =>
                 [
-                    'typo3' => '8.7.16 ',
-                    'php' => '7.0.0'
+                    'typo3' => '>=8.7',
+                    'php' => '>=7.0'
                 ],
             'conflicts' =>
                 [