Merge pull request #48 from Yoast/task/neos-5-compatibility

TASK: Neos 5 compatibility and update yoastseo to 1.59.0

Classes/Controller/DataController.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Yoast\YoastSeoForNeos\Controller;
 
 use Neos\Cache\Frontend\VariableFrontend;
@@ -55,7 +57,7 @@ class DataController extends ActionController
      *
      * @Flow\SkipCsrfProtection
      */
-    public function fetchTranslationsAction()
+    public function fetchTranslationsAction(): void
     {
         $interfaceLanguage = $this->userService->getInterfaceLanguage();
         $locale = $this->getValidLocale($interfaceLanguage);
@@ -82,7 +84,6 @@ public function fetchTranslationsAction()
                 'error' => $error ? $error : 'No translation available for language ' . $interfaceLanguage
             ]);
         }
-
     }
 
     /**
@@ -91,7 +92,7 @@ public function fetchTranslationsAction()
      * @param string $interfaceLanguage
      * @return string
      */
-    protected function getValidLocale($interfaceLanguage)
+    protected function getValidLocale(string $interfaceLanguage): string
     {
         if (array_key_exists($interfaceLanguage, $this->languageToLocaleMapping)) {
             return $this->languageToLocaleMapping[$interfaceLanguage];

Classes/Controller/PageController.php

@@ -1,22 +1,36 @@
 <?php
+declare(strict_types=1);
+
 namespace Yoast\YoastSeoForNeos\Controller;
 
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Flow\Mvc\Controller\ActionController;
+use Neos\Flow\Mvc\Exception\StopActionException;
 
 class PageController extends ActionController
 {
 
-    /**
+    /**                                                                w
      * Redirects request to the given node in preview mode without the neos backend
      *
      * @param NodeInterface $node
-     * @throws \Neos\Flow\Mvc\Exception\StopActionException
+     * @throws StopActionException
      */
-    public function renderPreviewPageAction(NodeInterface $node)
+    public function renderPreviewPageAction(NodeInterface $node): void
     {
-        $this->response->getHeaders()->setCacheControlDirective('no-cache');
-        $this->response->getHeaders()->setCacheControlDirective('no-store');
+        if (method_exists($this->response, 'setComponentParameter')) {
+            /** @noinspection PhpUndefinedClassInspection */
+            /** @noinspection PhpUndefinedNamespaceInspection */
+            $this->response->setComponentParameter(Neos\Flow\Http\Component\SetHeaderComponent::class, 'Cache-Control', [
+                'no-cache',
+                'no-store'
+            ]);
+        } else {
+            /** @noinspection PhpUndefinedMethodInspection */
+            $this->response->getHeaders()->setCacheControlDirective('no-cache');
+            /** @noinspection PhpUndefinedMethodInspection */
+            $this->response->getHeaders()->setCacheControlDirective('no-store');
+        }
         $this->redirect('show', 'Frontend\Node', 'Neos.Neos', [
             'node' => $node,
             'yoastSeoPreviewMode' => true,

Classes/FusionObjects/BaseUriImplementation.php

@@ -1,20 +1,26 @@
 <?php
+declare(strict_types=1);
+
 namespace Yoast\YoastSeoForNeos\FusionObjects;
 
+use Neos\Flow\Mvc\Routing\Exception\MissingActionNameException;
+use Neos\Flow\Property\Exception as PropertyException;
+use Neos\Flow\Security\Exception as SecurityException;
 use Neos\Neos\Exception as NeosException;
+use Neos\Neos\Fusion\NodeUriImplementation;
 
 /**
  * Create a link to a node and trim the format.
  * Also enforce a slash at the end.
  */
-class BaseUriImplementation extends \Neos\Neos\Fusion\NodeUriImplementation
+class BaseUriImplementation extends NodeUriImplementation
 {
     /**
      * If true, shortcuts will be resolved
      *
-     * @return boolean
+     * @return bool
      */
-    public function resolveShortcuts()
+    public function resolveShortcuts(): bool
     {
         return (boolean)$this->fusionValue('resolveShortcuts');
     }
@@ -24,11 +30,11 @@ public function resolveShortcuts()
      *
      * @return string The rendered URI or NULL if no URI could be resolved for the given node
      * @throws NeosException
-     * @throws \Neos\Flow\Mvc\Routing\Exception\MissingActionNameException
-     * @throws \Neos\Flow\Property\Exception
-     * @throws \Neos\Flow\Security\Exception
+     * @throws MissingActionNameException
+     * @throws PropertyException
+     * @throws SecurityException
      */
-    public function evaluate()
+    public function evaluate(): string
     {
         $baseNode = null;
         $baseNodeName = $this->getBaseNodeName() ?: 'documentNode';

Classes/FusionObjects/InterfaceLanguageImplementation.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Yoast\YoastSeoForNeos\FusionObjects;
 
 use Neos\Flow\Annotations as Flow;
@@ -22,7 +24,7 @@ class InterfaceLanguageImplementation extends AbstractFusionObject
      *
      * @return string
      */
-    public function evaluate()
+    public function evaluate(): string
     {
         return $this->userService->getInterfaceLanguage();
     }

Resources/Private/Fusion/Override/LangAttribute.fusion

@@ -1,6 +1,6 @@
 prototype(Neos.Seo:LangAttribute) {
     # Always render lang attribute to be able to use it for the analyzer
     value.@process.addFallback = ${value ? value : Configuration.setting('Yoast.YoastSeoForNeos.defaultContentLocale')}
-    @if.languageDimensionExists >
-    @if.onlyRenderWhenInLiveWorkspace >
+    @if.languageDimensionExists = true
+    @if.onlyRenderWhenInLiveWorkspace = true
 }