From 0fc60c13457f403661e3cc1d4fe1b41314e8d1f7 Mon Sep 17 00:00:00 2001 From: serdyuka Date: Fri, 4 Apr 2014 15:03:51 +0300 Subject: [PATCH 1/4] Move data loaders to binary folder --- .../Loader/AbstractDoctrineLoader.php | 2 +- .../Loader/ExtendedFileSystemLoader.php | 2 +- .../Loader/FileSystemLoader.php | 2 +- .../Data => Binary}/Loader/GridFSLoader.php | 2 +- .../Loader/LoaderInterface.php | 2 +- .../Data => Binary}/Loader/StreamLoader.php | 2 +- Imagine/Data/DataManager.php | 2 +- Resources/config/imagine.xml | 4 ++-- Resources/doc/data-loader/gridfs.md | 2 +- Resources/doc/data-loader/stream.md | 2 +- Resources/doc/data-loaders.md | 8 ++++---- Resources/doc/introduction.md | 4 ++-- .../S8rrlhhQ/images/cats.jpeg | Bin 2833 -> 2833 bytes .../S8rrlhhQ/images/cats.jpeg | 1 + Tests/Imagine/Data/DataManagerTest.php | 4 ++-- .../Data/Loader/FileSystemLoaderTest.php | 6 +++--- .../Imagine/Data/Loader/StreamLoaderTest.php | 4 ++-- 17 files changed, 25 insertions(+), 24 deletions(-) rename {Imagine/Data => Binary}/Loader/AbstractDoctrineLoader.php (97%) rename {Imagine/Data => Binary}/Loader/ExtendedFileSystemLoader.php (95%) rename {Imagine/Data => Binary}/Loader/FileSystemLoader.php (97%) rename {Imagine/Data => Binary}/Loader/GridFSLoader.php (94%) rename {Imagine/Data => Binary}/Loader/LoaderInterface.php (88%) rename {Imagine/Data => Binary}/Loader/StreamLoader.php (97%) create mode 100644 Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg diff --git a/Imagine/Data/Loader/AbstractDoctrineLoader.php b/Binary/Loader/AbstractDoctrineLoader.php similarity index 97% rename from Imagine/Data/Loader/AbstractDoctrineLoader.php rename to Binary/Loader/AbstractDoctrineLoader.php index ad681dc16..f65189560 100644 --- a/Imagine/Data/Loader/AbstractDoctrineLoader.php +++ b/Binary/Loader/AbstractDoctrineLoader.php @@ -1,6 +1,6 @@ - Liip\ImagineBundle\Imagine\Data\Loader\FileSystemLoader - Liip\ImagineBundle\Imagine\Data\Loader\StreamLoader + Liip\ImagineBundle\Binary\Loader\FileSystemLoader + Liip\ImagineBundle\Binary\Loader\StreamLoader diff --git a/Resources/doc/data-loader/gridfs.md b/Resources/doc/data-loader/gridfs.md index 454c4478c..2615ff994 100644 --- a/Resources/doc/data-loader/gridfs.md +++ b/Resources/doc/data-loader/gridfs.md @@ -14,7 +14,7 @@ liip_imagine: Add loader to your services: ``` xml - + diff --git a/Resources/doc/data-loader/stream.md b/Resources/doc/data-loader/stream.md index 935a41141..60e113616 100644 --- a/Resources/doc/data-loader/stream.md +++ b/Resources/doc/data-loader/stream.md @@ -12,7 +12,7 @@ liip_imagine: ## Custom -The `Liip\ImagineBundle\Imagine\Data\Loader\StreamLoader` allows to read images from any stream registered +The `Liip\ImagineBundle\Binary\Loader\StreamLoader` allows to read images from any stream registered thus allowing you to serve your images from literally anywhere. The example service definition shows how to use a stream wrapped by the [Gaufrette](https://github.com/KnpLabs/Gaufrette) filesystem abstraction layer. diff --git a/Resources/doc/data-loaders.md b/Resources/doc/data-loaders.md index f5e09cc16..4ecfd9bee 100644 --- a/Resources/doc/data-loaders.md +++ b/Resources/doc/data-loaders.md @@ -15,13 +15,13 @@ The ImagineBundle allows you to add your custom image loader classes. The only requirement is that each data loader implement the following interface: - Liip\ImagineBundle\Imagine\Data\Loader\LoaderInterface + Liip\ImagineBundle\Binary\Loader\LoaderInterface To tell the bundle about your new data loader, register it in the service container and apply the `liip_imagine.data.loader` tag to it (example here in XML): ``` xml - + @@ -51,13 +51,13 @@ liip_imagine: For an example of a data loader implementation, refer to -`Liip\ImagineBundle\Imagine\Data\Loader\FileSystemLoader`. +`Liip\ImagineBundle\Binary\Loader\FileSystemLoader`. ## Extending the image loader with data transformers You can extend a custom data loader to support virtually any file type using transformers. A data tranformer is intended to transform a file before actually rendering it. You -can refer to `Liip\ImagineBundle\Imagine\Data\Loader\ExtendedFileSystemLoader` and +can refer to `Liip\ImagineBundle\Binary\Loader\ExtendedFileSystemLoader` and to `Liip\ImagineBundle\Imagine\Data\Transformer\PdfTransformer` as an example. ExtendedFileSystemLoader extends FileSystemLoader and takes, as argument, an array of transformers. diff --git a/Resources/doc/introduction.md b/Resources/doc/introduction.md index 7737e3eb6..95d0d4cff 100644 --- a/Resources/doc/introduction.md +++ b/Resources/doc/introduction.md @@ -9,10 +9,10 @@ There are several components involved to get this done. The first step is to retrieve the original image, the one you address. -In order to retrieve such an image, there are so-called `DataLoader` those implement the `Liip\ImagineBundle\Imagine\Data\Loader\LoaderInterface`. +In order to retrieve such an image, there are so-called `DataLoader` those implement the `Liip\ImagineBundle\Binary\Loader\LoaderInterface`. Those loaders are typically managed by the `DataManager` and automatically wired with it, using dependency injection. -How a specific `DataLoader` retrieves the image, is up to the loader. The most simple way is to read a file from the local filesystem. This is implemented by the `Liip\ImagineBundle\Imagine\Data\Loader\FileSystemLoader`, which is set by default. +How a specific `DataLoader` retrieves the image, is up to the loader. The most simple way is to read a file from the local filesystem. This is implemented by the `Liip\ImagineBundle\Binary\Loader\FileSystemLoader`, which is set by default. You could also create a random image on the fly using drawing utilities, or read a binary stream from any stream registered. The most important parts about those `DataLoader`: diff --git a/Tests/Functional/app/web/media/cache/thumbnail_web_path/S8rrlhhQ/images/cats.jpeg b/Tests/Functional/app/web/media/cache/thumbnail_web_path/S8rrlhhQ/images/cats.jpeg index 8986710665c4891376d82266c2b27a9cd0854d81..b311ce48d7fed3fcc382e119a11806a15b82347b 100644 GIT binary patch delta 27 jcmbOzHc?FI|Be3-7zDiBJlz-=85tQ87!o!L{pSJzik%46 delta 27 jcmbOzHc?FI|Be3-7zDiBJlz-=85tND85lPT{pSJzh9C$Q diff --git a/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg b/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg new file mode 100644 index 000000000..74792f60d --- /dev/null +++ b/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg @@ -0,0 +1 @@ +anImageContent \ No newline at end of file diff --git a/Tests/Imagine/Data/DataManagerTest.php b/Tests/Imagine/Data/DataManagerTest.php index 8e880420d..2ea20b47a 100644 --- a/Tests/Imagine/Data/DataManagerTest.php +++ b/Tests/Imagine/Data/DataManagerTest.php @@ -3,7 +3,7 @@ namespace Liip\ImagineBundle\Tests\Imagine\Data; use Liip\ImagineBundle\Imagine\Data\DataManager; -use Liip\ImagineBundle\Imagine\Data\Loader\LoaderInterface; +use Liip\ImagineBundle\Binary\Loader\LoaderInterface; use Liip\ImagineBundle\Model\Binary; use Liip\ImagineBundle\Tests\AbstractTest; @@ -340,7 +340,7 @@ public function testShouldReturnBinaryWithLoaderContentAndGuessedFormatOnFind() */ protected function getMockLoader() { - return $this->getMock('Liip\ImagineBundle\Imagine\Data\Loader\LoaderInterface'); + return $this->getMock('Liip\ImagineBundle\Binary\Loader\LoaderInterface'); } /** diff --git a/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php b/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php index 0b296d0e3..4a0250080 100644 --- a/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php +++ b/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php @@ -2,7 +2,7 @@ namespace Liip\ImagineBundle\Tests\Imagine\Data\Loader; -use Liip\ImagineBundle\Imagine\Data\Loader\FileSystemLoader; +use Liip\ImagineBundle\Binary\Loader\FileSystemLoader; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser; use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesserInterface; @@ -27,9 +27,9 @@ public static function provideLoadCases() public function testShouldImplementLoaderInterface() { - $rc = new \ReflectionClass('Liip\ImagineBundle\Imagine\Data\Loader\FileSystemLoader'); + $rc = new \ReflectionClass('Liip\ImagineBundle\Binary\Loader\FileSystemLoader'); - $this->assertTrue($rc->implementsInterface('Liip\ImagineBundle\Imagine\Data\Loader\LoaderInterface')); + $this->assertTrue($rc->implementsInterface('Liip\ImagineBundle\Binary\Loader\LoaderInterface')); } public function testCouldBeConstructedWithExpectedArguments() diff --git a/Tests/Imagine/Data/Loader/StreamLoaderTest.php b/Tests/Imagine/Data/Loader/StreamLoaderTest.php index 99188d0a4..b685f935f 100644 --- a/Tests/Imagine/Data/Loader/StreamLoaderTest.php +++ b/Tests/Imagine/Data/Loader/StreamLoaderTest.php @@ -2,11 +2,11 @@ namespace Liip\ImagineBundle\Tests\Imagine\Data\Loader; -use Liip\ImagineBundle\Imagine\Data\Loader\StreamLoader; +use Liip\ImagineBundle\Binary\Loader\StreamLoader; use Liip\ImagineBundle\Tests\AbstractTest; /** - * @covers Liip\ImagineBundle\Imagine\Data\Loader\StreamLoader + * @covers Liip\ImagineBundle\Binary\Loader\StreamLoader */ class StreamLoaderTest extends AbstractTest { From daa109aac72eb2dbca5beb66e3b23d32753a502c Mon Sep 17 00:00:00 2001 From: serdyuka Date: Fri, 4 Apr 2014 16:20:51 +0300 Subject: [PATCH 2/4] Renamed configuration keys for data loaders. Tests for data loaders moved to binary folder. --- DependencyInjection/Compiler/LoadersCompilerPass.php | 2 +- .../Factory/Loader/FileSystemLoaderFactory.php | 6 +++--- .../Factory/Loader/StreamLoaderFactory.php | 6 +++--- DependencyInjection/LiipImagineExtension.php | 2 +- Resources/config/imagine.xml | 10 +++++----- Resources/doc/data-loader/gridfs.md | 4 ++-- Resources/doc/data-loader/stream.md | 6 +++--- Resources/doc/data-loaders.md | 6 +++--- .../Data => Binary}/Loader/FileSystemLoaderTest.php | 6 +++--- .../Data => Binary}/Loader/StreamLoaderTest.php | 2 +- .../Factory/Loader/FileSystemLoaderFactoryTest.php | 6 +++--- .../Factory/Loader/StreamLoaderFactoryTest.php | 6 +++--- UPGRADE.md | 6 ++++++ 13 files changed, 37 insertions(+), 31 deletions(-) rename Tests/{Imagine/Data => Binary}/Loader/FileSystemLoaderTest.php (93%) rename Tests/{Imagine/Data => Binary}/Loader/StreamLoaderTest.php (96%) diff --git a/DependencyInjection/Compiler/LoadersCompilerPass.php b/DependencyInjection/Compiler/LoadersCompilerPass.php index c96ab24e2..87ca4ab6b 100644 --- a/DependencyInjection/Compiler/LoadersCompilerPass.php +++ b/DependencyInjection/Compiler/LoadersCompilerPass.php @@ -20,7 +20,7 @@ public function process(ContainerBuilder $container) } } - $tags = $container->findTaggedServiceIds('liip_imagine.data.loader'); + $tags = $container->findTaggedServiceIds('liip_imagine.binary.loader'); if (count($tags) > 0 && $container->hasDefinition('liip_imagine.data.manager')) { $manager = $container->getDefinition('liip_imagine.data.manager'); diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php index 7468c3e11..43532c865 100644 --- a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php +++ b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php @@ -12,12 +12,12 @@ class FileSystemLoaderFactory implements LoaderFactoryInterface */ public function create(ContainerBuilder $container, $loaderName, array $config) { - $loaderDefinition = new DefinitionDecorator('liip_imagine.data.loader.prototype.filesystem'); + $loaderDefinition = new DefinitionDecorator('liip_imagine.binary.loader.prototype.filesystem'); $loaderDefinition->replaceArgument(2, $config['data_root']); - $loaderDefinition->addTag('liip_imagine.data.loader', array( + $loaderDefinition->addTag('liip_imagine.binary.loader', array( 'loader' => $loaderName )); - $loaderId = 'liip_imagine.data.loader.'.$loaderName; + $loaderId = 'liip_imagine.binary.loader.'.$loaderName; $container->setDefinition($loaderId, $loaderDefinition); diff --git a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php index ba33fb115..46ce26c2b 100644 --- a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php +++ b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php @@ -12,13 +12,13 @@ class StreamLoaderFactory implements LoaderFactoryInterface */ public function create(ContainerBuilder $container, $loaderName, array $config) { - $loaderDefinition = new DefinitionDecorator('liip_imagine.data.loader.prototype.stream'); + $loaderDefinition = new DefinitionDecorator('liip_imagine.binary.loader.prototype.stream'); $loaderDefinition->replaceArgument(0, $config['wrapper']); $loaderDefinition->replaceArgument(1, $config['context']); - $loaderDefinition->addTag('liip_imagine.data.loader', array( + $loaderDefinition->addTag('liip_imagine.binary.loader', array( 'loader' => $loaderName )); - $loaderId = 'liip_imagine.data.loader.'.$loaderName; + $loaderId = 'liip_imagine.binary.loader.'.$loaderName; $container->setDefinition($loaderId, $loaderDefinition); diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php index 82c9b61e7..20eb81e58 100644 --- a/DependencyInjection/LiipImagineExtension.php +++ b/DependencyInjection/LiipImagineExtension.php @@ -61,7 +61,7 @@ public function load(array $configs, ContainerBuilder $container) $container->setParameter('liip_imagine.filter_sets', $config['filter_sets']); - $container->setParameter('liip_imagine.data.loader.default', $config['data_loader']); + $container->setParameter('liip_imagine.binary.loader.default', $config['data_loader']); $container->setParameter('liip_imagine.controller_action', $config['controller_action']); diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml index c54c1067d..7edccc9bf 100644 --- a/Resources/config/imagine.xml +++ b/Resources/config/imagine.xml @@ -47,8 +47,8 @@ - Liip\ImagineBundle\Binary\Loader\FileSystemLoader - Liip\ImagineBundle\Binary\Loader\StreamLoader + Liip\ImagineBundle\Binary\Loader\FileSystemLoader + Liip\ImagineBundle\Binary\Loader\StreamLoader @@ -76,7 +76,7 @@ - %liip_imagine.data.loader.default% + %liip_imagine.binary.loader.default% @@ -179,13 +179,13 @@ - + - + diff --git a/Resources/doc/data-loader/gridfs.md b/Resources/doc/data-loader/gridfs.md index 2615ff994..3f46adeb5 100644 --- a/Resources/doc/data-loader/gridfs.md +++ b/Resources/doc/data-loader/gridfs.md @@ -14,8 +14,8 @@ liip_imagine: Add loader to your services: ``` xml - - + + Application\ImageBundle\Document\Image diff --git a/Resources/doc/data-loader/stream.md b/Resources/doc/data-loader/stream.md index 60e113616..c77b1f0f4 100644 --- a/Resources/doc/data-loader/stream.md +++ b/Resources/doc/data-loader/stream.md @@ -24,12 +24,12 @@ you can make use of the [StreamWrapper configuration](https://github.com/KnpLabs ``` yaml services: - acme.liip_imagine.data.loader.stream.profile_photos: - class: "%liip_imagine.data.loader.stream.class%" + acme.liip_imagine.binary.loader.stream.profile_photos: + class: "%liip_imagine.binary.loader.stream.class%" arguments: - 'gaufrette://profile_photos/' tags: - - { name: 'liip_imagine.data.loader', loader: 'stream.profile_photos' } + - { name: 'liip_imagine.binary.loader', loader: 'stream.profile_photos' } ``` ## Usage diff --git a/Resources/doc/data-loaders.md b/Resources/doc/data-loaders.md index 4ecfd9bee..048cf12a4 100644 --- a/Resources/doc/data-loaders.md +++ b/Resources/doc/data-loaders.md @@ -18,11 +18,11 @@ requirement is that each data loader implement the following interface: Liip\ImagineBundle\Binary\Loader\LoaderInterface To tell the bundle about your new data loader, register it in the service -container and apply the `liip_imagine.data.loader` tag to it (example here in XML): +container and apply the `liip_imagine.binary.loader` tag to it (example here in XML): ``` xml - + ``` @@ -79,7 +79,7 @@ services: custom_loader: class: Acme\ImagineBundle\Imagine\Data\Loader\MyCustomDataLoader tags: - - { name: liip_imagine.data.loader, loader: custom_data_loader } + - { name: liip_imagine.binary.loader, loader: custom_data_loader } arguments: - '@liip_imagine' - %kernel.root_dir%/../web diff --git a/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php b/Tests/Binary/Loader/FileSystemLoaderTest.php similarity index 93% rename from Tests/Imagine/Data/Loader/FileSystemLoaderTest.php rename to Tests/Binary/Loader/FileSystemLoaderTest.php index 4a0250080..087374f10 100644 --- a/Tests/Imagine/Data/Loader/FileSystemLoaderTest.php +++ b/Tests/Binary/Loader/FileSystemLoaderTest.php @@ -1,6 +1,6 @@ 'theDataRoot', )); - $this->assertTrue($container->hasDefinition('liip_imagine.data.loader.theloadername')); + $this->assertTrue($container->hasDefinition('liip_imagine.binary.loader.theloadername')); - $loaderDefinition = $container->getDefinition('liip_imagine.data.loader.theloadername'); + $loaderDefinition = $container->getDefinition('liip_imagine.binary.loader.theloadername'); $this->assertInstanceOf('Symfony\Component\DependencyInjection\DefinitionDecorator', $loaderDefinition); - $this->assertEquals('liip_imagine.data.loader.prototype.filesystem', $loaderDefinition->getParent()); + $this->assertEquals('liip_imagine.binary.loader.prototype.filesystem', $loaderDefinition->getParent()); $this->assertEquals('theDataRoot', $loaderDefinition->getArgument(2)); } diff --git a/Tests/DependencyInjection/Factory/Loader/StreamLoaderFactoryTest.php b/Tests/DependencyInjection/Factory/Loader/StreamLoaderFactoryTest.php index bcebcc7ed..fb01f8368 100644 --- a/Tests/DependencyInjection/Factory/Loader/StreamLoaderFactoryTest.php +++ b/Tests/DependencyInjection/Factory/Loader/StreamLoaderFactoryTest.php @@ -38,11 +38,11 @@ public function testCreateLoaderDefinitionOnCreate() 'context' => 'theContext', )); - $this->assertTrue($container->hasDefinition('liip_imagine.data.loader.theloadername')); + $this->assertTrue($container->hasDefinition('liip_imagine.binary.loader.theloadername')); - $loaderDefinition = $container->getDefinition('liip_imagine.data.loader.theloadername'); + $loaderDefinition = $container->getDefinition('liip_imagine.binary.loader.theloadername'); $this->assertInstanceOf('Symfony\Component\DependencyInjection\DefinitionDecorator', $loaderDefinition); - $this->assertEquals('liip_imagine.data.loader.prototype.stream', $loaderDefinition->getParent()); + $this->assertEquals('liip_imagine.binary.loader.prototype.stream', $loaderDefinition->getParent()); $this->assertEquals('theWrapper', $loaderDefinition->getArgument(0)); $this->assertEquals('theContext', $loaderDefinition->getArgument(1)); diff --git a/UPGRADE.md b/UPGRADE.md index 61f009fed..50142af43 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -28,6 +28,12 @@ Upgrade * [Cache] `AbstractFilesystemResolver` was removed. * [Data] `LoaderInterface::find` now can return string or `BinaryInterface` instance. * [Data] `DataManager::find` now can return `BinaryInterface` instance only. +* [Data] All data loaders moved to `Binary/Loader` folder. +* [Data] Tag name `liip_imagine.data.loader` changed to `liip_imagine.binary.loader` +* [Data] Parameter key `liip_imagine.data.loader.filesystem.class` changed to `liip_imagine.binary.loader.filesystem.class` +* [Data] Parameter key `liip_imagine.data.loader.stream.class` changed to `liip_imagine.binary.loader.stream.class` +* [Data] Service id `liip_imagine.data.loader.prototype.filesystem` changed to `liip_imagine.binary.loader.prototype.filesystem` +* [Data] Service id `liip_imagine.data.loader.prototype.stream` changed to `liip_imagine.binary.loader.prototype.stream` * [Filter] `FilterManager::applyFilter` now return instance of `BinaryInterface`. * [Filter] `FilterManager::applyFilter` first argument was changed from Image instance to BinaryInterface one. * [Filter] `FilterManager::get` was removed. From 86f8b5644fe04ee01b35ccc6d067449118f9e1ed Mon Sep 17 00:00:00 2001 From: serdyuka Date: Fri, 4 Apr 2014 16:38:39 +0300 Subject: [PATCH 3/4] removed cache imeages --- .../thumbnail_web_path/S8rrlhhQ/images/cats.jpeg | Bin 2833 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Tests/Functional/app/web/media/cache/thumbnail_web_path/S8rrlhhQ/images/cats.jpeg diff --git a/Tests/Functional/app/web/media/cache/thumbnail_web_path/S8rrlhhQ/images/cats.jpeg b/Tests/Functional/app/web/media/cache/thumbnail_web_path/S8rrlhhQ/images/cats.jpeg deleted file mode 100644 index b311ce48d7fed3fcc382e119a11806a15b82347b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2833 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 Date: Fri, 4 Apr 2014 16:47:02 +0300 Subject: [PATCH 4/4] removed image, added rule to gitignore --- .gitignore | 2 +- .../web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg diff --git a/.gitignore b/.gitignore index d6aab3ab9..6944c8f15 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ composer.lock composer.phar vendor/ -/Tests/Functional/app/web/media/cache +Tests/Functional/app/web/media/cache diff --git a/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg b/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg deleted file mode 100644 index 74792f60d..000000000 --- a/Tests/Functional/app/web/media/cachethumbnail_web_path/S8rrlhhQ/images/cats.jpeg +++ /dev/null @@ -1 +0,0 @@ -anImageContent \ No newline at end of file