Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3232691 by alexpott, longwave: Refactor \Drupal\Core\Ajax\AjaxHelperTrait to not cause deprecations in PHP 8.1

merge-requests/841/head
catch 2021-09-17 14:16:54 +01:00
parent aeccabb95d
commit 4e54392e56
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.lock generated
View File

@ -535,7 +535,7 @@
"dist": { "dist": {
"type": "path", "type": "path",
"url": "core", "url": "core",
"reference": "107b1d4f65408eb2844facd227005517de15343b" "reference": "833c40df380059ecff9e327223e066ac3a41c328"
}, },
"require": { "require": {
"asm89/stack-cors": "^1.1", "asm89/stack-cors": "^1.1",
@ -572,6 +572,7 @@
"symfony/http-kernel": "^4.4", "symfony/http-kernel": "^4.4",
"symfony/mime": "^5.3.0", "symfony/mime": "^5.3.0",
"symfony/polyfill-iconv": "^1.0", "symfony/polyfill-iconv": "^1.0",
"symfony/polyfill-php80": "^1.16",
"symfony/process": "^4.4", "symfony/process": "^4.4",
"symfony/psr-http-message-bridge": "^2.0", "symfony/psr-http-message-bridge": "^2.0",
"symfony/routing": "^4.4", "symfony/routing": "^4.4",
@ -6962,6 +6963,7 @@
"type": "github" "type": "github"
} }
], ],
"abandoned": true,
"time": "2020-11-30T07:30:19+00:00" "time": "2020-11-30T07:30:19+00:00"
}, },
{ {

1
core/composer.json
View File

@ -30,6 +30,7 @@
"symfony/validator": "^4.4", "symfony/validator": "^4.4",
"symfony/process": "^4.4", "symfony/process": "^4.4",
"symfony/polyfill-iconv": "^1.0", "symfony/polyfill-iconv": "^1.0",
"symfony/polyfill-php80": "^1.16",
"symfony/yaml": "^4.4.19", "symfony/yaml": "^4.4.19",
"typo3/phar-stream-wrapper": "^3.1.3", "typo3/phar-stream-wrapper": "^3.1.3",
"twig/twig": "^2.12.0", "twig/twig": "^2.12.0",

14
core/lib/Drupal/Core/Ajax/AjaxHelperTrait.php
View File

@ -18,19 +18,17 @@ trait AjaxHelperTrait {
* TRUE if the current request is via AJAX, FALSE otherwise. * TRUE if the current request is via AJAX, FALSE otherwise.
*/ */
protected function isAjax() { protected function isAjax() {
foreach (['drupal_ajax', 'drupal_modal', 'drupal_dialog'] as $wrapper) { $wrapper_format = $this->getRequestWrapperFormat() ?? '';
if (strpos($this->getRequestWrapperFormat(), $wrapper) !== FALSE) { return str_contains($wrapper_format, 'drupal_ajax') ||
return TRUE; str_contains($wrapper_format, 'drupal_modal') ||
} str_contains($wrapper_format, 'drupal_dialog');
}
return FALSE;
} }
/** /**
* Gets the wrapper format of the current request. * Gets the wrapper format of the current request.
* *
* @string * @return string|null
* The wrapper format. * The wrapper format. NULL if the wrapper format is not set.
*/ */
protected function getRequestWrapperFormat() { protected function getRequestWrapperFormat() {
return \Drupal::request()->get(MainContentViewSubscriber::WRAPPER_FORMAT); return \Drupal::request()->get(MainContentViewSubscriber::WRAPPER_FORMAT);