minor fixes

ot_templating/Classes/ViewHelpers/Social/MetadataViewHelper.php

@@ -36,7 +36,7 @@ class MetadataViewHelper extends OtAbstractViewHelper
     /**
      * @var \TYPO3\CMS\Extbase\Service\ImageService
      */
-    protected $imageService;
+    protected \TYPO3\CMS\Extbase\Service\ImageService $imageService;
 
     /**
      * @param \TYPO3\CMS\Extbase\Service\ImageService $imageService
@@ -58,18 +58,6 @@ class MetadataViewHelper extends OtAbstractViewHelper
             'Name of the returned array',
             true
         );
-        $this->registerArgument(
-            'title',
-            'string',
-            'Title of the page',
-            false
-        );
-        $this->registerArgument(
-            'description',
-            'string',
-            'Description of the page',
-            false
-        );
     }
 
     /**
@@ -114,12 +102,10 @@ class MetadataViewHelper extends OtAbstractViewHelper
      * @return string
      * @throws ApiRequestException|\Exception
      */
-    public function render()
+    public function render(): string
     {
         // Get current settings
         $as = $this->arguments['as'];
-        $forcedTitle = $this->arguments['title'];
-        $forcedDescription = $this->arguments['description'];
 
         $uri = $GLOBALS['TYPO3_REQUEST']->getUri();
         $page = $GLOBALS['TSFE']->page;
@@ -151,12 +137,13 @@ class MetadataViewHelper extends OtAbstractViewHelper
             $data['ogPageDescription'] = $page['og_description'];
         }
 
-        // Determine OG image (we use the typo3 builtin meta tags generator for now)
-//        if ($forcedImageUrl != null) {
-//            $data['ogImageUrl'] = $forcedImageUrl;
-//        } elseif ($page['og_image'] == 1) {
-//            $data['ogImageUrl'] = $this->getFalImagePath('pages', 'og_image', $page['uid']);
-//        }
+        // Determine OG image
+        if ($forcedImageUrl != null) {
+            $data['ogImageUrl'] = $forcedImageUrl;
+        } elseif ($page['og_image'] == 1) {
+            //  we use the typo3 builtin meta tags generator for now
+            // $data['ogImageUrl'] = $this->getFalImagePath('pages', 'og_image', $page['uid']);
+        }
 
         // Determine twitter title
         if ($forcedTitle != null) {
@@ -174,12 +161,13 @@ class MetadataViewHelper extends OtAbstractViewHelper
             $data['twitterPageDescription'] = $page['twitter_description'];
         }
 
-        // Determine twitter image (we use the typo3 builtin meta tags generator for now)
-//        if ($forcedImageUrl != null) {
-//            $data['twitterImageUrl'] = $forcedImageUrl;
-//        } elseif ($page['twitter_image'] == 1) {
-//            $data['twitterImageUrl'] = $this->getFalImagePath('pages', 'twitter_image', $page['uid']);
-//        }
+        // Determine twitter image
+        if ($forcedImageUrl != null) {
+            $data['twitterImageUrl'] = $forcedImageUrl;
+        } elseif ($page['twitter_image'] == 1) {
+            //  we use the typo3 builtin meta tags generator for now
+            // $data['twitterImageUrl'] = $this->getFalImagePath('pages', 'twitter_image', $page['uid']);
+        }
 
         $variables = [$as => $data];
         return $this->renderChildrenWithVariables($variables);

ot_templating/Resources/Private/Partials/Classic/MetaSocial.html

@@ -9,12 +9,9 @@
      <f:if condition="{meta.ogPageDescription}">
           <v:page.header.meta property="og:description" content="{meta.ogPageDescription}"/>
      </f:if>
-     <f:comment>
-          <!-- We use the typo3 builtin meta tags generator for now -->
-          <!--     <f:if condition="{meta.ogImageUrl}">-->
-          <!--          <v:page.header.meta property="og:image" content="{meta.ogImageUrl}"/>-->
-          <!--     </f:if>-->
-     </f:comment>
+     <f:if condition="{meta.ogImageUrl}">
+          <v:page.header.meta property="og:image" content="{meta.ogImageUrl}"/>
+     </f:if>
 
      <f:comment><!-- Twitter Meta Tags --></f:comment>
      <v:page.header.meta name="twitter:card" content="summary_large_image"/>
@@ -24,11 +21,8 @@
      <f:if condition="{meta.twitterPageDescription}">
           <v:page.header.meta name="twitter:description" content="{meta.twitterPageDescription}"/>
      </f:if>
-     <f:comment>
-          <!-- We use the typo3 builtin meta tags generator for now -->
-          <!--     <f:if condition="{meta.twitterImageUrl}">-->
-          <!--          <v:page.header.meta name="twitter:image" content="{meta.twitterImageUrl}"/>-->
-          <!--     </f:if>-->
-     </f:comment>
+     <f:if condition="{meta.twitterImageUrl}">
+          <v:page.header.meta name="twitter:image" content="{meta.twitterImageUrl}"/>
+     </f:if>
 
 </ot:social.metadata>

ot_templating/Resources/Private/Partials/Modern/MetaSocial.html

@@ -9,12 +9,9 @@
      <f:if condition="{meta.ogPageDescription}">
           <v:page.header.meta property="og:description" content="{meta.ogPageDescription}"/>
      </f:if>
-     <f:comment>
-          <!-- We use the typo3 builtin meta tags generator for now -->
-          <!--     <f:if condition="{meta.ogImageUrl}">-->
-          <!--          <v:page.header.meta property="og:image" content="{meta.ogImageUrl}"/>-->
-          <!--     </f:if>-->
-     </f:comment>
+     <f:if condition="{meta.ogImageUrl}">
+          <v:page.header.meta property="og:image" content="{meta.ogImageUrl}"/>
+     </f:if>
 
      <f:comment><!-- Twitter Meta Tags --></f:comment>
      <v:page.header.meta name="twitter:card" content="summary_large_image"/>
@@ -24,11 +21,8 @@
      <f:if condition="{meta.twitterPageDescription}">
           <v:page.header.meta name="twitter:description" content="{meta.twitterPageDescription}"/>
      </f:if>
-     <f:comment>
-          <!-- We use the typo3 builtin meta tags generator for now -->
-          <!--     <f:if condition="{meta.twitterImageUrl}">-->
-          <!--          <v:page.header.meta name="twitter:image" content="{meta.twitterImageUrl}"/>-->
-          <!--     </f:if>-->
-     </f:comment>
+     <f:if condition="{meta.twitterImageUrl}">
+          <v:page.header.meta name="twitter:image" content="{meta.twitterImageUrl}"/>
+     </f:if>
 
 </ot:social.metadata>