Commit 3c3f2a94 authored by Stefan Busemann's avatar Stefan Busemann

Merge branch 'task/update-to-typo3-v9' into 'develop'

Last fixes for running in TYPO3 v9

See merge request !158
parents c3b90c15 51c31a91
Pipeline #7060 passed with stages
in 4 minutes and 4 seconds
......@@ -1211,16 +1211,16 @@
},
{
"name": "in2code/femanager",
"version": "5.0.1",
"version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/in2code-de/femanager.git",
"reference": "9acdbdf3556a1a4822dd6c36a681341ccfae824b"
"reference": "79f711d672936be78a52d6fb17aab1d72b48e430"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/in2code-de/femanager/zipball/9acdbdf3556a1a4822dd6c36a681341ccfae824b",
"reference": "9acdbdf3556a1a4822dd6c36a681341ccfae824b",
"url": "https://api.github.com/repos/in2code-de/femanager/zipball/79f711d672936be78a52d6fb17aab1d72b48e430",
"reference": "79f711d672936be78a52d6fb17aab1d72b48e430",
"shasum": ""
},
"require": {
......@@ -1278,7 +1278,7 @@
"sr_feuser_register",
"typo3"
],
"time": "2019-05-20T20:39:43+00:00"
"time": "2019-05-21T17:06:36+00:00"
},
{
"name": "in2code/userprofile",
......
......@@ -603,7 +603,7 @@ class Ldap implements \Psr\Log\LoggerAwareInterface
$fromTable = 'static_countries';
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($fromTable);
$ret = $queryBuilder->select($selectFields)
$ret = $queryBuilder->select(...$selectFields)
->from($fromTable)
->where(
$queryBuilder->expr()->eq('cn_short_en', $queryBuilder->createNamedParameter($countryName))
......
......@@ -288,7 +288,8 @@ class FeManagerHooks
protected function getTSConfiguration()
{
// init ConfigurationManager
$configurationManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$configurationManager = $objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
// load complete ts
$tsSettings = $configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
......
Markdown is supported
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