Rewritten static 'create' method in all compressors, some code-cleanup

[core.git] / inc / classes / main / compressor / class_GzipCompressor.php

diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php
index 34bc01f1ab0843275aa105981a5f1c990f1b2e4f..f69f4260ea9a74756ed880ccbbb9a437c555defb 100644 (file)
--- a/inc/classes/main/compressor/class_GzipCompressor.php
+++ b/inc/classes/main/compressor/class_GzipCompressor.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,20 +35,20 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
        /**
         * Create a new compressor channel based a given compression handler
         *
-        * @return      $cInstance      An instance of this class
+        * @return      $compressorInstance             An instance of this class
         */
        public static final function createGzipCompressor () {
+               // Routines not found by default
+               $compressorInstance = null;
+
                // Get new instance
                if ((function_exists('gzcompress')) && (function_exists('gzuncompress'))) {
                        // Compressor can maybe be used
-                       $cInstance = new GzipCompressor();
-               } else {
-                       // Routines not found!
-                       $cInstance = null;
-               }
+                       $compressorInstance = new GzipCompressor();
+               } // END - if
 
                // Return the compressor instance
-               return $cInstance;
+               return $compressorInstance;
        }
 
        /**
@@ -62,7 +62,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
                if (is_object($streamData)) {
                        // Throw an exception
                        throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT);
-               }
+               } // END - if
 
                // Return the compressed stream
                return gzcompress($streamData, 1);
@@ -79,7 +79,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
                if (is_object($streamData)) {
                        // Throw an exception
                        throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT);
-               }
+               } // END - if
 
                // Return the decompressed stream
                return gzuncompress($streamData);