Skip to content
Snippets Groups Projects
Verified Commit 0a4f122f authored by Dave Long's avatar Dave Long
Browse files

Issue #3439591 by quietone, mstrelan, pradhumanjain2311, andypost, catch, mfb,...

Issue #3439591 by quietone, mstrelan, pradhumanjain2311, andypost, catch, mfb, longwave, coaston, penyaskito: Add composer dependency on ext-zlib
parent 539c50a2
No related branches found
No related tags found
28 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8736Update the Documention As per the Function uses.,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8513Issue #3453786: DefaultSelection should document why values for target_bundles NULL and [] behave as they do,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!8256Issue #3445896 by mstrelan, mondrake: PHPUnit\Runner\ErrorHandler::__construct...,!8126Added escape fucntionality on admintoolbar close icon,!7927Issue #3445425: \Drupal\Core\Template\Attribute should implement Countable interface,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #175743 canceled
......@@ -495,7 +495,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "a04ae36ab48fdc8d48a813f739cdfeeddb7517eb"
"reference": "ff1a97312bafb66b9f39cc05fa161d99956a15be"
},
"require": {
"asm89/stack-cors": "^2.1",
......@@ -517,6 +517,7 @@
"ext-spl": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-zlib": "*",
"guzzlehttp/guzzle": "^7.5",
"guzzlehttp/psr7": "^2.4.5",
"masterminds/html5": "^2.7",
......
......@@ -17,6 +17,7 @@
"ext-SPL": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-zlib": "*",
"php": ">=8.3.0",
"symfony/console": "^7.1@beta",
"symfony/dependency-injection": "^7.1@beta",
......
......@@ -80,9 +80,6 @@ public static function buildQuery(array $query, $parent = '') {
* The data compressed into a URL-safe string.
*/
public static function compressQueryParameter(string $data): string {
if (!\extension_loaded('zlib')) {
return $data;
}
// Use 'base64url' encoding. Note that the '=' sign is only used for padding
// on the right of the string, and is otherwise not part of the data.
// @see https://datatracker.ietf.org/doc/html/rfc4648#section-5
......@@ -104,9 +101,6 @@ public static function compressQueryParameter(string $data): string {
* uncompressed.
*/
public static function uncompressQueryParameter(string $compressed): string {
if (!\extension_loaded('zlib')) {
return $compressed;
}
// Because this comes from user data, suppress the PHP warning that
// gzcompress() throws if the base64-encoded string is invalid.
$return = @gzuncompress(base64_decode(str_replace(['-', '_'], ['+', '/'], $compressed)));
......
......@@ -60,15 +60,14 @@ public function dumpToUri(string $data, string $file_extension, string $uri): st
catch (FileException $e) {
return FALSE;
}
// If CSS/JS gzip compression is enabled and the zlib extension is available
// then create a gzipped version of this file. This file is served
// conditionally to browsers that accept gzip using .htaccess rules.
// It's possible that the rewrite rules in .htaccess aren't working on this
// server, but there's no harm (other than the time spent generating the
// file) in generating the file anyway. Sites on servers where rewrite rules
// aren't working can set css.gzip to FALSE in order to skip
// generating a file that won't be used.
if (extension_loaded('zlib') && \Drupal::config('system.performance')->get($file_extension . '.gzip')) {
// If CSS/JS gzip compression is enabled then create a gzipped version of
// this file. This file is served conditionally to browsers that accept gzip
// using .htaccess rules. It's possible that the rewrite rules in .htaccess
// aren't working on this server, but there's no harm (other than the time
// spent generating the file) in generating the file anyway. Sites on
// servers where rewrite rules aren't working can set css.gzip to FALSE in
// order to skip generating a file that won't be used.
if (\Drupal::config('system.performance')->get($file_extension . '.gzip')) {
try {
if (!file_exists($uri . '.gz') && !$this->fileSystem->saveData(gzencode($data, 9, FORCE_GZIP), $uri . '.gz', FileExists::Replace)) {
return FALSE;
......
......@@ -84,17 +84,6 @@ abstract class UpdatePathTestBase extends BrowserTestBase {
*/
protected $strictConfigSchema = FALSE;
/**
* {@inheritdoc}
*/
protected function setUp(): void {
if (!extension_loaded('zlib')) {
$this->markTestSkipped('The zlib extension is not available.');
}
parent::setUp();
}
/**
* Overrides BrowserTestBase::installDrupal() for update testing.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment