Merge remote-tracking branch 'origin/2.x' into 2-to-3

liip · Jul 3, 2024 · 2cb52ae · 2cb52ae
2 parents 05ebb4b + f3b6742
commit 2cb52ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,13 +15,17 @@ for a given releases. Unreleased, upcoming changes will be updated here periodic
 
 # 2.x
 
+## [2.13.1](https://github.com/liip/LiipImagineBundle/tree/2.13.1)
+
+- Fix Json Manifest handling when manifest file does not exist yet ([AirBair](https://github.com/liip/LiipImagineBundle/pull/1600))
+
 ## [2.13.0](https://github.com/liip/LiipImagineBundle/tree/2.13.0)
 
-- Support JsonManifestVersionStrategy that was added in Symfony 6.
+- Support JsonManifestVersionStrategy that was added in Symfony 6 ([wouterSkepp](https://github.com/liip/LiipImagineBundle/pull/1529)).
 
 ## [2.12.3](https://github.com/liip/LiipImagineBundle/tree/2.12.3)
 
-- Add alias for `Imagine\Image\ImagineInterface` to help autowiring.
+- Add alias for `Imagine\Image\ImagineInterface` to help autowiring ([dbu](https://github.com/liip/LiipImagineBundle/pull/1583)). 
 
 ## [2.12.2](https://github.com/liip/LiipImagineBundle/tree/2.12.2)
 

diff --git a/src/DependencyInjection/Compiler/AssetsVersionCompilerPass.php b/src/DependencyInjection/Compiler/AssetsVersionCompilerPass.php
@@ -68,6 +68,11 @@ public function process(ContainerBuilder $container): void
         $runtimeDefinition->setArgument(1, $version);
 
         if (is_a($versionStrategyDefinition->getClass(), JsonManifestVersionStrategy::class, true)) {
+            if (!file_exists($version)) {
+                $this->log($container, 'The manifest file at "'.$version.'" does not yet exist');
+
+                return;
+            }
             $jsonManifestString = file_get_contents($version);
 
             if (!\is_string($jsonManifestString)) {