Skip to content

Commit 3bed679

Browse files
anzinanzin
committed
Fixed Static Test
1 parent a6a659f commit 3bed679

File tree

4 files changed

+42
-52
lines changed

4 files changed

+42
-52
lines changed

‎app/code/Magento/Store/Model/Store.php

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -45,89 +45,89 @@ class Store extends AbstractExtensibleModel implements
4545
/**
4646
* Store Id key name
4747
*/
48-
const STORE_ID = 'store_id';
48+
public const STORE_ID = 'store_id';
4949

5050
/**
5151
* Entity name
5252
*/
53-
const ENTITY = 'store';
53+
public const ENTITY = 'store';
5454

5555
/**
5656
* Parameter used to determine app context.
5757
*/
58-
const CUSTOM_ENTRY_POINT_PARAM = 'custom_entry_point';
58+
public const CUSTOM_ENTRY_POINT_PARAM = 'custom_entry_point';
5959

6060
/**#@+
6161
* Configuration paths
6262
*/
63-
const XML_PATH_STORE_IN_URL = 'web/url/use_store';
63+
public const XML_PATH_STORE_IN_URL = 'web/url/use_store';
6464

65-
const XML_PATH_USE_REWRITES = 'web/seo/use_rewrites';
65+
public const XML_PATH_USE_REWRITES = 'web/seo/use_rewrites';
6666

67-
const XML_PATH_UNSECURE_BASE_URL = 'web/unsecure/base_url';
67+
public const XML_PATH_UNSECURE_BASE_URL = 'web/unsecure/base_url';
6868

69-
const XML_PATH_SECURE_BASE_URL = 'web/secure/base_url';
69+
public const XML_PATH_SECURE_BASE_URL = 'web/secure/base_url';
7070

71-
const XML_PATH_SECURE_IN_FRONTEND = 'web/secure/use_in_frontend';
71+
public const XML_PATH_SECURE_IN_FRONTEND = 'web/secure/use_in_frontend';
7272

73-
const XML_PATH_SECURE_IN_ADMINHTML = 'web/secure/use_in_adminhtml';
73+
public const XML_PATH_SECURE_IN_ADMINHTML = 'web/secure/use_in_adminhtml';
7474

75-
const XML_PATH_ENABLE_HSTS = 'web/secure/enable_hsts';
75+
public const XML_PATH_ENABLE_HSTS = 'web/secure/enable_hsts';
7676

77-
const XML_PATH_ENABLE_UPGRADE_INSECURE = 'web/secure/enable_upgrade_insecure';
77+
public const XML_PATH_ENABLE_UPGRADE_INSECURE = 'web/secure/enable_upgrade_insecure';
7878

79-
const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';
79+
public const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';
8080

81-
const XML_PATH_UNSECURE_BASE_LINK_URL = 'web/unsecure/base_link_url';
81+
public const XML_PATH_UNSECURE_BASE_LINK_URL = 'web/unsecure/base_link_url';
8282

83-
const XML_PATH_SECURE_BASE_STATIC_URL = 'web/secure/base_static_url';
83+
public const XML_PATH_SECURE_BASE_STATIC_URL = 'web/secure/base_static_url';
8484

85-
const XML_PATH_UNSECURE_BASE_STATIC_URL = 'web/unsecure/base_static_url';
85+
public const XML_PATH_UNSECURE_BASE_STATIC_URL = 'web/unsecure/base_static_url';
8686

87-
const XML_PATH_SECURE_BASE_MEDIA_URL = 'web/secure/base_media_url';
87+
public const XML_PATH_SECURE_BASE_MEDIA_URL = 'web/secure/base_media_url';
8888

89-
const XML_PATH_UNSECURE_BASE_MEDIA_URL = 'web/unsecure/base_media_url';
89+
public const XML_PATH_UNSECURE_BASE_MEDIA_URL = 'web/unsecure/base_media_url';
9090

91-
const XML_PATH_PRICE_SCOPE = 'catalog/price/scope';
91+
public const XML_PATH_PRICE_SCOPE = 'catalog/price/scope';
9292

9393
/**#@-*/
9494

9595
/**#@+
9696
* Price scope constants
9797
*/
98-
const PRICE_SCOPE_GLOBAL = 0;
98+
public const PRICE_SCOPE_GLOBAL = 0;
9999

100-
const PRICE_SCOPE_WEBSITE = 1;
100+
public const PRICE_SCOPE_WEBSITE = 1;
101101

102102
/**#@-*/
103103

104-
const ADMIN_CODE = 'admin';
104+
public const ADMIN_CODE = 'admin';
105105

106106
/**
107107
* Tag to use to cache stores.
108108
*/
109-
const CACHE_TAG = 'store';
109+
public const CACHE_TAG = 'store';
110110

111111
/**
112112
* Script name, which returns all the images
113113
*/
114-
const MEDIA_REWRITE_SCRIPT = 'get.php/';
114+
public const MEDIA_REWRITE_SCRIPT = 'get.php/';
115115

116116
/**
117117
* A placeholder for generating base URL
118118
*/
119-
const BASE_URL_PLACEHOLDER = '{{base_url}}';
119+
public const BASE_URL_PLACEHOLDER = '{{base_url}}';
120120

121121
/**
122122
* Identifier of default store
123123
* used for loading data of default scope
124124
*/
125-
const DEFAULT_STORE_ID = 0;
125+
public const DEFAULT_STORE_ID = 0;
126126

