From f6e5678ed3432e98670350c76e72d65cca0fd739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= Date: Wed, 14 Feb 2018 08:31:13 +0100 Subject: [PATCH] Umstellung auf Contao 4 Bundle --- composer.json | 40 ++++++++++--------- config/autoload.ini | 7 ---- config/autoload.php | 28 ------------- src/CgoITXlsexportBundle.php | 14 +++++++ src/ContaoManagerPlugin.php | 28 +++++++++++++ .../Resources/contao/vendor}/biff.php | 0 .../Resources/contao/vendor}/fat.php | 0 .../Resources/contao/vendor}/font.php | 0 .../Resources/contao/vendor}/mergedcells.php | 0 .../Resources/contao/vendor}/palette.php | 0 .../Resources/contao/vendor}/picture.php | 0 .../Resources/contao/vendor}/xf.php | 0 .../Resources/contao/vendor}/xls_export.php | 0 13 files changed, 64 insertions(+), 53 deletions(-) delete mode 100644 config/autoload.ini delete mode 100644 config/autoload.php create mode 100644 src/CgoITXlsexportBundle.php create mode 100644 src/ContaoManagerPlugin.php rename {vendor => src/Resources/contao/vendor}/biff.php (100%) rename {vendor => src/Resources/contao/vendor}/fat.php (100%) rename {vendor => src/Resources/contao/vendor}/font.php (100%) rename {vendor => src/Resources/contao/vendor}/mergedcells.php (100%) rename {vendor => src/Resources/contao/vendor}/palette.php (100%) rename {vendor => src/Resources/contao/vendor}/picture.php (100%) rename {vendor => src/Resources/contao/vendor}/xf.php (100%) rename {vendor => src/Resources/contao/vendor}/xls_export.php (100%) diff --git a/composer.json b/composer.json index c676bd5..0a354ac 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,9 @@ { - "name":"cgo-it/xls_export", - "description":"xls_export extension for the Contao Open Source CMS", - "keywords":["contao", "excel"], - "type":"contao-module", + "name":"cgo-it/contao-xls_export-bundle", + "description":"xls_export extension for the Contao Open Source CMS as contao 4 bundle", + "keywords":["contao", "excel", "bundle"], + "type":"contao-bundle", + "homepage":"https://cgo-it.de", "license":"GPL-3.0-or-later", "authors":[ { @@ -13,23 +14,26 @@ } ], "support": { - "email": "info@cgo-it.de", - "issues": "https://bitbucket.org/cgo-it/contao-xls_export/issues?status=new&status=open", - "source": "https://bitbucket.org/cgo-it/contao-xls_export/src" + "issues": "https://git.cgo-it.de/contao/xls_export/issues", + "source": "https://git.cgo-it.de/contao/xls_export.git" }, "require":{ - "php":">=5.3", - "contao/core":">=3.0||<5", - "contao-community-alliance/composer-plugin": "~2.0" + "php":">=7.0", + "contao/core-bundle": "^4.4" }, - "replace": { - "cgo-it/xls_export": "3.0.0" + "conflict": { + "contao/core": "*", + "contao/manager-plugin": "<2.0 || >=3.0", }, - "extra":{ - "contao": { - "sources":{ - "":"system/modules/xls_export" - } - } + "autoload": { + "psr-4": { + "cgoIT\\xlsexport\\": "src/" + }, + "classmap": [ + "src/Resources/contao/" + ] + }, + "extra": { + "contao-manager-plugin": "cgoIT\\xlsexport\\ContaoManagerPlugin" } } diff --git a/config/autoload.ini b/config/autoload.ini deleted file mode 100644 index 56a51b1..0000000 --- a/config/autoload.ini +++ /dev/null @@ -1,7 +0,0 @@ - -;; -; Configure what you want the autoload creator to register -;; -register_namespaces = true -register_classes = true -register_templates = true diff --git a/config/autoload.php b/config/autoload.php deleted file mode 100644 index f64204a..0000000 --- a/config/autoload.php +++ /dev/null @@ -1,28 +0,0 @@ - 'system/modules/xls_export/vendor/biff.php', - 'fat_class' => 'system/modules/xls_export/vendor/fat.php', - 'xls_font' => 'system/modules/xls_export/vendor/font.php', - 'xls_mergedcells' => 'system/modules/xls_export/vendor/mergedcells.php', - 'xls_palette' => 'system/modules/xls_export/vendor/palette.php', - 'xls_picture' => 'system/modules/xls_export/vendor/picture.php', - 'xls_xf' => 'system/modules/xls_export/vendor/xf.php', - 'xlsexport' => 'system/modules/xls_export/vendor/xls_export.php', -)); diff --git a/src/CgoITXlsexportBundle.php b/src/CgoITXlsexportBundle.php new file mode 100644 index 0000000..83bec0d --- /dev/null +++ b/src/CgoITXlsexportBundle.php @@ -0,0 +1,14 @@ +setLoadAfter([ContaoCoreBundle::class]) + ->setReplace(['xls_export']), + ]; + } +} diff --git a/vendor/biff.php b/src/Resources/contao/vendor/biff.php similarity index 100% rename from vendor/biff.php rename to src/Resources/contao/vendor/biff.php diff --git a/vendor/fat.php b/src/Resources/contao/vendor/fat.php similarity index 100% rename from vendor/fat.php rename to src/Resources/contao/vendor/fat.php diff --git a/vendor/font.php b/src/Resources/contao/vendor/font.php similarity index 100% rename from vendor/font.php rename to src/Resources/contao/vendor/font.php diff --git a/vendor/mergedcells.php b/src/Resources/contao/vendor/mergedcells.php similarity index 100% rename from vendor/mergedcells.php rename to src/Resources/contao/vendor/mergedcells.php diff --git a/vendor/palette.php b/src/Resources/contao/vendor/palette.php similarity index 100% rename from vendor/palette.php rename to src/Resources/contao/vendor/palette.php diff --git a/vendor/picture.php b/src/Resources/contao/vendor/picture.php similarity index 100% rename from vendor/picture.php rename to src/Resources/contao/vendor/picture.php diff --git a/vendor/xf.php b/src/Resources/contao/vendor/xf.php similarity index 100% rename from vendor/xf.php rename to src/Resources/contao/vendor/xf.php diff --git a/vendor/xls_export.php b/src/Resources/contao/vendor/xls_export.php similarity index 100% rename from vendor/xls_export.php rename to src/Resources/contao/vendor/xls_export.php