Large-scale update of dependencies, deprecation of PHP 8.0

2025-03-14 19:59:38 +01:00 · 2024-02-05 21:54:14 +01:00 · 2024-02-05 21:54:14 +01:00 · 2817d47120
commit 2817d47120
parent 679a3a9ece
14 changed files with 2165 additions and 2592 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,49 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm-major:
+        update-types:
+          - "major"
+      npm-minor:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "composer"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "weekly"
+    groups:
+      composer-major:
+        update-types:
+          - "major"
+      composer-minor:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "weekly"
+    groups:
+      docker:
+        patterns:
+          - '*'
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - '*'
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@ -15,10 +15,10 @@ jobs:
    steps:
      - uses: actions/checkout@v2

-      - name: Use Node.js 18.x
+      - name: Use Node.js
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20

      - name: Build all assets
        run: |
@ -28,7 +28,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: 8.0
+          php-version: 8.1
          coverage: pcov
          extensions: mbstring

--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@ -18,10 +18,10 @@ jobs:
          git config --global url."https://github.com/".insteadOf
          ssh://git@github.com/

-      - name: Use Node.js 18.x
+      - name: Use Node.js
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20

      - name: Try to build the assets
        run: |
@ -59,7 +59,7 @@ jobs:

      - uses: shivammathur/setup-php@v2
        with:
-          php-version: 8.0
+          php-version: 8.1
          extensions: mbstring

      - id: composer-cache
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -12,10 +12,10 @@ jobs:
    steps:
      - uses: actions/checkout@v2

-      - name: Use Node.js 18 LTS
+      - name: Use Node.js
        uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 20

      - name: Try to build the assets
        run: |
@ -42,7 +42,7 @@ jobs:
    strategy:
      matrix:
        operating-system: [ ubuntu-latest ]
-        php-versions: [ '8.0', '8.1', '8.2' ]
+        php-versions: [ '8.1', '8.2', '8.3' ]

    steps:
      - uses: actions/checkout@v2
