From e0432e37a1e00244fafaa4c46295a75d43803195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9Frul=20Topuz?= <tugrultopuz@gmail.com>
Date: Sun, 5 Jul 2020 14:38:46 +0300
Subject: [PATCH 1/2] update phpunit

---
 composer.json                            |  5 ++++-
 tests/CrEOF/Geo/WKB/Tests/ParserTest.php | 24 +++++++++--------------
 tests/CrEOF/Geo/WKB/Tests/ReaderTest.php | 25 +++++++++---------------
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/composer.json b/composer.json
index fb4a9fd..1e8f8b0 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "ext-SPL": "*"
     },
     "require-dev": {
-        "phpunit/phpunit":               ">=4.8",
+        "phpunit/phpunit":               ">6.0",
         "codeclimate/php-test-reporter": "dev-master",
         "satooshi/php-coveralls":        "~1.0"
     },
@@ -28,5 +28,8 @@
         "psr-0": {
             "CrEOF\\Geo\\WKB\\Tests": "tests/"
         }
+    },
+    "scripts": {
+        "test": "phpunit -v"
     }
 }
diff --git a/tests/CrEOF/Geo/WKB/Tests/ParserTest.php b/tests/CrEOF/Geo/WKB/Tests/ParserTest.php
index 83cb31c..a941af4 100644
--- a/tests/CrEOF/Geo/WKB/Tests/ParserTest.php
+++ b/tests/CrEOF/Geo/WKB/Tests/ParserTest.php
@@ -24,6 +24,8 @@
 namespace CrEOF\Geo\WKB\Tests;
 
 use CrEOF\Geo\WKB\Parser;
+use PHPUnit\Framework\TestCase;
+
 
 /**
  * Parser tests
@@ -33,31 +35,23 @@
  *
  * @covers \CrEOF\Geo\WKB\Parser
  */
-class ParserTest extends \PHPUnit_Framework_TestCase
+class ParserTest extends TestCase
 {
     /**
-     * @param mixed  $value
+     * @param mixed $value
      * @param string $exception
      * @param string $message
      *
      * @dataProvider badBinaryData
      */
-    public function testBadBinaryData($value, $exception, $message)
+    public function testBadBinaryData($value, string $exception, string $message)
     {
-        if (version_compare(\PHPUnit_Runner_Version::id(), '5.0', '>=')) {
-            $this->expectException($exception);
+        $this->expectException($exception);
 
-            if ('/' === $message[0]) {
-                $this->expectExceptionMessageRegExp($message);
-            } else {
-                $this->expectExceptionMessage($message);
-            }
+        if ('/' === $message[0]) {
+            $this->expectExceptionMessageMatches($message);
         } else {
-            if ('/' === $message[0]) {
-                $this->setExpectedExceptionRegExp($exception, $message);
-            } else {
-                $this->setExpectedException($exception, $message);
-            }
+            $this->expectExceptionMessage($message);
         }
 
         $parser = new Parser($value);
diff --git a/tests/CrEOF/Geo/WKB/Tests/ReaderTest.php b/tests/CrEOF/Geo/WKB/Tests/ReaderTest.php
index cd7e302..832a44f 100644
--- a/tests/CrEOF/Geo/WKB/Tests/ReaderTest.php
+++ b/tests/CrEOF/Geo/WKB/Tests/ReaderTest.php
@@ -24,6 +24,7 @@
 namespace CrEOF\Geo\WKB\Tests;
 
 use CrEOF\Geo\WKB\Reader;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Reader tests
@@ -33,32 +34,24 @@
  *
  * @covers \CrEOF\Geo\WKB\Reader
  */
-class ReaderTest extends \PHPUnit_Framework_TestCase
+class ReaderTest extends TestCase
 {
     /**
-     * @param mixed  $value
-     * @param array  $methods
+     * @param mixed $value
+     * @param array $methods
      * @param string $exception
      * @param string $message
      *
      * @dataProvider badTestData
      */
-    public function testBad($value, array $methods, $exception, $message)
+    public function testBad($value, array $methods, string $exception, string $message)
     {
-        if (version_compare(\PHPUnit_Runner_Version::id(), '5.0', '>=')) {
-            $this->expectException($exception);
+        $this->expectException($exception);
 
-            if ('/' === $message[0]) {
-                $this->expectExceptionMessageRegExp($message);
-            } else {
-                $this->expectExceptionMessage($message);
-            }
+        if ('/' === $message[0]) {
+            $this->expectExceptionMessageMatches($message);
         } else {
-            if ('/' === $message[0]) {
-                $this->setExpectedExceptionRegExp($exception, $message);
-            } else {
-                $this->setExpectedException($exception, $message);
-            }
+            $this->expectExceptionMessage($message);
         }
 
         $reader = new Reader($value);

From b4370930b452f07cc39bed05501bd646e9bf76fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9Frul=20Topuz?= <tugrultopuz@gmail.com>
Date: Sun, 5 Jul 2020 15:30:43 +0300
Subject: [PATCH 2/2] fix return type of function

---
 lib/CrEOF/Geo/WKB/Reader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/CrEOF/Geo/WKB/Reader.php b/lib/CrEOF/Geo/WKB/Reader.php
index 225d458..ebf0ba6 100644
--- a/lib/CrEOF/Geo/WKB/Reader.php
+++ b/lib/CrEOF/Geo/WKB/Reader.php
@@ -238,7 +238,7 @@ private function getByteOrder()
     /**
      * @param string $format
      *
-     * @return array
+     * @return int
      * @throws RangeException
      */
     private function unpackInput($format)