Resolved conflict while merging 38052

Indrani Sonawane · Indrani Sonawane · commit 4ce449089bcd · 2024-01-30T15:34:53.000+05:30
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -37,10 +37,10 @@ class PurgeCache
     /**
      * Batch size of the purge request.
      *
-     * Based on default Varnish 4 http_req_hdr_len size minus a 512 bytes margin for method,
+     * Based on default Varnish 6 http_req_hdr_len size minus a 512 bytes margin for method,
      * header name, line feeds etc.
      *
-     * @see https://varnish-cache.org/docs/4.1/reference/varnishd.html
+     * @see https://varnish-cache.org/docs/6.0/reference/varnishd.html
      *
      * @var int
      */
diff --git a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php
diff --git a/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish5.php b/app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish5.php
diff --git a/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php b/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
@@ -197,7 +197,7 @@ private function getOptionList()
                 null,
                 InputOption::VALUE_REQUIRED,
                 'The version of Varnish file',
-                VclTemplateLocator::VARNISH_SUPPORTED_VERSION_4
+                VclTemplateLocator::VARNISH_SUPPORTED_VERSION_6
             ),
             new InputOption(
                 self::GRACE_PERIOD_OPTION,
@@ -222,7 +222,7 @@ private function getOptionList()
     }
 
     /**
-     * Input vcl params
+     * Maps input keys to vcl parameters
      *
      * @param InputInterface $input
      * @return array
diff --git a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php
@@ -16,7 +16,7 @@ class ExportVarnishConfig extends \Magento\Backend\App\Action implements HttpGet
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::system';
+    public const ADMIN_RESOURCE = 'Magento_Backend::system';
 
     /**
      * @var \Magento\Backend\App\Response\Http\FileFactory
@@ -56,11 +56,8 @@ public function execute()
             case 6:
                 $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_6_CONFIGURATION_PATH);
                 break;
-            case 5:
-                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_5_CONFIGURATION_PATH);
-                break;
             default:
-                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);
+                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_6_CONFIGURATION_PATH);
                 break;
         }
         return $this->fileFactory->create($fileName, $content, DirectoryList::VAR_DIR);
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
@@ -57,11 +57,15 @@ class Config
     public const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
 
     /**
+     * @deprecated Varnish 5 is EOL
+     * @see VARNISH_6_CONFIGURATION_PATH
      * XML path to Varnish 5 config template path
      */
     public const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
 
     /**
+     * @deprecated Varnish 4 is EOL
+     * @see VARNISH_6_CONFIGURATION_PATH
      * XML path to Varnish 4 config template path
      */
     public const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
