include HyperPlug query param add/replace fixes

MindTouch · Dec 20, 2020 · 92a1239 · 92a1239
1 parent 2582142
commit 92a1239
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 47 deletions.
diff --git a/composer.json b/composer.json
@@ -15,14 +15,15 @@
   },
   "require": {
     "php": "^7.2.0",
-    "modethirteen/hyperplug": "^1.1.0",
-    "modethirteen/xarray": "^1.1.0",
+    "modethirteen/hyperplug": "^1.1.2",
+    "modethirteen/type-ex": "^1.0.0",
+    "modethirteen/xarray": "^1.2.2",
     "ext-fileinfo": "*",
     "ext-json": "*",
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpstan/phpstan": "~0.12",
+    "phpstan/phpstan": "~0.12.0",
     "phpunit/phpunit": "~7.4.3"
   },
   "autoload": {

diff --git a/src/ApiPlug.php b/src/ApiPlug.php
@@ -28,8 +28,8 @@
 use modethirteen\Http\Result;
 use modethirteen\Http\IMutableHeaders;
 use modethirteen\Http\Parser\SerializedPhpArrayParser;
-use modethirteen\Http\StringUtil;
 use modethirteen\Http\XUri;
+use modethirteen\TypeEx\StringEx;
 
 /**
  * Class ApiPlug - builder and invocation for MindTouch API requests
@@ -110,11 +110,12 @@ public function at(...$segments) : object {
         $plug = clone $this;
         $path = $plug->uri->getPath();
         foreach($segments as $segment) {
-            $segment = StringUtil::stringify($segment);
+            $segment = StringEx::stringify($segment);
             if(!in_array($segment, self::$rawUriPathSegments)) {
+                $string = new StringEx($segment);
 
                 // auto-double encode, check for '=' or ':' sign
-                $segment = StringUtil::startsWith($segment, '=') || StringUtil::startsWith($segment, ':')
+                $segment = $string->startsWith('=') || $string->startsWith(':')
                     ? substr($segment, 0, 1) . self::urlEncode(substr($segment, 1), true)
                     : self::urlEncode($segment, true);
             }

diff --git a/src/ApiResult.php b/src/ApiResult.php
@@ -19,7 +19,7 @@
 namespace MindTouch\Http;
 
 use modethirteen\Http\Result;
-use modethirteen\Http\StringUtil;
+use modethirteen\TypeEx\StringEx;
 
 /**
  * Class ApiResult - wraps http result with MindTouch API specific accessors
@@ -49,7 +49,7 @@ public function getError() : ?string {
 
         // curl error
         $error = $this->getCurlError();
-        if(!StringUtil::isNullOrEmpty($error)) {
+        if(!StringEx::isNullOrEmpty($error)) {
             return $error;
         }
 

diff --git a/tests/ApiPlug/atRaw_Test.php b/tests/ApiPlug/atRaw_Test.php
@@ -27,7 +27,7 @@ class atRaw_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_add_non_urlencoded_segments() {
+    public function Can_add_non_urlencoded_segments() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com'));

diff --git a/tests/ApiPlug/at_Test.php b/tests/ApiPlug/at_Test.php
@@ -27,7 +27,7 @@ class at_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_add_single_path_segment_to_hostname() {
+    public function Can_add_single_path_segment_to_hostname() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com'));
@@ -42,16 +42,16 @@ public function Can_add_single_path_segment_to_hostname() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_hostname_1() {
+    public function Can_add_multiple_path_segments_to_hostname_1() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com'));
         $object = new class {
-            public function __toString() {
+            public function __toString() : string {
                 return 'xyz';
             }
         };
-        $func = function() {
+        $func = function() : string {
             return 'asdf';
         };
 
@@ -65,7 +65,7 @@ public function __toString() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_hostname_2() {
+    public function Can_add_multiple_path_segments_to_hostname_2() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com'));
@@ -80,7 +80,7 @@ public function Can_add_multiple_path_segments_to_hostname_2() {
     /**
      * @test
      */
-    public function Can_add_single_path_segment_to_existing_path() {
+    public function Can_add_single_path_segment_to_existing_path() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux'));
@@ -95,7 +95,7 @@ public function Can_add_single_path_segment_to_existing_path() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_path_1() {
+    public function Can_add_multiple_path_segments_to_existing_path_1() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux'));
@@ -110,7 +110,7 @@ public function Can_add_multiple_path_segments_to_existing_path_1() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_path_2() {
+    public function Can_add_multiple_path_segments_to_existing_path_2() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux'));
@@ -127,7 +127,7 @@ public function Can_add_multiple_path_segments_to_existing_path_2() {
     /**
      * @test
      */
-    public function Can_add_single_path_segment_to_existing_path_query() {
+    public function Can_add_single_path_segment_to_existing_path_query() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux?a=b&c=d'));
@@ -142,7 +142,7 @@ public function Can_add_single_path_segment_to_existing_path_query() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_path_query_1() {
+    public function Can_add_multiple_path_segments_to_existing_path_query_1() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux?a=b&c=d'));
@@ -157,7 +157,7 @@ public function Can_add_multiple_path_segments_to_existing_path_query_1() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_path_query_2() {
+    public function Can_add_multiple_path_segments_to_existing_path_query_2() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/qux?a=b&c=d'));
@@ -172,7 +172,7 @@ public function Can_add_multiple_path_segments_to_existing_path_query_2() {
     /**
      * @test
      */
-    public function Can_add_single_path_segment_to_existing_query() {
+    public function Can_add_single_path_segment_to_existing_query() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com?a=b&c=d'));
@@ -187,7 +187,7 @@ public function Can_add_single_path_segment_to_existing_query() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_query_1() {
+    public function Can_add_multiple_path_segments_to_existing_query_1() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com?a=b&c=d'));
@@ -202,7 +202,7 @@ public function Can_add_multiple_path_segments_to_existing_query_1() {
     /**
      * @test
      */
-    public function Can_add_multiple_path_segments_to_existing_query_2() {
+    public function Can_add_multiple_path_segments_to_existing_query_2() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com?a=b&c=d'));
@@ -217,7 +217,7 @@ public function Can_add_multiple_path_segments_to_existing_query_2() {
     /**
      * @test
      */
-    public function Can_add_double_urlencoded_segments() {
+    public function Can_add_double_urlencoded_segments() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/@api/deki?strict=true'));
@@ -232,7 +232,7 @@ public function Can_add_double_urlencoded_segments() {
     /**
      * @test
      */
-    public function Can_add_non_urlencoded_segments() {
+    public function Can_add_non_urlencoded_segments() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/@api/deki?strict=true'));
@@ -247,7 +247,7 @@ public function Can_add_non_urlencoded_segments() {
     /**
      * @test
      */
-    public function Can_add_guid_segment() {
+    public function Can_add_guid_segment() : void {
 
         // arrange
         $plug = new ApiPlug(XUri::tryParse('http://foo.com/@api/deki?strict=true'));

diff --git a/tests/ApiPlug/get_Test.php b/tests/ApiPlug/get_Test.php
@@ -29,7 +29,7 @@ class get_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_invoke_get() {
+    public function Can_invoke_get() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');

diff --git a/tests/ApiPlug/put_Test.php b/tests/ApiPlug/put_Test.php
@@ -33,7 +33,7 @@ class put_Test extends MindTouchHttpUnitTestCase {
     /**
      * @test
      */
-    public function Can_invoke_put() {
+    public function Can_invoke_put() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo/tags');
@@ -61,7 +61,7 @@ public function Can_invoke_put() {
     /**
      * @test
      */
-    public function Can_invoke_put_with_text_content() {
+    public function Can_invoke_put_with_text_content() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo/tags');
@@ -91,7 +91,7 @@ public function Can_invoke_put_with_text_content() {
     /**
      * @test
      */
-    public function Can_invoke_put_with_form_data_content() {
+    public function Can_invoke_put_with_form_data_content() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo/tags');

diff --git a/tests/ApiPlug/urlEncode_Test.php b/tests/ApiPlug/urlEncode_Test.php
@@ -27,7 +27,7 @@ class urlEncode_Test extends MindTouchHttpUnitTestCase  {
      * @see ApiPlug::urlEncode()
      * @test
      */
-    public function Can_url_encode_with_special_trailing_dot_handling() {
+    public function Can_url_encode_with_special_trailing_dot_handling() : void {
 
         // act
         $result = ApiPlug::urlEncode('abc/123/765?!/.');
@@ -39,7 +39,7 @@ public function Can_url_encode_with_special_trailing_dot_handling() {
     /**
      * @test
      */
-    public function Can_double_url_encode() {
+    public function Can_double_url_encode() : void {
 
         // act
         $result = ApiPlug::urlEncode('abc/123/765?!/.', true);

diff --git a/tests/ApiPlug/withApiToken_Test.php b/tests/ApiPlug/withApiToken_Test.php
@@ -31,7 +31,7 @@ class withApiToken_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_invoke_with_api_token() {
+    public function Can_invoke_with_api_token() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');

diff --git a/tests/ApiPlug/withResultErrorHandler_Test.php b/tests/ApiPlug/withResultErrorHandler_Test.php
@@ -36,7 +36,7 @@ class withResultErrorHandler_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_invoke_with_result_error_handler_exception_supression() {
+    public function Can_invoke_with_result_error_handler_exception_supression() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');
@@ -70,7 +70,7 @@ public function Can_invoke_with_result_error_handler_exception_supression() {
     /**
      * @test
      */
-    public function Result_error_handler_can_handle_parser_error() {
+    public function Result_error_handler_can_handle_parser_error() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');
@@ -104,7 +104,7 @@ public function Result_error_handler_can_handle_parser_error() {
     /**
      * @test
      */
-    public function Result_error_handler_can_handle_content_length_parser_error() {
+    public function Result_error_handler_can_handle_content_length_parser_error() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');

diff --git a/tests/ApiPlug/withoutResultErrorHandler_Test.php b/tests/ApiPlug/withoutResultErrorHandler_Test.php
@@ -32,7 +32,7 @@ class withoutResultErrorHandler_Test extends MindTouchHttpUnitTestCase  {
     /**
      * @test
      */
-    public function Can_remove_result_error_handler_exception_supression_before_invocation() {
+    public function Can_remove_result_error_handler_exception_supression_before_invocation() : void {
 
         // arrange
         $uri = XUri::tryParse('test://example.com/@api/deki/pages/=foo');
@@ -54,7 +54,7 @@ public function Can_remove_result_error_handler_exception_supression_before_invo
         // act
         $exceptionThrown = false;
         try {
-            $plug->withResultErrorHandler(function () {
+            $plug->withResultErrorHandler(function () : bool {
                 return true;
             })->withoutResultErrorHandler()->get();
 

diff --git a/tests/ApiResult/getError_Test.php b/tests/ApiResult/getError_Test.php
@@ -62,7 +62,7 @@ public function Can_get_error_from_body($body, string $expected) {
     /**
      * @test
      */
-    public function Can_get_curl_error() {
+    public function Can_get_curl_error() : void {
 
         // arrange
         $data = [
@@ -82,7 +82,7 @@ public function Can_get_curl_error() {
     /**
      * @test
      */
-    public function Will_get_null_if_no_error() {
+    public function Will_get_null_if_no_error() : void {
 
         // arrange
         $result = new ApiResult([]);

diff --git a/tests/ApiResult/getException_Test.php b/tests/ApiResult/getException_Test.php
@@ -26,7 +26,7 @@ class getException_Test extends MindTouchHttpUnitTestCase {
     /**
      * @test
      */
-    public function Can_get_exception_type() {
+    public function Can_get_exception_type() : void {
 
         // arrange
         $data = [
@@ -50,7 +50,7 @@ public function Can_get_exception_type() {
     /**
      * @test
      */
-    public function Will_get_null_if_no_exception_type() {
+    public function Will_get_null_if_no_exception_type() : void {
 
         // arrange
         $data = [

diff --git a/tests/ApiToken/toSignature_Test.php b/tests/ApiToken/toSignature_Test.php
@@ -26,7 +26,7 @@ class toSignature_Test extends MindTouchHttpUnitTestCase {
     /**
      * @test
      */
-    public function Can_convert_to_signature() {
+    public function Can_convert_to_signature() : void {
 
         // arrange
         $token = new ApiToken('foo', 'bar');
@@ -41,7 +41,7 @@ public function Can_convert_to_signature() {
     /**
      * @test
      */
-    public function Can_convert_to_signature_by_timestamp() {
+    public function Can_convert_to_signature_by_timestamp() : void {
 
         // arrange
         $token = new ApiToken('foo', 'bar');

diff --git a/tests/ApiToken/withUserId_Test.php b/tests/ApiToken/withUserId_Test.php
@@ -26,7 +26,7 @@ class withUserId_Test extends MindTouchHttpUnitTestCase {
     /**
      * @test
      */
-    public function Can_update_user() {
+    public function Can_update_user() : void {
 
         // arrange
         $token = new ApiToken('foo', 'bar');

diff --git a/tests/ApiToken/withUsername_Test.php b/tests/ApiToken/withUsername_Test.php
@@ -26,7 +26,7 @@ class withUsername_Test extends MindTouchHttpUnitTestCase {
     /**
      * @test
      */
-    public function Can_update_user() {
+    public function Can_update_user() : void {
 
         // arrange
         $token = new ApiToken('foo', 'bar');