From 6d936fca582cf659515a3baccae7ee627418400f Mon Sep 17 00:00:00 2001 From: Peter Adelmann Date: Wed, 26 May 2021 10:25:00 +0200 Subject: [PATCH] run cs fixer, rework structure --- composer.json | 13 ++----- src/DependencyInjection/Configuration.php | 7 ++++ .../ConstantsExtension.php | 7 ++++ .../DataContainer/ConstantsListener.php | 9 ++++- src/EventListener/InsertTagListener.php | 36 +++++++++++++++++++ .../models => Model}/ConstantsModel.php | 5 ++- .../contao/classes/ConstantsInsertTags.php | 33 ----------------- src/Resources/contao/config/config.php | 6 ++-- src/Resources/contao/dca/tl_constants.php | 11 +++--- 9 files changed, 71 insertions(+), 56 deletions(-) create mode 100755 src/EventListener/InsertTagListener.php rename src/{Resources/contao/models => Model}/ConstantsModel.php (92%) delete mode 100755 src/Resources/contao/classes/ConstantsInsertTags.php diff --git a/composer.json b/composer.json index 0c58d28..b101900 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.0", + "php": "^7.3", "contao/core-bundle": "~4.4", "codefog/contao-haste": "^4.0" }, @@ -25,16 +25,7 @@ "autoload": { "psr-4": { "Trilobit\\ConstantsBundle\\": "src/" - }, - "classmap": [ - "src/Resources/contao/" - ], - "exclude-from-classmap": [ - "src/Resources/contao/config/", - "src/Resources/contao/dca/", - "src/Resources/contao/languages/", - "src/Resources/contao/templates/" - ] + } }, "extra": { "contao-manager-plugin": "Trilobit\\ConstantsBundle\\ContaoManager\\Plugin" diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 64c5e81..a9ea96e 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -1,5 +1,12 @@ + * @license LGPL-3.0-or-later + * @link http://github.com/trilobit-gmbh/contao-constants-bundle + */ + namespace Trilobit\ConstantsBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; diff --git a/src/DependencyInjection/ConstantsExtension.php b/src/DependencyInjection/ConstantsExtension.php index 6ae997b..e6f5b24 100644 --- a/src/DependencyInjection/ConstantsExtension.php +++ b/src/DependencyInjection/ConstantsExtension.php @@ -1,5 +1,12 @@ + * @license LGPL-3.0-or-later + * @link http://github.com/trilobit-gmbh/contao-constants-bundle + */ + namespace Trilobit\ConstantsBundle\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/EventListener/DataContainer/ConstantsListener.php b/src/EventListener/DataContainer/ConstantsListener.php index 4cb8eb9..c837dd6 100644 --- a/src/EventListener/DataContainer/ConstantsListener.php +++ b/src/EventListener/DataContainer/ConstantsListener.php @@ -1,10 +1,17 @@ + * @license LGPL-3.0-or-later + * @link http://github.com/trilobit-gmbh/contao-constants-bundle + */ + namespace Trilobit\ConstantsBundle\EventListener\DataContainer; use Contao\DataContainer; use Contao\System; -use Trilobit\ConstantsBundle\ConstantsModel; +use Trilobit\ConstantsBundle\Model\ConstantsModel; class ConstantsListener { diff --git a/src/EventListener/InsertTagListener.php b/src/EventListener/InsertTagListener.php new file mode 100755 index 0000000..c5ee389 --- /dev/null +++ b/src/EventListener/InsertTagListener.php @@ -0,0 +1,36 @@ + + * @license LGPL-3.0-or-later + * @link http://github.com/trilobit-gmbh/contao-constants-bundle + */ + +namespace Trilobit\ConstantsBundle\EventListener; + +use Contao\CoreBundle\ServiceAnnotation\Hook; +use Trilobit\ConstantsBundle\Model\ConstantsModel; + +class InsertTagListener +{ + /** + * Class ReplaceInsertTags. + * + * @Hook("replaceInsertTags") + */ + public function __invoke(string $tag) + { + $chunks = explode('::', $tag); + + if ('const' !== $chunks[0]) { + return false; + } + + if (null === ($result = ConstantsModel::findPublishedByName($chunks[1]))) { + return false; + } + + return $result->value; + } +} diff --git a/src/Resources/contao/models/ConstantsModel.php b/src/Model/ConstantsModel.php similarity index 92% rename from src/Resources/contao/models/ConstantsModel.php rename to src/Model/ConstantsModel.php index b2dfca4..ff35633 100755 --- a/src/Resources/contao/models/ConstantsModel.php +++ b/src/Model/ConstantsModel.php @@ -7,9 +7,9 @@ * @link http://github.com/trilobit-gmbh/contao-constants-bundle */ -namespace Trilobit\ConstantsBundle; +namespace Trilobit\ConstantsBundle\Model; -use Model; +use Contao\Model; /** * Class SocialmediaModel. @@ -23,7 +23,6 @@ class ConstantsModel extends Model /** * @param $intId - * @param array $arrOptions * @param mixed $strName * * @return mixed diff --git a/src/Resources/contao/classes/ConstantsInsertTags.php b/src/Resources/contao/classes/ConstantsInsertTags.php deleted file mode 100755 index 5a262fd..0000000 --- a/src/Resources/contao/classes/ConstantsInsertTags.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @license LGPL-3.0-or-later - * @link http://github.com/trilobit-gmbh/contao-constants-bundle - */ - -namespace Trilobit\ConstantsBundle; - -class ConstantsInsertTags -{ - /** - * @param $strInsertTag - * - * @return bool|string - */ - public function replaceInsertTags($strInsertTag) - { - $arrSplit = explode('::', $strInsertTag, 2); - - if ('const' === $arrSplit[0]) { - $objResult = ConstantsModel::findPublishedByName($arrSplit[1]); - - if (null !== $objResult) { - return $objResult->value; - } - } - - return false; - } -} diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index b7101f2..7afda97 100755 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -7,8 +7,8 @@ * @link http://github.com/trilobit-gmbh/contao-constants-bundle */ -use Trilobit\ConstantsBundle\ConstantsInsertTags; -use Trilobit\ConstantsBundle\ConstantsModel; +use Trilobit\ConstantsBundle\EventListener\InsertTagListener; +use Trilobit\ConstantsBundle\Model\ConstantsModel; $GLOBALS['BE_MOD']['trilobit']['tl_constants'] = [ 'tables' => ['tl_constants'], @@ -17,7 +17,7 @@ /* * Register hook */ -$GLOBALS['TL_HOOKS']['replaceInsertTags'][] = [ConstantsInsertTags::class, 'replaceInsertTags']; +$GLOBALS['TL_HOOKS']['replaceInsertTags'][] = [InsertTagListener::class, '__invoke']; /* * Models diff --git a/src/Resources/contao/dca/tl_constants.php b/src/Resources/contao/dca/tl_constants.php index 6278ffa..0c73aac 100755 --- a/src/Resources/contao/dca/tl_constants.php +++ b/src/Resources/contao/dca/tl_constants.php @@ -7,13 +7,15 @@ * @link http://github.com/trilobit-gmbh/contao-constants-bundle */ +use Trilobit\ConstantsBundle\EventListener\DataContainer\ConstantsListener; + $GLOBALS['TL_DCA']['tl_constants'] = [ // Config 'config' => [ 'dataContainer' => 'Table', 'enableVersioning' => true, 'onload_callback' => [ - [\Trilobit\ConstantsBundle\EventListener\DataContainer\ConstantsListener::class, 'modifyDca'] + [ConstantsListener::class, 'modifyDca'], ], 'sql' => [ 'keys' => [ @@ -98,8 +100,7 @@ // Palettes 'palettes' => [ - 'default' => '{key_legend},name,useWysiwygEditor,value;' - .'{published_legend:hide},published,start,stop', + 'default' => '{key_legend},name,useWysiwygEditor,value;{published_legend:hide},published,start,stop', ], // Subpalettes @@ -119,8 +120,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_constants']['useWysiwygEditor'], 'exclude' => true, 'inputType' => 'checkbox', - 'eval' => ['tl_class' => 'w50', 'submitOnChange' => true], - 'sql' => "char(1) NOT NULL default ''" + 'eval' => ['tl_class' => 'w50 m12', 'submitOnChange' => true], + 'sql' => "char(1) NOT NULL default ''", ], 'value' => [ 'label' => &$GLOBALS['TL_LANG']['tl_constants']['value'],