Commit 1c5cac27 authored by Thomas Löffler's avatar Thomas Löffler Committed by Stefan Busemann
Browse files

Update TYPO3 CMS to 8.7.29

parent dbe6f78e
Pipeline #7936 passed with stages
in 4 minutes and 37 seconds
.idea
/var/
/vendor
/private
!/private/typo3conf/LocalConfiguration.php
......
This diff is collapsed.
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
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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' => [
......
......@@ -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',
],
......
......@@ -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 . '*');
......
......@@ -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
......
......@@ -27,8 +27,8 @@ $EM_CONF[$_EXTKEY] = [
[
'depends' =>
[
'typo3' => '8.7.16 ',
'php' => '7.0.0'
'typo3' => '>=8.7',
'php' => '>=7.0'
],
'conflicts' =>
[
......
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment