diff --git a/composer.json b/composer.json index 65d5d26..d400fc0 100755 --- a/composer.json +++ b/composer.json @@ -32,12 +32,13 @@ }, "require": { "php": "^7.4 || ^8.0", - "contao/core-bundle": "^4.9 || ^5.0", + "contao/core-bundle": "^4.13 || ^5.0", "doctrine/dbal": "^2.11 || ^3.0", "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", "symfony/filesystem": "^4.4 || ^5.4 || ^6.0", "symfony/finder": "^4.4 || ^5.4 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0" + "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0", + "symfony/polyfill-php80": "^1.29" }, "require-dev": { "contao/manager-plugin": "^2.0" @@ -50,13 +51,14 @@ "config": { "allow-plugins": { "contao-components/installer": true, - "contao/manager-plugin": true + "contao/manager-plugin": true, + "php-http/discovery": false } }, "extra": { "contao-manager-plugin": "DirkKlemmt\\ContaoMmenuBundle\\ContaoManager\\Plugin" }, "scripts": { - "ecs": "@php tools/ecs/vendor/bin/ecs check src/ --config tools/ecs/config/default.php --fix --ansi" + "ecs": "@php tools/ecs/vendor/bin/ecs --config tools/ecs/config/default.php --fix --ansi" } } diff --git a/src/Resources/config/services.yml b/config/services.yml similarity index 100% rename from src/Resources/config/services.yml rename to config/services.yml diff --git a/src/Resources/contao/config/config.php b/contao/config/config.php similarity index 86% rename from src/Resources/contao/config/config.php rename to contao/config/config.php index 1a78980..39e68ac 100644 --- a/src/Resources/contao/config/config.php +++ b/contao/config/config.php @@ -6,27 +6,28 @@ * This file is part of the ContaoMmenuBundle. * * (c) Dirk Klemmt - * (c) inspiredminds + * (c) INSPIRED MINDS * * @license MIT */ +use Contao\ArrayUtil; use DirkKlemmt\ContaoMmenuBundle\FrontendModule\MmenuCustomModule; use DirkKlemmt\ContaoMmenuBundle\FrontendModule\MmenuHtmlModule; use DirkKlemmt\ContaoMmenuBundle\FrontendModule\MmenuModule; use DirkKlemmt\ContaoMmenuBundle\Model\MmenuConfigModel; -array_insert( +ArrayUtil::arrayInsert( $GLOBALS['BE_MOD']['system'], 0, [ 'mmenu_config' => [ 'tables' => ['tl_dk_mmenu_config'], ], - ] + ], ); -array_insert($GLOBALS['FE_MOD'], 3, [ +ArrayUtil::arrayInsert($GLOBALS['FE_MOD'], 3, [ 'navigationMenu' => [ 'mmenu' => MmenuModule::class, 'mmenuCustom' => MmenuCustomModule::class, diff --git a/src/Resources/contao/dca/tl_dk_mmenu_config.php b/contao/dca/tl_dk_mmenu_config.php similarity index 99% rename from src/Resources/contao/dca/tl_dk_mmenu_config.php rename to contao/dca/tl_dk_mmenu_config.php index bb1eddc..f724606 100644 --- a/src/Resources/contao/dca/tl_dk_mmenu_config.php +++ b/contao/dca/tl_dk_mmenu_config.php @@ -6,7 +6,7 @@ * This file is part of the ContaoMmenuBundle. * * (c) Dirk Klemmt - * (c) inspiredminds + * (c) INSPIRED MINDS * * @license MIT */ diff --git a/src/Resources/contao/dca/tl_module.php b/contao/dca/tl_module.php similarity index 98% rename from src/Resources/contao/dca/tl_module.php rename to contao/dca/tl_module.php index d5cfb2c..d729c37 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/contao/dca/tl_module.php @@ -6,7 +6,7 @@ * This file is part of the ContaoMmenuBundle. * * (c) Dirk Klemmt - * (c) inspiredminds + * (c) INSPIRED MINDS * * @license MIT */ diff --git a/src/Resources/contao/languages/de/default.xlf b/contao/languages/de/default.xlf similarity index 100% rename from src/Resources/contao/languages/de/default.xlf rename to contao/languages/de/default.xlf diff --git a/src/Resources/contao/languages/de/modules.xlf b/contao/languages/de/modules.xlf similarity index 100% rename from src/Resources/contao/languages/de/modules.xlf rename to contao/languages/de/modules.xlf diff --git a/src/Resources/contao/languages/de/tl_dk_mmenu_config.xlf b/contao/languages/de/tl_dk_mmenu_config.xlf similarity index 97% rename from src/Resources/contao/languages/de/tl_dk_mmenu_config.xlf rename to contao/languages/de/tl_dk_mmenu_config.xlf index 31563f7..75fb633 100644 --- a/src/Resources/contao/languages/de/tl_dk_mmenu_config.xlf +++ b/contao/languages/de/tl_dk_mmenu_config.xlf @@ -71,6 +71,10 @@ High contrast theme Theme mit hohem Kontrast + + Enable the high contrast theme. + Theme mit hohem Kontrast aktivieren. + Show submenu counter Zähler für Untermenüs diff --git a/src/Resources/contao/languages/de/tl_module.xlf b/contao/languages/de/tl_module.xlf similarity index 100% rename from src/Resources/contao/languages/de/tl_module.xlf rename to contao/languages/de/tl_module.xlf diff --git a/src/Resources/contao/languages/en/default.xlf b/contao/languages/en/default.xlf similarity index 100% rename from src/Resources/contao/languages/en/default.xlf rename to contao/languages/en/default.xlf diff --git a/src/Resources/contao/languages/en/modules.xlf b/contao/languages/en/modules.xlf similarity index 100% rename from src/Resources/contao/languages/en/modules.xlf rename to contao/languages/en/modules.xlf diff --git a/src/Resources/contao/languages/en/tl_dk_mmenu_config.xlf b/contao/languages/en/tl_dk_mmenu_config.xlf similarity index 97% rename from src/Resources/contao/languages/en/tl_dk_mmenu_config.xlf rename to contao/languages/en/tl_dk_mmenu_config.xlf index 34b0656..1df389e 100644 --- a/src/Resources/contao/languages/en/tl_dk_mmenu_config.xlf +++ b/contao/languages/en/tl_dk_mmenu_config.xlf @@ -53,6 +53,9 @@ High contrast theme + + Enable the high contrast theme. + Show submenu counter diff --git a/src/Resources/contao/languages/en/tl_module.xlf b/contao/languages/en/tl_module.xlf similarity index 100% rename from src/Resources/contao/languages/en/tl_module.xlf rename to contao/languages/en/tl_module.xlf diff --git a/src/Resources/contao/languages/fr/default.xlf b/contao/languages/fr/default.xlf similarity index 100% rename from src/Resources/contao/languages/fr/default.xlf rename to contao/languages/fr/default.xlf diff --git a/src/Resources/contao/languages/fr/modules.xlf b/contao/languages/fr/modules.xlf similarity index 100% rename from src/Resources/contao/languages/fr/modules.xlf rename to contao/languages/fr/modules.xlf diff --git a/src/Resources/contao/languages/fr/tl_dk_mmenu_config.xlf b/contao/languages/fr/tl_dk_mmenu_config.xlf similarity index 100% rename from src/Resources/contao/languages/fr/tl_dk_mmenu_config.xlf rename to contao/languages/fr/tl_dk_mmenu_config.xlf diff --git a/src/Resources/contao/languages/fr/tl_module.xlf b/contao/languages/fr/tl_module.xlf similarity index 100% rename from src/Resources/contao/languages/fr/tl_module.xlf rename to contao/languages/fr/tl_module.xlf diff --git a/src/Resources/contao/languages/ru/default.xlf b/contao/languages/ru/default.xlf similarity index 100% rename from src/Resources/contao/languages/ru/default.xlf rename to contao/languages/ru/default.xlf diff --git a/src/Resources/contao/languages/ru/modules.xlf b/contao/languages/ru/modules.xlf similarity index 100% rename from src/Resources/contao/languages/ru/modules.xlf rename to contao/languages/ru/modules.xlf diff --git a/src/Resources/contao/languages/ru/tl_dk_mmenu_config.xlf b/contao/languages/ru/tl_dk_mmenu_config.xlf similarity index 100% rename from src/Resources/contao/languages/ru/tl_dk_mmenu_config.xlf rename to contao/languages/ru/tl_dk_mmenu_config.xlf diff --git a/src/Resources/contao/languages/ru/tl_module.xlf b/contao/languages/ru/tl_module.xlf similarity index 100% rename from src/Resources/contao/languages/ru/tl_module.xlf rename to contao/languages/ru/tl_module.xlf diff --git a/src/Resources/contao/templates/mmenu_default.html5 b/contao/templates/mmenu_default.html5 similarity index 87% rename from src/Resources/contao/templates/mmenu_default.html5 rename to contao/templates/mmenu_default.html5 index a822946..bc0c030 100644 --- a/src/Resources/contao/templates/mmenu_default.html5 +++ b/contao/templates/mmenu_default.html5 @@ -4,7 +4,7 @@ $GLOBALS['TL_CSS']['contao_dk_mmenu'] = 'bundles/contaommenu/mmenu/mmenu.css|sta $GLOBALS['TL_JAVASCRIPT']['contao_dk_mmenu'] = 'bundles/contaommenu/mmenu/mmenu.js|static'; ?> -