Merge pull request #5046 from magento-trigger/MC-29044

[Trigger] MC-29044: PHP 7.1 syntax in 2.2 release line

Author: zakdma

app/code/Magento/Dhl/Model/Carrier.php

@@ -816,7 +816,7 @@ protected function _getAllItems()
      * @param float $itemWeight
      * @param float $maxWeight
      */
-    private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight): void
+    private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight)
     {
         $qtyItem = floor($itemWeight / $maxWeight);
         $decimalItems[] = ['weight' => $maxWeight, 'qty' => $qtyItem];

dev/tests/static/framework/Magento/Sniffs/Html/HtmlDirectiveSniff.php

@@ -156,7 +156,7 @@ private function processVarDirectivesAndParams(string $html, File $phpcsFile): s
      * @param File $phpcsFile
      * @param string $body
      */
-    private function validateDirectiveBody(File $phpcsFile, string $body): void
+    private function validateDirectiveBody(File $phpcsFile, string $body)
     {
         $parameterTokenizer = new Template\Tokenizer\Parameter();
         $parameterTokenizer->setString($body);
@@ -175,7 +175,7 @@ private function validateDirectiveBody(File $phpcsFile, string $body): void
      * @param File $phpcsFile
      * @param string $body
      */
-    private function validateVariableUsage(File $phpcsFile, string $body): void
+    private function validateVariableUsage(File $phpcsFile, string $body)
     {
         $this->usedVariables[] = 'var ' . trim($body);
         if (strpos($body, '|') !== false) {
@@ -208,7 +208,7 @@ private function validateVariableUsage(File $phpcsFile, string $body): void
      * @param File $phpcsFile
      * @param string $templateText
      */
-    private function validateDefinedVariables(File $phpcsFile, string $templateText): void
+    private function validateDefinedVariables(File $phpcsFile, string $templateText)
     {
         preg_match('/<!--@vars\s*((?:.)*?)\s*@-->/us', $templateText, $matches);
 

dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/AbstractHtmlSniffTest.php

@@ -25,7 +25,7 @@ abstract class AbstractHtmlSniffTest extends TestCase
      * @return void
      * @dataProvider processDataProvider
      */
-    public function testProcess(string $fileUnderTest, string $expectedReportFile): void
+    public function testProcess(string $fileUnderTest, string $expectedReportFile)
     {
         $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
         $ruleSetDir = __DIR__ . DIRECTORY_SEPARATOR . '_files';

lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php

@@ -103,7 +103,7 @@ private function getStackArgs($stack, Template $filter, array $templateVariables
      * @param int $i
      * @param array $stackArgs
      */
-    private function handlePropertyAccess(int $i, array &$stackArgs): void
+    private function handlePropertyAccess(int $i, array &$stackArgs)
     {
         if (is_array($stackArgs[$i - 1]['variable'])) {
             $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable'][$stackArgs[$i]['name']];
@@ -131,7 +131,7 @@ private function handleDataObjectMethod(
         array $templateVariables,
         int $i,
         array &$stackArgs
-    ): void {
+    ) {
         if (method_exists($stackArgs[$i - 1]['variable'], $stackArgs[$i]['name'])
             || substr($stackArgs[$i]['name'], 0, 3) == 'get'
         ) {
@@ -156,7 +156,7 @@ private function handleDataObjectMethod(
      * @param int $i
      * @param array $stackArgs
      */
-    private function handleObjectMethod(Template $filter, array $templateVariables, int $i, array &$stackArgs): void
+    private function handleObjectMethod(Template $filter, array $templateVariables, int $i, array &$stackArgs)
     {
         $object = $stackArgs[$i - 1]['variable'];
         $method = $stackArgs[$i]['name'];
@@ -204,7 +204,7 @@ private function shouldHandleAsObjectAccess(int $i, array &$stackArgs): bool
      * @param array $templateVariables
      * @param array $stackArgs
      */
-    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs)
     {
         // If data object calling methods or getting properties
         if ($stackArgs[$i]['type'] == 'property') {

lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php

@@ -75,7 +75,7 @@ public function resolve(string $value, Template $filter, array $templateVariable
      * @param array $templateVariables
      * @param array $stackArgs
      */
-    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs)
     {
         // If data object calling methods or getting properties
         if ($stackArgs[$i]['type'] == 'property') {
@@ -99,7 +99,7 @@ private function handleDataAccess(int $i, Template $filter, array $templateVaria
      * @param array $templateVariables
      * @param array $stackArgs
      */
-    private function handleGetterMethod(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    private function handleGetterMethod(int $i, Template $filter, array $templateVariables, array &$stackArgs)
     {
         if ($stackArgs[$i]['name'] === 'getUrl'
             && $stackArgs[$i - 1]['variable'] instanceof AbstractTemplate