Merge pull request #389 from virtualtam/utils/check-php-version

application: move checkPHPVersion from Utils to ApplicationUtils

5 files changed, 52 insertions, 52 deletions

diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index 6fb07f36..b0e94e24 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -6,6 +6,26 @@ class ApplicationUtils
 {
 
     /**
+     * Checks the PHP version to ensure Shaarli can run
+     *
+     * @param string $minVersion minimum PHP required version
+     * @param string $curVersion current PHP version (use PHP_VERSION)
+     *
+     * @throws Exception the PHP version is not supported
+     */
+    public static function checkPHPVersion($minVersion, $curVersion)
+    {
+        if (version_compare($curVersion, $minVersion) < 0) {
+            throw new Exception(
+                'Your PHP version is obsolete!'
+                .' Shaarli requires at least PHP '.$minVersion.', and thus cannot run.'
+                .' Your PHP version has known security vulnerabilities and should be'
+                .' updated as soon as possible.'
+            );
+        }
+    }
+
+    /**
      * Checks Shaarli has the proper access permissions to its resources
      *
      * @param array $globalConfig The $GLOBALS['config'] array
diff --git a/application/Utils.php b/application/Utils.php
index 120333c5..b8579b48 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -120,26 +120,6 @@ function generateLocation($referer, $host, $loopTerms = array())
 }
 
 /**
- * Checks the PHP version to ensure Shaarli can run
- *
- * @param string $minVersion minimum PHP required version
- * @param string $curVersion current PHP version (use PHP_VERSION)
- *
- * @throws Exception    the PHP version is not supported
- */
-function checkPHPVersion($minVersion, $curVersion)
-{
-    if (version_compare($curVersion, $minVersion) < 0) {
-        throw new Exception(
-            'Your PHP version is obsolete!'
-            .' Shaarli requires at least PHP '.$minVersion.', and thus cannot run.'
-            .' Your PHP version has known security vulnerabilities and should be'
-            .' updated as soon as possible.'
-        );
-    }
-}
-
-/**
  * Validate session ID to prevent Full Path Disclosure.
  *
  * See #298.
diff --git a/index.php b/index.php
index 654f7f8f..aae477bf 100644
--- a/index.php
+++ b/index.php
@@ -159,7 +159,7 @@ require_once 'application/Router.php';
 
 // Ensure the PHP version is supported
 try {
-    checkPHPVersion('5.3', PHP_VERSION);
+    ApplicationUtils::checkPHPVersion('5.3', PHP_VERSION);
 } catch(Exception $exc) {
     header('Content-Type: text/plain; charset=utf-8');
     echo $exc->getMessage();
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 9a99c6c6..01301e68 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -12,6 +12,37 @@ require_once 'application/ApplicationUtils.php';
 class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
 {
     /**
+     * Check supported PHP versions
+     */
+    public function testCheckSupportedPHPVersion()
+    {
+        $minVersion = '5.3';
+        ApplicationUtils::checkPHPVersion($minVersion, '5.4.32');
+        ApplicationUtils::checkPHPVersion($minVersion, '5.5');
+        ApplicationUtils::checkPHPVersion($minVersion, '5.6.10');
+    }
+
+    /**
+     * Check a unsupported PHP version
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
+     */
+    public function testCheckSupportedPHPVersion51()
+    {
+        ApplicationUtils::checkPHPVersion('5.3', '5.1.0');
+    }
+
+    /**
+     * Check another unsupported PHP version
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
+     */
+    public function testCheckSupportedPHPVersion52()
+    {
+        ApplicationUtils::checkPHPVersion('5.3', '5.2');
+    }
+
+    /**
      * Checks resource permissions for the current Shaarli installation
      */
     public function testCheckCurrentResourcePermissions()
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 311d4bfb..4847ea94 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -139,37 +139,6 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Check supported PHP versions
-     */
-    public function testCheckSupportedPHPVersion()
-    {
-        $minVersion = '5.3';
-        checkPHPVersion($minVersion, '5.4.32');
-        checkPHPVersion($minVersion, '5.5');
-        checkPHPVersion($minVersion, '5.6.10');
-    }
-
-    /**
-     * Check a unsupported PHP version
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
-     */
-    public function testCheckSupportedPHPVersion51()
-    {
-        checkPHPVersion('5.3', '5.1.0');
-    }
-
-    /**
-     * Check another unsupported PHP version
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
-     */
-    public function testCheckSupportedPHPVersion52()
-    {
-        checkPHPVersion('5.3', '5.2');
-    }
-
-    /**
      * Test is_session_id_valid with a valid ID - TEST ALL THE HASHES!
      *
      * This tests extensively covers all hash algorithms / bit representations