Upgrade to PHP 8.4

uldisrudzitis · uldisrudzitis · commit 3d43e85d8614 · 2026-04-10T12:55:05.000+03:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           tools: composer:v2
           coverage: xdebug
 
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -6,13 +6,14 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 Berta is a file-based CMS (no database required for content storage). It has three distinct sub-applications that are developed and built independently:
 
-1. **`_api_app/`** — Laravel 12 API backend (PHP 8.2+)
+1. **`_api_app/`** — Laravel 12 API backend (PHP 8.4+)
 2. **`editor/`** — Angular 20 admin editor (TypeScript)
 3. **`engine/`** — Legacy PHP rendering engine with Gulp-built assets
 
 ## Development Commands
 
 ### Laravel API (`_api_app/`)
+
 ```bash
 cd _api_app
 composer install
@@ -24,6 +25,7 @@ npm run build                                     # Build assets
 ```
 
 ### Angular Editor (`editor/`)
+
 ```bash
 cd editor
 npm install
@@ -33,6 +35,7 @@ npm test          # Karma/Jasmine unit tests
 ```
 
 ### Legacy Engine Assets (root)
+
 ```bash
 npm install
 npm run dev       # Gulp watch (compiles Sass for themes/templates)
@@ -50,18 +53,18 @@ npm run build     # Gulp production build
 
 ### Key Directories
 
-| Path | Purpose |
-|------|---------|
-| `_api_app/app/Sites/` | Site/section/entry management domain |
-| `_api_app/app/Shop/` | E-commerce plugin |
-| `_api_app/app/Plugins/` | Plugin system |
-| `_api_app/app/Configuration/` | App configuration classes |
-| `editor/src/` | Angular source (components, state, services) |
-| `engine/_classes/` | Legacy PHP classes for site rendering |
-| `engine/_lib/berta/` | CSS/JS assets bundled by Gulp |
-| `_themes/` | Site themes (capetown, jaipur, kyoto, madrid, etc.) |
-| `_templates/` | Email/system templates with SCSS |
-| `_plugin_shop/` | Shop plugin PHP files |
+| Path                          | Purpose                                             |
+| ----------------------------- | --------------------------------------------------- |
+| `_api_app/app/Sites/`         | Site/section/entry management domain                |
+| `_api_app/app/Shop/`          | E-commerce plugin                                   |
+| `_api_app/app/Plugins/`       | Plugin system                                       |
+| `_api_app/app/Configuration/` | App configuration classes                           |
+| `editor/src/`                 | Angular source (components, state, services)        |
+| `engine/_classes/`            | Legacy PHP classes for site rendering               |
+| `engine/_lib/berta/`          | CSS/JS assets bundled by Gulp                       |
+| `_themes/`                    | Site themes (capetown, jaipur, kyoto, madrid, etc.) |
+| `_templates/`                 | Email/system templates with SCSS                    |
+| `_plugin_shop/`               | Shop plugin PHP files                               |
 
 ### State Management (Angular)
 
diff --git a/INSTALL/includes/check.php b/INSTALL/includes/check.php
@@ -25,10 +25,10 @@ function getStatus($isOk, $message, $failDesc = '', $isIndented = false, $isFata
     $testOutput .= '<p><strong>Is your website hosted on a suitable server?</strong></p>';
 
     // php version ...
-    $isOk = version_compare(PHP_VERSION, '8.2', '>=');
+    $isOk = version_compare(PHP_VERSION, '8.4', '>=');
     $listOk &= $isOk;
     $listHasErrors |= ! $isOk;
-    $testOutput .= getStatus($isOk, 'Supported PHP version', 'Berta needs PHP >= 8.2 support on server. Ask your server administrator to enable supported PHP version.');
+    $testOutput .= getStatus($isOk, 'Supported PHP version', 'Berta needs PHP >= 8.4 support on server. Ask your server administrator to enable supported PHP version.');
 
     // multibyte ...
     $isOk = function_exists('mb_ereg_replace') && function_exists('mb_strlen') && function_exists('mb_substr');
diff --git a/INSTALL/includes/first_visit_serverreqs.php b/INSTALL/includes/first_visit_serverreqs.php
@@ -63,7 +63,7 @@
                 <div class="xMAlign-inner">
                     <h2>Thank you for choosing Berta.me!</h2>
                     <p>This server does not meet Berta's requirements.<br />
-                    Berta needs PHP >= 8.2 support on server.</p>
+                    Berta needs PHP >= 8.4 support on server.</p>
                 </div>
             </div>
         </div>
diff --git a/_api_app/.cursor/rules/laravel-boost.mdc b/_api_app/.cursor/rules/laravel-boost.mdc
@@ -11,7 +11,7 @@ The Laravel Boost guidelines are specifically curated by Laravel maintainers for
 ## Foundational Context
 This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
 
-- php - 8.2.29
+- php - 8.4
 - laravel/framework (LARAVEL) - v12
 - laravel/prompts (PROMPTS) - v0
 - laravel/sanctum (SANCTUM) - v4
diff --git a/_api_app/.github/copilot-instructions.md b/_api_app/.github/copilot-instructions.md
@@ -8,7 +8,7 @@ The Laravel Boost guidelines are specifically curated by Laravel maintainers for
 ## Foundational Context
 This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
 
-- php - 8.2.29
+- php - 8.4
 - laravel/framework (LARAVEL) - v12
 - laravel/prompts (PROMPTS) - v0
 - laravel/sanctum (SANCTUM) - v4
diff --git a/_api_app/.junie/guidelines.md b/_api_app/.junie/guidelines.md
@@ -8,7 +8,7 @@ The Laravel Boost guidelines are specifically curated by Laravel maintainers for
 ## Foundational Context
 This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
 
-- php - 8.2.29
+- php - 8.4
 - laravel/framework (LARAVEL) - v12
 - laravel/prompts (PROMPTS) - v0
 - laravel/sanctum (SANCTUM) - v4
diff --git a/_api_app/app/Http/Middleware/Authenticate.php b/_api_app/app/Http/Middleware/Authenticate.php
@@ -23,10 +23,9 @@ public function __construct(Auth $auth)
     /**
      * Handle an incoming request.
      *
-     * @param  string|null  $guard
      * @return mixed
      */
-    public function handle(Request $request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, ?string $guard = null)
     {
         $apiPrefix = config('app.api_prefix');
         $isAPIRequest = strpos($request->getRequestUri(), '/' . $apiPrefix) === 0;
diff --git a/_api_app/app/Sites/Sections/Entries/SectionEntriesController.php b/_api_app/app/Sites/Sections/Entries/SectionEntriesController.php
@@ -145,7 +145,7 @@ public function galleryCrop(Request $request)
     /**
      * This method is entry rendering example
      */
-    public function renderEntries($site, $section, Request $request, $id = null)
+    public function renderEntries(string $site, string $section, Request $request, ?string $id = null)
     {
         $sectionEntriesDS = new SectionEntriesDataService($site, $section);
         $siteSectionsDS = new SiteSectionsDataService($site);
diff --git a/_api_app/app/Sites/Sections/SectionsMenuRenderService.php b/_api_app/app/Sites/Sections/SectionsMenuRenderService.php
@@ -176,7 +176,7 @@ private function getViewData(
         ];
     }
 
-    private function getUrl($section, $site, $sections, $siteSettings, $isEditMode, $isPreviewMode, $tag = null)
+    private function getUrl($section, $site, $sections, $siteSettings, $isEditMode, $isPreviewMode, ?string $tag = null)
     {
         $urlParts = [];
         $isExternalLink = isset($section['@attributes']['type']) && $section['@attributes']['type'] == 'external_link';
diff --git a/_api_app/app/Sites/Sections/SiteSectionsDataService.php b/_api_app/app/Sites/Sections/SiteSectionsDataService.php
@@ -144,7 +144,7 @@ class SiteSectionsDataService extends Storage
 
     private $isPreview;
 
-    public function __construct($site = '', $xml_root = null, $isPreview = false)
+    public function __construct(string $site = '', ?string $xml_root = null, bool $isPreview = false)
     {
         parent::__construct($site, $isPreview);
         $this->site_name = $site;
@@ -158,7 +158,7 @@ public function __construct($site = '', $xml_root = null, $isPreview = false)
      *
      * @return array Array of sections
      */
-    public function get($sectionName = null)
+    public function get(?string $sectionName = null)
     {
         if (! $this->SECTIONS) {
             $this->SECTIONS = $this->xmlFile2array($this->XML_FILE);
@@ -211,9 +211,9 @@ public function getState()
         return $sections;
     }
 
-    public function create($name = null, $title = null)
+    public function create(?string $name = null, ?string $title = null)
     {
-        if (!$name && $title) {
+        if (! $name && $title) {
             $name = $this->getUniqueSlug($title);
         }
 
@@ -246,7 +246,7 @@ public function create($name = null, $title = null)
         return $section;
     }
 
-    public function cloneSection($name = null, $title = null)
+    public function cloneSection(?string $name = null, ?string $title = null)
     {
         $sections = $this->get();
         $title = empty($title) ? $name : $title;
diff --git a/_api_app/app/Sites/Sections/SitemapRenderService.php b/_api_app/app/Sites/Sections/SitemapRenderService.php
@@ -21,7 +21,7 @@ private function getTags($sectionTags)
         return $tags;
     }
 
-    private function getUrl($section, $siteSlug, $sections, $request, $tag = null)
+    private function getUrl($section, $siteSlug, $sections, $request, ?string $tag = null)
     {
         $urlParts = [];
 
diff --git a/_api_app/app/Sites/Sections/Tags/SectionTagsDataService.php b/_api_app/app/Sites/Sections/Tags/SectionTagsDataService.php
@@ -117,7 +117,7 @@ class SectionTagsDataService extends Storage
 
     private $TAGS;
 
-    public function __construct($site = '', $sectionName = '', $xml_root = null)
+    public function __construct(string $site = '', string $sectionName = '', ?string $xml_root = null)
     {
         parent::__construct($site);
         $this->XML_ROOT = $xml_root ? $xml_root : $this->getSiteXmlRoot($site);
diff --git a/_api_app/app/Sites/Settings/SiteSettingsDataService.php b/_api_app/app/Sites/Settings/SiteSettingsDataService.php
@@ -292,7 +292,7 @@ class SiteSettingsDataService extends Storage
 
     private $siteTemplatesConfigService;
 
-    public function __construct($site = '', $xml_root = null)
+    public function __construct(string $site = '', ?string $xml_root = null)
     {
         parent::__construct($site);
         $xml_root = $xml_root ? $xml_root : $this->getSiteXmlRoot($site);
diff --git a/_api_app/app/Sites/SitesDataService.php b/_api_app/app/Sites/SitesDataService.php
@@ -132,7 +132,7 @@ public function getState()
         return $sites;
     }
 
-    public function create(Request $request, $cloneFrom = null)
+    public function create(Request $request, ?string $cloneFrom = null)
     {
         $sites = $this->get();
         $name = 'untitled-' . uniqid();
diff --git a/_api_app/app/Sites/TemplateSettings/SiteTemplateSettingsDataService.php b/_api_app/app/Sites/TemplateSettings/SiteTemplateSettingsDataService.php
@@ -370,7 +370,7 @@ class SiteTemplateSettingsDataService extends Storage
 
     private $siteTemplateDefaults;
 
-    public function __construct($site = '', $template = 'messy-0.4.2', $xml_root = null)
+    public function __construct(string $site = '', string $template = 'messy-0.4.2', ?string $xml_root = null)
     {
         parent::__construct($site);
         $this->xml_root = $xml_root ? $xml_root : $this->getSiteXmlRoot($site);
diff --git a/_api_app/composer.json b/_api_app/composer.json
@@ -11,7 +11,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.3",
+        "php": "^8.4",
         "firebase/php-jwt": "^6.11",
         "intervention/image": "^3.11",
         "laravel/ai": "^0.3.0",
diff --git a/engine/inc.page.php b/engine/inc.page.php
@@ -60,14 +60,14 @@
     $ENGINE_ROOT_URL = $SITE_ROOT_URL . 'engine/';
 }
 
-$hasSupportedPhpVersion = version_compare(PHP_VERSION, '8.2', '>=');
+$hasSupportedPhpVersion = version_compare(PHP_VERSION, '8.4', '>=');
 
 if (! $hasSupportedPhpVersion) {
     if (file_exists($SITE_ROOT_PATH . 'INSTALL/includes/first_visit_serverreqs.php')) {
         $CHECK_INCLUDED = true;
         include $SITE_ROOT_PATH . 'INSTALL/includes/first_visit_serverreqs.php';
     } else {
-        exit('Berta needs PHP >= 8.2 support on server.');
+        exit('Berta needs PHP >= 8.4 support on server.');
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,9 @@ public function __construct(Auth $auth)`
`23`	`23`	`/**`
`24`	`24`	`* Handle an incoming request.`
`25`	`25`	`*`
`26`		`- * @param string\|null $guard`
`27`	`26`	`* @return mixed`
`28`	`27`	`*/`
`29`		`- public function handle(Request $request, Closure $next, $guard = null)`
	`28`	`+ public function handle(Request $request, Closure $next, ?string $guard = null)`
