From fd93f3dd47e9d126aa2db40526164254e8a0c577 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <mr.saeedvaziry@gmail.com>
Date: Sat, 16 Mar 2024 11:08:45 +0100
Subject: [PATCH] add PHP 8.3 support

---
 app/SSH/OS/scripts/install-dependencies.sh          |  2 +-
 app/SSH/Services/PHP/scripts/install-php.sh         |  4 +++-
 config/core.php                                     |  5 ++++-
 .../views/servers/partials/create-server.blade.php  | 13 ++++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/SSH/OS/scripts/install-dependencies.sh b/app/SSH/OS/scripts/install-dependencies.sh
index f21b06f..c22b0b5 100755
--- a/app/SSH/OS/scripts/install-dependencies.sh
+++ b/app/SSH/OS/scripts/install-dependencies.sh
@@ -1,3 +1,3 @@
-sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common curl zip unzip git gcc
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common curl zip unzip git gcc openssl
 git config --global user.email "__email__"
 git config --global user.name "__name__"
diff --git a/app/SSH/Services/PHP/scripts/install-php.sh b/app/SSH/Services/PHP/scripts/install-php.sh
index 04cbb75..0d1053b 100755
--- a/app/SSH/Services/PHP/scripts/install-php.sh
+++ b/app/SSH/Services/PHP/scripts/install-php.sh
@@ -2,7 +2,9 @@ sudo add-apt-repository ppa:ondrej/php -y
 
 sudo DEBIAN_FRONTEND=noninteractive apt-get update
 
-sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php__version__ php__version__-fpm php__version__-mbstring php__version__-mysql php__version__-mcrypt php__version__-gd php__version__-xml php__version__-curl php__version__-gettext php__version__-zip php__version__-bcmath php__version__-soap php__version__-redis php__version__-sqlite3
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php__version__ php__version__-fpm php__version__-mbstring php__version__-mysql php__version__-gd php__version__-xml php__version__-curl php__version__-gettext php__version__-zip php__version__-bcmath php__version__-soap php__version__-redis php__version__-sqlite3 php__version__-tokenizer php__version__-pgsql php__version__-pdo; then
+    echo 'VITO_SSH_ERROR' && exit 1
+fi
 
 if ! sudo sed -i 's/www-data/__user__/g' /etc/php/__version__/fpm/pool.d/www.conf; then
     echo 'VITO_SSH_ERROR' && exit 1
diff --git a/config/core.php b/config/core.php
index 87fdaa0..8b09cc6 100755
--- a/config/core.php
+++ b/config/core.php
@@ -57,6 +57,7 @@
         '8.0',
         '8.1',
         '8.2',
+        '8.3',
     ],
     'databases' => [
         'none',
@@ -239,6 +240,7 @@
                 '8.0' => 'php8.0-fpm',
                 '8.1' => 'php8.1-fpm',
                 '8.2' => 'php8.2-fpm',
+                '8.3' => 'php8.3-fpm',
             ],
             'ubuntu_20' => [
                 '5.6' => 'php5.6-fpm',
@@ -249,7 +251,7 @@
                 '7.4' => 'php7.4-fpm',
                 '8.0' => 'php8.0-fpm',
                 '8.1' => 'php8.1-fpm',
-                '8.2' => 'php8.2-fpm',
+                '8.3' => 'php8.3-fpm',
             ],
             'ubuntu_22' => [
                 '5.6' => 'php5.6-fpm',
@@ -261,6 +263,7 @@
                 '8.0' => 'php8.0-fpm',
                 '8.1' => 'php8.1-fpm',
                 '8.2' => 'php8.2-fpm',
+                '8.3' => 'php8.3-fpm',
             ],
         ],
         'redis' => [
diff --git a/resources/views/servers/partials/create-server.blade.php b/resources/views/servers/partials/create-server.blade.php
index e3095b7..630858b 100644
--- a/resources/views/servers/partials/create-server.blade.php
+++ b/resources/views/servers/partials/create-server.blade.php
@@ -181,7 +181,10 @@ class="mt-1 block w-full"
                 <x-input-label for="os" value="Operating System" />
                 <x-select-input id="os" name="os" class="mt-1 w-full">
                     @foreach (config("core.operating_systems") as $operatingSystem)
-                        <option value="{{ $operatingSystem }}" @if($operatingSystem == old('os')) selected @endif>
+                        <option
+                            value="{{ $operatingSystem }}"
+                            @if($operatingSystem == old('os', 'ubuntu_22')) selected @endif
+                        >
                             {{ str($operatingSystem)->replace("_", " ")->ucfirst() }}
                             LTS
                         </option>
@@ -197,7 +200,7 @@ class="mt-1 block w-full"
                 <x-select-input x-model="type" id="type" name="type" class="mt-1 w-full">
                     @foreach (config("core.server_types") as $serverType)
                         <option value="{{ $serverType }}" @if($serverType == old('type')) selected @endif>
-                            {{ $serverType }}
+                            {{ ucfirst($serverType) }}
                         </option>
                     @endforeach
                 </x-select-input>
@@ -207,7 +210,7 @@ class="mt-1 block w-full"
             </div>
 
             <div class="grid grid-cols-1 gap-3 lg:grid-cols-3">
-                <div x-show="[ServerType::REGULAR].includes(type)">
+                <div x-show="['{{ ServerType::REGULAR }}'].includes(type)">
                     <x-input-label for="webserver" value="Webserver" />
                     <x-select-input id="webserver" name="webserver" class="mt-1 w-full">
                         @foreach (config("core.webservers") as $ws)
@@ -220,7 +223,7 @@ class="mt-1 block w-full"
                         <x-input-error class="mt-2" :messages="$message" />
                     @enderror
                 </div>
-                <div x-show="[ServerType::REGULAR, ServerType::DATABASE].includes(type)">
+                <div x-show="['{{ ServerType::REGULAR }}', '{{ ServerType::DATABASE }}'].includes(type)">
                     <x-input-label for="database" value="Database" />
                     <x-select-input id="database" name="database" class="mt-1 w-full">
                         @foreach (config("core.databases") as $db)
@@ -233,7 +236,7 @@ class="mt-1 block w-full"
                         <x-input-error class="mt-2" :messages="$message" />
                     @enderror
                 </div>
-                <div x-show="[ServerType::REGULAR].includes(type)">
+                <div x-show="['{{ ServerType::REGULAR }}'].includes(type)">
                     <x-input-label for="php" value="PHP" />
                     <x-select-input id="php" name="php" class="mt-1 w-full">
                         @foreach (config("core.php_versions") as $p)