From 5631297c4865083b5e963f7ce5ba6e2b07e70ac2 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 18:46:37 +0100
Subject: [PATCH 01/10] gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5657f6e..4637cc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-vendor
\ No newline at end of file
+vendor
+.project
\ No newline at end of file

From 016ac0329b3d38ada2acb76c6073debbee637d0f Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 18:48:14 +0100
Subject: [PATCH 02/10] Clean Code psr-1 psr-2, fix namespaces

---
 src/MultiCurl.php          | 344 ++++++++++++++++++-------------------
 src/MultiCurlException.php |  14 +-
 src/MultiCurlManager.php   |  37 ++--
 src/MultiCurlSequence.php  | 109 ++++++------
 src/example.php            |   5 +-
 5 files changed, 262 insertions(+), 247 deletions(-)

diff --git a/src/MultiCurl.php b/src/MultiCurl.php
index f6ce91d..1cdb631 100644
--- a/src/MultiCurl.php
+++ b/src/MultiCurl.php
@@ -1,4 +1,5 @@
-<?php namespace JMathai\PhpMultiCurl;
+<?php 
+namespace JMathai\PhpMultiCurl;
 /*if(!class_exists('MultiCurlManager'))
   include 'MultiCurlManager.php';
 if(!class_exists('MultiCurlSequence'))
@@ -13,211 +14,206 @@
  */
 class MultiCurl
 {
-  const timeout = 3;
-  private static $inst = null;
-  /* @TODO make this private and add a method to set it to 0 */
-  public static $singleton = 0;
-
-  private $mc;
-  private $running;
-  private $execStatus;
-  private $sleepIncrement = 1.1;
-  private $requests = array();
-  private $responses = array();
-  private $properties = array();
-  private static $timers = array();
-
-  public function __construct()
-  {
-    if(self::$singleton === 0)
+    const timeout = 3;
+    private static $inst = null;
+    /* @TODO make this private and add a method to set it to 0 */
+    public static $singleton = 0;
+
+    private $mc;
+    private $running;
+    private $execStatus;
+    private $sleepIncrement = 1.1;
+    private $requests = array();
+    private $responses = array();
+    private $properties = array();
+    private static $timers = array();
+
+    public function __construct()
     {
-      throw new MultiCurlException('This class cannot be instantiated by the new keyword.  You must instantiate it using: $obj = MultiCurl::getInstance();');
-    }
+        if(self::$singleton === 0) {
+            throw new MultiCurlException('This class cannot be instantiated by the new keyword.  You must instantiate it using: $obj = MultiCurl::getInstance();');
+        }
 
-    $this->mc = curl_multi_init();
-    $this->properties = array(
-      'code'  => CURLINFO_HTTP_CODE,
-      'time'  => CURLINFO_TOTAL_TIME,
-      'length'=> CURLINFO_CONTENT_LENGTH_DOWNLOAD,
-      'type'  => CURLINFO_CONTENT_TYPE,
-      'url'   => CURLINFO_EFFECTIVE_URL
-      );
-  }
+        $this->mc = curl_multi_init();
+        $this->properties = array(
+        'code'  => CURLINFO_HTTP_CODE,
+        'time'  => CURLINFO_TOTAL_TIME,
+        'length'=> CURLINFO_CONTENT_LENGTH_DOWNLOAD,
+        'type'  => CURLINFO_CONTENT_TYPE,
+        'url'   => CURLINFO_EFFECTIVE_URL
+        );
+    }
   
-  public function reset(){
-      $this->requests = array();
-      $this->responses = array();
-      self::$timers = array();
-  }
-
-  public function addUrl($url, $options = array())
-  {
-    $ch = curl_init($url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    foreach($options as $option=>$value)
+    public function reset()
     {
-        curl_setopt($ch, $option, $value);
+        $this->requests = array();
+        $this->responses = array();
+        self::$timers = array();
     }
-    return $this->addCurl($ch);
-  }
 
-  public function addCurl($ch)
-  {
-    if(gettype($ch) !== 'resource')
+    public function addUrl($url, $options = array())
     {
-      throw new MultiCurlInvalidParameterException('Parameter must be a valid curl handle');
+        $ch = curl_init($url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        foreach($options as $option=>$value)
+        {
+            curl_setopt($ch, $option, $value);
+        }
+        return $this->addCurl($ch);
     }
 
-    $key = $this->getKey($ch);
-    $this->requests[$key] = $ch;
-    curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, 'headerCallback'));
+    public function addCurl($ch)
+    {
+        if(gettype($ch) !== 'resource') {
+            throw new MultiCurlInvalidParameterException('Parameter must be a valid curl handle');
+        }
+
+        $key = $this->getKey($ch);
+        $this->requests[$key] = $ch;
+        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, 'headerCallback'));
 
-    $code = curl_multi_add_handle($this->mc, $ch);
-    $this->startTimer($key);
+        $code = curl_multi_add_handle($this->mc, $ch);
+        $this->startTimer($key);
     
-    // (1)
-    if($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM)
+        // (1)
+        if($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM) {
+            do
+            {
+                $this->execStatus = curl_multi_exec($this->mc, $this->running);
+            } while ($this->execStatus === CURLM_CALL_MULTI_PERFORM);
+
+            return new MultiCurlManager($key);
+        }
+        else
+        {
+            return $code;
+        }
+    }
+
+    public function getResult($key = null)
     {
-      do
-      {
-        $this->execStatus = curl_multi_exec($this->mc, $this->running);
-      } while ($this->execStatus === CURLM_CALL_MULTI_PERFORM);
+        if($key != null) {
+            if(isset($this->responses[$key]['code'])) {
+                return $this->responses[$key];
+            }
+
+            $innerSleepInt = $outerSleepInt = 1;
+            while($this->running && ($this->execStatus == CURLM_OK || $this->execStatus == CURLM_CALL_MULTI_PERFORM))
+            {
+                usleep(intval($outerSleepInt));
+                $outerSleepInt = intval(max(1, ($outerSleepInt*$this->sleepIncrement)));
+                $ms=curl_multi_select($this->mc, 0);
+
+                // bug in PHP 5.3.18+ where curl_multi_select can return -1
+                // https://bugs.php.net/bug.php?id=63411
+                if($ms === -1) {
+                    usleep(100000);
+                }
+
+                // see pull request https://github.com/jmathai/php-multi-curl/pull/17
+                // details here http://curl.haxx.se/libcurl/c/libcurl-errors.html
+                if($ms >= CURLM_CALL_MULTI_PERFORM) {
+                    do{
+                        $this->execStatus = curl_multi_exec($this->mc, $this->running);
+                        usleep(intval($innerSleepInt));
+                        $innerSleepInt = intval(max(1, ($innerSleepInt*$this->sleepIncrement)));
+                    }while($this->execStatus==CURLM_CALL_MULTI_PERFORM);
+                    $innerSleepInt = 1;
+                }
+                $this->storeResponses();
+                if(isset($this->responses[$key]['data'])) {
+                    return $this->responses[$key];
+                }
+            }
+            return null;
+        }
+        return false;
+    }
 
