Manual merge

jaxwilko · jaxwilko · commit 2d8030d069ce · 2025-03-12T21:03:35.000Z
diff --git a/.github/ISSUE_TEMPLATE/1_BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/1_BUG_REPORT.yaml
@@ -27,6 +27,9 @@ body:
       label: PHP Version
       description: Please provide us the branch of PHP version. For example, for PHP version 7.4.9, select `7.4`, or for PHP version 8.0.1, select `8.0`.
       options:
+        - 8.4
+        - 8.3
+        - 8.2
         - 8.1
         - 8.0
         - 7.4
diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Install PHP and PHP Code Sniffer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
           tools: phpcs
 
diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
@@ -11,7 +11,7 @@ jobs:
     name: Update manifest
     runs-on: ubuntu-latest
     env:
-      phpVersion: '8.1'
+      phpVersion: '8.2'
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     name: ${{ matrix.operatingSystem }} / JavaScript
     env:
       nodeVersion: 16
-      phpVersion: '8.0'
+      phpVersion: '8.2'
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
@@ -96,7 +96,7 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['8.0', '8.1', '8.2', '8.3']
+        phpVersion: ['8.1', '8.2', '8.3', '8.4']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
         "source": "https://github.com/wintercms/winter"
     },
     "require": {
-        "php": "^8.0.2",
-        "winter/storm": "dev-wip/support-uploading-packages-update-manager-changes as 1.2",
+        "php": ">=8.1",
+        "winter/storm": "dev-develop as 1.2",
         "winter/wn-system-module": "dev-develop",
         "winter/wn-backend-module": "dev-develop",
         "winter/wn-cms-module": "dev-develop",
diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
@@ -2,6 +2,7 @@
 
 use System\Behaviors\SettingsModel;
 use Backend\Models\UserPreference;
+use Winter\Storm\Database\Model;
 
 /**
  * User Preferences model extension, identical to System\Behaviors\SettingsModel
@@ -58,9 +59,8 @@ public function isConfigured(): bool
 
     /**
      * Returns the raw Model record that stores the settings.
-     * @return Model
      */
-    public function getSettingsRecord()
+    public function getSettingsRecord(): ?Model
     {
         $item = UserPreference::forUser();
         $record = $item
diff --git a/modules/backend/composer.json b/modules/backend/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1"
     },
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
@@ -64,7 +64,7 @@ class ColorPicker extends FormWidgetBase
      */
     protected array $validationPatterns = [
         'cmyk' => '/^cmyk\((\d{1,2}\.?\d{0,2}%,? ?){4}\)$/',
-        'hex' => '/^#[\w\d]{6}$/',
+        'hex' => '/^#[\w\d]{6,8}$/',
         'hsl' => '/^hsla\((\d{1,3}\.?\d{0,2}%?, ?){3}\d\.?\d{0,2}?\)$/',
         'rgb' => '/^rgba\((\d{1,3}\.?\d{0,2}, ?){3}\d\.?\d{0,2}?\)$/',
     ];
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
@@ -312,6 +312,7 @@
     ],
     'recordfinder' => [
         'find_record' => 'Найти запись',
+        'default_prompt' => 'Нажмите кнопку %s чтобы найти запись',
         'invalid_model_class' => 'Предоставленный класс модели ":modelClass" для поиска записи является недействительным',
         'cancel' => 'Отмена',
     ],
