Merge pull request #37 from contao-themes-net/3.x

3.x

.editorconfig

@@ -20,6 +20,6 @@ insert_final_newline = false
 [*/src/Resources/contao/**.{css,js,php}]
 indent_style = tab
 
-[*/src/Resources/contao/**.html5]
+[*.{html.twig,html5}]
 indent_style = space
 indent_size = 2

CHANGELOG.md

@@ -10,6 +10,12 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [3.0.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/3.0.0) – 2022-09-25
+
+- [Changed] Increase Contao version to 5 only and PHP 8
+- [Added] Add migrations for demo data import (Setup without further steps, install and run migrations -> Done!)
+- [Removed] Cleanup older Contao SQL files
+
 ## [2.0.4](https://github.com/contao-themes-net/odd-theme-bundle/tree/2.0.4) – 2022-10-11
 
 - [Changed] now require terminal42/contao-folderpage version 2.* or 3.*

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "contao-themes-net/odd-theme-bundle",
   "type":"contao-bundle",
-  "description": "theme odd bundle for Contao 4",
+  "description": "theme odd bundle for Contao 5",
   "keywords":["contao","theme","template"],
   "homepage": "https://contao-themes.net",
   "license": "proprietary",
@@ -28,32 +28,28 @@
     "donate": "https://contao-themes.net/sponsoring.html"
   },
   "require": {
-    "php": "^7.2 || ^8.0",
-    "contao/core-bundle": "^4.9",
-    "madeyourday/contao-rocksolid-frontend-helper": "~2.0",
-    "terminal42/contao-folderpage": "^2.0 || ^3.0",
-    "pdir/contao-theme-helper-bundle": "^1.0",
-    "contao-themes-net/theme-components-bundle": "^1.2"
+    "php": "^8.1",
+    "contao/core-bundle": "^5.0",
+    "madeyourday/contao-rocksolid-frontend-helper": "^2.2",
+    "terminal42/contao-folderpage": "^3.0",
+    "pdir/contao-theme-helper-bundle": "^1.5",
+    "pdir/contao-webtools": "^1.5",
+    "contao-themes-net/theme-components-bundle": "^1.4",
+    "contao-dd/advanced-classes-bundle": "^1.5"
   },
-  "conflict": {
-    "contao/core": "*"
+  "require-dev": {
+    "contao/manager-plugin": "^2.0",
+    "contao/easy-coding-standard": "^3.0",
+    "phpunit/phpunit": "^9.5",
+    "symfony/phpunit-bridge": "^6.0"
   },
   "autoload": {
     "psr-4": {
-      "ContaoThemesNet\\ThemeOddBundle\\": "src/"
-    },
-    "classmap": [
-      "src/Resources/contao/"
-    ],
-    "exclude-from-classmap": [
-      "src/Resources/contao/config/",
-      "src/Resources/contao/dca/",
-      "src/Resources/contao/languages/",
-      "src/Resources/contao/templates/"
-    ]
+      "ContaoThemesNet\\OddThemeBundle\\": "src/"
+    }
   },
   "extra": {
-    "contao-manager-plugin": "ContaoThemesNet\\ThemeOddBundle\\ContaoManagerPlugin"
+    "contao-manager-plugin": "ContaoThemesNet\\OddThemeBundle\\ContaoManager\\Plugin"
   },
   "funding": [
     {
@@ -69,5 +65,12 @@
     "pdir/maklermodul-bundle": "ODD Theme includes all styles for maklermodul bundle. / ODD Theme enthält Stylesheets für das Maklermodul Bundle.",
     "pdir/social-feed-bundle": "ODD Theme includes all styles for social feed bundle. / ODD Theme enthält Stylesheets für das Social Feed Bundle.",
     "pdir/animated-timeline-bundle": "Render content in a dynamic timeline. / Zeige Inhalte in einem dynamischen Zeitstrahl an."
+  },
+  "config": {
+    "allow-plugins": {
+      "contao-components/installer": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "contao/manager-plugin": true
+    }
   }
 }

config/services.yml

@@ -0,0 +1,13 @@
+services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
+
+    ContaoThemesNet\OddThemeBundle\:
+        resource: ../src/
+
+    # Migration
+    ContaoThemesNet\OddThemeBundle\Migration\:
+        resource: "../src/Migration/*"
+        tags:
+            - { name: contao.migration, priority: 99 }

src/Resources/contao/config/config.php → contao/config/config.php

@@ -1,9 +1,10 @@
 <?php
 
-use ContaoThemesNet\ThemeOddBundle\Element\SliderElement;
+use Contao\ArrayUtil;
+use ContaoThemesNet\OddThemeBundle\Element\SliderElement;
 
 // Insert the mate theme category
-array_insert($GLOBALS['TL_CTE'], 1, array('themeOdd' => array()));
+ArrayUtil::arrayInsert($GLOBALS['TL_CTE'], 1, array('themeOdd' => array()));
 
 /**
  * Add content element
@@ -39,12 +40,12 @@
 /**
  * Backend Modules
  */
-array_insert($GLOBALS['BE_MOD']['contaoThemesNet'], 1, array
+ArrayUtil::arrayInsert($GLOBALS['BE_MOD']['contaoThemesNet'], 1, array
 (
     'oddThemeSetup' => array
     (
-        'callback'          => 'ContaoThemesNet\\ThemeOddBundle\\Module\\OddThemeSetup',
+        'callback'          => 'ContaoThemesNet\\OddThemeBundle\\Module\\OddThemeSetup',
         'tables'            => array(),
-        'stylesheet'		=> 'bundles/pdirthemeodd/scss/backend.css'
+        'stylesheet'		=> 'bundles/contaothemesnetoddtheme/scss/backend.css'
     ),
 ));

contao/dca/tl_content.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Add palette to tl_content
+ */
+
+
+$GLOBALS['TL_DCA']['tl_content']['palettes']['sliderElement'] = '{type_legend},type,headline,odd_subHeadline;{text_legend},text,odd_page,target,odd_linkText;{image_legend},addImage;{expert_legend:hide},guests,cssID;{invisible_legend:hide},invisible,start,stop';
+
+/**
+ * Add fields to tl_content
+ */
+
+$GLOBALS['TL_DCA']['tl_content']['fields']['odd_page'] = [
+    'exclude' => true,
+    'search' => true,
+    'inputType' => 'text',
+    'eval' => [
+        'mandatory' => false,
+        'rgxp' => 'url',
+        'decodeEntities' => true,
+        'maxlength' => 255,
+        'dcaPicker' => true,
+        'addWizardClass' => false,
+        'tl_class' => 'w50'],
+    'sql' => "TEXT NULL"
+];
+
+$GLOBALS['TL_DCA']['tl_content']['fields']['odd_linkText'] = [
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['tl_class' => 'w50'],
+    'sql' => "TEXT NULL"
+];
+
+$GLOBALS['TL_DCA']['tl_content']['fields']['target'] = [
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => "char(1) NOT NULL default ''"
+];
+
+$GLOBALS['TL_DCA']['tl_content']['fields']['odd_subHeadline'] = [
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['tl_class' => 'w50'],
+    'sql' => "TEXT NULL"
+];

contao/languages/de/modules.php

@@ -0,0 +1,17 @@
+<?php
+
+$GLOBALS['TL_LANG']['CTE']['themeOdd'] = 'ODD Theme';
+$GLOBALS['TL_LANG']['CTE']['sliderElement'][0] = 'Slider-Element';
+
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD01/01'] = 'Kopfzeile / 01';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD01/02'] = 'Kopfzeile / 02';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD02/01'] = 'Fußzeile / 01';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD02/02'] = 'Fußzeile / 02';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD02/03'] = 'Fußzeile / 03';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD02/04'] = 'Fußzeile / 04';
+$GLOBALS['TL_LANG']['tl_article']['th_tags']['ODD02/05'] = 'Fußzeile / 05';
+
+$GLOBALS['TL_LANG']['MOD']['oddTheme'][0] = "pdir themes";
+$GLOBALS['TL_LANG']['MOD']['oddThemeSetup'][0] = "ODD Theme Setup";
+
+$GLOBALS['TL_LANG']['odd']['event_more_link'] = "Event-Details ansehen";