-      return new MultiCurlManager($key);
+    public static function getSequence()
+    {
+        return new MultiCurlSequence(self::$timers);
     }
-    else
+
+    public static function getTimers()
     {
-      return $code;
+        return self::$timers;
     }
-  }
 
-  public function getResult($key = null)
-  {
-    if($key != null)
+    public function inject($key, $value)
     {
-      if(isset($this->responses[$key]['code']))
-      {
-        return $this->responses[$key];
-      }
-
-      $innerSleepInt = $outerSleepInt = 1;
-      while($this->running && ($this->execStatus == CURLM_OK || $this->execStatus == CURLM_CALL_MULTI_PERFORM))
-      {
-        usleep(intval($outerSleepInt));
-        $outerSleepInt = intval(max(1, ($outerSleepInt*$this->sleepIncrement)));
-        $ms=curl_multi_select($this->mc, 0);
-
-        // bug in PHP 5.3.18+ where curl_multi_select can return -1
-        // https://bugs.php.net/bug.php?id=63411
-        if($ms === -1)
-          usleep(100000);
-
-        // see pull request https://github.com/jmathai/php-multi-curl/pull/17
-        // details here http://curl.haxx.se/libcurl/c/libcurl-errors.html
-        if($ms >= CURLM_CALL_MULTI_PERFORM)
-        {
-          do{
-            $this->execStatus = curl_multi_exec($this->mc, $this->running);
-            usleep(intval($innerSleepInt));
-            $innerSleepInt = intval(max(1, ($innerSleepInt*$this->sleepIncrement)));
-          }while($this->execStatus==CURLM_CALL_MULTI_PERFORM);
-          $innerSleepInt = 1;
-        }
-        $this->storeResponses();
-        if(isset($this->responses[$key]['data']))
-        {
-          return $this->responses[$key];
-        }
-      }
-      return null;
+        $this->$key = $value;
     }
-    return false;
-  }
-
-  public static function getSequence()
-  {
-    return new MultiCurlSequence(self::$timers);
-  }
-
-  public static function getTimers()
-  {
-    return self::$timers;
-  }
-
-  public function inject($key, $value)
-  {
-    $this->$key = $value;
-  }
-
-  private function getKey($ch)
-  {
-    return (string)$ch;
-  }
-
-  private function headerCallback($ch, $header)
-  {
-    $_header = trim($header);
-    $colonPos= strpos($_header, ':');
-    if($colonPos > 0)
+
+    private function getKey($ch)
+    {
+        return (string)$ch;
+    }
+
+    private function headerCallback($ch, $header)
     {
-      $key = substr($_header, 0, $colonPos);
-      $val = preg_replace('/^\W+/','',substr($_header, $colonPos));
-      $this->responses[$this->getKey($ch)]['headers'][$key] = $val;
+        $_header = trim($header);
+        $colonPos= strpos($_header, ':');
+        if($colonPos > 0) {
+            $key = substr($_header, 0, $colonPos);
+            $val = preg_replace('/^\W+/', '', substr($_header, $colonPos));
+            $this->responses[$this->getKey($ch)]['headers'][$key] = $val;
+        }
+        return strlen($header);
     }
-    return strlen($header);
-  }
 
-  private function storeResponses()
-  {
-    while($done = curl_multi_info_read($this->mc))
+    private function storeResponses()
     {
-      $this->storeResponse($done);
+        while($done = curl_multi_info_read($this->mc))
+        {
+            $this->storeResponse($done);
+        }
     }
-  }
 
-  private function storeResponse($done, $isAsynchronous = true)
-  {
-    $key = $this->getKey($done['handle']);
-    $this->stopTimer($key, $done);
-    if($isAsynchronous)
-      $this->responses[$key]['data'] = curl_multi_getcontent($done['handle']);
-    else
-      $this->responses[$key]['data'] = curl_exec($done['handle']);
+    private function storeResponse($done, $isAsynchronous = true)
+    {
+        $key = $this->getKey($done['handle']);
+        $this->stopTimer($key, $done);
+        if($isAsynchronous) {
+            $this->responses[$key]['data'] = curl_multi_getcontent($done['handle']);
+        } else {
+            $this->responses[$key]['data'] = curl_exec($done['handle']);
+        }
+
+        $this->responses[$key]['response'] = $this->responses[$key]['data'];
 
-    $this->responses[$key]['response'] = $this->responses[$key]['data'];
+        foreach($this->properties as $name => $const)
+        {
+            $this->responses[$key][$name] = curl_getinfo($done['handle'], $const);
+        }
+        if($isAsynchronous) {
+            curl_multi_remove_handle($this->mc, $done['handle']);
+        }
+        curl_close($done['handle']);
+    }
 
-    foreach($this->properties as $name => $const)
+    private function startTimer($key)
     {
-      $this->responses[$key][$name] = curl_getinfo($done['handle'], $const);
+        self::$timers[$key]['start'] = microtime(true);
     }
-    if($isAsynchronous)
-      curl_multi_remove_handle($this->mc, $done['handle']);
-    curl_close($done['handle']);
-  }
-
-  private function startTimer($key)
-  {
-    self::$timers[$key]['start'] = microtime(true);
-  }
-
-  private function stopTimer($key, $done)
-  {
-      self::$timers[$key]['end'] = microtime(true);
-      self::$timers[$key]['api'] = curl_getinfo($done['handle'], CURLINFO_EFFECTIVE_URL);
-      self::$timers[$key]['time'] = curl_getinfo($done['handle'], CURLINFO_TOTAL_TIME);
-      self::$timers[$key]['code'] = curl_getinfo($done['handle'], CURLINFO_HTTP_CODE);
-  }
-
-  public static function getInstance()
-  {
-    if(self::$inst == null)
+
+    private function stopTimer($key, $done)
     {
-      self::$singleton = 1;
-      self::$inst = new MultiCurl();
+        self::$timers[$key]['end'] = microtime(true);
+        self::$timers[$key]['api'] = curl_getinfo($done['handle'], CURLINFO_EFFECTIVE_URL);
+        self::$timers[$key]['time'] = curl_getinfo($done['handle'], CURLINFO_TOTAL_TIME);
+        self::$timers[$key]['code'] = curl_getinfo($done['handle'], CURLINFO_HTTP_CODE);
     }
 
-    return self::$inst;
-  }
+    public static function getInstance()
+    {
+        if(self::$inst == null) {
+            self::$singleton = 1;
+            self::$inst = new MultiCurl();
+        }
+
+        return self::$inst;
+    }
 }
 
 /*
diff --git a/src/MultiCurlException.php b/src/MultiCurlException.php
index 0edc659..3f1e3c0 100644
--- a/src/MultiCurlException.php
+++ b/src/MultiCurlException.php
@@ -1,3 +1,11 @@
-<?php namespace JMathai\PhpMultiCurl;
-class MultiCurlException extends \Exception {}
-class MultiCurlInvalidParameterException extends MultiCurlException {}
+<?php 
+namespace JMathai\PhpMultiCurl;
+
+class MultiCurlException extends \Exception
+{
+
+}
+class MultiCurlInvalidParameterException extends MultiCurlException
+{
+
+}
diff --git a/src/MultiCurlManager.php b/src/MultiCurlManager.php
index 474c371..2cefeca 100644
--- a/src/MultiCurlManager.php
+++ b/src/MultiCurlManager.php
@@ -1,4 +1,5 @@
-<?php namespace JMathai\PhpMultiCurl;
+<?php 
+namespace JMathai\PhpMultiCurl;
 /**
  * MultiCurlManager manages multicurl handles
  *
@@ -6,24 +7,24 @@
  */
 class MultiCurlManager
 {
-  private $key;
-  private $epiCurl;
+    private $key;
+    private $epiCurl;
 
-  public function __construct($key)
-  {
-    $this->key = $key;
-    $this->epiCurl = MultiCurl::getInstance();
-  }
+    public function __construct($key)
+    {
+        $this->key = $key;
+        $this->epiCurl = MultiCurl::getInstance();
+    }
 
-  public function __get($name)
-  {
-    $responses = $this->epiCurl->getResult($this->key);
-    return isset($responses[$name]) ? $responses[$name] : null;
-  }
+    public function __get($name)
+    {
+        $responses = $this->epiCurl->getResult($this->key);
+        return isset($responses[$name]) ? $responses[$name] : null;
+    }
 
-  public function __isset($name)
-  {
-    $val = self::__get($name);
-    return empty($val);
-  }
+    public function __isset($name)
+    {
+        $val = self::__get($name);
+        return empty($val);
+    }
 }
