From ffbf230c421ba9c4b024ddd2a6606cce71ac0b87 Mon Sep 17 00:00:00 2001 From: endroid Date: Sun, 14 Jan 2018 16:06:28 +0000 Subject: [PATCH 1/6] Add endroid/image-placeholder --- .../packages/endroid_image_placeholder.yaml | 36 +++++++++++++++++++ endroid/image-placeholder/manifest.json | 5 +++ 2 files changed, 41 insertions(+) create mode 100644 endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml create mode 100644 endroid/image-placeholder/manifest.json diff --git a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml new file mode 100644 index 00000000..24502da2 --- /dev/null +++ b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml @@ -0,0 +1,36 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + Endroid\ImagePlaceholder\ImagePlaceholder: + arguments: ['%kernel.debug%', 'lorempixel', false] + calls: + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\BaconMockupProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\BeerHoldProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremFlickrProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremPixelProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PipsumProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceBearProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceCreatureProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceHoffProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceholdItProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceKittenProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceSkullProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\UnsplashItProvider']] + + Endroid\ImagePlaceholder\Twig\Extension\ImagePlaceholderExtension: ~ + + Endroid\ImagePlaceholder\Provider\BaconMockupProvider: ~ + Endroid\ImagePlaceholder\Provider\BeerHoldProvider: ~ + Endroid\ImagePlaceholder\Provider\LoremFlickrProvider: ~ + Endroid\ImagePlaceholder\Provider\LoremPixelProvider: ~ + Endroid\ImagePlaceholder\Provider\PipsumProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceBearProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceCreatureProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceHoffProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceholdItProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceKittenProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceSkullProvider: ~ + Endroid\ImagePlaceholder\Provider\UnsplashItProvider: ~ diff --git a/endroid/image-placeholder/manifest.json b/endroid/image-placeholder/manifest.json new file mode 100644 index 00000000..f0c301d4 --- /dev/null +++ b/endroid/image-placeholder/manifest.json @@ -0,0 +1,5 @@ +{ + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From e0b7b230cc43c3b3d8867e7628ea36fda06661bf Mon Sep 17 00:00:00 2001 From: endroid Date: Sun, 14 Jan 2018 16:19:01 +0000 Subject: [PATCH 2/6] Fix indentation --- endroid/image-placeholder/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/endroid/image-placeholder/manifest.json b/endroid/image-placeholder/manifest.json index f0c301d4..e164c6e6 100644 --- a/endroid/image-placeholder/manifest.json +++ b/endroid/image-placeholder/manifest.json @@ -1,5 +1,5 @@ { - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" - } + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } } From ff019ff9a1a18d0e49ea1fa65335309704aaa2ce Mon Sep 17 00:00:00 2001 From: endroid Date: Sun, 14 Jan 2018 16:20:44 +0000 Subject: [PATCH 3/6] Move manifest to correct level --- endroid/image-placeholder/{ => 2.0}/manifest.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename endroid/image-placeholder/{ => 2.0}/manifest.json (100%) diff --git a/endroid/image-placeholder/manifest.json b/endroid/image-placeholder/2.0/manifest.json similarity index 100% rename from endroid/image-placeholder/manifest.json rename to endroid/image-placeholder/2.0/manifest.json From a95cd5404349c9fb7a13e060371916d54203c85b Mon Sep 17 00:00:00 2001 From: endroid Date: Sun, 14 Jan 2018 19:08:43 +0000 Subject: [PATCH 4/6] Update providers --- .../2.0/config/packages/endroid_image_placeholder.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml index 24502da2..3e4198cc 100644 --- a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml +++ b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml @@ -5,32 +5,28 @@ services: public: false Endroid\ImagePlaceholder\ImagePlaceholder: - arguments: ['%kernel.debug%', 'lorempixel', false] + arguments: ['%kernel.debug%', 'placeholderpics', false] calls: - [addProvider, ['@Endroid\ImagePlaceholder\Provider\BaconMockupProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\BeerHoldProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremFlickrProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremPixelProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PipsumProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceBearProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceCreatureProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceHoffProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceholdItProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceKittenProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceSkullProvider']] - [addProvider, ['@Endroid\ImagePlaceholder\Provider\UnsplashItProvider']] + - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceholderPicsProvider']] Endroid\ImagePlaceholder\Twig\Extension\ImagePlaceholderExtension: ~ Endroid\ImagePlaceholder\Provider\BaconMockupProvider: ~ - Endroid\ImagePlaceholder\Provider\BeerHoldProvider: ~ Endroid\ImagePlaceholder\Provider\LoremFlickrProvider: ~ Endroid\ImagePlaceholder\Provider\LoremPixelProvider: ~ Endroid\ImagePlaceholder\Provider\PipsumProvider: ~ Endroid\ImagePlaceholder\Provider\PlaceBearProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceCreatureProvider: ~ Endroid\ImagePlaceholder\Provider\PlaceHoffProvider: ~ Endroid\ImagePlaceholder\Provider\PlaceholdItProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceKittenProvider: ~ Endroid\ImagePlaceholder\Provider\PlaceSkullProvider: ~ Endroid\ImagePlaceholder\Provider\UnsplashItProvider: ~ + Endroid\ImagePlaceholder\Provider\PlaceholderPicsProvider: ~ From 32da1e05e3165b44c81d15375eba1daabfdcf08f Mon Sep 17 00:00:00 2001 From: endroid Date: Tue, 30 Jan 2018 19:40:25 +0000 Subject: [PATCH 5/6] Allow for easier addition of providers --- .../packages/endroid_image_placeholder.yaml | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml index 3e4198cc..d6d73930 100644 --- a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml +++ b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml @@ -4,29 +4,16 @@ services: autoconfigure: true public: false + _instanceof: + Endroid\ImagePlaceholder\Provider\ProviderInterface: + tags: ['endroid_image_placeholder.provider'] + + Endroid\ImagePlaceholder\Provider\: + resource: '%kernel.project_dir%/vendor/endroid/image-placeholder/src/Provider/*' + Endroid\ImagePlaceholder\ImagePlaceholder: arguments: ['%kernel.debug%', 'placeholderpics', false] calls: - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\BaconMockupProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremFlickrProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\LoremPixelProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PipsumProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceBearProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceHoffProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceholdItProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceSkullProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\UnsplashItProvider']] - - [addProvider, ['@Endroid\ImagePlaceholder\Provider\PlaceholderPicsProvider']] + - [addProviders, [!tagged endroid_image_placeholder.provider]] Endroid\ImagePlaceholder\Twig\Extension\ImagePlaceholderExtension: ~ - - Endroid\ImagePlaceholder\Provider\BaconMockupProvider: ~ - Endroid\ImagePlaceholder\Provider\LoremFlickrProvider: ~ - Endroid\ImagePlaceholder\Provider\LoremPixelProvider: ~ - Endroid\ImagePlaceholder\Provider\PipsumProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceBearProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceHoffProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceholdItProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceSkullProvider: ~ - Endroid\ImagePlaceholder\Provider\UnsplashItProvider: ~ - Endroid\ImagePlaceholder\Provider\PlaceholderPicsProvider: ~ From dc23502849222a048e334e6bc22008498472a45d Mon Sep 17 00:00:00 2001 From: endroid Date: Tue, 30 Jan 2018 19:43:52 +0000 Subject: [PATCH 6/6] Use relative path --- .../2.0/config/packages/endroid_image_placeholder.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml index d6d73930..7bbf2eb2 100644 --- a/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml +++ b/endroid/image-placeholder/2.0/config/packages/endroid_image_placeholder.yaml @@ -9,7 +9,7 @@ services: tags: ['endroid_image_placeholder.provider'] Endroid\ImagePlaceholder\Provider\: - resource: '%kernel.project_dir%/vendor/endroid/image-placeholder/src/Provider/*' + resource: '../../vendor/endroid/image-placeholder/src/Provider/*' Endroid\ImagePlaceholder\ImagePlaceholder: arguments: ['%kernel.debug%', 'placeholderpics', false]