Merge pull request #393 from silinternational/feature/upgrade-php

Release 7.1.0 - Upgrade php version and dependencies
silinternational · Jan 29, 2025 · f23ac7b · f23ac7b
2 parents e887e63 + 9d93e29
commit f23ac7b
Show file tree

Hide file tree

Showing 7 changed files with 7,851 additions and 8,416 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM silintl/php8:8.1
+FROM silintl/php8:8.3
 
 ARG GITHUB_REF_NAME
 ENV GITHUB_REF_NAME=$GITHUB_REF_NAME

diff --git a/application/common/helpers/MySqlDateTime.php b/application/common/helpers/MySqlDateTime.php
@@ -35,6 +35,7 @@ public static function formatDateTime(int $timestamp): string
      */
     public static function relative(string $difference = '+30 days'): string
     {
+        $difference = str_replace('--', '+', $difference);
         return self::formatDate(strtotime($difference));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ public static function formatDateTime(int $timestamp): string @@
          */
         public static function relative(string $difference = '+30 days'): string
         {
+            $difference = str_replace('--', '+', $difference);
             return self::formatDate(strtotime($difference));
         }
@@ Expand Down @@