Skip to content

Commit 7636f86

Browse files
author
Sven Reichel
authored
rector: PowToExpRector (#4693)
* php-cs-fixer * rector: `PowToExpRector`
1 parent c437115 commit 7636f86

File tree

16 files changed

+143
-141
lines changed

16 files changed

+143
-141
lines changed

‎.php-cs-fixer.dist.php

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?php
2-
/*
3-
* This document has been generated with
4-
* https://mlocati.github.io/php-cs-fixer-configurator/#version:3.4.0|configurator
5-
* you can change this configuration by importing this file.
6-
*/
2+
3+
declare(strict_types=1);
4+
75
$config = new PhpCsFixer\Config();
86
return $config
97
->setRiskyAllowed(true)
@@ -31,11 +29,10 @@
3129
__DIR__,
3230
])
3331
->exclude([
34-
'lib/3Dsecure/',
35-
'lib/LinLibertineFont/',
36-
'lib/Unserialize/',
32+
__DIR__ . '/shell/translations.php',
33+
__DIR__ . '/shell/update-copyright.php',
3734
])
3835
->name('*.php')
3936
->ignoreDotFiles(true)
40-
->ignoreVCS(true)
37+
->ignoreVCS(true),
4138
);

‎.rector.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
try {
1818
return RectorConfig::configure()
1919
->withPhpSets(
20-
php55: true,
20+
php56: true,
2121
)
2222
->withPaths([
2323
__DIR__,

‎app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function getRange()
163163
$maxValue = $this->getMaxValue();
164164
$index = 1;
165165
do {
166-
$range = pow(10, (strlen(floor($maxValue)) - $index));
166+
$range = 10 ** (strlen(floor($maxValue)) - $index);
167167
$items = $this->getRangeItemCounts($range);
168168
$index++;
169169
} while ($range > self::MIN_RANGE_POWER && count($items) < 2);

‎app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function getPriceRange()
100100
if ($calculation == self::RANGE_CALCULATION_AUTO) {
101101
$index = 1;
102102
do {
103-
$range = pow(10, (strlen(floor($maxPrice)) - $index));
103+
$range = 10 ** (strlen(floor($maxPrice)) - $index);
104104
$items = $this->getRangeItemCounts($range);
105105
$index++;
106106
} while ($range > self::MIN_RANGE_POWER && count($items) < 2);

‎app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ public function setStatistics($min, $max, $standardDeviation, $count)
199199
}
200200

201201
if ($standardDeviation <= 0) {
202-
$intervalsNumber = pow(10, self::TEN_POWER_ROUNDING_FACTOR);
202+
$intervalsNumber = 10 ** self::TEN_POWER_ROUNDING_FACTOR;
203203
} else {
204-
$intervalsNumber = $priceRange * pow($count, 1 / 3) / (3.5 * $standardDeviation);
204+
$intervalsNumber = $priceRange * $count ** (1 / 3) / (3.5 * $standardDeviation);
205205
}
206206
$this->_intervalsNumber = max(ceil($intervalsNumber), self::MIN_INTERVALS_NUMBER);
207207
$this->_intervalsNumber = (int) min($this->_intervalsNumber, self::MAX_INTERVALS_NUMBER);
@@ -461,7 +461,7 @@ protected function _findRoundPrice($lowerPrice, $upperPrice, $returnEmpty = true
461461
}
462462

463463
$result = [];
464-
$tenPower = pow(10, self::TEN_POWER_ROUNDING_FACTOR);
464+
$tenPower = 10 ** self::TEN_POWER_ROUNDING_FACTOR;
465465
$roundingFactorCoefficients = [10, 5, 2];
466466
while ($tenPower >= Mage_Catalog_Model_Resource_Layer_Filter_Price::MIN_POSSIBLE_PRICE) {
467467
if ($tenPower == Mage_Catalog_Model_Resource_Layer_Filter_Price::MIN_POSSIBLE_PRICE) {

‎app/code/core/Mage/Catalog/Model/Product/Image.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ protected function _getNeedMemoryForFile($file = null)
295295
// if there is no info about this parameter lets set it for maximum
296296
$imageInfo['bits'] = 8;
297297
}
298-
return round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + pow(2, 16)) * 1.65);
298+
return round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + 2 ** 16) * 1.65);
299299
}
300300

