Merge pull request #29 from BobMali/main

closes #28

Author: BobMali

.ddev/commands/web/install

@@ -21,7 +21,11 @@ composer req --dev --no-progress -n -W -d /var/www/html/ \
 
 cd /var/www/html/
 
-mysql -udb -pdb -hdb -e "DROP DATABASE IF EXISTS test; CREATE DATABASE test;"
+mysql \
+  --host=db \
+  --user=db \
+  --password=db \
+  --execute="DROP DATABASE IF EXISTS test; CREATE DATABASE test; GRANT ALL PRIVILEGES ON test.* TO 'db'@'%'; FLUSH PRIVILEGES;"
 
 vendor/bin/typo3 install:setup --database-user-name=db --database-user-password=db --database-host-name=db --database-name=test --use-existing-database --force
 vendor/bin/typo3 configuration:set 'BE/debug' 1
@@ -33,6 +37,7 @@ vendor/bin/typo3 configuration:set 'MAIL/transport' 'smtp'
 vendor/bin/typo3 configuration:set 'MAIL/transport_smtp_server' 'localhost:1025'
 vendor/bin/typo3 configuration:set 'GFX/processor' 'ImageMagick'
 vendor/bin/typo3 configuration:set 'GFX/processor_path' '/usr/bin/'
+vendor/bin/typo3 backend:createadmin admin admin123
 
 sed -i -e "s/base: ht\//base: \//g" /var/www/html/config/sites/main/config.yaml
 sed -i -e 's/base: \/en\//base: \//g' /var/www/html/config/sites/main/config.yaml

Classes/Utility/Settings.php

@@ -32,8 +32,9 @@ class Settings extends AbstractEncryptionUtility
      */
     public static function renderConfigurationArray(array $settings, $makeSettingsRenderable = false, ServerRequestInterface $request = null)
     {
+        // @todo: this should be adjusted to use currentContentObject attribute from server request with v13
         /** @var ContentObjectRenderer|null $contentObject */
-        $contentObject = ($request ?? $GLOBALS['TYPO3_REQUEST'])?->getAttribute('currentContentObject');
+        $contentObject = self::getConfigurationManagerInterface()->getContentObject();
         if ($contentObject === null) {
             // This is a workaround until custom validators contain the current request to pass on to the current method
             return $makeSettingsRenderable ? self::makeConfigurationArrayRenderable($settings) : $settings;