From 31063199184e63605b873f2a5fd836faa3435525 Mon Sep 17 00:00:00 2001 From: Stefan Heimes Date: Sun, 7 Mar 2021 13:30:09 +0100 Subject: [PATCH 1/2] Some small changes - Correct the travis config - Some style things --- .travis.yml | 5 +++-- src/EventListener/GetOptionsListener.php | 2 +- .../MetaModelsAttributeContentArticleExtensionTest.php | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e0ce6d..6567376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,8 @@ php: - "7.1" env: - - CONTAO_VERSION=~4.8.0 + - CONTAO_VERSION=~4.10.0 + - CONTAO_VERSION=~4.9.0 - CONTAO_VERSION=~4.4.0 # Exclude impossible Contao Version combinations. @@ -21,7 +22,7 @@ matrix: exclude: fast_finish: true allow_failures: - - env: CONTAO_VERSION=~4.8.0 + - env: CONTAO_VERSION=~4.10.0 before_script: - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini diff --git a/src/EventListener/GetOptionsListener.php b/src/EventListener/GetOptionsListener.php index a871a5d..7a570f4 100644 --- a/src/EventListener/GetOptionsListener.php +++ b/src/EventListener/GetOptionsListener.php @@ -23,7 +23,7 @@ namespace MetaModels\AttributeContentArticleBundle\EventListener; use MetaModels\IFactory; -use MultiColumnWizard\Event\GetOptionsEvent; +use \MenAtWork\MultiColumnWizardBundle\Event\GetOptionsEvent; /** * Handle events for tl_metamodel_attribute. diff --git a/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php b/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php index 72775af..0e5d084 100644 --- a/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php +++ b/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php @@ -51,6 +51,5 @@ public function testLoad(): void { self::assertTrue($container->hasDefinition($expectedDefinition)); } - } } From 1a6541ef75a3a536b3faf9f62bf8a7924e041e1f Mon Sep 17 00:00:00 2001 From: Stefan Heimes Date: Mon, 8 Mar 2021 00:16:52 +0100 Subject: [PATCH 2/2] Some small fixes for the work with the translated version. --- .travis.yml | 2 ++ README.md | 0 src/EventListener/GetOptionsListener.php | 2 +- src/EventListener/InitializeListener.php | 11 ++++++++--- src/Resources/config/listeners.yml | 14 +++++--------- src/Resources/contao/dca/tl_content.php | 16 +++++++++++----- src/Widgets/ContentArticleWidget.php | 1 - 7 files changed, 27 insertions(+), 19 deletions(-) mode change 100755 => 100644 README.md diff --git a/.travis.yml b/.travis.yml index 6567376..6c9c46e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ env: # Exclude impossible Contao Version combinations. matrix: exclude: + - php: "7.1" + env: CONTAO_VERSION=~4.10.0 fast_finish: true allow_failures: - env: CONTAO_VERSION=~4.10.0 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/src/EventListener/GetOptionsListener.php b/src/EventListener/GetOptionsListener.php index 7a570f4..a871a5d 100644 --- a/src/EventListener/GetOptionsListener.php +++ b/src/EventListener/GetOptionsListener.php @@ -23,7 +23,7 @@ namespace MetaModels\AttributeContentArticleBundle\EventListener; use MetaModels\IFactory; -use \MenAtWork\MultiColumnWizardBundle\Event\GetOptionsEvent; +use MultiColumnWizard\Event\GetOptionsEvent; /** * Handle events for tl_metamodel_attribute. diff --git a/src/EventListener/InitializeListener.php b/src/EventListener/InitializeListener.php index 7fd83b4..3f9b13e 100644 --- a/src/EventListener/InitializeListener.php +++ b/src/EventListener/InitializeListener.php @@ -91,10 +91,15 @@ public function onKernelRequest(GetResponseEvent $event) */ public function addBackendModules(&$localMenu) { - $strModule = Input::get('do'); - $strTable = Input::get('table'); + $strModule = Input::get('do'); + $strTable = Input::get('table'); + $blnLangSupport = Input::get('langSupport'); - if (substr($strModule, 0, 10) == 'metamodel_' && $strTable == 'tl_content') { + if ( + substr($strModule, 0, 10) == 'metamodel_' + && $strTable == 'tl_content' + && $blnLangSupport === null + ) { $needsToBeAdded = true; foreach ($GLOBALS['BE_MOD'] as $key => $mod) { if (isset($mod[$strModule])) { diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml index cc700a3..ef17a98 100644 --- a/src/Resources/config/listeners.yml +++ b/src/Resources/config/listeners.yml @@ -2,12 +2,10 @@ services: MetaModels\AttributeContentArticleBundle\EventListener\BackendEventListener: public: false tags: - - - name: kernel.event_listener + - name: kernel.event_listener event: 'dc-general.model.post-duplicate' method: 'handlePostDuplicationModel' - - - name: kernel.event_listener + - name: kernel.event_listener event: 'dc-general.model.post-paste' method: 'handlePostPasteModel' MetaModels\AttributeContentArticleBundle\EventListener\GetOptionsListener: @@ -15,8 +13,7 @@ services: arguments: - '@metamodels.factory' tags: - - - name: kernel.event_listener + - name: kernel.event_listener event: 'men-at-work.multi-column-wizard.get-options' method: getOptions MetaModels\AttributeContentArticleBundle\EventListener\InitializeListener: @@ -27,7 +24,6 @@ services: - "@contao.routing.scope_matcher" - "@metamodels.view_combination" tags: - - - name: kernel.event_listener + - name: kernel.event_listener event: kernel.request - priority: -6000 + priority: -600 diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index 84a98a4..39abf79 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -19,21 +19,27 @@ * @filesource */ +use Contao\Input; use MetaModels\AttributeContentArticleBundle\Table\ArticleContent; $GLOBALS['TL_DCA']['tl_content']['fields']['mm_slot'] = [ 'sql' => "varchar(255) NOT NULL default ''", ]; -$strModule = \Input::get('do'); -$strTable = \Input::get('table'); +$strModule = Input::get('do'); +$strTable = Input::get('table'); +$strLangSupport = Input::get('langSupport'); // Change TL_Content for the article popup -if (substr($strModule, 0, 10) == 'metamodel_' && $strTable == 'tl_content') { +if ( + \substr($strModule, 0, 10) == 'metamodel_' + && $strTable == 'tl_content' + && $strLangSupport === null +) { $GLOBALS['TL_DCA']['tl_content']['config']['dataContainer'] = 'TableMetaModelsContentArticle'; $GLOBALS['TL_DCA']['tl_content']['config']['ptable'] = - \Input::get('ptable'); + Input::get('ptable'); $GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][] = [ ArticleContent::class, @@ -52,6 +58,6 @@ $GLOBALS['TL_DCA']['tl_content']['list']['sorting']['filter'][] = [ 'mm_slot=?', - \Input::get('slot') + Input::get('slot') ]; } diff --git a/src/Widgets/ContentArticleWidget.php b/src/Widgets/ContentArticleWidget.php index 1216995..0a7ae16 100644 --- a/src/Widgets/ContentArticleWidget.php +++ b/src/Widgets/ContentArticleWidget.php @@ -27,7 +27,6 @@ use Contao\Widget; use ContaoCommunityAlliance\DcGeneral\Contao\Compatibility\DcCompat; use Doctrine\DBAL\Connection; -use Twig\Environment; /** * Class ContentArticleWidget