From b19a2efc6c7bb24944e732e566e3d86a4517280c Mon Sep 17 00:00:00 2001
From: Dirk Adler <dirk@placestar.com>
Date: Mon, 20 Jul 2015 17:29:55 +0200
Subject: [PATCH 1/2] cleaned up .gitignore

+ removed common temp & ide config files - best practise ist to add them to ~/.gitignore_global
+ added vendor dir
---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2902d1e..dbbdce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-*.swp
+vendor
 config.ini
-.DS_Store
-*.esproj/
-.idea/
 iron.json

From 17050b3877fc2262f1de0b58716edc6a06ad7dac Mon Sep 17 00:00:00 2001
From: Dirk Adler <dirk@placestar.com>
Date: Mon, 20 Jul 2015 18:07:23 +0200
Subject: [PATCH 2/2] refactored to support PSR-4 & IronCore 1.0.*

+ moved classes to /src folder
+ moved test into /test folder
+ removed phar & build.php
---
 .gitignore                                |   2 -
 build.php                                 |  34 ----
 composer.json                             |  58 +++---
 iron_cache.phar                           | Bin 25763 -> 0 bytes
 IronCache.class.php => src/IronCache.php  | 238 +++++++---------------
 src/IronCacheItem.php                     | 124 +++++++++++
 test/.gitignore                           |   2 +
 sample_config.ini => test/sample_iron.ini |   0
 TestCache.php => test/test.php            |   6 +-
 9 files changed, 234 insertions(+), 230 deletions(-)
 delete mode 100644 build.php
 delete mode 100644 iron_cache.phar
 rename IronCache.class.php => src/IronCache.php (62%)
 create mode 100644 src/IronCacheItem.php
 create mode 100644 test/.gitignore
 rename sample_config.ini => test/sample_iron.ini (100%)
 rename TestCache.php => test/test.php (86%)

diff --git a/.gitignore b/.gitignore
index dbbdce1..22d0d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 vendor
-config.ini
-iron.json
diff --git a/build.php b/build.php
deleted file mode 100644
index f9cec27..0000000
--- a/build.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * This script creates  .phar archive with all required dependencies.
- * Archive usage:
- * include("phar://iron_cache.phar");
- * or
- * include("phar://".dirname(__FILE__)."/iron_cache.phar");
- */
- 
-@unlink('iron_cache.phar');
-
-$phar = new Phar('iron_cache.phar');
-
-# Loader
-$phar->setStub('<?php
-Phar::mapPhar("iron_cache.phar");
-if (!class_exists("IronCore")){
-    require "phar://iron_cache.phar/IronCore.class.php";
-}
-require "phar://iron_cache.phar/IronCache.class.php";
-__HALT_COMPILER(); ?>');
-
-# Files
-$phar->addFile('../iron_core_php/IronCore.class.php', 'IronCore.class.php');
-$phar->addFile('IronCache.class.php');
-$phar->addFile('LICENSE', 'LICENSE');
-
-echo "\ndone - ".(round(filesize('iron_cache.phar')/1024, 2))." KB\n";
-
-# Verification
-require "phar://iron_cache.phar";
-$cache = new IronCache();
-
-echo "Build finished successfully\n";
diff --git a/composer.json b/composer.json
index 3a00ccf..1792620 100644
--- a/composer.json
+++ b/composer.json
@@ -1,29 +1,31 @@
 {
-    "name": "iron-io/iron_cache",
-    "type": "library",
-    "description": "Client binding for IronCache (A key/value store in the cloud)",
-    "keywords": ["cache","iron_cache","iron","store","cloud storage"],
-    "homepage": "http://github.com/iron-io/iron_cache_php",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Alexander S",
-            "email": "alexander@iron.io",
-            "homepage": "http://iron.io",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=5.2.0",
-        "iron-io/iron_core": "0.*"
-    },
-    "autoload": {
-        "files": ["IronCache.class.php"]
-    },
-    "repositories":[
-        {
-            "type":"git",
-            "url":"http://github.com/iron-io/iron_cache_php"
-        }
-    ]
-}
\ No newline at end of file
+  "name": "iron-io/iron_cache",
+  "type": "library",
+  "description": "Client binding for IronCache (A key/value store in the cloud)",
+  "keywords": [
+    "cache",
+    "iron_cache",
+    "iron",
+    "store",
+    "cloud storage"
+  ],
+  "homepage": "http://github.com/iron-io/iron_cache_php",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Alexander S",
+      "email": "alexander@iron.io",
+      "homepage": "http://iron.io",
+      "role": "Developer"
+    }
+  ],
+  "require": {
+    "php": ">=5.2.0",
+    "iron-io/iron_core": "1.0.*"
+  },
+  "autoload": {
+    "psr-4": {
+      "IronCache\\": "src/"
+    }
+  }
+}
diff --git a/iron_cache.phar b/iron_cache.phar
deleted file mode 100644
index fe5d507b37e728c69c83f393db0c3292dd4f5dfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25763
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
W`QfAg+WnWO-^2e`<LQ%UPyQFk&Ri}4

