From fcabb8cc2cb31146a92b479a8076ec214d20bad8 Mon Sep 17 00:00:00 2001 From: Robin Wieschendorf Date: Thu, 13 Nov 2025 12:35:33 +0100 Subject: [PATCH 01/10] add GitHub Action for PHP Code Style checks using PHP CodeSniffer --- .github/workflows/php-code-style.yml | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/php-code-style.yml diff --git a/.github/workflows/php-code-style.yml b/.github/workflows/php-code-style.yml new file mode 100644 index 0000000..fc5ff26 --- /dev/null +++ b/.github/workflows/php-code-style.yml @@ -0,0 +1,33 @@ +# Name der GitHub Action, der im Actions-Tab angezeigt wird +name: PHP Code Style + +# Trigger: Wird bei jedem Push zu einem Pull Request ausgeführt +on: + pull_request: + branches: [ main ] # Nur PRs zum main-Branch + +jobs: + phpcs: + runs-on: ubuntu-latest # Ubuntu Linux Container + + steps: + # Schritt 1: Code aus dem Repository laden + # Hier verwenden wir eine vorgefertigte Action von GitHub + - uses: actions/checkout@v4 + + # Schritt 2: PHP installieren und phpcs einrichten + # Hier verwenden wir eine vorgefertigte Action von shivammathur + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.2' # PHP Version + tools: phpcs # PHP CodeSniffer installieren + + # Schritt 3: Code-Style prüfen mit PSR-12 Standard + # phpcs = PHP CodeSniffer prüft den Code auf Style-Fehler + # --standard=PSR12 = Verwendet den PSR-12 Coding Standard + # *.php = Prüft alle PHP-Dateien im Hauptverzeichnis + # admin/*.php = Prüft alle PHP-Dateien im admin-Ordner + # includes/*.php = Prüft alle PHP-Dateien im includes-Ordner + - name: Check PHP Code Style (PSR-12) + run: phpcs --standard=PSR12 *.php admin/*.php includes/*.php From d8f632217a5cd404c0f110204f8ee0f53678caa2 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 20:09:11 +0100 Subject: [PATCH 02/10] Testing GitHub Action with PHP 8.4 --- .github/workflows/php-code-style.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php-code-style.yml b/.github/workflows/php-code-style.yml index fc5ff26..77cbdf2 100644 --- a/.github/workflows/php-code-style.yml +++ b/.github/workflows/php-code-style.yml @@ -20,7 +20,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.2' # PHP Version + php-version: '8.4' # PHP Version tools: phpcs # PHP CodeSniffer installieren # Schritt 3: Code-Style prüfen mit PSR-12 Standard From 90aeb9f169ceb6103a4151d6e33d11a71f560cbd Mon Sep 17 00:00:00 2001 From: Robin Wieschendorf Date: Thu, 13 Nov 2025 20:44:37 +0100 Subject: [PATCH 03/10] Update PHP Code Style check to ignore warnings on exit --- .github/workflows/php-code-style.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php-code-style.yml b/.github/workflows/php-code-style.yml index 77cbdf2..42216be 100644 --- a/.github/workflows/php-code-style.yml +++ b/.github/workflows/php-code-style.yml @@ -30,4 +30,4 @@ jobs: # admin/*.php = Prüft alle PHP-Dateien im admin-Ordner # includes/*.php = Prüft alle PHP-Dateien im includes-Ordner - name: Check PHP Code Style (PSR-12) - run: phpcs --standard=PSR12 *.php admin/*.php includes/*.php + run: phpcs --standard=PSR12 --runtime-set ignore_warnings_on_exit 1 *.php admin/*.php includes/*.php From d7bf6505f3272ea489c1ab8184ccec07eeab6df1 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 20:55:06 +0100 Subject: [PATCH 04/10] Revert "Update PHP Code Style check to ignore warnings on exit" This reverts commit 90aeb9f169ceb6103a4151d6e33d11a71f560cbd. --- .github/workflows/php-code-style.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php-code-style.yml b/.github/workflows/php-code-style.yml index 42216be..77cbdf2 100644 --- a/.github/workflows/php-code-style.yml +++ b/.github/workflows/php-code-style.yml @@ -30,4 +30,4 @@ jobs: # admin/*.php = Prüft alle PHP-Dateien im admin-Ordner # includes/*.php = Prüft alle PHP-Dateien im includes-Ordner - name: Check PHP Code Style (PSR-12) - run: phpcs --standard=PSR12 --runtime-set ignore_warnings_on_exit 1 *.php admin/*.php includes/*.php + run: phpcs --standard=PSR12 *.php admin/*.php includes/*.php From 9e97a8a1b8448eaf18f88d54569db69a551b101a Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:04:59 +0100 Subject: [PATCH 05/10] Fix: A require statement must not appear between namespace/use declarations --- admin/send_email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/send_email.php b/admin/send_email.php index a95bf85..36fccdd 100644 --- a/admin/send_email.php +++ b/admin/send_email.php @@ -2,11 +2,11 @@ declare(strict_types=1); -use App\Service\MailSender; - // MailSender-Klasse einbinden require_once __DIR__ . '/../includes/MailSender.php'; +use App\Service\MailSender; + /** * Erstellt die E-Mail-Nachricht * From 833985ad28d122f46ad01763faecaa58901458c0 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:07:42 +0100 Subject: [PATCH 06/10] Fix: Delete require_once as we use Composer-Autoloader --- admin/send_email.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/admin/send_email.php b/admin/send_email.php index 36fccdd..dd216a1 100644 --- a/admin/send_email.php +++ b/admin/send_email.php @@ -2,9 +2,6 @@ declare(strict_types=1); -// MailSender-Klasse einbinden -require_once __DIR__ . '/../includes/MailSender.php'; - use App\Service\MailSender; /** From 2bd4db3004448d31e104eb6797e8c06239560c94 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:10:04 +0100 Subject: [PATCH 07/10] Revert "Fix: Delete require_once as we use Composer-Autoloader" This reverts commit 833985ad28d122f46ad01763faecaa58901458c0. --- admin/send_email.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/send_email.php b/admin/send_email.php index dd216a1..36fccdd 100644 --- a/admin/send_email.php +++ b/admin/send_email.php @@ -2,6 +2,9 @@ declare(strict_types=1); +// MailSender-Klasse einbinden +require_once __DIR__ . '/../includes/MailSender.php'; + use App\Service\MailSender; /** From f5bc0d7718f90649442eccb752169c575ab195ae Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:18:22 +0100 Subject: [PATCH 08/10] Fix: Trenne Definitionen und Logik --- admin/send_email.php | 46 ++--------------------------- includes/send_email_functions.php | 48 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 includes/send_email_functions.php diff --git a/admin/send_email.php b/admin/send_email.php index 36fccdd..9a82533 100644 --- a/admin/send_email.php +++ b/admin/send_email.php @@ -5,50 +5,10 @@ // MailSender-Klasse einbinden require_once __DIR__ . '/../includes/MailSender.php'; -use App\Service\MailSender; - -/** - * Erstellt die E-Mail-Nachricht - * - * @return string Die formatierte E-Mail-Nachricht - */ -function createEmailMessage(): string -{ - $message = "Hallo liebes modified-shop Team! 👋\n\n"; - $message .= "Ein mutiger Admin hat gerade auf einen mysteriösen Button geklickt...\n\n"; - $message .= "🤡 Witz des Tages:\n"; - $message .= "Letzter Wunsch des Programmierers:\n"; - $message .= "Bitte ein Bit. 🍺🍺🍺\n\n"; - $message .= "Mit freundlichen Grüßen,\n"; - $message .= "Ihr automatisiertes E-Mail-System\n\n"; - $message .= "P.S.: Diese E-Mail wurde am " . date('d.m.Y \u\m H:i:s') . " Uhr versendet.\n"; - - return $message; -} +// MailSender functions +require_once __DIR__ . '/../includes/send_email_functions.php'; -/** - * Gibt eine Erfolgsmeldung aus - * - * @param string $to Empfänger-Adresse - * @param string $subject Betreff - * @param string $message Nachricht - */ -function displaySuccessMessage(string $to, string $subject, string $message): void -{ - echo "✅ E-Mail erfolgreich versendet an $to!
"; - echo "📧 Betreff: $subject
"; - echo "
"; - echo "