301301
/**

‎app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ public function generatePool()
121121

122122
$chars = count(Mage::helper('salesrule/coupon')->getCharset($this->getFormat()));
123123
$length = (int) $this->getLength();
124-
$maxCodes = pow($chars, $length);
124+
$maxCodes = $chars ** $length;
125125
$probability = $size / $maxCodes;
126126
//increase the length of Code if probability is low
127127
if ($probability > $maxProbability) {
128128
do {
129129
$length++;
130-
$maxCodes = pow($chars, $length);
130+
$maxCodes = $chars ** $length;
131131
$probability = $size / $maxCodes;
132132
} while ($probability > $maxProbability);
133133
$this->setLength($length);

‎app/code/core/Mage/Tax/Model/Calculation.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round
670670
*/
671671
public function truncate($price, $precision = 4)
672672
{
673-
$exp = pow(10, $precision);
673+
$exp = 10 ** $precision;
674674
return floor($price * $exp) / $exp;
675675
}
676676

‎lib/3Dsecure/CentinelClient.php

+110-105
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
// Distributed by license from CardinalCommerce Corporation
34
/////////////////////////////////////////////////////////////////////////////////////////////
45
// CardinalCommerce (http://www.cardinalcommerce.com)
@@ -12,150 +13,154 @@
1213
//
1314
/////////////////////////////////////////////////////////////////////////////////////////////
1415

