From 455c9c80694cb8d512ad83340cca72503f3584c4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 21 Sep 2023 23:26:27 +0000 Subject: [PATCH] merge --- tests/Message/Http/RestTest.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Message/Http/RestTest.php b/tests/Message/Http/RestTest.php index 18c56990a..d2d48f337 100755 --- a/tests/Message/Http/RestTest.php +++ b/tests/Message/Http/RestTest.php @@ -52,10 +52,6 @@ final class RestTest extends \PHPUnit\Framework\TestCase $request = new HttpRequest(new HttpUri('http://httpbin.org/post')); $request->setMethod(RequestMethod::POST); self::assertTrue($request->setData('pdata', 'abc')); -<<<<<<< HEAD -======= - \var_dump(REST::request($request)->getJsonData()); ->>>>>>> 0080e35aace364fcf8708442f556fff4aba75143 self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata'] ?? ''); }