From 032d241d497d00425b2e124bcb9a06b7f1525760 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 24 Feb 2023 11:01:39 +0100 Subject: [PATCH] Continued: - rather check for extension being loaded than found functions - checks on resource or object is no longer needed --- .../compressor/class_Bzip2Compressor.php | 22 +++------------ .../compressor/class_GzipCompressor.php | 27 ++++++------------- .../compressor/class_ZlibCompressor.php | 27 ++++++------------- 3 files changed, 20 insertions(+), 56 deletions(-) diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php index 2606c13c..66c5ab02 100644 --- a/framework/main/classes/compressor/class_Bzip2Compressor.php +++ b/framework/main/classes/compressor/class_Bzip2Compressor.php @@ -6,9 +6,6 @@ namespace Org\Mxchange\CoreFramework\Compressor\Bzip2; use Org\Mxchange\CoreFramework\Compressor\Compressor; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; -// Load SPL stuff -use \InvalidArgumentException; - /** * BZIP2 compression and decompression class * @@ -52,7 +49,7 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor { $compressorInstance = NULL; // Get new instance - if ((function_exists('bzcompress')) && (function_exists('bzdecompress'))) { + if (extension_loaded('bzip2')) { // Compressor can maybe be used $compressorInstance = new Bzip2Compressor(); } @@ -66,17 +63,13 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The compressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function compressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } + // Compress it + $streamData = bzcompress($streamData, 1); // Return the compressed stream - return bzcompress($streamData, 1); + return $streamData; } /** @@ -84,15 +77,8 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The decompressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function decompressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } - // Decompress it $streamData = bzdecompress($streamData, true); diff --git a/framework/main/classes/compressor/class_GzipCompressor.php b/framework/main/classes/compressor/class_GzipCompressor.php index 3ab0b13f..d8446a8d 100644 --- a/framework/main/classes/compressor/class_GzipCompressor.php +++ b/framework/main/classes/compressor/class_GzipCompressor.php @@ -6,9 +6,6 @@ namespace Org\Mxchange\CoreFramework\Compressor\Gzip; use Org\Mxchange\CoreFramework\Compressor\Compressor; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; -// Load SPL stuff -use \InvalidArgumentException; - /** * GZIP compression and decompression class * @@ -66,17 +63,13 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The compressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function compressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } + // Compress stream + $streamData = gzencode($streamData, 1); - // Return the compressed stream - return gzencode($streamData, 1); + // Return it + return $streamData; } /** @@ -84,17 +77,13 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The decompressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function decompressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } + // Decompress string + $streamData = gzdecode($streamData); - // Return the decompressed stream - return gzdecode($streamData); + // Return it + return $streamData; } /** diff --git a/framework/main/classes/compressor/class_ZlibCompressor.php b/framework/main/classes/compressor/class_ZlibCompressor.php index f8982d5b..a5db0382 100644 --- a/framework/main/classes/compressor/class_ZlibCompressor.php +++ b/framework/main/classes/compressor/class_ZlibCompressor.php @@ -6,9 +6,6 @@ namespace Org\Mxchange\CoreFramework\Compressor\Zlib; use Org\Mxchange\CoreFramework\Compressor\Compressor; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; -// Load SPL stuff -use \InvalidArgumentException; - /** * ZLIB compression and decompression class * @@ -66,17 +63,13 @@ class ZlibCompressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The compressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function compressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } + // Compress string + $streamData = gzcompress($streamData, 1); - // Return the compressed stream - return gzcompress($streamData, 1); + // Return it + return $streamData; } /** @@ -84,17 +77,13 @@ class ZlibCompressor extends BaseFrameworkSystem implements Compressor { * * @param $streamData Mixed non-object stream data * @return $streamData The decompressed stream data - * @throws InvalidArgumentException If the stream is not compressable or decompressable */ public function decompressStream (string $streamData) { - // Validate parameter - if (is_object($streamData) || is_resource($streamData)) { - // Throw an exception - throw new InvalidArgumentException(sprintf('streamData[]=%s cannot be compressed/decompressed', gettype($streamData))); - } - // Return the decompressed stream - return gzuncompress($streamData); + $streamData = gzuncompress($streamData); + + // Return it + return $streamData; } /** -- 2.39.2