From b52a58253917d8d0898a13fb88d756c5efc5fe6a Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Tue, 21 Mar 2023 19:54:58 +0100
Subject: [PATCH] Stop supporting PHP 7.3 (#430) It is unmaintained

---
 .github/workflows/ci.yml |  3 ++-
 Dockerfile               |  3 +--
 composer.json            |  6 +++---
 composer.lock            | 23 +++++++++++------------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9a62ad..4167d5b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,8 +9,9 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.3'
           - '7.4'
+          - '8.0'
+          - '8.1'
     steps:
       - uses: actions/checkout@v2
       - name: Use PHP ${{ matrix.php-version }}
diff --git a/Dockerfile b/Dockerfile
index c0017b0..d7b0cb1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 RUN apt-get update
 RUN apt-get install -y libicu-dev xz-utils git python libgmp-dev unzip ffmpeg
-RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install intl
 RUN docker-php-ext-install gmp
 RUN a2enmod rewrite
diff --git a/composer.json b/composer.json
index dfe87f5..aab1f1f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "php": ">=7.3",
+    "php": ">=7.4",
     "ext-intl": "*",
     "ext-json": "*",
     "aura/session": "^2.1",
@@ -31,7 +31,7 @@
     "mathmarques/smarty-view": "^1.2",
     "oomphinc/composer-installers-extender": "^2.0",
     "paragonie/csp-builder": "^2.5",
-    "rinvex/countries": "^6.1",
+    "rinvex/countries": "^7.3",
     "rudloff/alltube-library": "^0.1.3",
     "symfony/finder": "^5.4",
     "symfony/translation": "^4.0",
@@ -92,7 +92,7 @@
       "phpro/grumphp": true
     },
     "platform": {
-      "php": "7.3.11"
+      "php": "7.4.33"
     },
     "sort-packages": true
   },
diff --git a/composer.lock b/composer.lock
index e2084e5..3a61904 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6f7b900aafa876f17e0815ca6fa044a5",
+    "content-hash": "454753ac2a4d31f21bf2e197b7ce24d1",
     "packages": [
         {
             "name": "aura/session",
@@ -2042,25 +2042,24 @@
         },
         {
             "name": "rinvex/countries",
-            "version": "v6.1.2",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rinvex/countries.git",
-                "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe"
+                "reference": "4696d23976e27d6cedf7e55db3fa24e11924b727"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rinvex/countries/zipball/0dd9da817c1faa33429fe56b8ba059fdabe6e0fe",
-                "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe",
+                "url": "https://api.github.com/repos/rinvex/countries/zipball/4696d23976e27d6cedf7e55db3fa24e11924b727",
+                "reference": "4696d23976e27d6cedf7e55db3fa24e11924b727",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.0"
+                "php": "^7.4.0 || ^8.0.0"
             },
             "require-dev": {
-                "codedungeon/phpunit-result-printer": "^0.26.0",
-                "laravel/helpers": "^1.1.0",
-                "phpunit/phpunit": "^8.3.0"
+                "codedungeon/phpunit-result-printer": "^0.30.0",
+                "phpunit/phpunit": "^9.5.0"
             },
             "type": "library",
             "extra": {
@@ -2122,7 +2121,7 @@
                 "issues": "https://github.com/rinvex/countries/issues",
                 "source": "https://github.com/rinvex/countries"
             },
-            "time": "2020-03-13T18:04:45+00:00"
+            "time": "2020-12-25T01:36:24+00:00"
         },
         {
             "name": "rudloff/alltube-library",
@@ -9359,13 +9358,13 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "ext-intl": "*",
         "ext-json": "*"
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.3.11"
+        "php": "7.4.33"
     },
     "plugin-api-version": "2.2.0"
 }