Skip to content

[FIX] Multiple assets in combiner url #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bennothommo merged 2 commits into from
Mar 29, 2023
Merged

[FIX] Multiple assets in combiner url #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f1c369
Added fix to ensure multiple assets are included in combination url
jaxwilko Mar 28, 2023
67ada20
Added test case for combining multiple asset via themeUrl
jaxwilko Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/cms/classes/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,7 +1394,7 @@ protected function themeCombineAssets(array $url): string
$asset = $source . DIRECTORY_SEPARATOR . $file;
if (File::exists($asset)) {
$assets[] = $asset;
break 2;
break;
}
}

Expand Down
30 changes: 30 additions & 0 deletions modules/cms/tests/classes/ControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,4 +639,34 @@ public function testMacro()
$response
);
}

public function testThemeCombineAssets(): void
{
$theme = Theme::load('test');
$controller = new Controller($theme);

// Generate a url
$url = $controller->themeUrl(['assets/css/style1.css', 'assets/css/style2.css']);
$this->assertIsString($url);

// Grab the cache key from the url
$cacheKey = 'combiner.' . str_before(basename($url), '-');

// Load the cached config
$combinerConfig = \Cache::get($cacheKey);
$this->assertIsString($combinerConfig);

// Decode the config
$combinerConfig = unserialize(base64_decode($combinerConfig));

// Assert the result is an array and includes files
$this->assertIsArray($combinerConfig);
$this->assertArrayHasKey('files', $combinerConfig);
$this->assertCount(2, $combinerConfig['files']);

// Check our input file names against our output file names
$files = array_map('basename', $combinerConfig['files']);
$this->assertTrue(in_array('style1.css', $files));
$this->assertTrue(in_array('style2.css', $files));
}
}