Fixed static test failures

Author: abhattGlo

app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php

@@ -29,36 +29,36 @@ class GenerateVclCommand extends Command
     /**
      * Access list option name
      */
-    const ACCESS_LIST_OPTION = 'access-list';
+    public const ACCESS_LIST_OPTION = 'access-list';
 
     /**
      * Backend host option name
      */
-    const BACKEND_HOST_OPTION = 'backend-host';
+    public const BACKEND_HOST_OPTION = 'backend-host';
 
     /**
      * Backend port option name
      */
-    const BACKEND_PORT_OPTION = 'backend-port';
+    public const BACKEND_PORT_OPTION = 'backend-port';
 
     /**
      * Varnish version option name
      */
-    const EXPORT_VERSION_OPTION = 'export-version';
+    public const EXPORT_VERSION_OPTION = 'export-version';
 
     /**
      * Grace period option name
      */
-    const GRACE_PERIOD_OPTION = 'grace-period';
+    public const GRACE_PERIOD_OPTION = 'grace-period';
 
     /**
      * Input file option name
      */
-    const INPUT_FILE_OPTION = 'input-file';
+    public const INPUT_FILE_OPTION = 'input-file';
     /**
      * Output file option name
      */
-    const OUTPUT_FILE_OPTION = 'output-file';
+    public const OUTPUT_FILE_OPTION = 'output-file';
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteFactory
@@ -222,6 +222,8 @@ private function getOptionList()
     }
 
     /**
+     * Input vcl params
+     *
      * @param InputInterface $input
      * @return array
      */

app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php

@@ -22,32 +22,32 @@ class VclTemplateLocator implements VclTemplateLocatorInterface
     /**
      * XML path to Varnish 5 config template path
      */
-    const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
+    public const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
 
     /**
      * XML path to Varnish 5 config template path
      */
-    const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
+    public const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
 
     /**
      * XML path to Varnish 4 config template path
      */
-    const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
+    public const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
 
     /**
      * Varnish 4 supported version
      */
-    const VARNISH_SUPPORTED_VERSION_4 = '4';
+    public const VARNISH_SUPPORTED_VERSION_4 = '4';
 
     /**
      * Varnish 5 supported version
      */
-    const VARNISH_SUPPORTED_VERSION_5 = '5';
+    public const VARNISH_SUPPORTED_VERSION_5 = '5';
 
     /**
      * Varnish 6 supported version
      */
-    const VARNISH_SUPPORTED_VERSION_6 = '6';
+    public const VARNISH_SUPPORTED_VERSION_6 = '6';
 
     /**
      * @var array
@@ -86,8 +86,12 @@ class VclTemplateLocator implements VclTemplateLocatorInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param DirectoryList $directoryList
      */
-    public function __construct(Reader $reader, ReadFactory $readFactory, ScopeConfigInterface $scopeConfig, DirectoryList $directoryList)
-    {
+    public function __construct(
+        Reader $reader,
+        ReadFactory $readFactory,
+        ScopeConfigInterface $scopeConfig,
+        DirectoryList $directoryList
+    ) {
         $this->reader = $reader;
         $this->readFactory = $readFactory;
         $this->scopeConfig = $scopeConfig;
@@ -99,9 +103,8 @@ public function __construct(Reader $reader, ReadFactory $readFactory, ScopeConfi
      */
     public function getTemplate($version, $inputFile = null)
     {
-        if (is_null($inputFile)) {
-            $moduleEtcPath  = $this->reader->getModuleDir(Dir::MODULE_ETC_DIR,
-                'Magento_PageCache');
+        if ($inputFile === null) {
+            $moduleEtcPath  = $this->reader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_PageCache');
             $configFilePath = $moduleEtcPath . '/' . $this->scopeConfig->getValue($this->getVclTemplatePath($version));
             $directoryRead  = $this->readFactory->create($moduleEtcPath);
             $configFilePath = $directoryRead->getRelativePath($configFilePath);

app/code/Magento/PageCache/Model/VclGeneratorInterface.php

@@ -16,7 +16,7 @@ interface VclGeneratorInterface
      * Return generated varnish.vcl configuration file
      *
      * @param int $version
-     * $param string $inputFile
+     * @param string $inputFile
      * @return string
      * @since 100.2.0
      */

app/code/Magento/PageCache/Model/VclTemplateLocatorInterface.php

@@ -9,7 +9,7 @@
 use Magento\PageCache\Exception\UnsupportedVarnishVersion;
 
 /**
- * Vcl template locator interface
+ * Vcl template locator
  *
  * @api
  * @since 100.2.0