diff --git a/modules/backend/widgets/form/partials/_field-button.php b/modules/backend/widgets/form/partials/_field-button.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @var \Winter\Storm\Database\Model $formModel
+ * @var \Backend\Classes\FormField $field
+ */
+$action = 'button';
+$handler = null;
+$href = null;
+$target = null;
+
+if (!empty($field->config['href']) || filter_var($field->value, FILTER_VALIDATE_URL)) {
+    $action = 'link';
+    $href = $field->config['href'] ?? '';
+    $target = $field->config['target'] ?? null;
+    if ($formModel->hasAttribute($href)) {
+        $href = $formModel->getAttribute($href);
+    }
+    if (filter_var($field->value, FILTER_VALIDATE_URL)) {
+        $href = $field->value;
+    }
+} elseif (!empty($field->config['handler'])) {
+    $action = 'popup';
+    $handler = $field->config['handler'];
+}
+
+$element = $action === 'link' ? 'a' : 'button';
+$label = $field->config['buttonLabel'] ?? '';
+$buttonType = $field->config['buttonType'] ?? 'default';
+$classes = implode(' ', array_filter([
+    "btn btn-$buttonType",
+    $field->config['buttonCssClass'] ?? ''
+]));
+$request = $field->config['request'] ?? '';
+
+$loadingText = $field->config['loading'] ?? '';
+$icon = $field->config['icon'] ?? '';
+?>
+<div class="loading-indicator-container">
+    <?php if ($field->path): ?>
+        <?= $this->controller->makePartial($field->path, [
+            'formWidget' => $this,
+            'formModel'  => $formModel,
+            'formField'  => $field,
+            'formValue'  => $field->value,
+            'model'      => $formModel,
+            'field'      => $field,
+            'value'      => $field->value,
+            'action'     => $action,
+            'element'    => $element,
+            'label'      => $label,
+            'buttonType' => $buttonType,
+            'classes'    => $classes,
+            'handler'    => $handler,
+            'request'    => $request,
+            'href'       => $href,
+            'target'     => $target,
+            'loading'    => $loadingText,
+            'icon'       => $icon,
+        ]) ?>
+    <?php else: ?>
+        <<?= e($element); ?>
+            class="<?= e($classes); ?>"
+            data-load-indicator<?= !empty($loadingText) ? '="' . e(trans($loadingText)) . '"' : ''; ?>
+            <?= $action === 'popup' ? 'data-control="popup"' : ''; ?>
+            <?= !empty($handler) ? 'data-handler="' . e($handler) . '"' : ''; ?>
+            <?= !empty($request) ? 'data-request="' . e($request) . '"' : ''; ?>
+            <?= !empty($href) ? 'href="' . e($href) . '"' : ''; ?>
+            <?= !empty($target) ? 'target="' . e($target) . '"' : ''; ?>
+        >
+            <?= !empty($icon) ? '<i class="' . e($icon) . '"></i>' : '' ?>
+            <?= e(trans($label)); ?>
+        </<?= e($element); ?>>
+    <?php endif; ?>
+</div>
diff --git a/modules/cms/composer.json b/modules/cms/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1"
     },
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
@@ -2,12 +2,12 @@
 
 return [
     'cms_object' => [
-        'invalid_file' => 'Ошибка в имени файла: :name. Имена файлов могут содержать только латинские буквы, цифры, знаки подчеркивания и точки. Пример правильных имен файлов: page.htm, page, subdirectory/page',
+        'invalid_file' => 'Ошибка в имени файла: :name. Имена файлов могут содержать только латинские буквы, цифры, знаки подчеркивания и точки. Пример правильных имён файлов: page.htm, page, subdirectory/page',
         'invalid_property' => "Параметр ':name' нельзя изменить.",
         'file_already_exists' => "Файл ':name' уже существует.",
         'error_saving' => "Ошибка сохранения файла ':name'. Пожалуйста, проверьте права на запись.",
         'error_creating_directory' => 'Ошибка создания директории :name. Пожалуйста, проверьте права на запись.',
-        'invalid_file_extension' => 'Указано неправильное расширение файла: :invalid. Разрешенные расширения: :allowed.',
+        'invalid_file_extension' => 'Указано неправильное расширение файла: :invalid. Разрешённые расширения: :allowed.',
         'error_deleting' => "Невозможно удалить файл шаблона ':name'. Пожалуйста, проверьте права на запись.",
         'delete_success' => 'Шаблоны были успешно удалены: :count.',
         'file_name_required' => 'Пожалуйста, укажите имя файла шаблона.',
@@ -76,7 +76,7 @@
         'export_button' => 'Экспортировать',
         'export_title' => 'Экспортировать тему',
         'export_folders_label' => 'Папки',
-        'export_folders_comment' => 'Пожалуйста, выберите папки темы, которые вы хотели бы экспортировать',
+        'export_folders_comment' => 'Пожалуйста, выберите папки темы которые вы хотели бы экспортировать',
         'delete_button' => 'Удалить',
         'delete_confirm' => 'Вы уверены, что хотите удалить эту тему? Это действие необратимо!',
         'delete_active_theme_failed' => 'Невозможно удалить активный тему, попробуйте сделать другую тему активной.',
@@ -90,10 +90,10 @@
         'new_directory_name_comment' => 'Укажите новое имя каталога для дубликата темы.',
         'dir_name_invalid' => 'Имя может содержать только цифры, латинские буквы и следующие символы: _ -',
         'dir_name_taken' => 'Указанный каталог уже существует.',
-        'find_more_themes' => 'Найти еще темы',
+        'find_more_themes' => 'Найти ещё темы',
         'saving' => 'Сохранение темы...',
         'return' => 'Вернуться к списку тем',
-        'default_description' => 'Пользовательская тема сгенерированая для :url',
+        'default_description' => 'Пользовательская тема сгенерированная для :url',
         'scaffold' => [
             'label' => 'Каркас',
             'empty' => 'Пусто',
diff --git a/modules/cms/models/MaintenanceSetting.php b/modules/cms/models/MaintenanceSetting.php
@@ -82,7 +82,7 @@ public function afterFetch()
     {
         if (
             ($theme = Theme::getEditTheme())
-            && ($themeMap = array_get($this->attributes, 'theme_map'))
+            && ($themeMap = array_get($this->value, 'theme_map'))
             && ($cmsPage = array_get($themeMap, $theme->getDirName()))
         ) {
             $this->cms_page = $cmsPage;
@@ -100,6 +100,6 @@ public function afterFetch()
      */
     public static function isAllowedIp(string $ip): bool
     {
-        return IpUtils::checkIp($ip, Arr::pluck(static::get('allowed_ips', []), 'ip'));
+        return IpUtils::checkIp($ip, Arr::pluck(static::get('allowed_ips', []) ?? [], 'ip'));
     }
 }
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
@@ -381,9 +381,23 @@ protected function registerErrorHandler()
     protected function registerLogging()
     {
         Event::listen(\Illuminate\Log\Events\MessageLogged::class, function ($event) {
+            if (!EventLog::useLogging()) {
+                return;
+            }
+
+            $details = $event->context ?? null;
+
+            // This allows for preventing db logging in cases where we don't want all log messages logged to the DB.
+            if (isset($details['skipDatabaseLog']) && $details['skipDatabaseLog']) {
+                return;
+            }
+
+            EventLog::add($event->message, $event->level, $details);
+        });
+
+        Event::listen('exception.report', function (\Throwable $throwable) {
             if (EventLog::useLogging()) {
-                $details = $event->context ?? null;
-                EventLog::add($event->message, $event->level, $details);
+                EventLog::addException($throwable);
             }
         });
     }
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
@@ -1,12 +1,13 @@
 <?php namespace System\Behaviors;
 
-use App;
-use Artisan;
-use Cache;
-use Log;
 use Exception;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
 use System\Classes\ModelBehavior;
+use Winter\Storm\Database\Model;
 
 /**
  * Settings model extension
@@ -112,30 +113,35 @@ public function resetDefault()
      */
     public function isConfigured(): bool
     {
-        return App::hasDatabase() && $this->getSettingsRecord() !== null;
+        if (!App::hasDatabase()) {
+            return false;
+        }
+
+        $record = null;
+        try {
+            $record = $this->getSettingsRecord();
+        } catch (QueryException $ex) {
+            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
+            if ($ex->getCode() !== '42S02') {
+                Log::error($ex, ['skipDatabaseLog' => true]);
+            }
+        }
+
+        return $record !== null;
     }
 
     /**
      * Returns the raw Model record that stores the settings.
-     * @return Model
      */
-    public function getSettingsRecord()
+    public function getSettingsRecord(): ?Model
     {
         $query = $this->model->where('item', $this->recordCode);
 
         if ($this->cacheTtl > 0) {
             $query = $query->remember($this->cacheTtl, $this->getCacheKey());
         }
 
-        $record = null;
-        try {
-            $record = $query->first();
-        } catch (QueryException $ex) {
-            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
-            if ($ex->getCode() === '42S02') {
-                traceLog($ex);
-            }
-        }
+        $record = $query->first();
 
         return $record ?: null;
     }
diff --git a/modules/system/classes/extensions/PluginManager.php b/modules/system/classes/extensions/PluginManager.php
@@ -6,6 +6,7 @@
 use FilesystemIterator;
 use Illuminate\Console\View\Components\Error;
 use Illuminate\Console\View\Components\Info;
+use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
@@ -652,8 +653,15 @@ public function registerAll(bool $force = false): void
             return;
         }
 
-        foreach ($this->plugins as $pluginId => $plugin) {
-            $this->registerPlugin($plugin, $pluginId);
+        try {
+            foreach ($this->plugins as $pluginId => $plugin) {
+                $this->registerPlugin($plugin, $pluginId);
+            }
+        } catch (QueryException $ex) {
+            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
+            if ($ex->getCode() === '42S02') {
+                Log::error("$pluginId cannot be registered, missing database content. Try running migrations. Error: " . $ex->getMessage());
+            }
         }
 
         // Ensure that route attributes are properly loaded
@@ -768,8 +776,15 @@ public function bootAll(bool $force = false): void
             return;
         }
 
-        foreach ($this->plugins as $plugin) {
-            $this->bootPlugin($plugin);
+        try {
+            foreach ($this->plugins as $pluginId => $plugin) {
+                $this->bootPlugin($plugin);
+            }
+        } catch (QueryException $ex) {
+            // SQLSTATE[42S02]: Base table or view not found - migrations haven't run yet
+            if ($ex->getCode() === '42S02') {
+                Log::error("$pluginId cannot be booted, missing database content. Try running migrations. Error: " . $ex->getMessage());
+            }
         }
 
         $this->booted = true;
diff --git a/modules/system/composer.json b/modules/system/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
+        "php": ">=8.1",
         "composer/installers": "~1.11.0",
         "laravel/framework": "^9.1",
         "composer/semver": "^3.2"
diff --git a/modules/system/controllers/eventlogs/_field_details.php b/modules/system/controllers/eventlogs/_field_details.php
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
diff --git a/modules/system/models/EventLog.php b/modules/system/models/EventLog.php
diff --git a/modules/system/models/Parameter.php b/modules/system/models/Parameter.php

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`}`
`24`	`24`	`],`
`25`	`25`	`"require": {`
`26`		`- "php": "^8.0.2",`
	`26`	`+ "php": ">=8.1",`
`27`	`27`	`"composer/installers": "~1.11.0",`
`28`	`28`	`"laravel/framework": "^9.1"`
`29`	`29`	`},`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function afterFetch()`
`82`	`82`	`{`
`83`	`83`	`if (`
`84`	`84`	`($theme = Theme::getEditTheme())`
`85`		`- && ($themeMap = array_get($this->attributes, 'theme_map'))`
	`85`	`+ && ($themeMap = array_get($this->value, 'theme_map'))`
`86`	`86`	`&& ($cmsPage = array_get($themeMap, $theme->getDirName()))`
`87`	`87`	`) {`
`88`	`88`	`$this->cms_page = $cmsPage;`
`@@ -100,6 +100,6 @@ public function afterFetch()`
`100`	`100`	`*/`
`101`	`101`	`public static function isAllowedIp(string $ip): bool`
`102`	`102`	`{`
`103`		`- return IpUtils::checkIp($ip, Arr::pluck(static::get('allowed_ips', []), 'ip'));`
	`103`	`+ return IpUtils::checkIp($ip, Arr::pluck(static::get('allowed_ips', []) ?? [], 'ip'));`
`104`	`104`	`}`
`105`	`105`	`}`