Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix file folders migration with minimal installation #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ContaoManager/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ContaoThemesNetConvertThemeBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Migration/InitialDemoDataMigration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -66,7 +66,7 @@
$count += $this->connection->fetchOne('SELECT COUNT(*) FROM `tl_content`');
$count += $this->connection->fetchOne('SELECT COUNT(*) FROM `tl_module`');

if ($count > 0) {

Check failure on line 69 in src/Migration/InitialDemoDataMigration.php

View workflow job for this annotation

GitHub Actions / PHPStan

Comparison operation ">" between (array|float|int) and 0 results in an error.

Check failure on line 69 in src/Migration/InitialDemoDataMigration.php

View workflow job for this annotation

GitHub Actions / PHPStan

Comparison operation ">" between (array|float|int) and 0 results in an error.
return false;
}

Expand Down
7 changes: 1 addition & 6 deletions src/Migration/InitialFilesFolderMigration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/Migration/MigrationHelperTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Migration/Version200Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Module/ConvertThemeSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/ThemeUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Twig/FileExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Twig/ThemeStyleExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ContaoThemesNetZeroOneThemeBundleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading