Merge branch 'optimisation/version-compare' into MAGETWO-50222-PRs

chntylz · Mar 14, 2016 · 456e735 · 456e735
2 parents 035b354 + 24432b3
commit 456e735
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -12,7 +12,7 @@
 umask(0);
 
 /* PHP version validation */
-if (version_compare(phpversion(), '5.5.0', '<') === true) {
+if (PHP_VERSION_ID < 50500) {
     if (PHP_SAPI == 'cli') {
         echo 'Magento supports PHP 5.5.0 or later. ' .
             'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -115,9 +115,7 @@ public static function setUpBeforeClass()
     public static function tearDownAfterClass()
     {
         //clear garbage in memory
-        if (version_compare(PHP_VERSION, '5.3', '>=')) {
-            gc_collect_cycles();
-        }
+        gc_collect_cycles();
 
         $fixtureNamespace = self::_getFixtureNamespace();
         if (isset(self::$_classLevelFixtures[$fixtureNamespace])