Raise PHP version requirement to PHP 5.5

kimai · Feb 20, 2018 · 463bbc5 · 463bbc5
1 parent 4809141
commit 463bbc5
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/INSTALL.md b/INSTALL.md
@@ -29,7 +29,7 @@ Kimai requires a web server with a PHP environment and a database. The minimum
 system requirements for running Kimai are:
 
 * Webserver capable of running PHP applications (Apache, Nginx, IIS or other)
-* PHP 5.4
+* PHP 5.5
 * MySQL 5.5 up to 5.7 or compatible
 * more than 100 MB of disk space
 

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         { "name": "Simon Schaufelberger", "homepage": "https://github.com/simonschaufi" }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
         "tecnickcom/tcpdf": "^6.2.12",
         "zendframework/zendframework1": "^1.12",
         "phpoffice/phpexcel": "1.8.*"

diff --git a/composer.lock b/composer.lock
diff --git a/installer/processor.php b/installer/processor.php
@@ -65,20 +65,20 @@ function getpass()
 
 $axAction = strip_tags($_REQUEST['axAction']);
 
-$javascript = "";
+$javascript = '';
 $errors = 0;
 
 switch ($axAction) {
 
     /**
      * Check for the requirements of Kimai:
-     *  - PHP major version >= 5.4
+     *  - PHP major version >= 5.5
      *  - MySQLi extension available
      *  - iconv extension available
      *  - memory limit should be at least 20 MB for reliable PDF export
      */
-    case "checkRequirements":
-        if (version_compare(PHP_VERSION, '5.4') < 0) {
+    case 'checkRequirements':
+        if (version_compare(PHP_VERSION, '5.5') < 0) {
             $errors++;
             $javascript .= "$('div.sp_phpversion').addClass('fail');";
         }
@@ -118,7 +118,7 @@ function getpass()
     /**
      * Check access rights to autoconf.php, the logfile and the temporary folder.
      */
-    case "checkRights":
+    case 'checkRights':
         if ((file_exists("../includes/autoconf.php") && !is_writeable("../includes/autoconf.php")) || !is_writeable("../includes/")) {
             $errors++;
             $javascript .= "$('span.ch_autoconf').addClass('fail');";
@@ -146,8 +146,8 @@ function getpass()
     /**
      * Create the autoconf.php file.
      */
-    case ("write_config"):
-        include "../includes/func.php";
+    case 'write_config':
+        include '../includes/func.php';
         // special characters " and $ are escaped
         $database = $_REQUEST['database'];
         $hostname = $_REQUEST['hostname'];
@@ -178,7 +178,7 @@ function getpass()
     /**
      * Create the database.
      */
-    case ('make_database'):
+    case 'make_database':
         $databaseName = $_REQUEST['database'];
         $hostname = $_REQUEST['hostname'];
         $username = $_REQUEST['username'];

diff --git a/installer/steps/25_system_requirements.php b/installer/steps/25_system_requirements.php
@@ -5,7 +5,7 @@
     ?>
     <h2>Systemanforderungen</h2>
     Die folgenden Punkte m&uuml;ssen erf&uuml;llt sein:<br/>
-    <div class="sp_phpversion fail">mindestens PHP Version 5.4</div>
+    <div class="sp_phpversion fail">mindestens PHP Version 5.5</div>
     <div class="sp_mysql">Die <b>MySQLi</b> Erweiterung f&uuml;r PHP muss aktiviert sein</div>
     <div class="sp_iconv">Die <b>iconv</b> Erweiterung f&uuml;r PHP muss aktiviert sein</div>
     <div class="sp_dom">Die <b>DOM</b> Erweiterung f&uuml;r PHP muss aktiviert sein</div>
@@ -21,7 +21,7 @@
     ?>
     <h2>Изисквания към системата</h2>
     Следните точни трябва да са изпълнени:<br/>
-    <div class="sp_phpversion fail">Версия на PHP най-малко 5.4</div>
+    <div class="sp_phpversion fail">Версия на PHP най-малко 5.5</div>
     <div class="sp_mysql"><b>MySQLi</b> разширението за PHP трябва да е активирано</div>
     <div class="sp_iconv"><b>iconv</b> разширението за PHP трябва да е активирано</div>
     <div class="sp_dom"><b>DOM</b> разширението за PHP трябва да е активирано</div>
@@ -37,7 +37,7 @@
     ?>
     <h2>System Requirements</h2>
     The following conditions must be met:<br/>
-    <div class="sp_phpversion fail">at least PHP version 5.4</div>
+    <div class="sp_phpversion fail">at least PHP version 5.5</div>
     <div class="sp_mysql">The <b>MySQLi</b> extension for PHP has to be loaded</div>
     <div class="sp_iconv">The <b>iconv</b> extension for PHP has to be loaded</div>
     <div class="sp_dom">The <b>DOM</b> extension for PHP has to be loaded</div>

diff --git a/updater/updater.php b/updater/updater.php
@@ -24,7 +24,7 @@
 require_once 'functions.php';
 
 define('KIMAI_UPDATER_RUNNING', true);
-$min_php_version = '5.4';
+$min_php_version = '5.5';
 
 // check all requirements/file permissions before starting an upgrade process
 if (!file_exists('../includes/autoconf.php')) {
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: php
     php:
-      - 5.4
       - 5.5
       - 5.6
       - 7.0
@@ Expand Down @@