diff --git a/src/MultiCurlSequence.php b/src/MultiCurlSequence.php
index 549a562..c2fd13d 100644
--- a/src/MultiCurlSequence.php
+++ b/src/MultiCurlSequence.php
@@ -1,4 +1,5 @@
-<?php namespace JMathai\PhpMultiCurl;
+<?php 
+namespace JMathai\PhpMultiCurl;
 /**
  * MultiCurlSequence displays sequence of http calls
  *
@@ -6,66 +7,74 @@
  */
 class MultiCurlSequence
 {
-  private $width = 100;
-  private $timers;
-  private $min;
-  private $max;
-  private $range;
-  private $step;
+    private $width = 100;
+    private $timers;
+    private $min;
+    private $max;
+    private $range;
+    private $step;
 
-  public function __construct($timers) 
-  {
-    $this->timers = $timers;
-    
-    $min = PHP_INT_MAX;
-    $max = 0;
-    foreach($this->timers as $timer)
+    public function __construct($timers) 
     {
-      if(!isset($timer['start']))
-        $timer['start'] = PHP_INT_MAX;
+        $this->timers = $timers;
+    
+        $min = PHP_INT_MAX;
+        $max = 0;
+        foreach($this->timers as $timer)
+        {
+            if(!isset($timer['start'])) {
+                $timer['start'] = PHP_INT_MAX;
+            }
 
-      if(!isset($timer['end']))
-        $timer['end'] = 0;
+            if(!isset($timer['end'])) {
+                $timer['end'] = 0;
+            }
 
-      $min = min($timer['start'], $min);
-      $max = max($timer['end'], $max);
+            $min = min($timer['start'], $min);
+            $max = max($timer['end'], $max);
+        }
+        $this->min = $min;
+        $this->max = $max;
+        $this->range = $max-$min;
+        $this->step = floatval($this->range/$this->width);
     }
-    $this->min = $min;
-    $this->max = $max;
-    $this->range = $max-$min;
-    $this->step = floatval($this->range/$this->width);
-  }
 
-  public function renderAscii()
-  {
-    $tpl = '';
-    foreach($this->timers as $timer)
-     $tpl .= $this->tplAscii($timer);
+    public function renderAscii()
+    {
+        $tpl = '';
+        foreach($this->timers as $timer) {
+            $tpl .= $this->tplAscii($timer);
+        }
     
-    return $tpl;
-  }
+        return $tpl;
+    }
 
-  private function tplAscii($timer)
-  {
-    $lpad = $rpad = 0;
-    $lspace = $chars = $rspace = '';
-    if($timer['start'] > $this->min)
-      $lpad = intval(($timer['start'] - $this->min) / $this->step);
-    if($timer['end'] < $this->max)
-      $rpad = intval(($this->max - $timer['end']) / $this->step);
-    $mpad = $this->width - $lpad - $rpad;
-    if($lpad > 0)
-      $lspace = str_repeat(' ', $lpad);
-    if($mpad > 0)
-      $chars = str_repeat('=', $mpad);
-    if($rpad > 0)
-      $rspace = str_repeat(' ', $rpad);
+    private function tplAscii($timer)
+    {
+        $lpad = $rpad = 0;
+        $lspace = $chars = $rspace = '';
+        if($timer['start'] > $this->min) {
+            $lpad = intval(($timer['start'] - $this->min) / $this->step);
+        }
+        if($timer['end'] < $this->max) {
+            $rpad = intval(($this->max - $timer['end']) / $this->step);
+        }
+        $mpad = $this->width - $lpad - $rpad;
+        if($lpad > 0) {
+            $lspace = str_repeat(' ', $lpad);
+        }
+        if($mpad > 0) {
+            $chars = str_repeat('=', $mpad);
+        }
+        if($rpad > 0) {
+            $rspace = str_repeat(' ', $rpad);
+        }
     
-    $tpl = <<<TPL
+        $tpl = <<<TPL
 ({$timer['api']} ::  code={$timer['code']}, start={$timer['start']}, end={$timer['end']}, total={$timer['time']})
 [{$lspace}{$chars}{$rspace}]
 
 TPL;
-    return $tpl;
-  }
+        return $tpl;
+    }
 }
diff --git a/src/example.php b/src/example.php
index 8c8dd63..79dec9e 100755
--- a/src/example.php
+++ b/src/example.php
@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 <?php
-if (php_sapi_name() !== 'cli')
-  die();
+if (php_sapi_name() !== 'cli') {
+    die();
+}
 
 require '../vendor/autoload.php';
 $mc = JMathai\PhpMultiCurl\MultiCurl::getInstance();

From 0642a08c1aef61b858e619539f3bacd9a2029545 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 18:48:38 +0100
Subject: [PATCH 03/10] Update docs url, old not working

---
 README.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index 36a6375..956a3ac 100644
--- a/README.markdown
+++ b/README.markdown
@@ -39,9 +39,9 @@ Basic usage can be done using the `addUrl($url/*, $options*/)` method. This call
   $mc = JMathai\PhpMultiCurl\MultiCurl::getInstance();
 
   // Make a call to a URL.
-  $call1 = $mc->addUrl('http://slowapi.herokuapp.com/delay/2.0');
+  $call1 = $mc->addUrl('http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com');
   // Make another call to a URL.
-  $call2 = $mc->addUrl('http://slowapi.herokuapp.com/delay/1.0');
+  $call2 = $mc->addUrl('http://slowwly.robertomurray.co.uk/delay/1000/url/http://www.google.com');
 
   // Access the response for $call2.
   // This blocks until $call2 is complete without waiting for $call1
