From bf751c3a8a944204013ff6b4ce20e76160e69c11 Mon Sep 17 00:00:00 2001 From: Philipp Seibt Date: Wed, 18 Dec 2024 13:00:31 +0100 Subject: [PATCH 1/2] Fix file folders migration with minimal installation --- CHANGELOG.md | 4 ++++ src/Migration/InitialFilesFolderMigration.php | 5 ----- src/Module/ConvertThemeSetup.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fda9b24..2a89473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ Types of changes Security in case of vulnerabilities. ) +## [2.0.4](https://github.com/contao-themes-net/convert-theme-bundle/tree/2.0.4) – 2024-12-18 + +- [Fixed] Fix file folders migration with minimal installation ([#23](https://github.com/contao-themes-net/convert-theme-bundle/issues/23)) + ## [2.0.3](https://github.com/contao-themes-net/convert-theme-bundle/tree/2.0.3) – 2024-05-15 - [Fixed] Fix text with image element diff --git a/src/Migration/InitialFilesFolderMigration.php b/src/Migration/InitialFilesFolderMigration.php index fadf420..0826838 100644 --- a/src/Migration/InitialFilesFolderMigration.php +++ b/src/Migration/InitialFilesFolderMigration.php @@ -53,11 +53,6 @@ public function shouldRun(): bool return false; } - // Check if full version is used - if (!$schemaManager->tablesExist($this->fullTables)) { - return false; - } - $this->contaoFramework->initialize(); $this->uploadPath = System::getContainer()->getParameter('contao.upload_path'); diff --git a/src/Module/ConvertThemeSetup.php b/src/Module/ConvertThemeSetup.php index 1a7facd..f8c629c 100644 --- a/src/Module/ConvertThemeSetup.php +++ b/src/Module/ConvertThemeSetup.php @@ -22,7 +22,7 @@ class ConvertThemeSetup extends BackendModule { - public const VERSION = '2.0.3'; + public const VERSION = '2.0.4'; protected $strTemplate = 'be_converttheme_setup'; From d738a82d663edde05829352e498f85f2f70a4c40 Mon Sep 17 00:00:00 2001 From: Philipp Seibt Date: Wed, 18 Dec 2024 13:04:19 +0100 Subject: [PATCH 2/2] update copyright year --- src/ContaoManager/Plugin.php | 2 +- src/ContaoThemesNetConvertThemeBundle.php | 2 +- .../ContaoThemesNetConvertThemeExtension.php | 2 +- src/Migration/InitialDemoDataMigration.php | 2 +- src/Migration/InitialFilesFolderMigration.php | 2 +- src/Migration/MigrationHelperTrait.php | 2 +- src/Migration/Version200Update.php | 2 +- src/Module/ConvertThemeSetup.php | 2 +- src/ThemeUtils.php | 2 +- src/Twig/FileExtension.php | 2 +- src/Twig/ThemeStyleExtension.php | 2 +- tests/ContaoThemesNetZeroOneThemeBundleTest.php | 2 +- .../ContaoThemesNetOddThemeExtensionTest.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php index 3be7d7c..0a74be4 100644 --- a/src/ContaoManager/Plugin.php +++ b/src/ContaoManager/Plugin.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/ContaoThemesNetConvertThemeBundle.php b/src/ContaoThemesNetConvertThemeBundle.php index 00e649f..de0c967 100644 --- a/src/ContaoThemesNetConvertThemeBundle.php +++ b/src/ContaoThemesNetConvertThemeBundle.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/DependencyInjection/ContaoThemesNetConvertThemeExtension.php b/src/DependencyInjection/ContaoThemesNetConvertThemeExtension.php index d3cb6dc..d65769d 100644 --- a/src/DependencyInjection/ContaoThemesNetConvertThemeExtension.php +++ b/src/DependencyInjection/ContaoThemesNetConvertThemeExtension.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Migration/InitialDemoDataMigration.php b/src/Migration/InitialDemoDataMigration.php index 1fbab49..c819137 100644 --- a/src/Migration/InitialDemoDataMigration.php +++ b/src/Migration/InitialDemoDataMigration.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Migration/InitialFilesFolderMigration.php b/src/Migration/InitialFilesFolderMigration.php index 0826838..67790fb 100644 --- a/src/Migration/InitialFilesFolderMigration.php +++ b/src/Migration/InitialFilesFolderMigration.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Migration/MigrationHelperTrait.php b/src/Migration/MigrationHelperTrait.php index ca06a20..2444698 100644 --- a/src/Migration/MigrationHelperTrait.php +++ b/src/Migration/MigrationHelperTrait.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Migration/Version200Update.php b/src/Migration/Version200Update.php index 656b3e9..8338bc5 100644 --- a/src/Migration/Version200Update.php +++ b/src/Migration/Version200Update.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Module/ConvertThemeSetup.php b/src/Module/ConvertThemeSetup.php index f8c629c..95ec202 100644 --- a/src/Module/ConvertThemeSetup.php +++ b/src/Module/ConvertThemeSetup.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/ThemeUtils.php b/src/ThemeUtils.php index 637c7b6..3384bdf 100644 --- a/src/ThemeUtils.php +++ b/src/ThemeUtils.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Twig/FileExtension.php b/src/Twig/FileExtension.php index 57d226c..0581355 100644 --- a/src/Twig/FileExtension.php +++ b/src/Twig/FileExtension.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/src/Twig/ThemeStyleExtension.php b/src/Twig/ThemeStyleExtension.php index 69d20ad..316f696 100644 --- a/src/Twig/ThemeStyleExtension.php +++ b/src/Twig/ThemeStyleExtension.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/tests/ContaoThemesNetZeroOneThemeBundleTest.php b/tests/ContaoThemesNetZeroOneThemeBundleTest.php index 8adec20..d52a9c7 100644 --- a/tests/ContaoThemesNetZeroOneThemeBundleTest.php +++ b/tests/ContaoThemesNetZeroOneThemeBundleTest.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle diff --git a/tests/DependencyInjection/ContaoThemesNetOddThemeExtensionTest.php b/tests/DependencyInjection/ContaoThemesNetOddThemeExtensionTest.php index 22a78a5..422040c 100644 --- a/tests/DependencyInjection/ContaoThemesNetOddThemeExtensionTest.php +++ b/tests/DependencyInjection/ContaoThemesNetOddThemeExtensionTest.php @@ -5,7 +5,7 @@ /* * CONVERT theme for Contao Open Source CMS * - * Copyright (C) 2023 pdir / digital agentur // pdir GmbH + * Copyright (C) 2024 pdir / digital agentur // pdir GmbH * * @package contao-themes-net/convert-theme-bundle * @link https://github.com/contao-themes-net/convert-theme-bundle