15-
require("XMLParser.php");
16-
include "CentinelErrors.php";
17-
18-
class CentinelClient {
16+
require('XMLParser.php');
17+
include 'CentinelErrors.php';
1918

20-
public $request ;
21-
public $response ;
22-
public $parser;
19+
class CentinelClient
20+
{
21+
public $request ;
22+
public $response ;
23+
public $parser;
2324

24-
/////////////////////////////////////////////////////////////////////////////////////////////
25-
// Function Add(name, value)
26-
//
27-
// Add name/value pairs to the Centinel request collection.
28-
/////////////////////////////////////////////////////////////////////////////////////////////
25+
/////////////////////////////////////////////////////////////////////////////////////////////
26+
// Function Add(name, value)
27+
//
28+
// Add name/value pairs to the Centinel request collection.
29+
/////////////////////////////////////////////////////////////////////////////////////////////
2930

3031

31-
function add($name, $value) {
32-
$this->request[$name] = $this->escapeXML($value);
33-
}
32+
public function add($name, $value)
33+
{
34+
$this->request[$name] = $this->escapeXML($value);
35+
}
3436

35-
/////////////////////////////////////////////////////////////////////////////////////////////
36-
// Function getValue(name)
37-
//
38-
// Retrieve a specific value for the give name within the Centinel response collection.
39-
/////////////////////////////////////////////////////////////////////////////////////////////
37+
/////////////////////////////////////////////////////////////////////////////////////////////
38+
// Function getValue(name)
39+
//
40+
// Retrieve a specific value for the give name within the Centinel response collection.
41+
/////////////////////////////////////////////////////////////////////////////////////////////
4042

4143

42-
function getValue($name) {
43-
if (isset($this->response[$name])) {
44-
return $this->response[$name];
45-
}else{
46-
return "";
47-
}
48-
}
44+
public function getValue($name)
45+
{
46+
if (isset($this->response[$name])) {
47+
return $this->response[$name];
48+
} else {
49+
return '';
50+
}
51+
}
4952

5053

51-
/////////////////////////////////////////////////////////////////////////////////////////////
52-
// Function getRequestXml(name)
53-
//
54-
// Serialize all elements of the request collection into a XML message, and format the required
55-
// form payload according to the Centinel XML Message APIs. The form payload is returned from
56-
// the function.
57-
/////////////////////////////////////////////////////////////////////////////////////////////
54+
/////////////////////////////////////////////////////////////////////////////////////////////
55+
// Function getRequestXml(name)
56+
//
57+
// Serialize all elements of the request collection into a XML message, and format the required
58+
// form payload according to the Centinel XML Message APIs. The form payload is returned from
59+
// the function.
60+
/////////////////////////////////////////////////////////////////////////////////////////////
5861

5962

60-
function getRequestXml()
61-
{
62-
$queryString = "<CardinalMPI>";
63-
foreach ($this->request as $name => $value) {
64-
$queryString = $queryString . "<" . ($name) . ">" . ($value) . "</" . ($name) . ">";
65-
}
66-
$queryString = $queryString . "</CardinalMPI>";
67-
return "cmpi_msg=" . urlencode($queryString);
63+
public function getRequestXml()
64+
{
65+
$queryString = '<CardinalMPI>';
66+
foreach ($this->request as $name => $value) {
67+
$queryString = $queryString . '<' . ($name) . '>' . ($value) . '</' . ($name) . '>';
6868
}
69+
$queryString = $queryString . '</CardinalMPI>';
70+
return 'cmpi_msg=' . urlencode($queryString);
71+
}
6972

70-
/////////////////////////////////////////////////////////////////////////////////////////////
71-
// Function sendHttp(url, "", $timeout)
72-
//
73-
// HTTP POST the form payload to the url using cURL.
74-
// form payload according to the Centinel XML Message APIs. The form payload is returned from
75-
// the function.
76-
/////////////////////////////////////////////////////////////////////////////////////////////
73+
/////////////////////////////////////////////////////////////////////////////////////////////
74+
// Function sendHttp(url, "", $timeout)
75+
//
76+
// HTTP POST the form payload to the url using cURL.
77+
// form payload according to the Centinel XML Message APIs. The form payload is returned from
78+
// the function.
79+
/////////////////////////////////////////////////////////////////////////////////////////////
7780

78-
function sendHttp($url, $connectTimeout, $timeout)
79-
{
81+
public function sendHttp($url, $connectTimeout, $timeout)
82+
{
8083

81-
// verify that the URL uses a supported protocol.
84+
// verify that the URL uses a supported protocol.
8285

83-
if ((str_starts_with($url, "http://")) || (str_starts_with($url, "https://"))) {
86+
if ((str_starts_with($url, 'http://')) || (str_starts_with($url, 'https://'))) {
8487

85-
//Construct the payload to POST to the url.
88+
//Construct the payload to POST to the url.
8689

87-
$data = $this->getRequestXml();
88-
// create a new cURL resource
90+
$data = $this->getRequestXml();
91+
// create a new cURL resource
8992

90-
$ch = curl_init($url);
93+
$ch = curl_init($url);
9194

92-
// set URL and other appropriate options
93-
curl_setopt($ch, CURLOPT_POST, 1);
94-
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
95-
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
96-
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
97-
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
98-
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
95+
// set URL and other appropriate options
96+
curl_setopt($ch, CURLOPT_POST, 1);
97+
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
98+
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
99+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
100+
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
101+
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
99102

100-
// Execute the request.
103+
// Execute the request.
101104

102-
$result = curl_exec($ch);
103-
$succeeded = curl_errno($ch) == 0 ? true : false;
105+
$result = curl_exec($ch);
106+
$succeeded = curl_errno($ch) == 0 ? true : false;
104107

105-
// close cURL resource, and free up system resources
108+
// close cURL resource, and free up system resources
106109

107-
curl_close($ch);
110+
curl_close($ch);
108111

109-
// If Communication was not successful set error result, otherwise
112+
// If Communication was not successful set error result, otherwise
110113

111-
if(!$succeeded) {
114+
if (!$succeeded) {
112115

113-
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8030, CENTINEL_ERROR_CODE_8030_DESC);
116+
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8030, CENTINEL_ERROR_CODE_8030_DESC);
114117

115-
}
118+
}
116119

117-
// Assert that we received an expected Centinel Message in response.
120+
// Assert that we received an expected Centinel Message in response.
118121

119-
if (!str_contains($result, "<CardinalMPI>")) {
120-
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8010, CENTINEL_ERROR_CODE_8010_DESC);
121-
}
122+
if (!str_contains($result, '<CardinalMPI>')) {
123+
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8010, CENTINEL_ERROR_CODE_8010_DESC);
124+
}
122125

123126

124-
} else {
125-
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8000, CENTINEL_ERROR_CODE_8000_DESC);
126-
}
127-
$parser = new XMLParser;
128-
$parser->deserializeXml($result);
129-
$this->response = $parser->deserializedResponse;
130-
}
127+
} else {
128+
$result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8000, CENTINEL_ERROR_CODE_8000_DESC);
129+
}
130+
$parser = new XMLParser();
131+
$parser->deserializeXml($result);
132+
$this->response = $parser->deserializedResponse;
133+
}
131134