@@ -59,9 +59,9 @@ This is what the output of that code will look like.
 ```
 Call 2: consequatur id est
 Call 1: in maiores et
-(http://slowapi.herokuapp.com/delay/2.0 ::  code=200, start=1447701285.5536, end=1447701287.9512, total=2.397534)
+(http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com ::  code=200, start=1447701285.5536, end=1447701287.9512, total=2.397534)
 [====================================================================================================]
-(http://slowapi.herokuapp.com/delay/1.0 ::  code=200, start=1447701285.5539, end=1447701287.0871, total=1.532997)
+(http://slowwly.robertomurray.co.uk/delay/1000/url/http://www.google.com ::  code=200, start=1447701285.5539, end=1447701287.0871, total=1.532997)
 [================================================================                                    ]
 ```
 

From 3993398f74ae412f815f54558e186abcce44c5b8 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 18:48:53 +0100
Subject: [PATCH 04/10] Update phpunit tests

---
 tests/AsynchronousTest.php | 85 +++++++++++++++++++-------------------
 tests/CallsTest.php        | 67 +++++++++++++++---------------
 tests/MultiCurlTest.php    | 63 ++++++++++++++--------------
 3 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/tests/AsynchronousTest.php b/tests/AsynchronousTest.php
index edaf79b..5c65207 100644
--- a/tests/AsynchronousTest.php
+++ b/tests/AsynchronousTest.php
@@ -1,46 +1,47 @@
-<?php use JMathai\PhpMultiCurl\MultiCurl;
+<?php 
+use JMathai\PhpMultiCurl\MultiCurl;
 
 class AsynchronousTest extends PHPUnit_Framework_TestCase
 {
-  public function testAsynchronousCalls()
-  {
-    $ch1 = curl_init('http://slowapi.herokuapp.com/delay/2.0');
-    curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);
-    $ch2 = curl_init('http://slowapi.herokuapp.com/delay/2.0');
-    curl_setopt($ch2, CURLOPT_RETURNTRANSFER, 1);
-
-    MultiCurl::$singleton = 0;
-    $mc = MultiCurl::getInstance();
-    $res1 = $mc->addCurl($ch1);
-    $res2 = $mc->addCurl($ch2);
-
-    $res2->response;
-    $res1->response;
-
-    $sequenceGraph = $mc->getSequence()->renderAscii();
-
-    preg_match_all('/[ =]{25}={50}[ =]{25}/', $sequenceGraph, $matches);
-    $this->assertEquals(2, count($matches[0]));
-  }
-
-  public function testSynchronousCalls()
-  {
-    $ch1 = curl_init('http://slowapi.herokuapp.com/delay/2.0');
-    curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);
-    $ch2 = curl_init('http://slowapi.herokuapp.com/delay/2.0');
-    curl_setopt($ch2, CURLOPT_RETURNTRANSFER, 1);
-
-    MultiCurl::$singleton = 0;
-    $mc = MultiCurl::getInstance();
-    $res1 = $mc->addCurl($ch1);
-    $res1->response;
-
-    $res2 = $mc->addCurl($ch2);
-    $res2->response;
-
-    $sequenceGraph = $mc->getSequence()->renderAscii();
-
-    preg_match_all('/[ =]{25}={50}[ =]{25}/', $sequenceGraph, $matches);
-    $this->assertEquals(0, count($matches[0]));
-  }
+    public function testAsynchronousCalls()
+    {
+        $ch1 = curl_init('http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com');
+        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);
+        $ch2 = curl_init('http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com');
+        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, 1);
+
+        MultiCurl::$singleton = 0;
+        $mc = MultiCurl::getInstance();
+        $res1 = $mc->addCurl($ch1);
+        $res2 = $mc->addCurl($ch2);
+
+        $res2->response;
+        $res1->response;
+
+        $sequenceGraph = $mc->getSequence()->renderAscii();
+
+        preg_match_all('/[ =]{25}={50}[ =]{25}/', $sequenceGraph, $matches);
+        $this->assertEquals(2, count($matches[0]));
+    }
+
+    public function testSynchronousCalls()
+    {
+        $ch1 = curl_init('http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com');
+        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);
+        $ch2 = curl_init('http://slowwly.robertomurray.co.uk/delay/2000/url/http://www.google.com');
+        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, 1);
+
+        MultiCurl::$singleton = 0;
+        $mc = MultiCurl::getInstance();
+        $res1 = $mc->addCurl($ch1);
+        $res1->response;
+
+        $res2 = $mc->addCurl($ch2);
+        $res2->response;
+
+        $sequenceGraph = $mc->getSequence()->renderAscii();
+
+        preg_match_all('/[ =]{25}={50}[ =]{25}/', $sequenceGraph, $matches);
+        $this->assertEquals(0, count($matches[0]));
+    }
 }
diff --git a/tests/CallsTest.php b/tests/CallsTest.php
index b383d64..651c0f1 100644
--- a/tests/CallsTest.php
+++ b/tests/CallsTest.php
@@ -1,45 +1,46 @@
-<?php use JMathai\PhpMultiCurl\MultiCurl;
+<?php 
+use JMathai\PhpMultiCurl\MultiCurl;
 
 class CallsTest extends PHPUnit_Framework_TestCase
 {
-  public function testGetCode()
-  {
-    $mc = MultiCurl::getInstance();
-    $google = $mc->addURL('http://www.google.com'); // call google
+    public function testGetCode()
+    {
+        $mc = MultiCurl::getInstance();
+        $google = $mc->addURL('http://www.google.com'); // call google
     
-    $this->assertInternalType('integer', $google->code);
-  }
+        $this->assertInternalType('integer', $google->code);
+    }
 
-  public function testGetCode200()
-  {
-    $mc = MultiCurl::getInstance();
-    $google = $mc->addUrl('http://www.google.com');
+    public function testGetCode200()
+    { 
+       $mc = MultiCurl::getInstance();
+       $github = $mc->addUrl('https://github.com');
     
-    $this->assertEquals(200, $google->code);
-  }
+       $this->assertEquals(200, $github->code);
+    }
 
-  public function testGetCode404()
-  {
-    $mc = MultiCurl::getInstance();
-    $google = $mc->addUrl('http://www.example.com/404');
+    public function testGetCode404()
+    {
+        $mc = MultiCurl::getInstance();
+        $google = $mc->addUrl('https://www.google.com/404');
     
-    $this->assertEquals(404, $google->code);
-  }
+        $this->assertEquals(404, $google->code);
+    }
 
-  public function testResponseJson()
-  {
-    $mc = MultiCurl::getInstance();
-    $call = $mc->addUrl('http://jsonplaceholder.typicode.com/users');
-    $response = json_decode($call->response, true);
-    $this->assertInternalType('array', $response);
-  }
+    public function testResponseJson()
+    {
+        $mc = MultiCurl::getInstance();
+        $call = $mc->addUrl('http://jsonplaceholder.typicode.com/users');
+        $response = json_decode($call->response, true);
+        $this->assertInternalType('array', $response);
+    }
 
-  public function testResponseHeaders()
-  {
-    $mc = MultiCurl::getInstance();
-    $google = $mc->addUrl('http://www.example.com/404');
+    public function testResponseHeaders()
+    {
+        $mc = MultiCurl::getInstance();
+        $google = $mc->addUrl('https://www.google.com');
     
-    $this->assertInternalType('array', $google->headers);
-    $this->assertNotEmpty($google->headers['Etag']);
-  }
+        $this->assertInternalType('array', $google->headers);
+        $this->assertNotEmpty($google->headers['Date']);
+    }
 }
