Skip to content

Commit 422a9bd

Browse files
committed
closes #28
1 parent d9cc80c commit 422a9bd

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.ddev/commands/web/install

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ composer req --dev --no-progress -n -W -d /var/www/html/ \
2121

2222
cd /var/www/html/
2323

24+
mysql \
25+
--host=db \
26+
--user=db \
27+
--password=db \
28+
--execute="DROP DATABASE IF EXISTS test; CREATE DATABASE test; GRANT ALL PRIVILEGES ON test.* TO 'db'@'%'; FLUSH PRIVILEGES;"
29+
2430
vendor/bin/typo3 install:setup --database-user-name=db --database-user-password=db --database-host-name=db --database-name=test --use-existing-database --force
2531
vendor/bin/typo3 configuration:set 'BE/debug' 1
2632
vendor/bin/typo3 configuration:set 'FE/debug' 1
@@ -31,6 +37,7 @@ vendor/bin/typo3 configuration:set 'MAIL/transport' 'smtp'
3137
vendor/bin/typo3 configuration:set 'MAIL/transport_smtp_server' 'localhost:1025'
3238
vendor/bin/typo3 configuration:set 'GFX/processor' 'ImageMagick'
3339
vendor/bin/typo3 configuration:set 'GFX/processor_path' '/usr/bin/'
40+
vendor/bin/typo3 backend:createadmin admin admin123
3441

3542
sed -i -e "s/base: ht\//base: \//g" /var/www/html/config/sites/main/config.yaml
3643
sed -i -e 's/base: \/en\//base: \//g' /var/www/html/config/sites/main/config.yaml

Classes/Utility/Settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ class Settings extends AbstractEncryptionUtility
3232
*/
3333
public static function renderConfigurationArray(array $settings, $makeSettingsRenderable = false, ServerRequestInterface $request = null)
3434
{
35+
// @todo: this should be adjusted to use currentContentObject attribute from server request with v13
3536
/** @var ContentObjectRenderer|null $contentObject */
36-
$contentObject = ($request ?? $GLOBALS['TYPO3_REQUEST'])?->getAttribute('currentContentObject');
37+
$contentObject = self::getConfigurationManagerInterface()->getContentObject();
3738
if ($contentObject === null) {
3839
return [];
3940
}

0 commit comments

Comments
 (0)