leviathonbeast/php-flasher
1
0
Fork 0
mirror of https://github.com/php-flasher/php-flasher.git synced 2026-03-31 15:07:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix FlasherPlugin::normalizeAlias() return type and add tests

Browse Source
This commit is contained in:
Younes ENNAJI
2026-03-02 04:02:08 +00:00
parent 5612d4d705
commit e126813835
3 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -26,6 +26,8 @@
* fix [Flasher] Fix NotificationStorageMethods::resolveResourceName() return type from ?string to string (never returns null) * fix [Flasher] Fix NotificationStorageMethods::resolveResourceName() return type from ?string to string (never returns null)
* fix [Flasher] Fix parameter name inconsistency in NotificationBuilderInterface::options() - changed $merge to $append to match implementation * fix [Flasher] Fix parameter name inconsistency in NotificationBuilderInterface::options() - changed $merge to $append to match implementation
* fix [Flasher] Add type validation for callable presenter return values in ResponseManager with descriptive error messages * fix [Flasher] Add type validation for callable presenter return values in ResponseManager with descriptive error messages
* fix [Flasher] Fix FlasherPlugin::normalizePlugins() losing scripts/styles when both top-level and plugin-level configs are provided - replaced array union operator with array_merge
* fix [Flasher] Simplify FlasherPlugin::normalizeFlashBag() by replacing redundant array union with direct array_merge
## [v2.1.3](https://github.com/php-flasher/php-flasher/compare/v2.1.2...v2.1.3) - 2025-01-25 ## [v2.1.3](https://github.com/php-flasher/php-flasher/compare/v2.1.2...v2.1.3) - 2025-01-25
src/Prime/Plugin/FlasherPlugin.php
+13 -7
View File
@@ -127,18 +127,24 @@ final class FlasherPlugin extends Plugin
} }
if (!empty($config['scripts'])) { if (!empty($config['scripts'])) {
$config['plugins']['flasher']['scripts'] ??= []; $config['plugins']['flasher']['scripts'] = array_merge(
$config['plugins']['flasher']['scripts'] += $config['scripts']; $config['plugins']['flasher']['scripts'] ?? [],
$config['scripts']
);
} }
if (!empty($config['styles'])) { if (!empty($config['styles'])) {
$config['plugins']['flasher']['styles'] ??= []; $config['plugins']['flasher']['styles'] = array_merge(
$config['plugins']['flasher']['styles'] += $config['styles']; $config['plugins']['flasher']['styles'] ?? [],
$config['styles']
);
} }
if (!empty($config['options'])) { if (!empty($config['options'])) {
$config['plugins']['flasher']['options'] ??= []; $config['plugins']['flasher']['options'] = array_merge(
$config['plugins']['flasher']['options'] += $config['options']; $config['options'],
$config['plugins']['flasher']['options'] ?? []
);
} }
foreach ($config['plugins'] as $name => $options) { foreach ($config['plugins'] as $name => $options) {
@@ -345,7 +351,7 @@ final class FlasherPlugin extends Plugin
return $config; return $config;
} }
$config['flash_bag'] += array_merge($mapping, $config['flash_bag']); $config['flash_bag'] = array_merge($mapping, $config['flash_bag']);
return $config; return $config;
} }
tests/Prime/Plugin/FlasherPluginTest.php
+53
View File
@@ -406,4 +406,57 @@ final class FlasherPluginTest extends TestCase
$plugin = new FlasherPlugin(); $plugin = new FlasherPlugin();
$this->assertSame([], $plugin->getOptions()); $this->assertSame([], $plugin->getOptions());
} }
public function testNormalizeConfigMergesTopLevelAndPluginLevelScripts(): void
{
$plugin = new FlasherPlugin();
$config = $plugin->normalizeConfig([
'scripts' => ['/top-level.js'],
'plugins' => [
'flasher' => [
'scripts' => ['/plugin-level.js'],
],
],
]);
// Both scripts should be present - plugin-level first, then top-level
$this->assertCount(2, $config['plugins']['flasher']['scripts']);
$this->assertContains('/plugin-level.js', $config['plugins']['flasher']['scripts']);
$this->assertContains('/top-level.js', $config['plugins']['flasher']['scripts']);
}
public function testNormalizeConfigMergesTopLevelAndPluginLevelStyles(): void
{
$plugin = new FlasherPlugin();
$config = $plugin->normalizeConfig([
'styles' => ['/top-level.css'],
'plugins' => [
'flasher' => [
'styles' => ['/plugin-level.css'],
],
],
]);
// Both styles should be present
$this->assertContains('/plugin-level.css', $config['plugins']['flasher']['styles']);
$this->assertContains('/top-level.css', $config['plugins']['flasher']['styles']);
}
public function testNormalizeConfigMergesOptionsWithPluginLevelOverride(): void
{
$plugin = new FlasherPlugin();
$config = $plugin->normalizeConfig([
'options' => ['timeout' => 5000, 'position' => 'top-right'],
'plugins' => [
'flasher' => [
'options' => ['timeout' => 3000],
],
],
]);
// Plugin-level timeout should override top-level
$this->assertSame(3000, $config['plugins']['flasher']['options']['timeout']);
// Top-level position should be preserved as default
$this->assertSame('top-right', $config['plugins']['flasher']['options']['position']);
}
} }