@@ -140,7 +144,8 @@ public function getTtl()
      *
      * @param string $vclTemplatePath
      * @return string
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
+     * @deprecated 100.2.0
+     * @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function getVclFile($vclTemplatePath)
     {
@@ -153,11 +158,8 @@ public function getVclFile($vclTemplatePath)
             case self::VARNISH_6_CONFIGURATION_PATH:
                 $version = 6;
                 break;
-            case self::VARNISH_5_CONFIGURATION_PATH:
-                $version = 5;
-                break;
             default:
-                $version = 4;
+                $version = 6;
         }
         $sslOffloadedHeader = $this->_scopeConfig->getValue(
             Request::XML_PATH_OFFLOADER_HEADER
@@ -179,7 +181,8 @@ public function getVclFile($vclTemplatePath)
      * Prepare data for VCL config
      *
      * @return array
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
+     * @deprecated 100.2.0
+     * @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     protected function _getReplacements()
     {
@@ -209,7 +212,8 @@ protected function _getReplacements()
      * }
      *
      * @return mixed|null|string
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
+     * @deprecated 100.2.0
+     * @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     protected function _getAccessList()
     {
@@ -235,7 +239,8 @@ protected function _getAccessList()
      * we have to convert "/pattern/iU" into "(?Ui)pattern"
      *
      * @return string
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
+     * @deprecated 100.2.0
+     * @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     protected function _getDesignExceptions()
     {
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php b/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
@@ -20,41 +20,46 @@
 class VclTemplateLocator implements VclTemplateLocatorInterface
 {
     /**
-     * XML path to Varnish 5 config template path
+     * XML path to Varnish 6 config template path
      */
     public const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
 
     /**
+     * @deprecated Varnish 5 is EOL
+     * @see VARNISH_6_CONFIGURATION_PATH
      * XML path to Varnish 5 config template path
      */
     public const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
 
     /**
+     * @deprecated Varnish 4 is EOL
+     * @see VARNISH_6_CONFIGURATION_PATH
      * XML path to Varnish 4 config template path
      */
     public const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
 
     /**
-     * Varnish 4 supported version
+     * @deprecated Varnish 4 is EOL
+     * @see VARNISH_SUPPORTED_VERSION_6
      */
     public const VARNISH_SUPPORTED_VERSION_4 = '4';
 
     /**
-     * Varnish 5 supported version
+     * @deprecated Varnish 5 is EOL
+     * @see VARNISH_SUPPORTED_VERSION_6
      */
     public const VARNISH_SUPPORTED_VERSION_5 = '5';
 
     /**
      * Varnish 6 supported version
+     * @see VARNISH_SUPPORTED_VERSION_6
      */
     public const VARNISH_SUPPORTED_VERSION_6 = '6';
 
     /**
      * @var array
      */
     private $supportedVarnishVersions = [
-        self::VARNISH_SUPPORTED_VERSION_4 => self::VARNISH_4_CONFIGURATION_PATH,
-        self::VARNISH_SUPPORTED_VERSION_5 => self::VARNISH_5_CONFIGURATION_PATH,
         self::VARNISH_SUPPORTED_VERSION_6 => self::VARNISH_6_CONFIGURATION_PATH,
     ];
 
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/ConfigTest.php b/app/code/Magento/PageCache/Test/Unit/Model/ConfigTest.php
@@ -183,7 +183,7 @@ public function testGetVcl(): void
             ->method('unserialize')
             ->with('serializedConfig')
             ->willReturn([['regexp' => '(?i)pattern', 'value' => 'value_for_pattern']]);
-        $test = $this->config->getVclFile(Config::VARNISH_5_CONFIGURATION_PATH);
+        $test = $this->config->getVclFile(Config::VARNISH_6_CONFIGURATION_PATH);
         $this->assertEquals(file_get_contents(__DIR__ . '/_files/result.vcl'), $test);
     }
 
diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml
@@ -49,19 +49,6 @@
                             <field id="caching_application">1</field>
                         </depends>
                     </field>
-                    <field id="export_button_version4" translate="label" type="button" sortOrder="35" showInDefault="1">
-                        <label>Export Configuration</label>
-                        <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4</frontend_model>
-                        <depends>
-                            <field id="caching_application">1</field>
-                        </depends>
-                    </field>
-                    <field id="export_button_version5" type="button" sortOrder="40" showInDefault="1">
-                        <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish5</frontend_model>
-                        <depends>
-                            <field id="caching_application">1</field>
-                        </depends>
-                    </field>
                     <field id="export_button_version6" type="button" sortOrder="40" showInDefault="1">
                         <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish6</frontend_model>
                         <depends>
diff --git a/app/code/Magento/PageCache/etc/config.xml b/app/code/Magento/PageCache/etc/config.xml
@@ -17,12 +17,6 @@
                 <varnish6>
                     <path>varnish6.vcl</path>
                 </varnish6>
-                <varnish5>
-                    <path>varnish5.vcl</path>
-                </varnish5>
-                <varnish4>
-                    <path>varnish4.vcl</path>
-                </varnish4>
                 <ttl>86400</ttl>
                 <handles_size>100</handles_size>
                 <caching_application>1</caching_application>
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php
@@ -13,17 +13,13 @@ class ExportTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     /**
      * Check Varnish export buttons
      * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export::_getElementHtml
-     * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish5::getVarnishVersion
-     * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4::getVarnishVersion
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      */
     public function testExportButtons()
     {
         $this->dispatch('backend/admin/system_config/edit/section/system/');
         $body = $this->getResponse()->getBody();
-        $this->assertStringContainsString('system_full_page_cache_varnish_export_button_version4', $body);
-        $this->assertStringContainsString('system_full_page_cache_varnish_export_button_version5', $body);
         $this->assertStringContainsString('[id^=system_full_page_cache_varnish_export_button_version]', $body);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Model/ConfigTest.php
@@ -85,7 +85,7 @@ protected function setUp(): void
     // @codingStandardsIgnoreEnd
     public function testGetVclFile()
     {
-        $result = $this->config->getVclFile(Config::VARNISH_5_CONFIGURATION_PATH);
+        $result = $this->config->getVclFile(Config::VARNISH_6_CONFIGURATION_PATH);
         $this->assertEquals(file_get_contents(__DIR__ . '/_files/result.vcl'), $result);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ class PurgeCache`
`37`	`37`	`/**`
`38`	`38`	`* Batch size of the purge request.`
`39`	`39`	`*`
`40`		`- * Based on default Varnish 4 http_req_hdr_len size minus a 512 bytes margin for method,`
	`40`	`+ * Based on default Varnish 6 http_req_hdr_len size minus a 512 bytes margin for method,`
`41`	`41`	`* header name, line feeds etc.`
`42`	`42`	`*`
`43`		`- * @see https://varnish-cache.org/docs/4.1/reference/varnishd.html`
	`43`	`+ * @see https://varnish-cache.org/docs/6.0/reference/varnishd.html`
`44`	`44`	`*`
`45`	`45`	`* @var int`
`46`	`46`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public function testGetVcl(): void`
`183`	`183`	`->method('unserialize')`
`184`	`184`	`->with('serializedConfig')`
`185`	`185`	`->willReturn([['regexp' => '(?i)pattern', 'value' => 'value_for_pattern']]);`
`186`		`- $test = $this->config->getVclFile(Config::VARNISH_5_CONFIGURATION_PATH);`
	`186`	`+ $test = $this->config->getVclFile(Config::VARNISH_6_CONFIGURATION_PATH);`
`187`	`187`	`$this->assertEquals(file_get_contents(__DIR__ . '/_files/result.vcl'), $test);`
`188`	`188`	`}`
`189`	`189`