Update to PHP 8.4; update dependencies

.drone.yml

@@ -1,25 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: install dependencies
-    image: composer
-    volumes:
-      - name: composer-cache
-        path: /tmp/cache
-    environment:
-      COMPOSER_CACHE_DIR: /tmp/cache
-    commands:
-      - composer install --no-progress --no-interaction --ignore-platform-reqs
-
-  - name: run unit tests
-    image: php:7.4
-    commands:
-      - vendor/bin/phpunit -c phpunit.xml
-
-volumes:
-  - name: composer-cache
-    host:
-      path: /tmp/drone/composer-cache

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-apache AS base
+FROM php:8.4-apache AS base
 
 WORKDIR /var/www
 
@@ -11,7 +11,7 @@ RUN apt-get update && \
 RUN a2enmod rewrite && \
     sed -ri -e 's!/var/www/html!/var/www/public!g' /etc/apache2/sites-available/*.conf
 
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.10 /usr/bin/composer /usr/bin/composer
 
 
 FROM base AS development

Makefile

@@ -2,7 +2,7 @@
 DOCKER_UID = "$(shell id -u):$(shell id -g)"
 
 # Basic docker-compose command
-DOCKER_COMPOSE = DOCKER_UID=$(DOCKER_UID) docker-compose
+DOCKER_COMPOSE = DOCKER_UID=$(DOCKER_UID) docker compose
 
 # Commands inside containers
 DOCKER_RUN = $(DOCKER_COMPOSE) run --rm app

composer.json

@@ -12,13 +12,13 @@
         "optimize-autoloader": true
     },
     "require": {
-        "php": "^7.4",
+        "php": "^8.4",
         "ext-pdo": "*",
         "ext-yaml": "*",
-        "slim/slim": "^4.8",
+        "slim/slim": "^4.15",
-        "slim/psr7": "^1.3",
+        "slim/psr7": "^1.8",
-        "php-di/php-di": "^6.3",
+        "php-di/php-di": "^7.1",
-        "slim/twig-view": "^3.2"
+        "slim/twig-view": "^3.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9"

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.4'
+name: mail-account-admin
 
 services:
   app:

src/Models/Account.php

@@ -45,7 +45,7 @@ class Account
             (int)$data['user_id'],
             $data['username'],
             $data['password'],
-            $data['is_active'] === '1',
+            $data['is_active'] === 1,
             $data['home_dir'],
             $data['memo'] !== null ? $data['memo'] : '',
             new DateTimeImmutable($data['created_at']),

src/Models/AdminUser.php

@@ -31,7 +31,7 @@ class AdminUser
             (int)$data['admin_id'],
             $data['username'],
             $data['password'],
-            $data['is_active'] === '1',
+            $data['is_active'] === 1,
             new DateTimeImmutable($data['created_at']),
             new DateTimeImmutable($data['modified_at']),
         );

src/Repositories/AccountRepository.php

@@ -9,7 +9,7 @@ use PDO;
 
 class AccountRepository extends BaseRepository
 {
-    public function fetchAccountList(string $filterByDomain = null): array
+    public function fetchAccountList(?string $filterByDomain = null): array
     {
         $queryWhere = '';
         $queryParams = [];