Nachricht:

"; - echo "
" . htmlspecialchars($message) . "
"; -} - -/** - * Gibt eine Fehlermeldung aus - */ -function displayErrorMessage(): void -{ - echo "❌ Fehler beim Versenden der E-Mail."; -} +use App\Service\MailSender; // E-Mail-Konfiguration $to = 'info@modified-shop.org'; diff --git a/includes/send_email_functions.php b/includes/send_email_functions.php new file mode 100644 index 0000000..5a8ca6a --- /dev/null +++ b/includes/send_email_functions.php @@ -0,0 +1,48 @@ +"; + echo "📧 Betreff: $subject
"; + echo "
"; + echo "

Nachricht:

"; + echo "
" . htmlspecialchars($message) . "
"; +} + +/** + * Gibt eine Fehlermeldung aus + */ +function displayErrorMessage(): void +{ + echo "❌ Fehler beim Versenden der E-Mail."; +} From 7d209fe0082660a93cdfdca31330bd2e0ce124b0 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:42:52 +0100 Subject: [PATCH 09/10] add f72054d after resolving conflict --- includes/send_email_functions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/send_email_functions.php b/includes/send_email_functions.php index 5a8ca6a..ffbcbbc 100644 --- a/includes/send_email_functions.php +++ b/includes/send_email_functions.php @@ -16,6 +16,7 @@ function createEmailMessage(): string $message .= "🤡 Witz des Tages:\n"; $message .= "Letzter Wunsch des Programmierers:\n"; $message .= "Bitte ein Bit. 🍺🍺🍺\n\n"; + $message .= "Wie viele Software-Entwickler braucht man, um eine Glühbirne zu wechseln? Keinen. Das ist ein Hardware-Problem.\n\n"; $message .= "Mit freundlichen Grüßen,\n"; $message .= "Ihr automatisiertes E-Mail-System\n\n"; $message .= "P.S.: Diese E-Mail wurde am " . date('d.m.Y \u\m H:i:s') . " Uhr versendet.\n"; From 098e76abe841f47263ac8c11ef7826c5de7b4a71 Mon Sep 17 00:00:00 2001 From: Tomcraft1980 Date: Thu, 13 Nov 2025 21:46:04 +0100 Subject: [PATCH 10/10] Fix line length of 120 characters --- includes/send_email_functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/send_email_functions.php b/includes/send_email_functions.php index ffbcbbc..8119c25 100644 --- a/includes/send_email_functions.php +++ b/includes/send_email_functions.php @@ -16,7 +16,8 @@ function createEmailMessage(): string $message .= "🤡 Witz des Tages:\n"; $message .= "Letzter Wunsch des Programmierers:\n"; $message .= "Bitte ein Bit. 🍺🍺🍺\n\n"; - $message .= "Wie viele Software-Entwickler braucht man, um eine Glühbirne zu wechseln? Keinen. Das ist ein Hardware-Problem.\n\n"; + $message .= "Wie viele Software-Entwickler braucht man, um eine Glühbirne zu wechseln?\n"; + $message .= "Keinen. Das ist ein Hardware-Problem.\n\n"; $message .= "Mit freundlichen Grüßen,\n"; $message .= "Ihr automatisiertes E-Mail-System\n\n"; $message .= "P.S.: Diese E-Mail wurde am " . date('d.m.Y \u\m H:i:s') . " Uhr versendet.\n";