v2 (#1)

Author: f3ath

.travis.yml

@@ -1,12 +1,15 @@
 language: php
 php:
-  - '5.3'
-  - '5.4'
   - '5.5'
   - '5.6'
   - '7.0'
+  - '7.1'
   - hhvm
   - nightly
 
 before_script:
   - composer install
+
+script:
+  - vendor/bin/phpcs --standard=PSR2 src/ test/
+  - phpunit --coverage-clover build/logs/clover.xml

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Alexey Karapetov
+Copyright (c) Alexey Karapetov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -16,7 +16,7 @@ class MyApiClient {
     function call($url)
     {
         $ch = curl_init($url);
-        curl_set_opt($ch, ...)
+        curl_set_opt($ch, /*...*/)
         return curl_exec($ch);
     }
 }
@@ -31,12 +31,12 @@ class MyApiClient {
     {
         $this->curl = $curl;
     }
-    ...
+    //...
     function call($url)
     {
         $this->curl->init($url);
-        $this->curl->setOpt(...)
-        return $this->curl->exec($ch);
+        $this->curl->setOpt(/*...*/)
+        return $this->curl->exec();
     }
 }
 ```
@@ -59,8 +59,8 @@ Via [composer](https://getcomposer.org):
 | `$i = curl_getinfo($h, $opt);`    | `$i = $curl->getInfo($opt);` |
 | `curl_setopt($h, $opt, $val);`    | `$curl->setOpt($opt, $val);` |
 | `curl_setopt_array($h, $array);`  | `$curl->setOptArray($array);` |
-| `curl_version($age)`              | `Curl::version($age);` |
-| `curl_strerror($errornum)`        | `Curl::strerror($errornum);` |
+| `curl_version($age)`              | `$curl->version($age);` |
+| `curl_strerror($errornum)`        | `$curl->strerror($errornum);` |
 | `$h2 = curl_copy_handle($h);`     | `$curl2 = clone($curl);` |
 | `$result = curl_exec($h);`        | `$result = $curl->exec();` |
 | `$res = curl_pause($h, $mask);`   | `$res = $curl->pause($mask);` |
@@ -88,19 +88,3 @@ Via [composer](https://getcomposer.org):
 | `curl_share_init();`                           |   `$cs = new CurlShare();` |
 | `curl_share_close($h);`                        |   `unset($cs);` |
 | `$r = curl_multi_setopt($h, $opt, $val);`      |   `$r = $cs->setOpt($opt, $val);` |
-
-##Auto retry and error control through exceptions
-
-Curl::exec() can automatically retry in case of an error (i.e. network is unstable). It also is able to throw a RuntimeException if an error occurs.
-
-```php
-$curl = new Curl('http://example.com');
-$curl->setOpt(CURLOPT_RETURNTRANSFER, true);
-try {
-    // try 3 times, if unable throw a RuntimeException
-    $curl->exec(3, true);
-} catch (CurlException $e) {
-    $message = $e->getMessage();
-    $curlErrorNumber = $e->getCode();
-}
-```

composer.json

@@ -25,11 +25,13 @@
     }
   ],
   "require": {
-    "php": ">=5.3.0",
+    "php": ">=5.5.0",
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8 || ^5.0"
+    "phpunit/phpunit": "^4.8 || ^5.0",
+    "squizlabs/php_codesniffer": "^2.0"
+
   },
   "autoload": {
     "psr-4": {

phpcs.xml.dist

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ruleset>
+    <file>src</file>
+    <file>test</file>
+    <exclude-pattern>vendor/*</exclude-pattern>
+    <rule ref="PSR2"/>
+</ruleset>

src/Curl.php

@@ -1,44 +1,14 @@
 <?php
 namespace PHPCurl\CurlWrapper;
 
-use InvalidArgumentException;
-
-/**
- * OOP wrapper for curl_* functions
- *
- * Functional and OOP style mapping:
- *
- * $h = curl_init($url);              $curl = new Curl($url); //or $curl->init($url)
- * curl_close($h);                    unset($curl);
- * $e = curl_errno($h);               $e = $curl->errno();
- * $e = curl_error($h);               $e = $curl->error();
- * $i = curl_getinfo($h, $opt);       $i = $curl->getInfo($opt);
- * curl_setopt($h, $opt, $val);       $curl->setOpt($opt, $val);
- * curl_setopt_array($h, $array);     $curl->setOptArray($array);
- * curl_version($age)                 Curl::version($age);
- * curl_strerror($errornum)           Curl::strerror($errornum);
- * $h2 = curl_copy_handle($h);        $curl2 = clone($curl);
- * $result = curl_exec($h);           $result = $curl->exec();
- * $res = curl_pause($h, $mask);      $res = $curl->pause($mask);
- * $res = curl_escape($h, $str);      $res = $curl->escape($str);
- * $res = curl_unescape($h, $str);    $res = $curl->unescape($str);
- *
- * @copyright Alexey Karapetov
- * @author Alexey Karapetov <karapetov@gmail.com>
- * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
- */
 class Curl
 {
     /**
-     * curl handle
-     *
      * @var resource
      */
     private $handle;
 
     /**
-     * Ctor
-     *
      * @param string $url URL
      */
     public function __construct($url = null)
@@ -57,26 +27,6 @@ public function init($url = null)
         $this->handle = curl_init($url);
     }
 
-    /**
-     * Get curl handle
-     *
-     * @return resource
-     */
-    public function getHandle()
-    {
-        return $this->handle;
-    }
-
-    /**
-     * @see curl_close()
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        curl_close($this->handle);
-    }
-
     /**
      * @see curl_errno()
      *
@@ -100,29 +50,11 @@ public function error()
     /**
      * @see curl_exec()
      *
-     * @param int $attempts Connection attempts (default is 1)
-     * @param boolean $useException Throw \RuntimeException on failure
      * @return boolean|string
-     * @throws InvalidArgumentException if the number of attempts is invalid
-     * @throws CurlException if curl_exec() returned false
      */
-    public function exec($attempts = 1, $useException = false)
+    public function exec()
     {
-        $attempts = (int) $attempts;
-        if ($attempts < 1) {
-            throw new InvalidArgumentException(sprintf('Attempts count is not positive: %d', $attempts));
-        }
-        $i = 0;
-        while ($i++ < $attempts) {
-            $result = curl_exec($this->handle);
-            if ($result !== false) {
-                break;
-            }
-        }
-        if ($useException && (false === $result)) {
-            throw new CurlException(sprintf('Error "%s" after %d attempt(s)', $this->error(), $attempts), $this->errno());
-        }
-        return $result;
+        return curl_exec($this->handle);
     }
 
     /**
@@ -168,7 +100,7 @@ public function setOptArray(array $options)
      * @param int $age
      * @return array
      */
-    static public function version($age = CURLVERSION_NOW)
+    public function version($age = CURLVERSION_NOW)
     {
         return curl_version($age);
     }
@@ -177,24 +109,13 @@ static public function version($age = CURLVERSION_NOW)
      * @see curl_strerror()
      *
      * @param int $errornum
-     * @return array
+     * @return string
      */
-    static public function strerror($errornum)
+    public function strError($errornum)
     {
         return curl_strerror($errornum);
     }
 
-    /**
-     * __clone
-     * Copies handle using curl_copy_handle()
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        $this->handle = curl_copy_handle($this->handle);
-    }
-
     /**
      * @see curl_escape()
      *
@@ -236,4 +157,24 @@ public function pause($bitmask)
     {
         return curl_pause($this->handle, $bitmask);
     }
+
+    /**
+     * Get curl handle
+     *
+     * @return resource
+     */
+    public function getHandle()
+    {
+        return $this->handle;
+    }
+
+    public function __destruct()
+    {
+        curl_close($this->handle);
+    }
+
+    public function __clone()
+    {
+        $this->handle = curl_copy_handle($this->handle);
+    }
 }

src/CurlException.php

@@ -16,23 +16,21 @@
  * $i = curl_multi_select($mh, $timeout);        $i = $cm->select($timeout);
  * $r = curl_multi_setopt($h, $opt, $val);       $r = $cm->setOpt($opt, $val);
  *
- * @copyright Alexey Karapetov
- * @author Alexey Karapetov <karapetov@gmail.com>
  * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
  */
 class CurlMulti
 {
     /**
-     * curl handle
-     *
      * @var resource
      */
     private $handle;
 
-    /**
-     * __construct
-     */
     public function __construct()
+    {
+        $this->init();
+    }
+
+    public function init()
     {
         $this->handle = curl_multi_init();
     }
@@ -129,7 +127,7 @@ public function select($timeout = 1.0)
      * @param int $errornum
      * @return string
      */
-    static public function strerror($errornum)
+    public function strError($errornum)
     {
         return curl_multi_strerror($errornum);
     }

src/CurlMulti.php

@@ -10,23 +10,26 @@
  * curl_share_close($h);                     unset($cs);
  * $r = curl_share_setopt($h, $opt, $val);   $r = $cs->setOpt($opt, $val);
  *
- * @copyright Alexey Karapetov
- * @author Alexey Karapetov <karapetov@gmail.com>
  * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
  */
 class CurlShare
 {
     /**
-     * curl handle
-     *
      * @var resource
      */
     private $handle;
 
+    public function __construct()
+    {
+        $this->init();
+    }
+
     /**
-     * __construct
+     * @see curl_share_init()
+     *
+     * @return void
      */
-    public function __construct()
+    public function init()
     {
         $this->handle = curl_share_init();
     }

src/CurlShare.php

@@ -59,7 +59,9 @@ class CurlMultiTest extends \PHPUnit_Framework_TestCase
 
     public function testAll()
     {
-        $c = $this->getMock('PHPCurl\\CurlWrapper\\Curl', array('getHandle'));
+        $c = $this->getMockBuilder('PHPCurl\\CurlWrapper\\Curl')
+            ->setMethods(['getHandle'])
+            ->getMock();
         $c->expects($this->any())
             ->method('getHandle')
             ->will($this->returnValue('bar'));
@@ -79,7 +81,7 @@ public function testAll()
         $this->assertEquals('exec_foo', $cm->exec($running));
         $this->assertEquals(24, $running);
 
-        $this->assertEquals('strerror_boo', CurlMulti::strerror('boo'));
+        $this->assertEquals('strerror_boo', $cm->strError('boo'));
         unset($cm);
         $this->assertEquals('close_foo', array_pop(self::$log));
     }