jmathai / php-multi-curl

src/MultiCurlSequence.php

Spacing +11 added lines, -11 removed lines

@@ -19,12 +19,12 @@ 
     
     $min = PHP_INT_MAX;
     $max = 0;
-    foreach($this->timers as $timer)
+    foreach ($this->timers as $timer)
     {
-      if(!isset($timer['start']))
+      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);
@@ -32,14 +32,14 @@ 
     }
     $this->min = $min;
     $this->max = $max;
-    $this->range = $max-$min;
-    $this->step = floatval($this->range/$this->width);
+    $this->range = $max - $min;
+    $this->step = floatval($this->range / $this->width);
   }
 
   public function renderAscii()
   {
     $tpl = '';
-    foreach($this->timers as $timer)
+    foreach ($this->timers as $timer)
      $tpl .= $this->tplAscii($timer);
     
     return $tpl;
@@ -49,16 +49,16 @@ 
   {
     $lpad = $rpad = 0;
     $lspace = $chars = $rspace = '';
-    if($timer['start'] > $this->min)
+    if ($timer['start'] > $this->min)
       $lpad = intval(($timer['start'] - $this->min) / $this->step);
-    if($timer['end'] < $this->max)
+    if ($timer['end'] < $this->max)
       $rpad = intval(($this->max - $timer['end']) / $this->step);
     $mpad = $this->width - $lpad - $rpad;
-    if($lpad > 0)
+    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);
     
     $tpl = <<<TPL

Braces +24 added lines, -16 removed lines

@@ -21,11 +21,13 @@ 
     $max = 0;
     foreach($this->timers as $timer)
     {
-      if(!isset($timer['start']))
-        $timer['start'] = PHP_INT_MAX;
+      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);
@@ -39,8 +41,9 @@ 
   public function renderAscii()
   {
     $tpl = '';
-    foreach($this->timers as $timer)
-     $tpl .= $this->tplAscii($timer);
+    foreach($this->timers as $timer) {
+         $tpl .= $this->tplAscii($timer);
+    }
     
     return $tpl;
   }
@@ -49,17 +52,22 @@ 
   {
     $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);
+    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);
+    if($lpad > 0) {
+          $lspace = str_repeat(' ', $lpad);
+    }
+    if($mpad > 0) {
+          $chars = str_repeat('=', $mpad);
+    }
+    if($rpad > 0) {
+          $rspace = str_repeat(' ', $rpad);
+    }
     
     $tpl = <<<TPL
 ({$timer['api']} ::  code={$timer['code']}, start={$timer['start']}, end={$timer['end']}, total={$timer['time']})

src/example.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 <?php
-if (php_sapi_name() !== 'cli')
+if (php_sapi_name() !== 'cli') {
   die();
+}
 
 require '../vendor/autoload.php';
 $mc = JMathai\PhpMultiCurl\MultiCurl::getInstance();

src/MultiCurl.php

Braces +12 added lines, -10 removed lines

@@ -78,8 +78,7 @@ 
       } while ($this->execStatus === CURLM_CALL_MULTI_PERFORM);
 
       return new MultiCurlManager($key);
-    }
-    else
+    } else
     {
       return $code;
     }
@@ -103,8 +102,9 @@ 
 
         // 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);
+        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
@@ -173,10 +173,11 @@ 
   {
     $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']);
+    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'];
 
@@ -184,8 +185,9 @@ 
     {
       $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']);
   }
 

Spacing +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 
   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();');
     }
@@ -44,7 +44,7 @@ 
       );
   }
   
-  public function reset(){
+  public function reset() {
       $this->requests = array();
       $this->responses = array();
       self::$timers = array();
@@ -54,7 +54,7 @@ 
   {
     $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);
     }
@@ -63,7 +63,7 @@ 
 
   public function addCurl($ch)
   {
-    if(gettype($ch) !== 'resource')
+    if (gettype($ch) !== 'resource')
     {
       throw new MultiCurlInvalidParameterException('Parameter must be a valid curl handle');
     }
@@ -76,7 +76,7 @@ 
     $this->startTimer($key);
     
     // (1)
-    if($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM)
+    if ($code === CURLM_OK || $code === CURLM_CALL_MULTI_PERFORM)
     {
       do
       {
@@ -93,38 +93,38 @@ 
 
   public function getResult($key = null)
   {
-    if($key != null)
+    if ($key != null)
     {
-      if(isset($this->responses[$key]['code']))
+      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)
+        if ($ms >= CURLM_CALL_MULTI_PERFORM)
         {
-          do{
+          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']))
+        if (isset($this->responses[$key]['data']))
         {
           return $this->responses[$key];
         }
@@ -157,11 +157,11 @@ 
   private function headerCallback($ch, $header)
   {
     $_header = trim($header);
-    $colonPos= strpos($_header, ':');
-    if($colonPos > 0)
+    $colonPos = strpos($_header, ':');
+    if ($colonPos > 0)
     {
       $key = substr($_header, 0, $colonPos);
-      $val = preg_replace('/^\W+/','',substr($_header, $colonPos));
+      $val = preg_replace('/^\W+/', '', substr($_header, $colonPos));
       $this->responses[$this->getKey($ch)]['headers'][$key] = $val;
     }
     return strlen($header);
@@ -169,7 +169,7 @@ 
 
   private function storeResponses()
   {
-    while($done = curl_multi_info_read($this->mc))
+    while ($done = curl_multi_info_read($this->mc))
     {
       $this->storeResponse($done);
     }
@@ -179,18 +179,18 @@ 
   {
     $key = $this->getKey($done['handle']);
     $this->stopTimer($key, $done);
-    if($isAsynchronous)
+    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'];
 
-    foreach($this->properties as $name => $const)
+    foreach ($this->properties as $name => $const)
     {
       $this->responses[$key][$name] = curl_getinfo($done['handle'], $const);
     }
-    if($isAsynchronous)
+    if ($isAsynchronous)
       curl_multi_remove_handle($this->mc, $done['handle']);
     curl_close($done['handle']);
   }
@@ -210,7 +210,7 @@ 
 
   public static function getInstance()
   {
-    if(self::$inst == null)
+    if (self::$inst == null)
     {
       self::$singleton = 1;
       self::$inst = new MultiCurl();