Fix php-curl-class#58: Include PHP_VERSION and curl version in user-agent

Author: zachborboa

src/Curl/Curl.php

@@ -4,7 +4,7 @@
 
 class Curl
 {
-    const USER_AGENT = 'PHP-Curl-Class/2.1.0 (+https://github.com/php-curl-class/php-curl-class)';
+    const VERSION = '2.1.0';
 
     private $cookies = array();
     private $headers = array();
@@ -43,7 +43,7 @@ public function __construct()
         }
 
         $this->curl = curl_init();
-        $this->setUserAgent(self::USER_AGENT);
+        $this->setDefaultUserAgent();
         $this->setOpt(CURLINFO_HEADER_OUT, true);
         $this->setOpt(CURLOPT_HEADER, true);
         $this->setOpt(CURLOPT_RETURNTRANSFER, true);
@@ -169,6 +169,15 @@ public function unsetHeader($key)
         unset($this->headers[$key]);
     }
 
+    public function setDefaultUserAgent()
+    {
+        $user_agent = 'PHP-Curl-Class/' . self::VERSION . ' (+https://github.com/php-curl-class/php-curl-class)';
+        $user_agent .= ' PHP/' . PHP_VERSION;
+        $curl_version = curl_version();
+        $user_agent .= ' curl/' . $curl_version['version'];
+        $this->setUserAgent($user_agent);
+    }
+
     public function setUserAgent($user_agent)
     {
         $this->setOpt(CURLOPT_USERAGENT, $user_agent);

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -73,11 +73,14 @@ function assertions($array, $count = 1)
 
     public function testUserAgent()
     {
+        $php_version = 'PHP\/' . PHP_VERSION;
+        $curl_version = curl_version();
+        $curl_version = 'curl\/' . $curl_version['version'];
+
         $test = new Test();
-        $test->curl->setUserAgent(Curl::USER_AGENT);
-        $this->assertTrue($test->server('server', 'GET', array(
-            'key' => 'HTTP_USER_AGENT',
-        )) === Curl::USER_AGENT);
+        $user_agent = $test->server('server', 'GET', array('key' => 'HTTP_USER_AGENT'));
+        $this->assertRegExp('/' . $php_version . '/', $user_agent);
+        $this->assertRegExp('/' . $curl_version . '/', $user_agent);
     }
 
     public function testGet()