fixed namespace issus with slick bundle

heimrichhannot · Feb 8, 2023 · d5ff4ed · d5ff4ed
1 parent 909e64b
commit d5ff4ed
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.1.1] - 2023-02-08
+- Fixed: slick bundle compatibility
+
 ## [2.1.0] - 2022-08-24
 - Added: support for newer banner version and drop support for older ones ([#14])
 - Changed: minumum contao version is now 4.9

diff --git a/composer.json b/composer.json
@@ -23,6 +23,9 @@
         "heimrichhannot/contao-mediaquery": "^1.1",
         "heimrichhannot/contao-utils-bundle": "^2.218"
     },
+    "conflict": {
+        "heimrichhannot/contao-slick-bundle": "<1.8.2"
+    },
     "autoload": {
         "psr-4": {
             "HeimrichHannot\\BannerPlusBundle\\": "src/"

diff --git a/src/EventListener/CompileSlickNewsListListener.php b/src/EventListener/CompileSlickNewsListListener.php
@@ -15,7 +15,7 @@
 use Contao\FrontendTemplate;
 use Contao\ModuleModel;
 use HeimrichHannot\BannerPlusBundle\Template\SlickBannerTemplate;
-use HeimrichHannot\SlickBundle\ModuleSlickNewsList;
+use HeimrichHannot\SlickBundle\Module\ModuleSlickNewsList;
 
 class CompileSlickNewsListListener
 {

diff --git a/src/EventListener/InitializeSystemListener.php b/src/EventListener/InitializeSystemListener.php
@@ -13,6 +13,7 @@
 
 
 use Contao\CoreBundle\ServiceAnnotation\Hook;
+use HeimrichHannot\SlickBundle\HeimrichHannotContaoSlickBundle;
 use HeimrichHannot\UtilsBundle\Util\Utils;
 
 /**
@@ -34,15 +35,12 @@ public function onInitializeSystem()
     {
         $this->addBackendAssets();
 
-        if (class_exists('HeimrichHannot\SlickBundle\HeimrichHannotContaoSlickBundle')) {
+        if (class_exists(HeimrichHannotContaoSlickBundle::class)) {
             $GLOBALS['TL_HOOKS']['compileSlickNewsList']['huh_banner_plus'] = [CompileSlickNewsListListener::class, 'onCompileSlickNewsList'];
         }
-        if(isset($GLOBALS['TL_HOOKS']['replaceInsertTags']) && is_array($GLOBALS['TL_HOOKS']['replaceInsertTags']))
-        {
-            foreach($GLOBALS['TL_HOOKS']['replaceInsertTags'] as $key => $arrConfig)
-            {
-                if($arrConfig[0] == 'BugBuster\Banner\BannerInsertTag')
-                {
+        if (isset($GLOBALS['TL_HOOKS']['replaceInsertTags']) && is_array($GLOBALS['TL_HOOKS']['replaceInsertTags'])) {
+            foreach ($GLOBALS['TL_HOOKS']['replaceInsertTags'] as $key => $arrConfig) {
+                if ($arrConfig[0] == 'BugBuster\Banner\BannerInsertTag') {
                     $GLOBALS['TL_HOOKS']['replaceInsertTags'][$key] = [ReplaceInsertTagsListener::class, 'onReplaceInsertTags'];
                 }
             }

diff --git a/src/Template/SlickBannerTemplate.php b/src/Template/SlickBannerTemplate.php
@@ -17,8 +17,8 @@
 use Contao\Module;
 use Contao\ModuleModel;
 use HeimrichHannot\BannerPlusBundle\Helper\SliderDisplayFormatHelper;
-use HeimrichHannot\SlickBundle\ModuleSlickEventList;
-use HeimrichHannot\SlickBundle\ModuleSlickNewsList;
+use HeimrichHannot\SlickBundle\Module\ModuleSlickEventList;
+use HeimrichHannot\SlickBundle\Module\ModuleSlickNewsList;
 
 /**
  * Class SlickBannerGenerator