Merge pull request #316 from jweiland-net/doNotStoreMessageInBeSession

Do not store message in be session
jweiland-net · Mar 5, 2024 · ea28c7c · ea28c7c
2 parents ea4a068 + d027f80
commit ea28c7c
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 15 deletions.
diff --git a/Classes/Helper/MessageHelper.php b/Classes/Helper/MessageHelper.php
@@ -11,6 +11,7 @@
 
 namespace JWeiland\Maps2\Helper;
 
+use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
@@ -40,7 +41,7 @@ public function addFlashMessage(string $message, string $title = '', int $severi
             $message,
             $title,
             $severity,
-            true
+            !Environment::isCli()
         );
 
         $this->getFlashMessageQueue()->enqueue($flashMessage);

diff --git a/Classes/Tca/Maps2Registry.php b/Classes/Tca/Maps2Registry.php
@@ -217,7 +217,6 @@ protected function applyTcaForTableAndField(string $tableName, string $fieldName
      */
     protected function addToAllTCAtypes(string $tableName, string $fieldName, array $options)
     {
-
         // Makes sure to add more TCA to an existing structure
         if (isset($GLOBALS['TCA'][$tableName]['columns'])) {
             if (empty($options['fieldList'])) {

diff --git a/Classes/Update/MoveOldFlexFormSettingsUpdate.php b/Classes/Update/MoveOldFlexFormSettingsUpdate.php
@@ -73,15 +73,15 @@ public function updateNecessary(): bool
 
             try {
                 if (
-                ArrayUtility::getValueByPath(
-                    $valueFromDatabase,
-                    'data/sGoogleMapsOptions/lDEF/settings.activateScrollWheel'
-                )
+                    ArrayUtility::getValueByPath(
+                        $valueFromDatabase,
+                        'data/sGoogleMapsOptions/lDEF/settings.activateScrollWheel'
+                    )
                 ) {
                     return true;
                 }
             } catch (MissingArrayPathException $e) {
-                // If value does not exists, check further requirements
+                // If value does not exist, check further requirements
             } catch (\RuntimeException $e) {
                 // Some as above, but for TYPO3 8
             }

diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
@@ -6,6 +6,14 @@
 ChangeLog
 =========
 
+**Version 9.3.14**
+
+- BUGFIX: Do not store FlashMessages in BE session in CLI context
+
+**Version 9.3.13**
+
+- BUGFIX: Add lazy annotation to prevent recursive validation
+
 **Version 9.3.12**
 
 - BUGFIX: Class ApplicationType not found. Repair TYPO3 9 compatibility.

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -22,7 +22,7 @@
 
 project     = maps2 (Maps2)
 version     = 9.3
-release     = 9.3.13
+release     = 9.3.14
 t3author    = Stefan Froemken
 copyright   = since 2013 by jweiland.net
 

diff --git a/Tests/Functional/Helper/MessageHelperTest.php b/Tests/Functional/Helper/MessageHelperTest.php
@@ -62,7 +62,7 @@ public function addFlashMessageWithMessageCallsEnqueue()
             'Hello',
             '',
             FlashMessage::OK,
-            true
+            false
         );
 
         $this->subject->addFlashMessage('Hello');
@@ -82,7 +82,7 @@ public function addFlashMessageWithMessageAndSubjectCallsEnqueue()
             'Hello',
             'Subject',
             FlashMessage::OK,
-            true
+            false
         );
 
         $this->subject->addFlashMessage('Hello', 'Subject');
@@ -102,7 +102,7 @@ public function addFlashMessageWithAllArgumentsCallsEnqueue()
             'Hello',
             'Subject',
             FlashMessage::ERROR,
-            true
+            false
         );
 
         $this->subject->addFlashMessage('Hello', 'Subject', FlashMessage::ERROR);

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 	"description": "Create maps with Marker, Area, Routes or Radius based on Google Maps or OpenStreetMap",
 	"license": "GPL-2.0-or-later",
 	"keywords": ["typo3", "TYPO3 CMS", "google maps", "osm", "open street map", "openstreetmap", "maps2"],
-	"homepage": "http://www.jweiland.net",
+	"homepage": "https://jweiland.net",
 	"authors": [
 		{
 			"name": "Stefan Froemken",
@@ -22,7 +22,6 @@
 		"typo3/cms-core": "^9.5.17 || ^10.4.2"
 	},
 	"require-dev": {
-		"roave/security-advisories": "dev-latest",
 		"friendsofphp/php-cs-fixer": "^3.4",
 		"nimut/testing-framework": "^6.0",
 		"phpunit/phpunit": "^9.5",
@@ -39,8 +38,15 @@
 			"JWeiland\\Maps2\\Tests\\": "Tests"
 		}
 	},
+	"replace": {
+		"typo3-ter/maps2": "self.version"
+	},
 	"config": {
-		"vendor-dir": ".build/vendor"
+		"vendor-dir": ".build/vendor",
+		"allow-plugins": {
+			"typo3/class-alias-loader": true,
+			"typo3/cms-composer-installers": true
+		}
 	},
 	"extra": {
 		"typo3/cms": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -3,7 +3,7 @@
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Maps2',
     'description' => 'Create maps with Marker, Area, Routes or Radius based on Google Maps or OpenStreetMap',
-    'version' => '9.3.13',
+    'version' => '9.3.14',
     'category' => 'plugin',
     'state' => 'stable',
     'uploadfolder' => false,