Preparing for 8.3+

Author: stephen-hill

src/BCMathService.php

@@ -24,7 +24,7 @@ class BCMathService implements ServiceInterface
      * @param string $alphabet optional
      * @since v1.1.0
      */
-    public function __construct($alphabet = null)
+    public function __construct(?string $alphabet = null)
     {
         // Handle null alphabet
         if (is_null($alphabet) === true) {
@@ -51,7 +51,7 @@ public function __construct($alphabet = null)
      * @since Release v1.1.0
      * @return string The Base58 encoded string.
      */
-    public function encode($string)
+    public function encode(string $string) : string
     {
         // Type validation
         if (is_string($string) === false) {
@@ -113,7 +113,7 @@ public function encode($string)
      * @since Release v1.1.0
      * @return string Returns the decoded string.
      */
-    public function decode($base58)
+    public function decode(string $base58) : string
     {
         // Type Validation
         if (is_string($base58) === false) {

src/Base58.php

@@ -29,19 +29,14 @@ class Base58
      * @since v1.1.0 Added the optional $service argument.
      */
     public function __construct(
-        $alphabet = null,
-        ServiceInterface $service = null
+        ?string $alphabet = null,
+        ?ServiceInterface $service = null
     ) {
         // Handle null alphabet
         if (is_null($alphabet) === true) {
             $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
         }
 
-        // Type validation
-        if (is_string($alphabet) === false) {
-            throw new InvalidArgumentException('Argument $alphabet must be a string.');
-        }
-
         // The alphabet must contain 58 characters
         if (strlen($alphabet) !== 58) {
             throw new InvalidArgumentException('Argument $alphabet must contain 58 characters.');
@@ -71,7 +66,7 @@ public function __construct(
      * @since v1.0.0
      * @return string The Base58 encoded string.
      */
-    public function encode($string)
+    public function encode(string $string) : string
     {
         return $this->service->encode($string);
     }
@@ -83,7 +78,7 @@ public function encode($string)
      * @since v1.0.0
      * @return string Returns the decoded string.
      */
-    public function decode($base58)
+    public function decode(string $base58) : string
     {
         return $this->service->decode($base58);
     }

src/GMPService.php

@@ -24,7 +24,7 @@ class GMPService implements ServiceInterface
      * @param string $alphabet optional
      * @since v1.1.0
      */
-    public function __construct($alphabet = null)
+    public function __construct(?string $alphabet = null)
     {
         // Handle null alphabet
         if (is_null($alphabet) === true) {
@@ -51,7 +51,7 @@ public function __construct($alphabet = null)
      * @since Release v1.1.0
      * @return string The Base58 encoded string.
      */
-    public function encode($string)
+    public function encode(string $string) : string
     {
         // Type validation
         if (is_string($string) === false) {
@@ -105,7 +105,7 @@ public function encode($string)
      * @since Release v1.1.0
      * @return string Returns the decoded string.
      */
-    public function decode($base58)
+    public function decode(string $base58) : string
     {
         // Type Validation
         if (is_string($base58) === false) {

src/ServiceInterface.php

@@ -11,7 +11,7 @@ interface ServiceInterface
      * @since v1.1.0
      * @return string The Base58 encoded string.
      */
-    public function encode($string);
+    public function encode(string $string) : string;
 
     /**
      * Decode base58 into a PHP string.
@@ -20,5 +20,5 @@ public function encode($string);
      * @since v1.1.0
      * @return string Returns the decoded string.
      */
-    public function decode($base58);
+    public function decode(string $base58) : string;
 }

tests/Base58Test.php

@@ -56,14 +56,6 @@ public static function encodingsProvider(): array
         return $return;
     }
 
-    public function testConstructorTypeException(): void
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Argument $alphabet must be a string.');
-
-        new Base58(intval(123));
-    }
-
     public function testConstructorLengthException(): void
     {
         $this->expectException(\InvalidArgumentException::class);