diff --git a/IronCache.class.php b/src/IronCache.php
similarity index 62%
rename from IronCache.class.php
rename to src/IronCache.php
index f2d7120..99ea88d 100644
--- a/IronCache.class.php
+++ b/src/IronCache.php
@@ -5,127 +5,29 @@
  * @link https://github.com/iron-io/iron_cache_php
  * @link http://www.iron.io/products/cache
  * @link http://dev.iron.io/
- * @version 0.1.3
+ * @version 1.0.0
  * @package IronCache
  * @copyright Feel free to copy, steal, take credit for, or whatever you feel like doing with this code. ;)
  */
 
+namespace IronCache;
 
-class IronCache_Item
-{
-    protected $value;
-    protected $expires_in;
-    protected $replace;
-    protected $add;
-
-    const MAX_EXPIRES_IN = 2592000;
-
-    /**
-     * Create a new item.
-     *
-     * @param array|string $item
-     *        An array of item properties or a string of the item value.
-     * Fields in item array:
-     * Required:
-     * - value: string - The item data, as a string.
-     * Optional:
-     * - expires_in: integer - How long in seconds to keep the item on the cache before it is deleted.
-     *                         Default is 604,800 seconds (7 days). Maximum is 2,592,000 seconds (30 days).
-     * - replace: boolean - Will only work if key already exists.
-     * - add:     boolean - Will only work if key does not exist.
-     */
-    public function __construct($item)
-    {
-        if (is_string($item) || is_integer($item)) {
-            $this->setValue($item);
-        } elseif (is_array($item)) {
-            $this->setValue($item['value']);
-            if (array_key_exists("replace", $item)) {
-                $this->setReplace($item['replace']);
-            }
-            if (array_key_exists("add", $item)) {
-                $this->setAdd($item['add']);
-            }
-            if (array_key_exists("expires_in", $item)) {
-                $this->setExpiresIn($item['expires_in']);
-            }
-        }
-    }
-
-    public function setValue($value)
-    {
-        if ($value === null) {
-            throw new InvalidArgumentException("Please specify a value");
-        } else {
-            $this->value = $value;
-        }
-    }
-
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    public function setReplace($replace)
-    {
-        $this->replace = $replace;
-    }
-
-    public function getReplace()
-    {
-        return $this->replace;
-    }
-
-    public function setAdd($add)
-    {
-        $this->add = $add;
-    }
-
-    public function getAdd()
-    {
-        return $this->add;
-    }
-
-    public function setExpiresIn($expires_in)
-    {
-        if ($expires_in > self::MAX_EXPIRES_IN) {
-            throw new InvalidArgumentException("Expires In can't be greater than ".self::MAX_EXPIRES_IN.".");
-        } else {
-            $this->expires_in = $expires_in;
-        }
-    }
-
-    public function getExpiresIn()
-    {
-        return $this->expires_in;
-    }
-
-    public function asArray()
-    {
-        $array = array();
-        $array['value'] = $this->getValue();
-        if ($this->getExpiresIn() != null) {
-            $array['expires_in'] = $this->getExpiresIn();
-        }
-        if ($this->getReplace() != null) {
-            $array['replace'] = $this->getReplace();
-        }
-        if ($this->getAdd() != null) {
-            $array['add'] = $this->getAdd();
-        }
-        return $array;
-    }
-}
+use IronCore\IronCore;
+use IronCore\HttpException;
 
