diff --git a/doc/basic-usage.rst b/doc/basic-usage.rst index 66dc86b4..8c64f5be 100644 --- a/doc/basic-usage.rst +++ b/doc/basic-usage.rst @@ -203,9 +203,9 @@ available filters will be resolved). Resolve Programmatically ~~~~~~~~~~~~~~~~~~~~~~~~ -You can resolve the image URL in your code using the ``getBrowserPath`` -method of the ``liip_imagine.cache.manager`` service. Assuming you already -have the service assigned to a variable called ``$imagineCacheManager``, +You can resolve the image URL in your code using the ``getBrowserPath`` method +of the ``Liip\ImagineBundle\Imagine\Cache\CacheManager`` service. Assuming you +already have the service assigned to a variable called ``$imagineCacheManager``, you would run: .. code-block:: php @@ -214,9 +214,7 @@ you would run: Often, you need to perform this operation in a controller. -You can access the ``CacheManager`` simply by type hinting it in your controller method: the service -``liip_imagine.cache.manager`` will be automatically injected and you will be able to call -``getBrowserPath`` on a relative image path to get its resolved location. +In a controller, this can look as follows: .. code-block:: php @@ -224,7 +222,7 @@ You can access the ``CacheManager`` simply by type hinting it in your controller namespace App\Controller; - use \Liip\ImagineBundle\Imagine\Cache\CacheManager; + use Liip\ImagineBundle\Imagine\Cache\CacheManager; class YourController { diff --git a/src/Resources/config/imagine.xml b/src/Resources/config/imagine.xml index 38019ce2..6e2d9d85 100644 --- a/src/Resources/config/imagine.xml +++ b/src/Resources/config/imagine.xml @@ -125,6 +125,7 @@ + @@ -133,6 +134,7 @@ %liip_imagine.binary.loader.default% %liip_imagine.default_image% + @@ -142,6 +144,7 @@ %liip_imagine.cache.resolver.default% %liip_imagine.webp.generate% + %liip_imagine.filter_sets% diff --git a/tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php b/tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php index c2f66ed2..4baf98f6 100644 --- a/tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php +++ b/tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php @@ -347,7 +347,7 @@ public function testCatchAndLogExceptionForFilterOnRemove(): void } /** - * @return MockObject&\Aws\S3\S3Client + * @return MockObject&S3Client */ protected function getS3ClientMock() {