diff --git a/tests/MultiCurlTest.php b/tests/MultiCurlTest.php
index 73f824f..b4b7128 100644
--- a/tests/MultiCurlTest.php
+++ b/tests/MultiCurlTest.php
@@ -1,40 +1,41 @@
-<?php use JMathai\PhpMultiCurl\MultiCurl;
+<?php 
+use JMathai\PhpMultiCurl\MultiCurl;
 
 class MultiCurlTest extends PHPUnit_Framework_TestCase
 {
-  public function testConstructorThrowsExceptionWhenInvokedWithNew()
-  {
-    MultiCurl::$singleton = 0;
-    $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlException');
-    new MultiCurl();
-  }
+    public function testConstructorThrowsExceptionWhenInvokedWithNew()
+    {
+        MultiCurl::$singleton = 0;
+        $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlException');
+        new MultiCurl();
+    }
 
-  public function testConstructorSucceedsAsSingleton()
-  {
-    MultiCurl::getInstance();
-  }
+    public function testConstructorSucceedsAsSingleton()
+    {
+        MultiCurl::getInstance();
+    }
 
-  public function testAddUrl()
-  {
-    $mc = MultiCurl::getInstance();
-    $res = $mc->addUrl('http://google.com');
-    $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
-  }
+    public function testAddUrl()
+    {
+        $mc = MultiCurl::getInstance();
+        $res = $mc->addUrl('http://google.com');
+        $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
+    }
 
-  public function testAddCurl()
-  {
-    $ch = curl_init('https://www.google.com');
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    public function testAddCurl()
+    {
+        $ch = curl_init('https://www.google.com');
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-    $mc = MultiCurl::getInstance();
-    $res = $mc->addCurl($ch);
-    $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
-  }
+        $mc = MultiCurl::getInstance();
+        $res = $mc->addCurl($ch);
+        $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
+    }
 
-  public function testAddCurlWithNull()
-  {
-    $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlInvalidParameterException');
-    $mc = MultiCurl::getInstance();
-    $res = $mc->addCurl(null);
-  }
+    public function testAddCurlWithNull()
+    {
+        $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlInvalidParameterException');
+        $mc = MultiCurl::getInstance();
+        $res = $mc->addCurl(null);
+    }
 }

From cc56656c8c1b944bdaeb10942dc75a8b4eef075c Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 20:34:49 +0100
Subject: [PATCH 05/10] update standards

---
 src/MultiCurl.php         | 167 ++++++++++++++++++--------------------
 src/MultiCurlManager.php  |  10 +--
 src/MultiCurlSequence.php |  51 ++++++------
 tests/CallsTest.php       |   6 +-
 4 files changed, 113 insertions(+), 121 deletions(-)

diff --git a/src/MultiCurl.php b/src/MultiCurl.php
index 1cdb631..8b898f1 100644
--- a/src/MultiCurl.php
+++ b/src/MultiCurl.php
@@ -1,11 +1,10 @@
 <?php 
 namespace JMathai\PhpMultiCurl;
