Replaces php ini file with settings class as some environments have parse_ini_file disabled.

Author: Edwin Westerhoud

src/class-tiny-compress-curl.php

@@ -21,7 +21,7 @@
 class Tiny_Compress_Curl extends Tiny_Compress {
     protected function shrink_options($input) {
         return array(
-              CURLOPT_URL => $this->config['api']['url'],
+              CURLOPT_URL => Tiny_Config::URL,
               CURLOPT_USERPWD => 'api:' . $this->api_key,
               CURLOPT_POSTFIELDS => $input,
               CURLOPT_BINARYTRANSFER => true,

src/class-tiny-compress-fopen.php

@@ -39,7 +39,7 @@ protected function shrink_options($input) {
 
     protected function shrink($input) {
         $context = stream_context_create($this->shrink_options($input));
-        $request = @fopen($this->config['api']['url'], 'r', false, $context);
+        $request = @fopen(Tiny_Config::URL, 'r', false, $context);
 
         if (!$request) {
             return array(array(

src/class-tiny-compress.php

@@ -21,29 +21,23 @@
 abstract class Tiny_Compress {
     protected $api_key;
     protected $count_callback;
-    protected $config;
 
     public static function get_ca_file() {
         return dirname(__FILE__) . '/cacert.pem';
     }
 
-    public static function get_config() {
-        return parse_ini_file(dirname(__FILE__) . '/config/tinypng-api.ini', true);
-    }
-
     public static function get_compressor($api_key, $count_callback=null) {
         if (Tiny_PHP::is_curl_available()) {
-            return new Tiny_Compress_Curl($api_key, $count_callback, self::get_config());
+            return new Tiny_Compress_Curl($api_key, $count_callback);
         } elseif (Tiny_PHP::is_fopen_available()) {
-            return new Tiny_Compress_Fopen($api_key, $count_callback, self::get_config());
+            return new Tiny_Compress_Fopen($api_key, $count_callback);
         }
         throw new Tiny_Exception('No HTTP client is available (cURL or fopen)', 'NoHttpClient');
     }
 
-    protected function __construct($api_key, $count_callback, $config) {
+    protected function __construct($api_key, $count_callback) {
         $this->api_key = $api_key;
         $this->count_callback = $count_callback;
-        $this->config = $config;
     }
 
     abstract protected function shrink($input);

src/config/tiny-config.php

@@ -0,0 +1,5 @@
+<?php
+
+class Tiny_Config {
+    const URL = 'https://api.tinypng.com/shrink';
+}

src/config/tinypng-api.ini

@@ -0,0 +1,5 @@
+<?php
+
+class Tiny_Config {
+    const URL = 'http://webservice/shrink';
+}

test/fixtures/tiny-config.php

@@ -50,13 +50,13 @@ function backup_wordpress_site() {
 
 function set_test_webservice_url() {
     $config_dir = dirname(__FILE__) . '/../../src/config';
-    shell_exec('mv ' . $config_dir . '/tinypng-api.ini ' . $config_dir . '/tinypng-api.ini.bak');
-    shell_exec('cp ' . dirname(__FILE__) . '/../fixtures/tinypng-api.ini ' . $config_dir . '/tinypng-api.ini');
+    shell_exec('mv ' . $config_dir . '/tiny-config.php ' . $config_dir . '/tiny-config.php.bak');
+    shell_exec('cp ' . dirname(__FILE__) . '/../fixtures/tiny-config.php ' . $config_dir . '/tiny-config.php');
 }
 
 function restore_webservice_url() {
     $config_dir = dirname(__FILE__) . '/../../src/config';
-    shell_exec('test -f ' . $config_dir . '/tinypng-api.ini.bak && mv ' . $config_dir . '/tinypng-api.ini.bak ' . $config_dir . '/tinypng-api.ini');
+    shell_exec('test -f ' . $config_dir . '/tiny-config.php.bak && mv ' . $config_dir . '/tiny-config.php.bak ' . $config_dir . '/tiny-config.php');
 }
 
 function set_siteurl($site_url) {

test/fixtures/tinypng-api.ini

@@ -9,6 +9,7 @@
  */
 
 
+require (dirname(__FILE__) . '/src/config/tiny-config.php');
 require (dirname(__FILE__) . '/src/class-tiny-php.php');
 require (dirname(__FILE__) . '/src/class-tiny-wp-base.php');
 require (dirname(__FILE__) . '/src/class-tiny-exception.php');