Rewrite resize_options to be compatible with PHP 5.2

Author: Jacob Middag

src/class-tiny-compress-curl.php

@@ -63,30 +63,25 @@ protected function shrink($input) {
         return array(self::decode(substr($response, $header_size)), $headers, $status_code);
     }
 
-    protected function output_options($url) {
-        return array(
+    protected function output_options($url, $resize) {
+        $options = array(
             CURLOPT_URL => $url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_HEADER => true,
             CURLOPT_CAINFO => self::get_ca_file(),
             CURLOPT_SSL_VERIFYPEER => true
         );
-    }
-
-    protected function resize_options($resize) {
-        if (!$resize) {
-            return array();
+        if ($resize) {
+            $options[CURLOPT_USERPWD] = 'api:' . $this->api_key;
+            $options[CURLOPT_HTTPHEADER] = array('Content-Type: application/json');
+            $options[CURLOPT_POSTFIELDS] = json_encode(array('resize' => $resize));
         }
-        return array(
-            CURLOPT_USERPWD => 'api:' . $this->api_key,
-            CURLOPT_HTTPHEADER => array('Content-Type: application/json'),
-            CURLOPT_POSTFIELDS => json_encode(array('resize' => $resize))
-        );
+        return $options;
     }
 
     protected function output($url, $resize) {
         $request = curl_init();
-        $options = array_replace_recursive($this->output_options($url), $this->resize_options($resize));
+        $options = $this->output_options($url, $resize);
         curl_setopt_array($request, $options);
 
         $response = curl_exec($request);

src/class-tiny-compress-fopen.php

@@ -66,8 +66,8 @@ protected function shrink($input) {
         return array(self::decode($response), $headers, $status_code);
     }
 
-    protected function output_options() {
-        return array(
+    protected function output_options($resize) {
+        $options = array(
             'http' => array(
                 'method' => 'GET',
             ),
@@ -76,25 +76,17 @@ protected function output_options() {
                 'verify_peer' => true
             )
         );
-    }
-
-    protected function resize_options($resize) {
-        if (!$resize) {
-            return array();
+        if ($resize) {
+            $options['http']['header'] = array(
+                'Authorization: Basic ' . base64_encode('api:' . $this->api_key),
+                'Content-Type: application/json'
+            );
+            $options['http']['content'] = json_encode(array('resize' => $resize));
         }
-        return array(
-            'http' => array(
-                'header' => array(
-                    'Authorization: Basic ' . base64_encode('api:' . $this->api_key),
-                    'Content-Type: application/json'
-                 ),
-                'content' => json_encode(array('resize' => $resize))
-            )
-        );
     }
 
     protected function output($url, $resize) {
-        $options = array_replace_recursive($this->output_options(), $this->resize_options($resize));
+        $options = $this->output_options($resize);
         $context = stream_context_create($options);
         $request = @fopen($url, 'rb', false, $context);