joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-16 09:02:52 +00:00
Code Packages Releases Activity

Fix a bug of web assets file joomla.asset.json registration/parsing (#41431)

Browse Source 
* Make sure that all registry files parsed

* Make sure that all registry files parsed

---------
This commit is contained in:
Fedir Zinchuk 2023-11-16 14:05:42 +02:00 committed by GitHub
parent e28916314a
commit 0b6137699f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/src/WebAsset/WebAssetRegistry.php
View File

@ -155,6 +155,9 @@ class WebAssetRegistry implements WebAssetRegistryInterface, DispatcherAwareInte
$this->assets[$type] = [];
}
// Check if any new file was added
$this->parseRegistryFiles();
$eventChange = 'new';
$eventAsset = $asset;
@ -183,6 +186,9 @@ class WebAssetRegistry implements WebAssetRegistryInterface, DispatcherAwareInte
*/
public function remove(string $type, string $name): WebAssetRegistryInterface
{
// Check if any new file was added
$this->parseRegistryFiles();
if (!empty($this->assets[$type][$name])) {
$asset = $this->assets[$type][$name];
@ -206,6 +212,9 @@ class WebAssetRegistry implements WebAssetRegistryInterface, DispatcherAwareInte
*/
public function exists(string $type, string $name): bool
{
// Check if any new file was added
$this->parseRegistryFiles();
return !empty($this->assets[$type][$name]);
}
@ -332,7 +341,11 @@ class WebAssetRegistry implements WebAssetRegistryInterface, DispatcherAwareInte
return;
}
foreach ($this->dataFilesNew as $path) {
$paths = $this->dataFilesNew;
$this->dataFilesNew = [];
foreach ($paths as $path) {
// Parse only if the file was not parsed already
if (empty($this->dataFilesParsed[$path])) {
$this->parseRegistryFile($path);
@ -340,9 +353,6 @@ class WebAssetRegistry implements WebAssetRegistryInterface, DispatcherAwareInte
// Mark the file as parsed
$this->dataFilesParsed[$path] = $path;
}
// Remove the file from queue
unset($this->dataFilesNew[$path]);
}
}