Changeset 487 for trunk/lib/App.inc.php

Timestamp:

Aug 20, 2014 11:56:27 AM (10 years ago)

Author:

anonymous

Message:

Added Validator::fileUploadSize(), phpIniGetBytes(), and fixed php version error checking.

File:

• trunk/lib/App.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -42 +42 @@
 class App {
 
+    // Minimum version of PHP required for this version of the Codebase.
+    const CODEBASE_MIN_PHP_VERSION = '5.3.0';
+
     // A place to keep an object instance for the singleton pattern.
     protected static $instance = null;
@@ -179 +182 @@
         $this->timer = new ScriptTimer();
         $this->timer->start('_app');
-
-        // The codebase now requires a minimum PHP version.
-        $codebase_minimum_php_version = '5.3.0';
-        if (version_compare(PHP_VERSION, $codebase_minimum_php_version, '<')) {
-            $this->logMsg(sprintf('Codebase minimum PHP version of %s not satisfied (you have %s). ', $codebase_minimum_php_version, phpversion()), LOG_NOTICE, __FILE__, __LINE__);
-        }
     }
 
@@ -382 +379 @@
         // Set the version of the codebase we're using.
         $codebase_version_file = dirname(__FILE__) . '/../docs/version.txt';
+        $codebase_version = '';
         if (is_readable($codebase_version_file)) {
             $codebase_version = trim(file_get_contents($codebase_version_file));
@@ -388 +386 @@
                 header('X-Codebase-Version: ' . $codebase_version);
             }
+        }
+
+        if (version_compare(PHP_VERSION, self::CODEBASE_MIN_PHP_VERSION, '<')) {
+            $this->logMsg(sprintf('PHP %s required for Codebase %s, using %s; some things will break.', self::CODEBASE_MIN_PHP_VERSION, $codebase_version, PHP_VERSION), LOG_NOTICE, __FILE__, __LINE__);
         }