-/*if(!class_exists('MultiCurlManager'))
-  include 'MultiCurlManager.php';
-if(!class_exists('MultiCurlSequence'))
-  include 'MultiCurlSequence.php';
-if(!class_exists('MultiCurlException'))
-  include 'MultiCurlException.php';*/
+
+use JMathai\PhpMultiCurl\MultiCurlManager;
+use JMathai\PhpMultiCurl\MultiCurlSequence;
+use JMathai\PhpMultiCurl\MultiCurlException;
+use JMathai\PhpMultiCurl\MultiCurlInvalidParameterException;
 
 /**
  * MultiCurl multicurl http client
@@ -14,28 +13,28 @@
  */
 class MultiCurl
 {
-    const timeout = 3;
-    private static $inst = null;
+    const TIMEOUT = 3;
+    private static $_inst = null;
     /* @TODO make this private and add a method to set it to 0 */
     public static $singleton = 0;
 
-    private $mc;
-    private $running;
-    private $execStatus;
-    private $sleepIncrement = 1.1;
-    private $requests = array();
-    private $responses = array();
-    private $properties = array();
-    private static $timers = array();
+    private $_mc;
+    private $_running;
+    private $_execStatus;
+    private $_sleepIncrement = 1.1;
+    private $_requests = array();
+    private $_responses = array();
+    private $_properties = array();
+    private static $_timers = array();
 
     public function __construct()
     {
-        if(self::$singleton === 0) {
+        if (self::$singleton === 0) {
             throw new MultiCurlException('This class cannot be instantiated by the new keyword.  You must instantiate it using: $obj = MultiCurl::getInstance();');
         }
 
-        $this->mc = curl_multi_init();
-        $this->properties = array(
+        $this->_mc = curl_multi_init();
+        $this->_properties = array(
         'code'  => CURLINFO_HTTP_CODE,
         'time'  => CURLINFO_TOTAL_TIME,
         'length'=> CURLINFO_CONTENT_LENGTH_DOWNLOAD,
@@ -46,17 +45,16 @@ public function __construct()
   
     public function reset()
     {
-        $this->requests = array();
-        $this->responses = array();
-        self::$timers = array();
+        $this->_requests = array();
+        $this->_responses = array();
+        self::$_timers = array();
     }
 
     public function addUrl($url, $options = array())
     {
         $ch = curl_init($url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        foreach($options as $option=>$value)
-        {
+        foreach ($options as $option=>$value) {
             curl_setopt($ch, $option, $value);
         }
         return $this->addCurl($ch);
@@ -64,65 +62,61 @@ public function addUrl($url, $options = array())
 
     public function addCurl($ch)
     {
-        if(gettype($ch) !== 'resource') {
+        if (gettype($ch) !== 'resource') {
             throw new MultiCurlInvalidParameterException('Parameter must be a valid curl handle');
         }
 
-        $key = $this->getKey($ch);
-        $this->requests[$key] = $ch;
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, 'headerCallback'));
+        $key = $this->_getKey($ch);
+        $this->_requests[$key] = $ch;
+        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_headerCallback'));
 
-        $code = curl_multi_add_handle($this->mc, $ch);
-        $this->startTimer($key);
+        $code = curl_multi_add_handle($this->_mc, $ch);
+        $this->_startTimer($key);
     
         // (1)
-        if($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM) {
-            do
-            {
-                $this->execStatus = curl_multi_exec($this->mc, $this->running);
-            } while ($this->execStatus === CURLM_CALL_MULTI_PERFORM);
+        if ($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM) {
+            do {
+                $this->_execStatus = curl_multi_exec($this->_mc, $this->_running);
+            } while ($this->_execStatus === CURLM_CALL_MULTI_PERFORM);
 
             return new MultiCurlManager($key);
-        }
-        else
-        {
+        } else {
             return $code;
         }
     }
 
     public function getResult($key = null)
     {
-        if($key != null) {
-            if(isset($this->responses[$key]['code'])) {
-                return $this->responses[$key];
+        if ($key != null) {
+            if (isset($this->_responses[$key]['code'])) {
+                return $this->_responses[$key];
             }
 
             $innerSleepInt = $outerSleepInt = 1;
-            while($this->running && ($this->execStatus == CURLM_OK || $this->execStatus == CURLM_CALL_MULTI_PERFORM))
-            {
+            while ($this->_running && ($this->_execStatus == CURLM_OK || $this->_execStatus == CURLM_CALL_MULTI_PERFORM)) {
                 usleep(intval($outerSleepInt));
-                $outerSleepInt = intval(max(1, ($outerSleepInt*$this->sleepIncrement)));
-                $ms=curl_multi_select($this->mc, 0);
+                $outerSleepInt = intval(max(1, ($outerSleepInt*$this->_sleepIncrement)));
+                $ms=curl_multi_select($this->_mc, 0);
 
                 // bug in PHP 5.3.18+ where curl_multi_select can return -1
                 // https://bugs.php.net/bug.php?id=63411
-                if($ms === -1) {
+                if ($ms === -1) {
                     usleep(100000);
                 }
 
                 // see pull request https://github.com/jmathai/php-multi-curl/pull/17
                 // details here http://curl.haxx.se/libcurl/c/libcurl-errors.html
-                if($ms >= CURLM_CALL_MULTI_PERFORM) {
-                    do{
-                        $this->execStatus = curl_multi_exec($this->mc, $this->running);
+                if ($ms >= CURLM_CALL_MULTI_PERFORM) {
+                    do {
+                        $this->_execStatus = curl_multi_exec($this->_mc, $this->_running);
                         usleep(intval($innerSleepInt));
-                        $innerSleepInt = intval(max(1, ($innerSleepInt*$this->sleepIncrement)));
-                    }while($this->execStatus==CURLM_CALL_MULTI_PERFORM);
+                        $innerSleepInt = intval(max(1, ($innerSleepInt*$this->_sleepIncrement)));
+                    } while ($this->_execStatus==CURLM_CALL_MULTI_PERFORM);
                     $innerSleepInt = 1;
                 }
-                $this->storeResponses();
-                if(isset($this->responses[$key]['data'])) {
-                    return $this->responses[$key];
+                $this->_storeResponses();
+                if (isset($this->_responses[$key]['data'])) {
+                    return $this->_responses[$key];
                 }
             }
             return null;
@@ -132,12 +126,12 @@ public function getResult($key = null)
 
     public static function getSequence()
     {
-        return new MultiCurlSequence(self::$timers);
+        return new MultiCurlSequence(self::$_timers);
     }
 
     public static function getTimers()
     {
-        return self::$timers;
+        return self::$_timers;
     }
 
     public function inject($key, $value)
@@ -145,74 +139,73 @@ public function inject($key, $value)
         $this->$key = $value;
     }
 
-    private function getKey($ch)
+    private function _getKey($ch)
     {
         return (string)$ch;
     }
 
-    private function headerCallback($ch, $header)
+    private function _headerCallback($ch, $header)
     {
         $_header = trim($header);
         $colonPos= strpos($_header, ':');
-        if($colonPos > 0) {
+        if ($colonPos > 0) {
             $key = substr($_header, 0, $colonPos);
             $val = preg_replace('/^\W+/', '', substr($_header, $colonPos));
-            $this->responses[$this->getKey($ch)]['headers'][$key] = $val;
+            $this->_responses[$this->_getKey($ch)]['headers'][$key] = $val;
         }
         return strlen($header);
     }
 
-    private function storeResponses()
+    private function _storeResponses()
     {
-        while($done = curl_multi_info_read($this->mc))
-        {
-            $this->storeResponse($done);
+        while ($done = curl_multi_info_read($this->_mc)) {
+            $this->_storeResponse($done);
         }
     }
 
-    private function storeResponse($done, $isAsynchronous = true)
+    private function _storeResponse($done, $isAsynchronous = true)
     {
-        $key = $this->getKey($done['handle']);
-        $this->stopTimer($key, $done);
-        if($isAsynchronous) {
-            $this->responses[$key]['data'] = curl_multi_getcontent($done['handle']);
+        $key = $this->_getKey($done['handle']);
+        $this->_stopTimer($key, $done);
+        if ($isAsynchronous) {
+            $this->_responses[$key]['data'] = curl_multi_getcontent($done['handle']);
         } else {
-            $this->responses[$key]['data'] = curl_exec($done['handle']);
+            $this->_responses[$key]['data'] = curl_exec($done['handle']);
         }
 
-        $this->responses[$key]['response'] = $this->responses[$key]['data'];
+        $this->_responses[$key]['response'] = $this->_responses[$key]['data'];
 
-        foreach($this->properties as $name => $const)
-        {
-            $this->responses[$key][$name] = curl_getinfo($done['handle'], $const);
+        foreach ($this->_properties as $name => $const) {
+            $this->_responses[$key][$name] = curl_getinfo($done['handle'], $const);
         }
-        if($isAsynchronous) {
-            curl_multi_remove_handle($this->mc, $done['handle']);
+
+        if ($isAsynchronous) {
+            curl_multi_remove_handle($this->_mc, $done['handle']);
         }
         curl_close($done['handle']);
     }
 
-    private function startTimer($key)
+    private function _startTimer($key)
     {
-        self::$timers[$key]['start'] = microtime(true);
+        self::$_timers[$key]['start'] = microtime(true);
     }
 
-    private function stopTimer($key, $done)
+    private function _stopTimer($key, $done)
     {
-        self::$timers[$key]['end'] = microtime(true);
-        self::$timers[$key]['api'] = curl_getinfo($done['handle'], CURLINFO_EFFECTIVE_URL);
-        self::$timers[$key]['time'] = curl_getinfo($done['handle'], CURLINFO_TOTAL_TIME);
-        self::$timers[$key]['code'] = curl_getinfo($done['handle'], CURLINFO_HTTP_CODE);
+        self::$_timers[$key]['end'] = microtime(true);
+        self::$_timers[$key]['api'] = curl_getinfo($done['handle'], CURLINFO_EFFECTIVE_URL);
+        self::$_timers[$key]['time'] = curl_getinfo($done['handle'], CURLINFO_TOTAL_TIME);
+        self::$_timers[$key]['code'] = curl_getinfo($done['handle'], CURLINFO_HTTP_CODE);
     }
 
     public static function getInstance()
     {
-        if(self::$inst == null) {
+        if (self::$_inst == null) {
             self::$singleton = 1;
-            self::$inst = new MultiCurl();
+            self::$_inst = new MultiCurl();
         }
-
-        return self::$inst;
+        
+        return self::$_inst;
     }
 }
 
diff --git a/src/MultiCurlManager.php b/src/MultiCurlManager.php
index 2cefeca..c9f1de3 100644
--- a/src/MultiCurlManager.php
+++ b/src/MultiCurlManager.php
@@ -7,18 +7,18 @@
  */
 class MultiCurlManager
 {
-    private $key;
-    private $epiCurl;
+    private $_key;
+    private $_epiCurl;
 
     public function __construct($key)
     {
-        $this->key = $key;
-        $this->epiCurl = MultiCurl::getInstance();
+        $this->_key = $key;
+        $this->_epiCurl = MultiCurl::getInstance();
     }
 
     public function __get($name)
     {
-        $responses = $this->epiCurl->getResult($this->key);
+        $responses = $this->_epiCurl->getResult($this->_key);
         return isset($responses[$name]) ? $responses[$name] : null;
     }
 
diff --git a/src/MultiCurlSequence.php b/src/MultiCurlSequence.php
index c2fd13d..b04fb3f 100644
--- a/src/MultiCurlSequence.php
+++ b/src/MultiCurlSequence.php
@@ -7,66 +7,65 @@
  */
 class MultiCurlSequence
 {
-    private $width = 100;
-    private $timers;
-    private $min;
-    private $max;
-    private $range;
-    private $step;
+    private $_width = 100;
+    private $_timers;
+    private $_min;
+    private $_max;
+    private $_range;
+    private $_step;
 
     public function __construct($timers) 
     {
-        $this->timers = $timers;
+        $this->_timers = $timers;
     
         $min = PHP_INT_MAX;
         $max = 0;
-        foreach($this->timers as $timer)
-        {
-            if(!isset($timer['start'])) {
+        foreach ($this->_timers as $timer) {
+            if (!isset($timer['start'])) {
                 $timer['start'] = PHP_INT_MAX;
             }
 
-            if(!isset($timer['end'])) {
+            if (!isset($timer['end'])) {
                 $timer['end'] = 0;
             }
 
             $min = min($timer['start'], $min);
             $max = max($timer['end'], $max);
         }
-        $this->min = $min;
-        $this->max = $max;
-        $this->range = $max-$min;
-        $this->step = floatval($this->range/$this->width);
+        $this->_min = $min;
+        $this->_max = $max;
+        $this->_range = $max-$min;
+        $this->_step = floatval($this->_range/$this->_width);
     }
 
     public function renderAscii()
     {
         $tpl = '';
-        foreach($this->timers as $timer) {
-            $tpl .= $this->tplAscii($timer);
+        foreach ($this->_timers as $timer) {
+            $tpl .= $this->_tplAscii($timer);
         }
     
         return $tpl;
     }
 
-    private function tplAscii($timer)
+    private function _tplAscii($timer)
     {
         $lpad = $rpad = 0;
         $lspace = $chars = $rspace = '';
-        if($timer['start'] > $this->min) {
-            $lpad = intval(($timer['start'] - $this->min) / $this->step);
+        if ($timer['start'] > $this->_min) {
+            $lpad = intval(($timer['start'] - $this->_min) / $this->_step);
         }
-        if($timer['end'] < $this->max) {
-            $rpad = intval(($this->max - $timer['end']) / $this->step);
+        if ($timer['end'] < $this->_max) {
+            $rpad = intval(($this->_max - $timer['end']) / $this->_step);
         }
-        $mpad = $this->width - $lpad - $rpad;
-        if($lpad > 0) {
+        $mpad = $this->_width - $lpad - $rpad;
+        if ($lpad > 0) {
             $lspace = str_repeat(' ', $lpad);
         }
-        if($mpad > 0) {
+        if ($mpad > 0) {
             $chars = str_repeat('=', $mpad);
         }
-        if($rpad > 0) {
+        if ($rpad > 0) {
             $rspace = str_repeat(' ', $rpad);
         }
     
diff --git a/tests/CallsTest.php b/tests/CallsTest.php
index 651c0f1..4a8a04c 100644
--- a/tests/CallsTest.php
+++ b/tests/CallsTest.php
@@ -13,10 +13,10 @@ public function testGetCode()
 
     public function testGetCode200()
     { 
-       $mc = MultiCurl::getInstance();
-       $github = $mc->addUrl('https://github.com');
+        $mc = MultiCurl::getInstance();
+        $github = $mc->addUrl('https://github.com');
     
-       $this->assertEquals(200, $github->code);
+        $this->assertEquals(200, $github->code);
     }
 
     public function testGetCode404()

From 051a3e82afecd00b4fe8aacf87aca7edabaa3baf Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 20:42:57 +0100
Subject: [PATCH 06/10] update example

---
 README.markdown                | 2 +-
 src/example.php => example.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/example.php => example.php (96%)
 mode change 100755 => 100644

diff --git a/README.markdown b/README.markdown
index 956a3ac..903bde8 100644
--- a/README.markdown
+++ b/README.markdown
@@ -85,7 +85,7 @@ You'll most likely want to configure your cURL calls for your specific purpose.
   $code = $call->code;
 ```
 
-You can look at the [tests/example.php](https://github.com/jmathai/php-multi-curl/blob/master/src/example.php) file for working code and execute it from the command line.
+You can look at the [example.php](https://github.com/jmathai/php-multi-curl/blob/master/example.php) file for working code and execute it from the command line.
 
 ## Documentation
 
diff --git a/src/example.php b/example.php
old mode 100755
new mode 100644
similarity index 96%
rename from src/example.php
rename to example.php
index 79dec9e..2982ea9
--- a/src/example.php
+++ b/example.php
@@ -4,7 +4,7 @@
     die();
 }
 
-require '../vendor/autoload.php';
+require 'vendor/autoload.php';
 $mc = JMathai\PhpMultiCurl\MultiCurl::getInstance();
 
 $ch1 = curl_init('http://www.yahoo.com');

From 33078e3f53119f56d0f46bc142bad89aa9274b79 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 20:45:57 +0100
Subject: [PATCH 07/10] Name optimization

---
 src/{MultiCurlManager.php => Manager.php}   |  4 ++--
 src/MultiCurl.php                           | 16 ++++++++--------
 src/MultiCurlException.php                  | 11 -----------
 src/MultiException.php                      | 11 +++++++++++
 src/{MultiCurlSequence.php => Sequence.php} |  4 ++--
 tests/MultiCurlTest.php                     |  8 ++++----
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename src/{MultiCurlManager.php => Manager.php} (89%)
 delete mode 100644 src/MultiCurlException.php
 create mode 100644 src/MultiException.php
 rename src/{MultiCurlSequence.php => Sequence.php} (96%)

diff --git a/src/MultiCurlManager.php b/src/Manager.php
similarity index 89%
rename from src/MultiCurlManager.php
rename to src/Manager.php
index c9f1de3..04b9217 100644
--- a/src/MultiCurlManager.php
+++ b/src/Manager.php
@@ -1,11 +1,11 @@
 <?php 
 namespace JMathai\PhpMultiCurl;
 /**
- * MultiCurlManager manages multicurl handles
+ * Manager manages multicurl handles
  *
  * @author Jaisen Mathai <jaisen@jmathai.com>
  */
-class MultiCurlManager
+class Manager
 {
     private $_key;
     private $_epiCurl;
diff --git a/src/MultiCurl.php b/src/MultiCurl.php
index 8b898f1..1cf4e05 100644
--- a/src/MultiCurl.php
+++ b/src/MultiCurl.php
@@ -1,10 +1,10 @@
 <?php 
 namespace JMathai\PhpMultiCurl;
 
-use JMathai\PhpMultiCurl\MultiCurlManager;
-use JMathai\PhpMultiCurl\MultiCurlSequence;
-use JMathai\PhpMultiCurl\MultiCurlException;
-use JMathai\PhpMultiCurl\MultiCurlInvalidParameterException;
+use JMathai\PhpMultiCurl\Manager;
+use JMathai\PhpMultiCurl\Sequence;
+use JMathai\PhpMultiCurl\MultiException;
+use JMathai\PhpMultiCurl\MultiInvalidParameterException;
 
 /**
  * MultiCurl multicurl http client
@@ -30,7 +30,7 @@ class MultiCurl
     public function __construct()
     {
         if (self::$singleton === 0) {
-            throw new MultiCurlException('This class cannot be instantiated by the new keyword.  You must instantiate it using: $obj = MultiCurl::getInstance();');
+            throw new MultiException('This class cannot be instantiated by the new keyword.  You must instantiate it using: $obj = MultiCurl::getInstance();');
         }
 
         $this->_mc = curl_multi_init();
@@ -63,7 +63,7 @@ public function addUrl($url, $options = array())
     public function addCurl($ch)
     {
         if (gettype($ch) !== 'resource') {
-            throw new MultiCurlInvalidParameterException('Parameter must be a valid curl handle');
+            throw new MultiInvalidParameterException('Parameter must be a valid curl handle');
         }
 
         $key = $this->_getKey($ch);
@@ -79,7 +79,7 @@ public function addCurl($ch)
                 $this->_execStatus = curl_multi_exec($this->_mc, $this->_running);
             } while ($this->_execStatus === CURLM_CALL_MULTI_PERFORM);
 
-            return new MultiCurlManager($key);
+            return new Manager($key);
         } else {
             return $code;
         }
@@ -126,7 +126,7 @@ public function getResult($key = null)
 
     public static function getSequence()
     {
-        return new MultiCurlSequence(self::$_timers);
+        return new Sequence(self::$_timers);
     }
 
     public static function getTimers()
diff --git a/src/MultiCurlException.php b/src/MultiCurlException.php
deleted file mode 100644
index 3f1e3c0..0000000
--- a/src/MultiCurlException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php 
-namespace JMathai\PhpMultiCurl;
-
-class MultiCurlException extends \Exception
-{
-
-}
-class MultiCurlInvalidParameterException extends MultiCurlException
-{
-
-}
diff --git a/src/MultiException.php b/src/MultiException.php
new file mode 100644
index 0000000..64732a0
--- /dev/null
+++ b/src/MultiException.php
@@ -0,0 +1,11 @@
+<?php 
+namespace JMathai\PhpMultiCurl;
+
+class MultiException extends \Exception
+{
+
+}
+class MultiInvalidParameterException extends MultiException
+{
+
+}
diff --git a/src/MultiCurlSequence.php b/src/Sequence.php
similarity index 96%
rename from src/MultiCurlSequence.php
rename to src/Sequence.php
index b04fb3f..2017309 100644
--- a/src/MultiCurlSequence.php
+++ b/src/Sequence.php
@@ -1,11 +1,11 @@
 <?php 
 namespace JMathai\PhpMultiCurl;
 /**
- * MultiCurlSequence displays sequence of http calls
+ * Sequence displays sequence of http calls
  *
  * @author Jaisen Mathai <jaisen@jmathai.com>
  */
-class MultiCurlSequence
+class Sequence
 {
     private $_width = 100;
     private $_timers;
diff --git a/tests/MultiCurlTest.php b/tests/MultiCurlTest.php
index b4b7128..10a95a8 100644
--- a/tests/MultiCurlTest.php
+++ b/tests/MultiCurlTest.php
@@ -6,7 +6,7 @@ class MultiCurlTest extends PHPUnit_Framework_TestCase
     public function testConstructorThrowsExceptionWhenInvokedWithNew()
     {
         MultiCurl::$singleton = 0;
-        $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlException');
+        $this->setExpectedException('JMathai\PhpMultiCurl\MultiException');
         new MultiCurl();
     }
 
@@ -19,7 +19,7 @@ public function testAddUrl()
     {
         $mc = MultiCurl::getInstance();
         $res = $mc->addUrl('http://google.com');
-        $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
+        $this->assertInstanceOf('Jmathai\PhpMultiCurl\Manager', $res);
     }
 
     public function testAddCurl()
@@ -29,12 +29,12 @@ public function testAddCurl()
 
         $mc = MultiCurl::getInstance();
         $res = $mc->addCurl($ch);
-        $this->assertInstanceOf('Jmathai\PhpMultiCurl\MultiCurlManager', $res);
+        $this->assertInstanceOf('Jmathai\PhpMultiCurl\Manager', $res);
     }
 
     public function testAddCurlWithNull()
     {
-        $this->setExpectedException('JMathai\PhpMultiCurl\MultiCurlInvalidParameterException');
+        $this->setExpectedException('JMathai\PhpMultiCurl\MultiInvalidParameterException');
         $mc = MultiCurl::getInstance();
         $res = $mc->addCurl(null);
     }

From 5c59661a3b1b6ddb9a4ca21f3790d40705e6d5c7 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 20:48:39 +0100
Subject: [PATCH 08/10] update travis tests

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2774819..2a10f73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
   - hhvm
 
 before_script:

From b316bc8312be0ab261c9694f5741be39ded816aa Mon Sep 17 00:00:00 2001
From: Dusta <dusta@users.noreply.github.com>
Date: Sat, 3 Feb 2018 20:56:51 +0100
Subject: [PATCH 09/10] Update README.markdown

---
 README.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.markdown b/README.markdown
index 903bde8..5967717 100644
--- a/README.markdown
+++ b/README.markdown
@@ -152,8 +152,9 @@ echo $mc->getSequence()->renderAscii();
 ```
 
 ## Authors
-   * jmathai
+   * jmathai 
    
 ### Contributors
-   * Lewis Cowles (LewisCowles1986) - Usability for adding url's without needing to worry about CURL, but provisioning also for specifying additional parameters
-   * Sam Thomson (samthomson) - Packaged it up
+   * Lewis Cowles  ([LewisCowles1986](https://github.com/LewisCowles1986)) - Usability for adding url's without needing to worry about CURL, but provisioning also for specifying additional parameters
+   * Sam Thomson ([Samthomson](https://github.com/samthomson)) - Packaged it up
+   * Sławek Kaleta ([Dusta](https://github.com/dusta)) - Updated it up

From 90bae580d1df3a5102acc13309357fcb88c13087 Mon Sep 17 00:00:00 2001
From: Slawek Kaleta <s.kaleta@citycore.pro>
Date: Sat, 3 Feb 2018 21:05:25 +0100
Subject: [PATCH 10/10] phpunit not work "Done. Your build exited with 1."

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2a10f73..3d59880 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - hhvm
 
 before_script:
   - composer self-update