Skip to content

Commit 1e0b13d

Browse files
authored
Remove Varnish 4/5 support
Fix static test failures
1 parent 0228734 commit 1e0b13d

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,32 @@ class GenerateVclCommand extends Command
2929
/**
3030
* Access list option name
3131
*/
32-
const ACCESS_LIST_OPTION = 'access-list';
32+
public const ACCESS_LIST_OPTION = 'access-list';
3333

3434
/**
3535
* Backend host option name
3636
*/
37-
const BACKEND_HOST_OPTION = 'backend-host';
37+
public const BACKEND_HOST_OPTION = 'backend-host';
3838

3939
/**
4040
* Backend port option name
4141
*/
42-
const BACKEND_PORT_OPTION = 'backend-port';
42+
public const BACKEND_PORT_OPTION = 'backend-port';
4343

4444
/**
4545
* Varnish version option name
4646
*/
47-
const EXPORT_VERSION_OPTION = 'export-version';
47+
public const EXPORT_VERSION_OPTION = 'export-version';
4848

4949
/**
5050
* Grace period option name
5151
*/
52-
const GRACE_PERIOD_OPTION = 'grace-period';
52+
public const GRACE_PERIOD_OPTION = 'grace-period';
5353

5454
/**
5555
* Output file option name
5656
*/
57-
const OUTPUT_FILE_OPTION = 'output-file';
57+
public const OUTPUT_FILE_OPTION = 'output-file';
5858

5959
/**
6060
* @var \Magento\Framework\Filesystem\Directory\WriteFactory
@@ -211,6 +211,8 @@ private function getOptionList()
211211
}
212212

213213
/**
214+
* Maps input keys to vcl parameters
215+
*
214216
* @param InputInterface $input
215217
* @return array
216218
*/

app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ExportVarnishConfig extends \Magento\Backend\App\Action implements HttpGet
1616
/**
1717
* Authorization level of a basic admin session
1818
*/
19-
const ADMIN_RESOURCE = 'Magento_Backend::system';
19+
public const ADMIN_RESOURCE = 'Magento_Backend::system';
2020

2121
/**
2222
* @var \Magento\Backend\App\Response\Http\FileFactory

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ public function getTtl()
144144
*
145145
* @param string $vclTemplatePath
146146
* @return string
147-
* @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
147+
* @deprecated 100.2.0
148+
* @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
148149
*/
149150
public function getVclFile($vclTemplatePath)
150151
{
@@ -180,7 +181,8 @@ public function getVclFile($vclTemplatePath)
180181
* Prepare data for VCL config
181182
*
182183
* @return array
183-
* @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
184+
* @deprecated 100.2.0
185+
* @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
184186
*/
185187
protected function _getReplacements()
186188
{
@@ -210,7 +212,8 @@ protected function _getReplacements()
210212
* }
211213
*
212214
* @return mixed|null|string
213-
* @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
215+
* @deprecated 100.2.0
216+
* @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
214217
*/
215218
protected function _getAccessList()
216219
{
@@ -236,7 +239,8 @@ protected function _getAccessList()
236239
* we have to convert "/pattern/iU" into "(?Ui)pattern"
237240
*
238241
* @return string
239-
* @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
242+
* @deprecated 100.2.0
243+
* @see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
240244
*/
241245
protected function _getDesignExceptions()
242246
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ class VclTemplateLocator implements VclTemplateLocatorInterface
2121
/**
2222
* XML path to Varnish 6 config template path
2323
*/
24-
const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
24+
public const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
2525

2626
/**
2727
* @deprecated Varnish 5 is EOL
2828
* @see VARNISH_6_CONFIGURATION_PATH
2929
* XML path to Varnish 5 config template path
3030
*/
31-
const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
31+
public const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
3232

3333
/**
3434
* @deprecated Varnish 4 is EOL
3535
* @see VARNISH_6_CONFIGURATION_PATH
3636
* XML path to Varnish 4 config template path
3737
*/
38-
const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
38+
public const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
3939

4040
/**
4141
* @deprecated Varnish 4 is EOL
4242
* @see VARNISH_SUPPORTED_VERSION_6
4343
*/
44-
const VARNISH_SUPPORTED_VERSION_4 = '4';
44+
public const VARNISH_SUPPORTED_VERSION_4 = '4';
4545

4646
/**
4747
* @deprecated Varnish 5 is EOL
4848
* @see VARNISH_SUPPORTED_VERSION_6
4949
*/
50-
const VARNISH_SUPPORTED_VERSION_5 = '5';
50+
public const VARNISH_SUPPORTED_VERSION_5 = '5';
5151

5252
/**
5353
* Varnish 6 supported version
5454
* @see VARNISH_SUPPORTED_VERSION_6
5555
*/
56-
const VARNISH_SUPPORTED_VERSION_6 = '6';
56+
public const VARNISH_SUPPORTED_VERSION_6 = '6';
5757

5858
/**
5959
* @var array

0 commit comments

Comments
 (0)