`30`	`29`	`{`
`31`	`30`	`$apiPrefix = config('app.api_prefix');`
`32`	`31`	`$isAPIRequest = strpos($request->getRequestUri(), '/' . $apiPrefix) === 0;`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function galleryCrop(Request $request)`
`145`	`145`	`/**`
`146`	`146`	`* This method is entry rendering example`
`147`	`147`	`*/`
`148`		`- public function renderEntries($site, $section, Request $request, $id = null)`
	`148`	`+ public function renderEntries(string $site, string $section, Request $request, ?string $id = null)`
`149`	`149`	`{`
`150`	`150`	`$sectionEntriesDS = new SectionEntriesDataService($site, $section);`
`151`	`151`	`$siteSectionsDS = new SiteSectionsDataService($site);`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private function getViewData(`
`176`	`176`	`];`
`177`	`177`	`}`
`178`	`178`
`179`		`- private function getUrl($section, $site, $sections, $siteSettings, $isEditMode, $isPreviewMode, $tag = null)`
	`179`	`+ private function getUrl($section, $site, $sections, $siteSettings, $isEditMode, $isPreviewMode, ?string $tag = null)`
`180`	`180`	`{`
`181`	`181`	`$urlParts = [];`
`182`	`182`	`$isExternalLink = isset($section['@attributes']['type']) && $section['@attributes']['type'] == 'external_link';`