[MERGE] Branch 'master' of https://phabricator.glanzstueck.agency/source/typo3-template_aide

Classes/Traits/DependencyInjectionTrait.php

@@ -88,7 +88,7 @@ trait DependencyInjectionTrait
         );
         $frameworkConfiguration = $this->configurationManager->getConfiguration(
             ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK,
-            $this->getExtensionKey()
+            str_replace('_', '', $this->getExtensionKey())
         );
         $this->configurationManager->setConfiguration(
             $frameworkConfiguration

Classes/Utility/MailUtility.php

@@ -280,6 +280,13 @@ class MailUtility
                     $bodydataText[] = $textRow;
                     $bodydataHtml[] = $htmlRow;
                     break;
+                case 'attachment':
+                    $mail->attach(new \Swift_Attachment(
+                        $row['data'][0],
+                        $row['data'][1],
+                        $row['data'][2]
+                    ));
+                    break;
                 case 'attachmentBase64':
                     $attachmentdata = explode(',', $row['data']);
                     preg_match('/\w*:(.*);\w*/', $attachmentdata[0], $matches);

Classes/Utility/SiteConfigUtility.php

@@ -27,8 +27,10 @@ class SiteConfigUtility
      * @var string $path
      * @return string
      */
-    public static function getByPath($path)
-    {
+    public static function getByPath(
+        $path,
+        $limitToSiteConfig = true
+    ) {
         $pathParts = explode('.', $path);
         $objectManager = GeneralUtility::makeInstance(
             ObjectManager::class
@@ -40,7 +42,10 @@ class SiteConfigUtility
             ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
         );
         $typoscript = GeneralUtility::removeDotsFromTS($typoscript);
+        $siteConfig = $typoscript;
+        if ($limitToSiteConfig) {
             $siteConfig = $typoscript['config']['site'];
+        }
         $current = &$siteConfig;
         foreach ($pathParts as $key) {
             $current = &$current[$key];

Resources/Private/PageTSConfig/default.tsconfig

@@ -1 +1,5 @@
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:templates_aide/Resources/Private/PageTSConfig/lib/layout.tsconfig">
+
+[applicationContext = Development]
+TCAdefaults.pages.hidden = 0
+[end]