From 57d6fc9c63eb803e5348e3bd22d6a44303cc6354 Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Thu, 16 Mar 2023 17:10:01 +0100 Subject: [PATCH] Updated bundle structure and require Contao 4.9+ --- composer.json | 51 ++++++++++--------- .../services.yml => config/services.yaml | 0 .../languages/cs/default.php | 0 .../languages/da/default.php | 0 .../languages/de/default.php | 0 .../languages/en/default.php | 0 .../languages/es/default.php | 0 .../languages/fa/default.php | 0 .../languages/fi/default.php | 0 .../languages/fr/default.php | 0 .../languages/it/default.php | 0 .../languages/nl/default.php | 0 .../languages/pl/default.php | 0 .../languages/pt_BR/default.php | 0 .../languages/ru/default.php | 0 .../languages/sl/default.php | 0 gulpfile.js | 6 +-- {src/Resources/public => public}/backend.css | 0 .../public => public}/backend.min.css | 0 .../Terminal42DcMultilingualExtension.php | 7 +-- src/Terminal42DcMultilingualBundle.php | 4 ++ 21 files changed, 36 insertions(+), 32 deletions(-) rename src/Resources/config/services.yml => config/services.yaml (100%) rename {src/Resources/contao => contao}/languages/cs/default.php (100%) rename {src/Resources/contao => contao}/languages/da/default.php (100%) rename {src/Resources/contao => contao}/languages/de/default.php (100%) rename {src/Resources/contao => contao}/languages/en/default.php (100%) rename {src/Resources/contao => contao}/languages/es/default.php (100%) rename {src/Resources/contao => contao}/languages/fa/default.php (100%) rename {src/Resources/contao => contao}/languages/fi/default.php (100%) rename {src/Resources/contao => contao}/languages/fr/default.php (100%) rename {src/Resources/contao => contao}/languages/it/default.php (100%) rename {src/Resources/contao => contao}/languages/nl/default.php (100%) rename {src/Resources/contao => contao}/languages/pl/default.php (100%) rename {src/Resources/contao => contao}/languages/pt_BR/default.php (100%) rename {src/Resources/contao => contao}/languages/ru/default.php (100%) rename {src/Resources/contao => contao}/languages/sl/default.php (100%) rename {src/Resources/public => public}/backend.css (100%) rename {src/Resources/public => public}/backend.min.css (100%) diff --git a/composer.json b/composer.json index afa3187..e7d2fb3 100644 --- a/composer.json +++ b/composer.json @@ -1,31 +1,37 @@ { - "name":"terminal42/dc_multilingual", - "description":"A multilingual DC driver storing the translations in the same table for Contao Open Source CMS", - "keywords":["contao", "multilingual", "driver"], - "type":"contao-module", - "license":"LGPL-3.0+", - "authors":[{ - "name":"terminal42 gmbh", - "homepage":"https://www.terminal42.ch" - }, { - "name":"Codefog", - "homepage":"http://codefog.pl" - }], - "funding": [{ - "type": "github", - "url": "https://github.com/terminal42" - }, { - "type": "other", - "url": "https://ko-fi.com/terminal42" - }], + "name": "terminal42/dc_multilingual", + "description": "A multilingual DC driver storing the translations in the same table for Contao Open Source CMS", + "keywords": ["contao", "multilingual", "driver"], + "type": "contao-bundle", + "license": "LGPL-3.0+", + "authors": [ + { + "name": "terminal42 gmbh", + "homepage": "https://www.terminal42.ch" + }, + { + "name": "Codefog", + "homepage": "https://codefog.pl" + } + ], + "funding": [ + { + "type": "github", + "url": "https://github.com/terminal42" + }, + { + "type": "other", + "url": "https://ko-fi.com/terminal42" + } + ], "support": { "issues": "https://github.com/terminal42/contao-DC_Multilingual/issues", "source": "https://github.com/terminal42/contao-DC_Multilingual", "forum": "https://community.contao.org" }, - "require":{ + "require": { "php": "^7.1 || ^8.0", - "contao/core-bundle": "^4.4", + "contao/core-bundle": "^4.9", "doctrine/dbal": "^2.11 || ^3.0" }, "require-dev": { @@ -35,9 +41,6 @@ "conflict": { "contao/manager-plugin": "<2.0 || >=3.0" }, - "replace": { - "contao-legacy/dc_multilingual": "self.version" - }, "autoload": { "classmap": [ "src/DC_Multilingual.php" diff --git a/src/Resources/config/services.yml b/config/services.yaml similarity index 100% rename from src/Resources/config/services.yml rename to config/services.yaml diff --git a/src/Resources/contao/languages/cs/default.php b/contao/languages/cs/default.php similarity index 100% rename from src/Resources/contao/languages/cs/default.php rename to contao/languages/cs/default.php diff --git a/src/Resources/contao/languages/da/default.php b/contao/languages/da/default.php similarity index 100% rename from src/Resources/contao/languages/da/default.php rename to contao/languages/da/default.php diff --git a/src/Resources/contao/languages/de/default.php b/contao/languages/de/default.php similarity index 100% rename from src/Resources/contao/languages/de/default.php rename to contao/languages/de/default.php diff --git a/src/Resources/contao/languages/en/default.php b/contao/languages/en/default.php similarity index 100% rename from src/Resources/contao/languages/en/default.php rename to contao/languages/en/default.php diff --git a/src/Resources/contao/languages/es/default.php b/contao/languages/es/default.php similarity index 100% rename from src/Resources/contao/languages/es/default.php rename to contao/languages/es/default.php diff --git a/src/Resources/contao/languages/fa/default.php b/contao/languages/fa/default.php similarity index 100% rename from src/Resources/contao/languages/fa/default.php rename to contao/languages/fa/default.php diff --git a/src/Resources/contao/languages/fi/default.php b/contao/languages/fi/default.php similarity index 100% rename from src/Resources/contao/languages/fi/default.php rename to contao/languages/fi/default.php diff --git a/src/Resources/contao/languages/fr/default.php b/contao/languages/fr/default.php similarity index 100% rename from src/Resources/contao/languages/fr/default.php rename to contao/languages/fr/default.php diff --git a/src/Resources/contao/languages/it/default.php b/contao/languages/it/default.php similarity index 100% rename from src/Resources/contao/languages/it/default.php rename to contao/languages/it/default.php diff --git a/src/Resources/contao/languages/nl/default.php b/contao/languages/nl/default.php similarity index 100% rename from src/Resources/contao/languages/nl/default.php rename to contao/languages/nl/default.php diff --git a/src/Resources/contao/languages/pl/default.php b/contao/languages/pl/default.php similarity index 100% rename from src/Resources/contao/languages/pl/default.php rename to contao/languages/pl/default.php diff --git a/src/Resources/contao/languages/pt_BR/default.php b/contao/languages/pt_BR/default.php similarity index 100% rename from src/Resources/contao/languages/pt_BR/default.php rename to contao/languages/pt_BR/default.php diff --git a/src/Resources/contao/languages/ru/default.php b/contao/languages/ru/default.php similarity index 100% rename from src/Resources/contao/languages/ru/default.php rename to contao/languages/ru/default.php diff --git a/src/Resources/contao/languages/sl/default.php b/contao/languages/sl/default.php similarity index 100% rename from src/Resources/contao/languages/sl/default.php rename to contao/languages/sl/default.php diff --git a/gulpfile.js b/gulpfile.js index 7a2273a..f7998d2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,8 +9,8 @@ const production = true; // Configuration const styles = [ - 'src/Resources/public/*.css', - '!src/Resources/public/*.min.css' + 'public/*.css', + '!public/*.min.css' ]; // Build styles @@ -27,7 +27,7 @@ gulp.task('styles', function () { gulp.task('watch', function () { gulp.watch( [ - 'src/Resources/public/*.css' + 'public/*.css' ], ['styles'] ); diff --git a/src/Resources/public/backend.css b/public/backend.css similarity index 100% rename from src/Resources/public/backend.css rename to public/backend.css diff --git a/src/Resources/public/backend.min.css b/public/backend.min.css similarity index 100% rename from src/Resources/public/backend.min.css rename to public/backend.min.css diff --git a/src/DependencyInjection/Terminal42DcMultilingualExtension.php b/src/DependencyInjection/Terminal42DcMultilingualExtension.php index 0abf024..bc233df 100644 --- a/src/DependencyInjection/Terminal42DcMultilingualExtension.php +++ b/src/DependencyInjection/Terminal42DcMultilingualExtension.php @@ -20,11 +20,8 @@ class Terminal42DcMultilingualExtension extends Extension { public function load(array $configs, ContainerBuilder $container) { - $loader = new YamlFileLoader( - $container, - new FileLocator(__DIR__.'/../Resources/config') - ); + $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../config')); - $loader->load('services.yml'); + $loader->load('services.yaml'); } } diff --git a/src/Terminal42DcMultilingualBundle.php b/src/Terminal42DcMultilingualBundle.php index 8d5fc40..d0bef9d 100644 --- a/src/Terminal42DcMultilingualBundle.php +++ b/src/Terminal42DcMultilingualBundle.php @@ -15,4 +15,8 @@ class Terminal42DcMultilingualBundle extends Bundle { + public function getPath(): string + { + return \dirname(__DIR__); + } }