#6 Allow different behavior for homepage

nenes25 · Apr 4, 2022 · 3c49df8 · 3c49df8
1 parent 170cd9b
commit 3c49df8
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 35 deletions.
diff --git a/Block/Page/Canonical.php b/Block/Page/Canonical.php
@@ -50,7 +50,7 @@ public function getCanonicalPageUrl()
     {
         if (null !== $this->getPage() && $this->_helper->isCanonicalUrlEnable()) {
             if ($this->isHomePage()) {
-                if ($this->_helper->useTrailingSlash()) {
+                if ($this->_helper->useTrailingSlashForHomepage()) {
                     $url = $this->getUrl('');
                 } else {
                     $url = rtrim($this->getUrl(''), '/');

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -15,6 +15,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const XML_PATH_CANONICAL_USE_TRAILING_SLASH = 'cms/canonical/use_trailing_slash';
 
+    /**
+     * Cms canonical use trailing slash for homepage config path
+     */
+    const XML_PATH_CANONICAL_USE_TRAILING_SLASH_HOMEPAGE = 'cms/canonical/use_trailing_slash_homepage';
+
     /**
      * Return if canonical url is enabled
      * @return bool
@@ -38,4 +43,16 @@ public function useTrailingSlash()
             ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Return if we use the trailing slash for the homepage
+     * @return bool
+     */
+    public function useTrailingSlashForHomepage()
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_CANONICAL_USE_TRAILING_SLASH_HOMEPAGE,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
-    <system>
-        <!-- Ajout d'un nouveau groupe dans la section cms existante -->
-        <section id="cms">
-            <group id="canonical" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1"
-                   showInStore="1">
-                <label>Canonical urls</label>
-                <field id="enable_canonical" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1"
-                       showInStore="1" canRestore="1">
-                    <label>Enable Canonical for cms pages</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-                <field id="use_trailing_slash" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="1"
-                       showInStore="1" canRestore="1">
-                    <label>Use trailing slash</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-            </group>
-        </section>
-    </system>
-</config>
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="cms">
+            <group id="canonical" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1"
+                   showInStore="1">
+                <label>Canonical urls</label>
+                <field id="enable_canonical" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1"
+                       showInStore="1" canRestore="1">
+                    <label>Enable Canonical for cms pages</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="use_trailing_slash" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="1"
+                       showInStore="1" canRestore="1">
+                    <label>Use trailing slash</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="use_trailing_slash_homepage" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="1"
+                       showInStore="1" canRestore="1">
+                    <label>Use trailing slash for homepage</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/etc/config.xml b/etc/config.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
-    <default>
-        <cms>
-            <canonical>
-                <enable_canonical>1</enable_canonical>
-                <use_trailing_slash>0</use_trailing_slash>
-            </canonical>
-        </cms>
-    </default>
-</config>
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <cms>
+            <canonical>
+                <enable_canonical>1</enable_canonical>
+                <use_trailing_slash>0</use_trailing_slash>
+                <use_trailing_slash_homepage>0</use_trailing_slash_homepage>
+            </canonical>
+        </cms>
+    </default>
+</config>