MAGETWO-32644: Remove PHP 5.4 support from composer.json

Safwan Khan · Safwan Khan · commit adb1ec78e684 · 2015-01-15T10:41:01.000-06:00
- Updated functional test composer.json
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "magento/mtf": "1.0.0-rc11",
-        "php": ">=5.4.0",
+        "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
         "netwing/selenium-server-standalone": ">=2.35"
diff --git a/dev/tests/functional/composer.json.dist b/dev/tests/functional/composer.json.dist
@@ -1,7 +1,7 @@
 {
     "require": {
         "magento/mtf": "dev-develop",
-        "php": ">=5.4.0",
+        "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
         "netwing/selenium-server-standalone": ">=2.35"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`	`3`	`"magento/mtf": "1.0.0-rc11",`
`4`		`- "php": ">=5.4.0",`
	`4`	`+ "php": "~5.5.0\|~5.6.0",`
`5`	`5`	`"phpunit/phpunit": "4.1.0",`
`6`	`6`	`"phpunit/phpunit-selenium": ">=1.2",`
`7`	`7`	`"netwing/selenium-server-standalone": ">=2.35"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`	`3`	`"magento/mtf": "dev-develop",`
`4`		`- "php": ">=5.4.0",`
	`4`	`+ "php": "~5.5.0\|~5.6.0",`
`5`	`5`	`"phpunit/phpunit": "4.1.0",`
`6`	`6`	`"phpunit/phpunit-selenium": ">=1.2",`
`7`	`7`	`"netwing/selenium-server-standalone": ">=2.35"`