+/**
+ * Class IronCache
+ * @package IronCache
+ */
 class IronCache extends IronCore
 {
     protected $client_version = '0.1.3';
-    protected $client_name    = 'iron_cache_php';
-    protected $product_name   = 'iron_cache';
+    protected $client_name = 'iron_cache_php';
+    protected $product_name = 'iron_cache';
     protected $default_values = array(
-        'protocol'    => 'https',
-        'host'        => 'cache-aws-us-east-1.iron.io',
-        'port'        => '443',
+        'protocol' => 'https',
+        'host' => 'cache-aws-us-east-1.iron.io',
+        'port' => '443',
         'api_version' => '1',
     );
 
@@ -134,20 +36,20 @@ class IronCache extends IronCore
     public $session_expire_time = 172800; # 2 days
 
     /**
-    * @param string|array $config
-    *        Array of options or name of config file.
-    * Fields in options array or in config:
-    *
-    * Required:
-    * - token
-    * - project_id
-    * Optional:
-    * - protocol
-    * - host
-    * - port
-    * - api_version
-    * @param string|null $cache_name set default cache name
-    */
+     * @param string|array $config
+     *        Array of options or name of config file.
+     * Fields in options array or in config:
+     *
+     * Required:
+     * - token
+     * - project_id
+     * Optional:
+     * - protocol
+     * - host
+     * - port
+     * - api_version
+     * @param string|null $cache_name set default cache name
+     */
     public function __construct($config = null, $cache_name = null)
     {
         $this->getConfigData($config);
@@ -156,27 +58,27 @@ public function __construct($config = null, $cache_name = null)
     }
 
     /**
-    * Switch active project
-    *
-    * @param string $project_id Project ID
-    * @throws InvalidArgumentException
-    */
+     * Switch active project
+     *
+     * @param string $project_id Project ID
+     * @throws \InvalidArgumentException
+     */
     public function setProjectId($project_id)
     {
         if (!empty($project_id)) {
             $this->project_id = $project_id;
         }
         if (empty($this->project_id)) {
-            throw new InvalidArgumentException("Please set project_id");
+            throw new \InvalidArgumentException("Please set project_id");
         }
     }
 
     /**
-    * Set default cache name
-    *
-    * @param string $cache_name name of cache
-    * @throws InvalidArgumentException
-    */
+     * Set default cache name
+     *
+     * @param string $cache_name name of cache
+     * @throws \InvalidArgumentException
+     */
     public function setCacheName($cache_name)
     {
         if (!empty($cache_name)) {
@@ -193,21 +95,23 @@ public function getCaches($page = 0)
             $params['page'] = $page;
         }
         $this->setJsonHeaders();
+
         return self::json_decode($this->apiCall(self::GET, $url, $params));
     }
 
     /**
-    * Get information about cache.
-    * Also returns cache size.
-    *
-    * @param string $cache
-    * @return mixed
-    */
+     * Get information about cache.
+     * Also returns cache size.
+     *
+     * @param string $cache
+     * @return mixed
+     */
     public function getCache($cache)
     {
         $cache = self::encodeCache($cache);
         $url = "projects/{$this->project_id}/caches/$cache";
         $this->setJsonHeaders();
+
         return self::json_decode($this->apiCall(self::GET, $url));
     }
 
@@ -235,13 +139,14 @@ public function getCache($cache)
     public function putItem($cache, $key, $item)
     {
         $cache = self::encodeCache($cache);
-        $key   = self::encodeKey($key);
-        $itm   = new IronCache_Item($item);
-        $req   = $itm->asArray();
-        $url   = "projects/{$this->project_id}/caches/$cache/items/$key";
+        $key = self::encodeKey($key);
+        $itm = new IronCacheItem($item);
+        $req = $itm->asArray();
+        $url = "projects/{$this->project_id}/caches/$cache/items/$key";
 
         $this->setJsonHeaders();
         $res = $this->apiCall(self::PUT, $url, $req);
+
         return self::json_decode($res);
     }
 
@@ -251,34 +156,36 @@ public function putItem($cache, $key, $item)
      * @param string $cache Cache name
      * @param string $key Cache key
      * @return mixed|null single item or null
-     * @throws Http_Exception
+     * @throws HttpException
      */
     public function getItem($cache, $key)
     {
         $cache = self::encodeCache($cache);
-        $key   = self::encodeKey($key);
-        $url   = "projects/{$this->project_id}/caches/$cache/items/$key";
+        $key = self::encodeKey($key);
+        $url = "projects/{$this->project_id}/caches/$cache/items/$key";
 
         $this->setJsonHeaders();
         try {
             $res = $this->apiCall(self::GET, $url);
-        } catch (Http_Exception $e) {
-            if ($e->getCode() == Http_Exception::NOT_FOUND) {
+        } catch (HttpException $e) {
+            if ($e->getCode() == HttpException::NOT_FOUND) {
                 return null;
             } else {
                 throw $e;
             }
         }
+
         return self::json_decode($res);
     }
 
     public function deleteItem($cache, $key)
     {
         $cache = self::encodeCache($cache);
-        $key   = self::encodeKey($key);
-        $url   = "projects/{$this->project_id}/caches/$cache/items/$key";
+        $key = self::encodeKey($key);
+        $url = "projects/{$this->project_id}/caches/$cache/items/$key";
 
         $this->setJsonHeaders();
+
         return self::json_decode($this->apiCall(self::DELETE, $url));
     }
 
@@ -297,12 +204,13 @@ public function deleteItem($cache, $key)
     public function incrementItem($cache, $key, $amount = 1)
     {
         $cache = self::encodeCache($cache);
-        $key   = self::encodeKey($key);
+        $key = self::encodeKey($key);
         $url = "projects/{$this->project_id}/caches/$cache/items/$key/increment";
         $params = array(
             'amount' => $amount
         );
         $this->setJsonHeaders();
+
         return self::json_decode($this->apiCall(self::POST, $url, $params));
     }
 
@@ -313,7 +221,7 @@ public function incrementItem($cache, $key, $amount = 1)
      *
      * @param string $key
      * @return mixed|null
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function get($key)
     {
@@ -327,7 +235,7 @@ public function get($key)
      * @param string $key
      * @param array|string $item
      * @return mixed
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function put($key, $item)
     {
@@ -340,7 +248,7 @@ public function put($key, $item)
      *
      * @param string $key
      * @return mixed|void
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function delete($key)
     {
@@ -354,7 +262,7 @@ public function delete($key)
      * @param string $key
      * @param int $amount
      * @return mixed|void
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function increment($key, $amount = 1)
     {
@@ -377,6 +285,7 @@ public function clear($cache = null)
         $url = "projects/{$this->project_id}/caches/$cache/clear";
         $params = array();
         $this->setJsonHeaders();
+
         return self::json_decode($this->apiCall(self::POST, $url, $params));
     }
 
@@ -384,6 +293,7 @@ public function clear($cache = null)
     public function session_open($savePath, $sessionName)
     {
         $this->setCacheName($sessionName);
+
         return true;
     }
 
@@ -408,6 +318,7 @@ public function session_write($id, $data)
             "value" => $data,
             "expires_in" => $this->session_expire_time
         ));
+
         return true;
     }
 
@@ -415,9 +326,10 @@ public function session_destroy($id)
     {
         try {
             $this->delete($id);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             # ignore any exceptions
         }
+
         return true;
     }
 
@@ -453,16 +365,18 @@ public function set_as_session_store($session_expire_time = null)
     protected static function encodeCache($cache)
     {
         if (empty($cache)) {
-            throw new InvalidArgumentException('Please set $cache variable');
+            throw new \InvalidArgumentException('Please set $cache variable');
         }
+
         return rawurlencode($cache);
     }
 
     protected static function encodeKey($key)
     {
         if (empty($key)) {
-            throw new InvalidArgumentException('Please set $key variable');
+            throw new \InvalidArgumentException('Please set $key variable');
         }
+
         return rawurlencode($key);
     }
 
@@ -475,6 +389,6 @@ protected function setJsonHeaders()
     protected function setPostHeaders()
     {
         $this->setCommonHeaders();
-        $this->headers['Content-Type'] ='multipart/form-data';
+        $this->headers['Content-Type'] = 'multipart/form-data';
     }
 }
diff --git a/src/IronCacheItem.php b/src/IronCacheItem.php
new file mode 100644
index 0000000..61154a4
--- /dev/null
+++ b/src/IronCacheItem.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * PHP client for IronCache
+ *
+ * @link https://github.com/iron-io/iron_cache_php
+ * @link http://www.iron.io/products/cache
+ * @link http://dev.iron.io/
+ * @version 1.0.0
+ * @package IronCache
+ * @copyright Feel free to copy, steal, take credit for, or whatever you feel like doing with this code. ;)
+ */
+
+namespace IronCache;
+
+/**
+ * Class IronCacheItem
+ * @package IronCache
+ */
+class IronCacheItem
+{
+    protected $value;
+    protected $expires_in;
+    protected $replace;
+    protected $add;
+
+    const MAX_EXPIRES_IN = 2592000;
+
+    /**
+     * Create a new item.
+     *
+     * @param array|string $item
+     *        An array of item properties or a string of the item value.
+     * Fields in item array:
+     * Required:
+     * - value: string - The item data, as a string.
+     * Optional:
+     * - expires_in: integer - How long in seconds to keep the item on the cache before it is deleted.
+     *                         Default is 604,800 seconds (7 days). Maximum is 2,592,000 seconds (30 days).
+     * - replace: boolean - Will only work if key already exists.
+     * - add:     boolean - Will only work if key does not exist.
+     */
+    public function __construct($item)
+    {
+        if (is_string($item) || is_integer($item)) {
+            $this->setValue($item);
+        } elseif (is_array($item)) {
+            $this->setValue($item['value']);
+            if (array_key_exists("replace", $item)) {
+                $this->setReplace($item['replace']);
+            }
+            if (array_key_exists("add", $item)) {
+                $this->setAdd($item['add']);
+            }
+            if (array_key_exists("expires_in", $item)) {
+                $this->setExpiresIn($item['expires_in']);
+            }
+        }
+    }
+
+    public function setValue($value)
+    {
+        if ($value === null) {
+            throw new \InvalidArgumentException("Please specify a value");
+        } else {
+            $this->value = $value;
+        }
+    }
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    public function setReplace($replace)
+    {
+        $this->replace = $replace;
+    }
+
+    public function getReplace()
+    {
+        return $this->replace;
+    }
+
+    public function setAdd($add)
+    {
+        $this->add = $add;
+    }
+
+    public function getAdd()
+    {
+        return $this->add;
+    }
+
+    public function setExpiresIn($expires_in)
+    {
+        if ($expires_in > self::MAX_EXPIRES_IN) {
+            throw new \InvalidArgumentException("Expires In can't be greater than " . self::MAX_EXPIRES_IN . ".");
+        } else {
+            $this->expires_in = $expires_in;
+        }
+    }
+
+    public function getExpiresIn()
+    {
+        return $this->expires_in;
+    }
+
+    public function asArray()
+    {
+        $array = array();
+        $array['value'] = $this->getValue();
+        if ($this->getExpiresIn() != null) {
+            $array['expires_in'] = $this->getExpiresIn();
+        }
+        if ($this->getReplace() != null) {
+            $array['replace'] = $this->getReplace();
+        }
+        if ($this->getAdd() != null) {
+            $array['add'] = $this->getAdd();
+        }
+
+        return $array;
+    }
+}
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..fa20ff2
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,2 @@
+iron.ini
+iron.json
diff --git a/sample_config.ini b/test/sample_iron.ini
similarity index 100%
rename from sample_config.ini
rename to test/sample_iron.ini
diff --git a/TestCache.php b/test/test.php
similarity index 86%
rename from TestCache.php
rename to test/test.php
index fb2d69a..cab7c0f 100644
--- a/TestCache.php
+++ b/test/test.php
@@ -1,10 +1,8 @@
 <?php
 
-#require "iron_cache.phar";
-require("../iron_core_php/IronCore.class.php");
-require("IronCache.class.php");
+require(dirname(__DIR__) . '/vendor/autoload.php');
 
-$cache = new IronCache();
+$cache = new \IronCache\IronCache();
 $cache->ssl_verifypeer = false;
 #$cache->debug_enabled = true;
 $cache->setCacheName('cache #4');