Bump PHP version to 7 and add typehinting (#5)

* bump version in composer.json

* add typehinting to the classes and interfaces

* fix minor code styling errors

* remove 5.* php versions from travis config

* return values from mocks that fit the new typehints

* attempt to fix travis hhvm php7 tests

* ignore platform reqs when testing with hhvm

* revert changes to travis config and ignore platform reqs

* another attempt for hhvm php7 travis tests

* keep "regular" php versions in "old" travis config format

* added hhvm to allowed failures

The HHVM team announced that HHVM will never truly support PHP7, in the
light of this I have added the hhvm to the allowed failures list in
traves. Source: http://hhvm.com/blog/2017/09/18/the-future-of-hhvm.html

* fix allow_failures error in travis config

Author: slax0rr

.travis.yml

@@ -1,12 +1,14 @@
 language: php
 php:
-  - '5.5'
-  - '5.6'
   - '7.0'
   - '7.1'
   - hhvm
   - nightly
 
+matrix:
+  allow_failures:
+    - php: hhvm
+
 before_script:
   - composer install
 

composer.json

@@ -25,7 +25,7 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0",
+    "php": ">=7.0.0",
     "ext-curl": "*"
   },
   "require-dev": {

src/Curl.php

@@ -11,31 +11,31 @@ class Curl implements CurlInterface
     /**
      * @param string $url URL
      */
-    public function __construct($url = null)
+    public function __construct(string $url = null)
     {
         $this->init($url);
     }
 
     /**
      * @inheritdoc
      */
-    public function init($url = null)
+    public function init(string $url = null)
     {
         $this->handle = curl_init($url);
     }
 
     /**
      * @inheritdoc
      */
-    public function errno()
+    public function errno(): int
     {
         return curl_errno($this->handle);
     }
 
     /**
      * @inheritdoc
      */
-    public function error()
+    public function error(): string
     {
         return curl_error($this->handle);
     }
@@ -51,7 +51,7 @@ public function exec()
     /**
      * @inheritdoc
      */
-    public function getInfo($opt = 0)
+    public function getInfo(int $opt = 0)
     {
         if (func_num_args() > 0) {
             return curl_getinfo($this->handle, $opt);
@@ -62,47 +62,47 @@ public function getInfo($opt = 0)
     /**
      * @inheritdoc
      */
-    public function setOpt($option, $value)
+    public function setOpt(int $option, $value): bool
     {
         return curl_setopt($this->handle, $option, $value);
     }
 
     /**
      * @inheritdoc
      */
-    public function setOptArray(array $options)
+    public function setOptArray(array $options): bool
     {
         return curl_setopt_array($this->handle, $options);
     }
 
     /**
      * @inheritdoc
      */
-    public function version($age = CURLVERSION_NOW)
+    public function version(int $age = CURLVERSION_NOW): array
     {
         return curl_version($age);
     }
 
     /**
      * @inheritdoc
      */
-    public function strError($errornum)
+    public function strError(int $errornum): string
     {
         return curl_strerror($errornum);
     }
 
     /**
      * @inheritdoc
      */
-    public function escape($str)
+    public function escape(string $str): string
     {
         return curl_escape($this->handle, $str);
     }
 
     /**
      * @inheritdoc
      */
-    public function unescape($str)
+    public function unescape(string $str): string
     {
         return curl_unescape($this->handle, $str);
     }
@@ -118,7 +118,7 @@ public function reset()
     /**
      * @inheritdoc
      */
-    public function pause($bitmask)
+    public function pause(int $bitmask): int
     {
         return curl_pause($this->handle, $bitmask);
     }

src/CurlInterface.php

@@ -9,21 +9,21 @@ interface CurlInterface
      * @param string $url URL
      * @return void
      */
-    public function init($url = null);
+    public function init(string $url = null);
 
     /**
      * @see curl_errno()
      *
      * @return int
      */
-    public function errno();
+    public function errno(): int;
 
     /**
      * @see curl_error()
      *
      * @return string
      */
-    public function error();
+    public function error(): string;
 
     /**
      * @see curl_exec()
@@ -38,7 +38,7 @@ public function exec();
      * @param int $opt CURLINFO_*
      * @return array|string
      */
-    public function getInfo($opt = 0);
+    public function getInfo(int $opt = 0);
 
     /**
      * @see curl_setopt()
@@ -47,47 +47,47 @@ public function getInfo($opt = 0);
      * @param mixed $value  Option value
      * @return boolean
      */
-    public function setOpt($option, $value);
+    public function setOpt(int $option, $value): bool;
 
     /**
      * @see curl_setopt_array()
      *
      * @param array $options Options
      * @return boolean
      */
-    public function setOptArray(array $options);
+    public function setOptArray(array $options): bool;
 
     /**
      * @see curl_version()
      *
      * @param int $age
      * @return array
      */
-    public function version($age = CURLVERSION_NOW);
+    public function version(int $age = CURLVERSION_NOW): array;
 
     /**
      * @see curl_strerror()
      *
      * @param int $errornum
      * @return string
      */
-    public function strError($errornum);
+    public function strError(int $errornum): string;
 
     /**
      * @see curl_escape()
      *
      * @param string $str
      * @return string
      */
-    public function escape($str);
+    public function escape(string $str): string;
 
     /**
      * @see curl_unescape()
      *
      * @param string $str
      * @return string
      */
-    public function unescape($str);
+    public function unescape(string $str): string;
 
     /**
      * @see curl_reset()
@@ -102,7 +102,7 @@ public function reset();
      * @param int $bitmask
      * @return int
      */
-    public function pause($bitmask);
+    public function pause(int $bitmask): int;
 
     /**
      * Get curl handle

src/CurlMulti.php

@@ -32,63 +32,63 @@ public function getHandle()
     /**
      * @inheritdoc
      */
-    public function add(CurlInterface $curl)
+    public function add(CurlInterface $curl): int
     {
         return curl_multi_add_handle($this->handle, $curl->getHandle());
     }
 
     /**
      * @inheritdoc
      */
-    public function exec(&$stillRunning)
+    public function exec(int &$stillRunning): int
     {
         return curl_multi_exec($this->handle, $stillRunning);
     }
 
     /**
      * @inheritdoc
      */
-    public function getContent(CurlInterface $curl)
+    public function getContent(CurlInterface $curl): string
     {
         return curl_multi_getcontent($curl->getHandle());
     }
 
     /**
      * @inheritdoc
      */
-    public function infoRead(&$msgs = null)
+    public function infoRead(int &$msgs = null): array
     {
         return curl_multi_info_read($this->handle, $msgs);
     }
 
     /**
      * @inheritdoc
      */
-    public function remove(CurlInterface $curl)
+    public function remove(CurlInterface $curl): int
     {
         return curl_multi_remove_handle($this->handle, $curl->getHandle());
     }
 
     /**
      * @inheritdoc
      */
-    public function select($timeout = 1.0)
+    public function select(float $timeout = 1.0): int
     {
         return curl_multi_select($this->handle, $timeout);
     }
 
     /**
      * @inheritdoc
      */
-    public function strError($errornum)
+    public function strError(int $errornum): string
     {
         return curl_multi_strerror($errornum);
     }
 
     /**
      * @inheritdoc
      */
-    public function setOpt($opt, $val)
+    public function setOpt(int $opt, $val): bool
     {
         return curl_multi_setopt($this->handle, $opt, $val);
     }

src/CurlMultiInterface.php

@@ -18,55 +18,55 @@ public function getHandle();
      * @param CurlInterface $curl Curl object to add
      * @return int
      */
-    public function add(CurlInterface $curl);
+    public function add(CurlInterface $curl): int;
 
     /**
      * @see curl_multi_exec()
      *
      * @param int $stillRunning Flag
      * @return int (One of CURLM_* constants)
      */
-    public function exec(&$stillRunning);
+    public function exec(int &$stillRunning): int;
 
     /**
      * @see curl_multi_getcontent()
      *
      * @param CurlInterface $curl
      * @return string
      */
-    public function getContent(CurlInterface $curl);
+    public function getContent(CurlInterface $curl): string;
 
     /**
      * @see curl_multi_info_read()
      *
      * @param int $msgs
      * @return array
      */
-    public function infoRead(&$msgs = null);
+    public function infoRead(int &$msgs = null): array;
 
     /**
      * @see curl_multi_remove_handle()
      *
      * @param CurlInterface $curl Handle to remove
      * @return int
      */
-    public function remove(CurlInterface $curl);
+    public function remove(CurlInterface $curl): int;
 
     /**
      * @see curl_multi_select()
      *
      * @param float $timeout Timeout
      * @return int
      */
-    public function select($timeout = 1.0);
+    public function select(float $timeout = 1.0): int;
 
     /**
      * @see curl_multi_strerror
      *
      * @param int $errornum
      * @return string
      */
-    public function strError($errornum);
+    public function strError(int $errornum): string;
 
     /**
      * @see curl_multi_setopt
@@ -75,5 +75,5 @@ public function strError($errornum);
      * @param mixed $val
      * @return boolean
      */
-    public function setOpt($opt, $val);
+    public function setOpt(int $opt, $val): bool;
 }

src/CurlShare.php

@@ -24,7 +24,7 @@ public function init()
     /**
      * @inheritdoc
      */
-    public function setOpt($opt, $val)
+    public function setOpt(int $opt, $val): bool
     {
         return curl_share_setopt($this->handle, $opt, $val);
     }

src/CurlShareInterface.php

@@ -17,5 +17,5 @@ public function init();
      * @param mixed $val
      * @return boolean
      */
-    public function setOpt($opt, $val);
+    public function setOpt(int $opt, $val): bool;
 }