From 99e7a088b076da74efa0100ed699ca9c24cdba94 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sat, 10 Dec 2022 21:31:20 +0100
Subject: [PATCH] Use PHP 8.2 for builds and fixed warning in email validation
 rule

---
 docker/Dockerfile                   |  2 +-
 docker/dev/Dockerfile               |  2 +-
 src/Http/Validation/Rules/Email.php | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/Http/Validation/Rules/Email.php

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ca2f867..d8baa77d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -38,7 +38,7 @@ COPY --from=themes /app/public/assets /app/public/assets/
 RUN find /app/storage/ -type f -not -name VERSION -exec rm {} \;
 
 # Build the PHP/Nginx container
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine
 WORKDIR /var/www
 RUN apk add --no-cache icu-dev nginx && \
     docker-php-ext-install intl pdo_mysql && \
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 58e6e36c..0460c8cd 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,5 +1,5 @@
 # Engelsystem PHP FPM/Nginx development image including Xdebug
-FROM php:8.1-fpm-alpine AS es_base
+FROM php:8.2-fpm-alpine AS es_base
 WORKDIR /var/www
 RUN apk add --no-cache icu-dev linux-headers $PHPIZE_DEPS && \
     pecl install pcov xdebug && \
diff --git a/src/Http/Validation/Rules/Email.php b/src/Http/Validation/Rules/Email.php
new file mode 100644
index 00000000..31891360
--- /dev/null
+++ b/src/Http/Validation/Rules/Email.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use Egulias\EmailValidator\EmailValidator;
+use Respect\Validation\Rules\Email as RespectEmail;
+
+class Email extends RespectEmail
+{
+    // Fix for "Creation of dynamic property $emailValidator is deprecated" warning in PHP 8.2
+    public ?EmailValidator $emailValidator;
+}