--- a/composer.json
+++ b/composer.json
@ -4,41 +4,47 @@
  "license": "GPL-3.0-or-later",
  "type": "project",
  "require": {
-    "php": "^8.0.2 | ^8.1 | ^8.2",
+    "php": "^8.1 | ^8.2 | ^8.3",
    "composer/semver": "^3.3.2",
-    "doctrine/dbal": "^3.6.1",
-    "guzzlehttp/guzzle": "^7.0.1",
+    "doctrine/dbal": "^3.6",
+    "guzzlehttp/guzzle": "^7.8.1",
    "kovah/laravel-html-meta": "^2.0",
    "laracasts/flash": "^3.1",
-    "laravel/fortify": "^1.7",
-    "laravel/framework": "^9.0",
+    "laravel/fortify": "^v1.20",
+    "laravel/framework": "^v10.43",
    "league/csv": "^9.6",
    "league/flysystem-aws-s3-v3": "^3.0",
    "league/flysystem-ftp": "^3.0",
    "league/flysystem-sftp-v3": "^3.0",
    "masterminds/html5": "^2.8",
    "predis/predis": "^v2.1",
-    "rap2hpoutre/laravel-log-viewer": "^v2.2.0",
-    "sentry/sentry-laravel": "^3.3.0",
-    "shaarli/netscape-bookmark-parser": "^v4.0",
+    "rap2hpoutre/laravel-log-viewer": "^v2.3",
+    "sentry/sentry-laravel": "^4.2",
+    "shaarli/netscape-bookmark-parser": "dev-master",
    "spatie/laravel-backup": "^8.1.5",
    "symfony/http-client": "^6.0",
    "symfony/mailgun-mailer": "^6.0",
    "symfony/postmark-mailer": "^6.0",
-    "venturecraft/revisionable": "^1.34"
+    "venturecraft/revisionable": "^1.40"
  },
  "require-dev": {
    "barryvdh/laravel-debugbar": "^3.2",
    "barryvdh/laravel-ide-helper": "^2.6",
-    "spatie/laravel-ignition": "^1.6",
+    "spatie/laravel-ignition": "^2.4",
    "fakerphp/faker": "^1.12",
    "laravel/tinker": "^2.2",
    "mockery/mockery": "^1.5",
-    "nunomaduro/collision": "^6.1",
-    "phpunit/phpunit": "^9.0",
+    "nunomaduro/collision": "^v7.10.0",
+    "phpunit/phpunit": "^10.5",
    "roave/security-advisories": "dev-latest",
    "squizlabs/php_codesniffer": "^3.5"
  },
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/Kovah/netscape-bookmark-parser"
+    }
+  ],
  "autoload": {
    "files": [
      "app/Helper/functions.php"
--- a/composer.lock
+++ b/composer.lock
--- a/docker-compose.production-simple.yml
+++ b/docker-compose.production-simple.yml
@ -4,9 +4,9 @@ services:

  # --- MariaDB
  db:
-    image: mariadb:10.7
+    image: mariadb:11.2
    restart: unless-stopped
-    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
+    command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
    environment:
      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
      - MYSQL_USER=${DB_USERNAME}
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@ -4,9 +4,9 @@ services:

  # --- MariaDB
  db:
-    image: mariadb:10.7
+    image: mariadb:11.2
    restart: unless-stopped
-    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
+    command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
    environment:
      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
      - MYSQL_USER=${DB_USERNAME}
@ -29,7 +29,7 @@ services:

  # --- nginx
  nginx:
-    image: bitnami/nginx:1.21
+    image: bitnami/nginx:1.24
    restart: unless-stopped
    ports:
      - "0.0.0.0:80:8080"
@ -45,7 +45,7 @@ services:

  # --- Redis
  redis:
-    image: bitnami/redis:6.2
+    image: bitnami/redis:7.2
    restart: unless-stopped
    environment:
      - REDIS_PASSWORD=${REDIS_PASSWORD}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,8 +5,8 @@ services:

  # --- MariaDB
  db:
-    image: mariadb:10.6
-    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
+    image: mariadb:11.2
+    command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
    environment:
      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
      - MYSQL_USER=${DB_USERNAME}
@ -18,7 +18,7 @@ services:
      - linkace-db:/var/lib/mysql

  pg-db:
-    image: postgres:13
+    image: postgres:14
    environment:
      - POSTGRES_PASSWORD=${DB_PASSWORD}
      - POSTGRES_USER=${DB_USERNAME}
@ -41,7 +41,7 @@ services:

  # --- nginx
  nginx:
-    image: bitnami/nginx:1.19
+    image: bitnami/nginx:1.25
    ports:
      - "80:8080"
    depends_on:
@ -52,7 +52,7 @@ services:

  # --- Redis
  redis:
-    image: bitnami/redis:6.0
+    image: bitnami/redis:7.2
    environment:
      - REDIS_PASSWORD=${REDIS_PASSWORD}
    ports:
--- a/package-lock.json
+++ b/package-lock.json
--- a/renovate.json
+++ b/renovate.json
@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}
--- a/resources/docker/dockerfiles/development.Dockerfile
+++ b/resources/docker/dockerfiles/development.Dockerfile
@ -1,7 +1,7 @@
 # DOCKERFILE DEVELOPMENT
 # Installs MySQL Client for database exports, xDebug with PCov and Composer

-FROM php:8.0.29-fpm
+FROM php:8.1.10-fpm
 WORKDIR /app

 RUN apt-get update && apt-get install -y \
--- a/resources/docker/dockerfiles/release-base.Dockerfile
+++ b/resources/docker/dockerfiles/release-base.Dockerfile
@ -1,4 +1,4 @@
-FROM php:8.2-fpm-alpine
+FROM php:8.3-fpm-alpine

 # Install package and PHP dependencies
 RUN apk add --no-cache mariadb-client postgresql postgresql-dev sqlite zip libzip-dev; \
--- a/resources/docker/dockerfiles/release-multiplatform.Dockerfile
+++ b/resources/docker/dockerfiles/release-multiplatform.Dockerfile
@ -32,7 +32,7 @@ RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-back

 # ================================
 # Compile all assets
-FROM node:18 AS npm_builder
+FROM node:20 AS npm_builder
 WORKDIR /srv

 COPY ./resources/assets ./resources/assets
@ -43,7 +43,7 @@ RUN npm run production

 # ================================
 # Prepare the final image
-FROM linkace/base-image:php-8.2-alpine
+FROM linkace/base-image:php-8.3-alpine
 WORKDIR /app

 # Copy the app into the container