moved reader and list config to own bundle

README.md

@@ -1,4 +1,4 @@
-# YouTube
+huh.list.backend.module# YouTube
 
 [![](https://img.shields.io/packagist/v/heimrichhannot/contao-youtube-bundle.svg)](https://packagist.org/packages/heimrichhannot/contao-youtube-bundle)
 [![](https://img.shields.io/packagist/dt/heimrichhannot/contao-youtube-bundle.svg)](https://packagist.org/packages/heimrichhannot/contao-youtube-bundle)
@@ -26,6 +26,10 @@ It provides support for content elements and news items.
 
 ## Technical instruction
 
+### Upgrade major version or from heimrichhannot/contao-youtube
+
+See [Upgrade.md](UPGRADE.md)
+
 ### Add to list and reader item templates
 
 For usage with [List-](https://github.com/heimrichhannot/contao-list-bundle) and [Readerbundle](https://github.com/heimrichhannot/contao-reader-bundle) you first need to add the config elements in List- and/or Reader config.
@@ -66,9 +70,5 @@ Youtube videos can be added to news templates with ease. Just add the following
 
 To use preview images from youtube, you have to generate an API key (https://developers.google.com/youtube/v3/getting-started) and place it in the contao settings.
 
-## Upgrade notice from heimrichhannot/contao-youtube
-
-- After update, save your root-pages in back end mode again to update template names
-- Declare an Youtube-API Key in tl_settings or tl_page (otherwise preview image download wont work)
-- The modal windows for privacy dialog or modalvideo require additional css, that is not delivered by the bundle. Markup fits [Bootstrap](http://getbootstrap.com/) modal window css, so you are well-advised to use the css from that framework.
-- If you were using custom youtube `.html5` templates, migrate them to `.html.twig` templates, if you need help: check the default templates
+## Integrations/Extension
+- Integration with [Contao Reader Bundle](https://github.com/heimrichhannot/contao-reader-bundle): [Contao Youtube Reader Bundle](https://github.com/heimrichhannot/contao-youtube-reader-bundle)

UPGRADE.md

@@ -0,0 +1,23 @@
+# Upgrade
+
+## 1.* to 2.0
+
+### Integrations
+* moved reader bundle integration to own [bundle](https://github.com/heimrichhannot/contao-youtube-reader-bundle) 
+
+### Constants
+* Removed `ConfigFactory::CONTEXT_READER_BUNDLE` (use `CONTEXT_TWIG` instead)
+
+### Classes
+* moved `YouTubeReaderConfigElementType` to own bundle (see Integrations)
+
+### DCA
+* moved `tl_reader_config_element` dca and languages to own bundle (see integrations)
+
+## heimrichhannot/contao-youtube to youtube bundle 1.0
+
+- After update, save your root-pages in back end mode again to update template names
+- Declare an Youtube-API Key in tl_settings or tl_page (otherwise preview image download wont work)
+- The modal windows for privacy dialog or modalvideo require additional css, that is not delivered by the bundle. Markup fits [Bootstrap](http://getbootstrap.com/) modal window css, so you are well-advised to use the css from that framework.
+- If you were using custom youtube `.html5` templates, migrate them to `.html.twig` templates, if you need help: check the default templates
+

src/Configuration/ConfigFactory.php

@@ -12,10 +12,9 @@
 
 class ConfigFactory
 {
+    const CONTEXT_TWIG = 'twig';
     const CONTEXT_CONTENT_ELEMENT = 'contentElement';
     const CONTEXT_FRONTEND_MODULE = 'frontendModule';
-    const CONTEXT_READER_BUNDLE = 'readerBundle';
-    const CONTEXT_LIST_BUNDLE = 'listBundle';
 
     /**
      * @var ContaoFrameworkInterface
@@ -38,8 +37,7 @@ public function __construct(ContaoFrameworkInterface $framework)
     public function createConfig(string $context, array $config = null)
     {
         switch ($context) {
-            case static::CONTEXT_READER_BUNDLE:
-            case static::CONTEXT_LIST_BUNDLE:
+            case static::CONTEXT_TWIG:
                 return new YoutubeTwigConfig($this->framework, $config);
             case static::CONTEXT_CONTENT_ELEMENT:
             case static::CONTEXT_FRONTEND_MODULE:

src/ContaoManager/Plugin.php

@@ -25,7 +25,10 @@ class Plugin implements BundlePluginInterface, ExtensionPluginInterface
     public function getBundles(ParserInterface $parser)
     {
         return [
-            BundleConfig::create(HeimrichHannotContaoYoutubeBundle::class)->setLoadAfter([ContaoCoreBundle::class, 'multi_column_editor']),
+            BundleConfig::create(HeimrichHannotContaoYoutubeBundle::class)->setLoadAfter([
+                ContaoCoreBundle::class,
+                'multi_column_editor',
+            ]),
         ];
     }
 
@@ -46,18 +49,6 @@ public function getExtensionConfig($extensionName, array $extensionConfigs, Cont
             $extensionConfigs,
             __DIR__.'/../Resources/config/config_encore.yml'
         );
-        $extensionConfigs = ContainerUtil::mergeConfigFile(
-            'huh_list',
-            $extensionName,
-            $extensionConfigs,
-            __DIR__.'/../Resources/config/huh_list.yml'
-        );
-        $extensionConfigs = ContainerUtil::mergeConfigFile(
-            'huh_reader',
-            $extensionName,
-            $extensionConfigs,
-            __DIR__.'/../Resources/config/huh_reader.yml'
-        );
 
         return $extensionConfigs;
     }

src/Resources/translations/messages.de.yml

@@ -13,22 +13,4 @@ huh.youtube:
     default: Video anzeigen
     play: Video abspielen
     window: Video in neuen Fenster öffnen
-    article: Videobeitrag
-
-# DCA
-huh.list:
-  tl_list_config_element.field:
-    typeSelectorField.youtube:
-      name: YouTube Selektor Element
-      desc: Wählen Sie hier das Feld aus, welches den boolschen Selektor für das YouTube Feld enthält.
-    typeField.youtube:
-      name: YouTube Feld
-      desc: Wählen Sie hier das Feld aus, welches die ID des YouTube Video enthält.
-huh.reader:
-  tl_reader_config_element.field:
-    typeSelectorField.youtube:
-      name: YouTube Selektor Element
-      desc: Wählen Sie hier das Feld aus, welches den boolschen Selektor für das YouTube Feld enthält.
-    typeField.youtube:
-      name: YouTube Feld
-      desc: Wählen Sie hier das Feld aus, welches die ID des YouTube Video enthält.
+    article: Videobeitrag

src/Resources/translations/messages.en.yml

@@ -13,22 +13,4 @@ huh.youtube:
     default: Show video
     play: Play video
     window: Open video in new window
-    article: video post
-
-# DCA
-huh.list:
-  tl_list_config_element.field:
-    typeSelectorField.youtube:
-      name: YouTube selector element
-      desc: Choose the field containing the boolean selector for the youtube field.
-    typeField.youtube:
-      name: YouTube field
-      desc: Choose the field containing the Youtube Video ID.
-huh.reader:
-  tl_reader_config_element.field:
-    typeSelectorField.youtube:
-      name: YouTube selector element
-      desc: Choose the field containing the boolean selector for the youtube field.
-    typeField.youtube:
-      name: YouTube field
-      desc: Choose the field containing the Youtube Video ID.
+    article: video post

src/Video/YoutubeVideoTemplateDataTrait.php

@@ -145,7 +145,7 @@ public function getYoutubePreviewImage(bool $cache = true): string
         try {
             $response = json_decode($result);
 
-            if ($response->error || !is_array($response->items) || empty($response->items)) {
+            if ($response->error || !\is_array($response->items) || empty($response->items)) {
                 return '';
             }