Merge remote-tracking branch 'mainline/develop' into MC-38148-develop

Rrego6 · Rrego6 · commit fcbab9c15fc5 · 2021-01-29T12:19:48.000-05:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -14,6 +14,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Update PHP
+      run: sudo update-alternatives --set php /usr/bin/php7.2
+
     - name: Validate composer
       run: composer validate
 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/magento-semver",
     "description": "Magento Semantic Version Checker",
-    "version": "8.0.0",
+    "version": "9.0.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/composer.lock b/composer.lock
diff --git a/src/Analyzer/Mftf/DataAnalyzer.php b/src/Analyzer/Mftf/DataAnalyzer.php
@@ -104,7 +104,7 @@ public function analyze($registryBefore, $registryAfter)
                         $afterArrayFields[] = $afterChild;
                     }
                 }
-                
+
                 // Validate <data> fields
                 foreach ($beforeDataFields as $beforeField) {
                     $beforeFieldKey = $beforeField['attributes']['key'];

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "magento/magento-semver",`
`3`	`3`	`"description": "Magento Semantic Version Checker",`
`4`		`- "version": "8.0.0",`
	`4`	`+ "version": "9.0.0",`
`5`	`5`	`"license": [`
`6`	`6`	`"OSL-3.0",`
`7`	`7`	`"AFL-3.0"`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function analyze($registryBefore, $registryAfter)`
`104`	`104`	`$afterArrayFields[] = $afterChild;`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-`
	`107`	`+`
`108`	`108`	`// Validate <data> fields`
`109`	`109`	`foreach ($beforeDataFields as $beforeField) {`
`110`	`110`	`$beforeFieldKey = $beforeField['attributes']['key'];`