127127
/**
128128
* Default store Id (for install)
129129
*/
130-
const DISTRO_STORE_ID = 1;
130+
public const DISTRO_STORE_ID = 1;
131131

132132
/**
133133
* @var \Magento\Framework\App\Cache\Type\Config
@@ -156,8 +156,6 @@ class Store extends AbstractExtensibleModel implements
156156
protected $_eventObject = 'store';
157157

158158
/**
159-
* Price filter
160-
*
161159
* @var \Magento\Directory\Model\Currency\Filter
162160
*/
163161
protected $_priceFilter;
@@ -184,15 +182,11 @@ class Store extends AbstractExtensibleModel implements
184182
protected $_dirCache = [];
185183

186184
/**
187-
* URL cache
188-
*
189185
* @var array
190186
*/
191187
protected $_urlCache = [];
192188

193189
/**
194-
* Base URL cache
195-
*
196190
* @var array
197191
*/
198192
protected $_baseUrlCache = [];
@@ -256,8 +250,6 @@ class Store extends AbstractExtensibleModel implements
256250
protected $_configDataResource;
257251

258252
/**
259-
* Core file storage database
260-
*
261253
* @var \Magento\MediaStorage\Helper\File\Storage\Database
262254
*/
263255
protected $_coreFileStorageDatabase = null;
@@ -666,7 +658,7 @@ public function getBaseUrl($type = UrlInterface::URL_TYPE_LINK, $secure = null)
666658
throw new \InvalidArgumentException('Invalid base url type');
667659
}
668660

669-
if (is_string($url) && false !== strpos($url, self::BASE_URL_PLACEHOLDER)) {
661+
if (is_string($url) && strpos($url, self::BASE_URL_PLACEHOLDER) !== false) {
670662
$url = str_replace(self::BASE_URL_PLACEHOLDER, $this->_request->getDistroBaseUrl(), $url);
671663
}
672664

‎app/code/Magento/Usps/Model/Carrier.php

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,45 @@
2828
class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
2929
{
3030
/** @deprecated Redundant dependency */
31-
const CONTAINER_VARIABLE = 'VARIABLE';
31+
public const CONTAINER_VARIABLE = 'VARIABLE';
3232

3333
/** @deprecated Redundant dependency */
34-
const CONTAINER_FLAT_RATE_BOX = 'FLAT RATE BOX';
34+
public const CONTAINER_FLAT_RATE_BOX = 'FLAT RATE BOX';
3535

3636
/** @deprecated Redundant dependency */
37-
const CONTAINER_FLAT_RATE_ENVELOPE = 'FLAT RATE ENVELOPE';
37+
public const CONTAINER_FLAT_RATE_ENVELOPE = 'FLAT RATE ENVELOPE';
3838

3939
/** @deprecated Redundant dependency */
40-
const CONTAINER_RECTANGULAR = 'RECTANGULAR';
40+
public const CONTAINER_RECTANGULAR = 'RECTANGULAR';
4141

4242
/** @deprecated Redundant dependency */
43-
const CONTAINER_NONRECTANGULAR = 'NONRECTANGULAR';
43+
public const CONTAINER_NONRECTANGULAR = 'NONRECTANGULAR';
4444

4545
/**
4646
* USPS size
4747
*/
48-
const SIZE_REGULAR = 'REGULAR';
48+
public const SIZE_REGULAR = 'REGULAR';
4949

50-
const SIZE_LARGE = 'LARGE';
50+
public const SIZE_LARGE = 'LARGE';
5151

5252
/**
5353
* Default api revision
5454
*
5555
* @var int
5656
*/
57-
const DEFAULT_REVISION = 2;
57+
public const DEFAULT_REVISION = 2;
5858

5959
/**
6060
* Code of the carrier
6161
*
6262
* @var string
6363
*/
64-
const CODE = 'usps';
64+
public const CODE = 'usps';
6565

6666
/**
6767
* Ounces in one pound for conversion
6868
*/
69-
const OUNCES_POUND = 16;
69+
public const OUNCES_POUND = 16;
7070

7171
/**
7272
* Code of the carrier
@@ -1198,11 +1198,8 @@ public function getResponse()
11981198
}
11991199
}
12001200
}
1201-
if (empty($statuses)) {
1202-
$statuses = __('Empty response');
1203-
}
12041201

1205-
return $statuses;
1202+
return $statuses ?: __('Empty response');
12061203
}
12071204

12081205
/**

‎lib/internal/Magento/Framework/App/Response/Http.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
2424
{
2525
/** Cookie to store page vary string */
26-
const COOKIE_VARY_STRING = 'X-Magento-Vary';
26+
public const COOKIE_VARY_STRING = 'X-Magento-Vary';
2727

2828
/** Format for expiration timestamp headers */
29-
const EXPIRATION_TIMESTAMP_FORMAT = 'D, d M Y H:i:s T';
29+
public const EXPIRATION_TIMESTAMP_FORMAT = 'D, d M Y H:i:s T';
3030

3131
/** X-FRAME-OPTIONS Header name */
32-
const HEADER_X_FRAME_OPT = 'X-Frame-Options';
32+
public const HEADER_X_FRAME_OPT = 'X-Frame-Options';
3333

3434
/**
3535
* @var \Magento\Framework\App\Request\Http

‎lib/internal/Magento/Framework/DataObject.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public function unsetData($key = null)
120120
* @param string $key
121121
* @param string|int $index
122122
* @return mixed
123+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
123124
*/
124125
public function getData($key = '', $index = null)
125126
{

0 commit comments

Comments
 (0)