132-
/////////////////////////////////////////////////////////////////////////////////////////////
133-
// Function setErrorResponse(errorNo, errorDesc)
134-
//
135-
// Initialize an Error response to ensure that parsing will be handled properly.
136-
/////////////////////////////////////////////////////////////////////////////////////////////
135+
/////////////////////////////////////////////////////////////////////////////////////////////
136+
// Function setErrorResponse(errorNo, errorDesc)
137+
//
138+
// Initialize an Error response to ensure that parsing will be handled properly.
139+
/////////////////////////////////////////////////////////////////////////////////////////////
137140

138-
function setErrorResponse($errorNo, $errorDesc) {
141+
public function setErrorResponse($errorNo, $errorDesc)
142+
{
139143

140-
$resultText = "<CardinalMPI>";
141-
$resultText = $resultText."<ErrorNo>".($errorNo)."</ErrorNo>" ;
142-
$resultText = $resultText."<ErrorDesc>".($errorDesc)."</ErrorDesc>" ;
144+
$resultText = '<CardinalMPI>';
145+
$resultText = $resultText . '<ErrorNo>' . ($errorNo) . '</ErrorNo>' ;
146+
$resultText = $resultText . '<ErrorDesc>' . ($errorDesc) . '</ErrorDesc>' ;
143147

144-
return $resultText."</CardinalMPI>";
145-
}
148+
return $resultText . '</CardinalMPI>';
149+
}
146150

147-
/////////////////////////////////////////////////////////////////////////////////////////////
148-
// Function escapeXML(value)
149-
//
150-
// Escaped string converting all '&' to '&amp;' and all '<' to '&lt'. Return the escaped value.
151-
/////////////////////////////////////////////////////////////////////////////////////////////
151+
/////////////////////////////////////////////////////////////////////////////////////////////
152+
// Function escapeXML(value)
153+
//
154+
// Escaped string converting all '&' to '&amp;' and all '<' to '&lt'. Return the escaped value.
155+
/////////////////////////////////////////////////////////////////////////////////////////////
152156

153-
function escapeXML($elementValue){
157+
public function escapeXML($elementValue)
158+
{
154159

155-
$escapedValue = str_replace("&", "&amp;", $elementValue);
160+
$escapedValue = str_replace('&', '&amp;', $elementValue);
156161

157-
return str_replace("<", "&lt;", $escapedValue);
162+
return str_replace('<', '&lt;', $escapedValue);
158163

159-
}
164+
}
160165

161-
}
166+
}

0 commit comments

Comments
 (0)