Use namespaces

examples/coinbase_account_balance.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('API_KEY', '');
 define('API_SECRET', '');

examples/coinbase_spot_rate.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $curl = new Curl();
 $curl->get('https://coinbase.com/api/v1/prices/spot_rate');

examples/deviant_art_rss.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $curl = new Curl();
 $curl->get('http://backend.deviantart.com/rss.xml', array(

examples/domainr_search_domain_name_availability.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $curl = new Curl();
 $curl->get('https://domai.nr/api/json/search', array(

examples/flickr_photo_search.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 function construct_url($photo, $size = 's', $ext = 'jpg')
 {

examples/flickr_upload_photo.php

@@ -1,7 +1,8 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 require 'Flickr.class.php';
 
+use \Curl\Curl;
 
 $flickr = new Flickr();
 $flickr->authenticate();

examples/github_create_gist.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $content = <<<EOF
 <?php

examples/gittip_send_tip.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('GITTIP_USERNAME', 'XXXXXXXXXX');
 define('GITTIP_API_KEY', 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX');

examples/google_plus_profile.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('CLIENT_ID', 'XXXXXXXXXXXX.apps.googleusercontent.com');
 define('CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXX');

examples/instagram_popular_media.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
 define('INSTAGRAM_CLIENT_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
@@ -46,8 +47,7 @@
                 '<img alt="" src="' . $media->images->thumbnail->url . '" />' .
             '</a>';
     }
-}
-else {
+} else {
     header('Location: https://api.instagram.com/oauth/authorize/?' . http_build_query(array(
         'client_id' => INSTAGRAM_CLIENT_ID,
         'redirect_uri' => $redirect_uri,

examples/instagram_search_photos.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('INSTAGRAM_CLIENT_ID', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
 

examples/mailchimp_subscribe_email_address.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('MAILCHIMP_API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXX');
 $parts = explode('-', MAILCHIMP_API_KEY);

examples/put.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 // curl -X PUT -d "id=1&first_name=Zach&last_name=Borboa" "http://httpbin.org/put"
 $curl = new Curl();

examples/reddit_top_pics.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $data = array();
 if (isset($_GET['after'])) {

examples/twitter_post_tweet.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 define('API_KEY', 'XXXXXXXXXXXXXXXXXXXXXXXXX');
 define('API_SECRET', 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');

examples/youtube_video_count.php

@@ -1,6 +1,7 @@
 <?php
-require '../src/Curl.class.php';
+require '../src/Curl/Curl.php';
 
+use \Curl\Curl;
 
 $video_ids = array(
     '9bZkp7q19f0',

src/Curl.class.php → src/Curl/Curl.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Curl;
+
 class Curl
 {
     const USER_AGENT = 'PHP-Curl-Class/2.0 (+https://github.com/php-curl-class/php-curl-class)';
@@ -338,8 +340,8 @@ private function parseResponseHeaders($raw_headers)
     private function postfields($data)
     {
         if (is_array($data)) {
-            if (is_array_multidim($data)) {
-                $data = http_build_multi_query($data);
+            if (self::is_array_multidim($data)) {
+                $data = self::http_build_multi_query($data);
             } else {
                 $binary_data = false;
                 foreach ($data as $key => $value) {
@@ -354,9 +356,9 @@ private function postfields($data)
                     } elseif (is_string($value) && strpos($value, '@') === 0) {
                         $binary_data = true;
                         if (class_exists('CURLFile')) {
-                            $data[$key] = new CURLFile(substr($value, 1));
+                            $data[$key] = new \CURLFile(substr($value, 1));
                         }
-                    } elseif ($value instanceof CURLFile) {
+                    } elseif ($value instanceof \CURLFile) {
                         $binary_data = true;
                     }
                 }
@@ -423,9 +425,46 @@ public function __destruct()
     {
         $this->close();
     }
+
+    public static function is_array_assoc($array)
+    {
+        return (bool)count(array_filter(array_keys($array), 'is_string'));
+    }
+
+    public static function is_array_multidim($array)
+    {
+        if (!is_array($array)) {
+            return false;
+        }
+
+        return !(count($array) === count($array, COUNT_RECURSIVE));
+    }
+
+    public static function http_build_multi_query($data, $key = null)
+    {
+        $query = array();
+
+        if (empty($data)) {
+            return $key . '=';
+        }
+
+        $is_array_assoc = self::is_array_assoc($data);
+
+        foreach ($data as $k => $value) {
+            if (is_string($value) || is_numeric($value)) {
+                $brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
+                $query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
+            } elseif (is_array($value)) {
+                $nested = is_null($key) ? $k : $key . '[' . $k . ']';
+                $query[] = self::http_build_multi_query($value, $nested);
+            }
+        }
+
+        return implode('&', $query);
+    }
 }
 
-class CaseInsensitiveArray implements ArrayAccess, Countable, Iterator
+class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
 {
     private $container = array();
 
@@ -494,40 +533,3 @@ public function rewind()
         reset($this->container);
     }
 }
-
-function is_array_assoc($array)
-{
-    return (bool)count(array_filter(array_keys($array), 'is_string'));
-}
-
-function is_array_multidim($array)
-{
-    if (!is_array($array)) {
-        return false;
-    }
-
-    return !(count($array) === count($array, COUNT_RECURSIVE));
-}
-
-function http_build_multi_query($data, $key = null)
-{
-    $query = array();
-
-    if (empty($data)) {
-        return $key . '=';
-    }
-
-    $is_array_assoc = is_array_assoc($data);
-
-    foreach ($data as $k => $value) {
-        if (is_string($value) || is_numeric($value)) {
-            $brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
-            $query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
-        } elseif (is_array($value)) {
-            $nested = is_null($key) ? $k : $key . '[' . $k . ']';
-            $query[] = http_build_multi_query($value, $nested);
-        }
-    }
-
-    return implode('&', $query);
-}

tests/PHPCurlClass/helper.inc.php → tests/PHPCurlClass/Helper.php

@@ -1,4 +1,8 @@
 <?php
+namespace Helper;
+
+use Curl\Curl;
+
 class Test
 {
     const TEST_URL = 'http://127.0.0.1:8000/';
@@ -23,9 +27,9 @@ public function server($test, $request_method, $data = array())
 function test($instance, $before, $after)
 {
     $instance->server('request_method', $before);
-    PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $before);
+    \PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $before);
     $instance->server('request_method', $after);
-    PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $after);
+    \PHPUnit_Framework_Assert::assertEquals($instance->curl->response_headers['X-REQUEST-METHOD'], $after);
 }
 
 function create_png()