Merge pull request #155 from t3solution/5.1.3

v5.1.3
t3solution · Oct 25, 2021 · 2593c2c · 2593c2c
2 parents ceb7d4f + 44dddd5
commit 2593c2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Classes/Updates/t3sbMigrateUpdateWizard.php → Classes/Updates/T3sbMigrateUpdateWizard.php b/Classes/Updates/t3sbMigrateUpdateWizard.php → Classes/Updates/T3sbMigrateUpdateWizard.php
@@ -305,8 +305,9 @@ protected function checkIfWizardIsRequired(): bool
 						 ->execute()
 						 ->fetchAll();
 				foreach ($statements as $statement) {
+					$check = strpos((string)$statement[$field], 'var(--bs-');
 					$pos = strpos((string)$statement[$field], $rename);
-					if ($pos === false) {
+					if ($pos === false || $check === 0) {
 						// do nothing
 					} else {
 						$require = true;

diff --git a/composer.json b/composer.json
@@ -16,11 +16,9 @@
   "license": "GPL-2.0-or-later",
   "type": "typo3-cms-extension",
   "require": {
-    "typo3/cms-core": "^10.4",
-    "b13/container": "^1.3.1"
-  },
-  "suggest": {
-    "ichhabrecht/content-defender": "^3.1.3"
+    "typo3/cms-core": "^10.4.18 || ^11.5.0",
+    "b13/container": "^1.3.1",
+    "ichhabrecht/content-defender": "^3.2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -22,18 +22,15 @@
     'version' => '5.1.3',
     'constraints' => [
         'depends' => [
-        'typo3' => '10.4.13-11.9.99',
+        'typo3' => '10.4.18-11.9.99',
         'container' => '1.3.1-1.99.99',
-
+      	'content_defender' => '3.2.0-3.99.99',
       ],
       'conflicts' => [
         'ws_scss' => '*',
         'dyncss' => '*',
         'gridelements' => '*',
       ],
-      'suggests' => [
-      	'content_defender' => '3.1.3-3.99.99',
-      ],
     ],
     'autoload' => [
       'psr-4' => [