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

Do not store message in be session #316

Merged
merged 8 commits into from
Mar 5, 2024
Merged
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
3 changes: 2 additions & 1 deletion Classes/Helper/MessageHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -40,7 +41,7 @@ public function addFlashMessage(string $message, string $title = '', int $severi
$message,
$title,
$severity,
true
!Environment::isCli()
);

$this->getFlashMessageQueue()->enqueue($flashMessage);
Expand Down
1 change: 0 additions & 1 deletion Classes/Tca/Maps2Registry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down
10 changes: 5 additions & 5 deletions Classes/Update/MoveOldFlexFormSettingsUpdate.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 8 additions & 0 deletions Documentation/ChangeLog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Tests/Functional/Helper/MessageHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function addFlashMessageWithMessageCallsEnqueue()
'Hello',
'',
FlashMessage::OK,
true
false
);

$this->subject->addFlashMessage('Hello');
Expand All @@ -82,7 +82,7 @@ public function addFlashMessageWithMessageAndSubjectCallsEnqueue()
'Hello',
'Subject',
FlashMessage::OK,
true
false
);

$this->subject->addFlashMessage('Hello', 'Subject');
Expand All @@ -102,7 +102,7 @@ public function addFlashMessageWithAllArgumentsCallsEnqueue()
'Hello',
'Subject',
FlashMessage::ERROR,
true
false
);

$this->subject->addFlashMessage('Hello', 'Subject', FlashMessage::ERROR);
Expand Down
12 changes: 9 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading