close #83

xrdebug · Feb 21, 2024 · 9881656 · 9881656
1 parent c256045
commit 9881656
Show file tree

Hide file tree

Showing 39 changed files with 107 additions and 113 deletions.
diff --git a/.vscode/test.code-snippets b/.vscode/test.code-snippets
@@ -5,7 +5,7 @@
         "body": [
             "<?php",
             "",
-            "namespace Chevere\\Xr\\Tests\\\\${TM_DIRECTORY/.*tests\\/(([^\\/]*)(\\/)?)|(\\/)([^\\/]*)/$2${3:+\\\\}${5:+\\\\}$5/g};",
+            "namespace Chevere\\xrDebug\\PHP\\Tests\\\\${TM_DIRECTORY/.*tests\\/(([^\\/]*)(\\/)?)|(\\/)([^\\/]*)/$2${3:+\\\\}${5:+\\\\}$5/g};",
             "",
             "use PHPUnit\\Framework\\TestCase;",
             "",
@@ -31,12 +31,12 @@
         "body": [
             "<?php",
             "",
-            "namespace Chevere\\Xr\\Tests\\\\${TM_DIRECTORY/.*tests\\/(([^\\/]*)(\\/)?)|(\\/)([^\\/]*)/$2${3:+\\\\}${5:+\\\\}$5/g};",
+            "namespace Chevere\\xrDebug\\PHP\\Tests\\\\${TM_DIRECTORY/.*tests\\/(([^\\/]*)(\\/)?)|(\\/)([^\\/]*)/$2${3:+\\\\}${5:+\\\\}$5/g};",
             "",
             "final class $TM_FILENAME_BASE",
             "{",
             "\t$0",
             "}"
         ]
     },
-}
+}
diff --git a/README.md b/README.md
@@ -175,7 +175,7 @@ Use `registerThrowableHandler` to enable xrDebug throwable handling.
 
 ```php
 
-use Chevere\Xr\registerThrowableHandler;
+use Chevere\xrDebug\PHP\registerThrowableHandler;
 
 // True append xrDebug to your existing handler
 // False use only xrDebug handler
@@ -187,7 +187,7 @@ registerThrowableHandler(true);
 Use `throwableHandler` in any existing exception handler logic:
 
 ```php
-use Chevere\Xr\throwableHandler;
+use Chevere\xrDebug\PHP\throwableHandler;
 
 set_exception_handler(
     function(Throwable $throwable) {
@@ -210,8 +210,8 @@ For code below, `myDump` defines a method that will stream data from your applic
 ```php
 <?php
 
-use Chevere\Xr\Inspector\Traits\XrInspectorTrait;
-use Chevere\Xr\Interfaces\XrInspectorInterface;
+use Chevere\xrDebug\PHP\Inspector\Traits\XrInspectorTrait;
+use Chevere\xrDebug\PHP\Interfaces\XrInspectorInterface;
 
 class MyInspector implements XrInspectorInterface
 {
@@ -264,8 +264,8 @@ A null inspector is required to void any inspection call **if xrDebug is disable
 ```php
 <?php
 
-use Chevere\Xr\Inspector\Traits\XrInspectorNullTrait;
-use Chevere\Xr\Interfaces\XrInspectorInterface;
+use Chevere\xrDebug\PHP\Inspector\Traits\XrInspectorNullTrait;
+use Chevere\xrDebug\PHP\Interfaces\XrInspectorInterface;
 
 class MyInspectorNull implements XrInspectorInterface
 {
@@ -288,8 +288,8 @@ class MyInspectorNull implements XrInspectorInterface
 ### Helper function for custom inspector
 
 ```php
-use Chevere\Xr\Inspector\XrInspectorInstance;
-use Chevere\Xr\Interfaces\XrInspectorInterface;
+use Chevere\xrDebug\PHP\Inspector\XrInspectorInstance;
+use Chevere\xrDebug\PHP\Interfaces\XrInspectorInterface;
 use LogicException;
 use MyInspector;
 use MyInspectorNull;
@@ -324,7 +324,7 @@ Documentation available at [docs.xrdebug.com](https://docs.xrdebug.com/).
 
 ## License
 
-Copyright 2023 [Rodolfo Berrios A.](https://rodolfoberrios.com/)
+Copyright [Rodolfo Berrios A.](https://rodolfoberrios.com/)
 
 xrDebug is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE) for the full license text.
 

diff --git a/composer.json b/composer.json
@@ -21,12 +21,10 @@
         "ext-curl": "*",
         "ext-json": "*",
         "chevere/filesystem": "^1.0.x-dev",
-        "chevere/http": "^0.4.x-dev",
         "chevere/message": "^1.0.0",
         "chevere/throwable-handler": "^0.12.x-dev",
         "chevere/trace": "^1.0.0",
         "chevere/var-dump": "^1.0.0",
-        "chevere/writer": "^1.0.1",
         "phpseclib/phpseclib": "~3.0",
         "ramsey/uuid": "^4.7"
     },
@@ -41,7 +39,7 @@
             "src/functions.php"
         ],
         "psr-4": {
-            "Chevere\\Xr\\": "src/"
+            "Chevere\\xrDebug\\PHP\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/demo/demo-throwable.php b/demo/demo-throwable.php
@@ -17,7 +17,7 @@
 use Chevere\Writer\WritersInstance;
 use RuntimeException;
 use function Chevere\Writer\streamFor;
-use function Chevere\Xr\registerThrowableHandler;
+use function Chevere\xrDebug\PHP\registerThrowableHandler;
 
 foreach (['/../', '/../../../../'] as $path) {
     $autoload = __DIR__ . $path . 'vendor/autoload.php';

diff --git a/src/Client.php b/src/Client.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr;
+namespace Chevere\xrDebug\PHP;
 
-use Chevere\Xr\Interfaces\ClientInterface;
-use Chevere\Xr\Traits\ClientTrait;
+use Chevere\xrDebug\PHP\Interfaces\ClientInterface;
+use Chevere\xrDebug\PHP\Traits\ClientTrait;
 
 final class Client implements ClientInterface
 {

diff --git a/src/Curl.php b/src/Curl.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr;
+namespace Chevere\xrDebug\PHP;
 
-use Chevere\Xr\Interfaces\CurlInterface;
-use Chevere\Xr\Traits\CurlTrait;
+use Chevere\xrDebug\PHP\Interfaces\CurlInterface;
+use Chevere\xrDebug\PHP\Traits\CurlTrait;
 
 final class Curl implements CurlInterface
 {

diff --git a/src/Exceptions/StopException.php b/src/Exceptions/StopException.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Exceptions;
+namespace Chevere\xrDebug\PHP\Exceptions;
 
 use Exception;
 

diff --git a/src/Inspector/Inspector.php b/src/Inspector/Inspector.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Inspector;
+namespace Chevere\xrDebug\PHP\Inspector;
 
-use Chevere\Xr\Inspector\Traits\InspectorTrait;
-use Chevere\Xr\Interfaces\InspectorInterface;
+use Chevere\xrDebug\PHP\Inspector\Traits\InspectorTrait;
+use Chevere\xrDebug\PHP\Interfaces\InspectorInterface;
 
 final class Inspector implements InspectorInterface
 {

diff --git a/src/Inspector/InspectorInstance.php b/src/Inspector/InspectorInstance.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Inspector;
+namespace Chevere\xrDebug\PHP\Inspector;
 
-use Chevere\Xr\Interfaces\InspectorInterface;
+use Chevere\xrDebug\PHP\Interfaces\InspectorInterface;
 use LogicException;
 use function Chevere\Message\message;
 

diff --git a/src/Inspector/InspectorNull.php b/src/Inspector/InspectorNull.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Inspector;
+namespace Chevere\xrDebug\PHP\Inspector;
 
-use Chevere\Xr\Inspector\Traits\InspectorNullTrait;
-use Chevere\Xr\Interfaces\InspectorInterface;
+use Chevere\xrDebug\PHP\Inspector\Traits\InspectorNullTrait;
+use Chevere\xrDebug\PHP\Interfaces\InspectorInterface;
 
 final class InspectorNull implements InspectorInterface
 {

diff --git a/src/Inspector/Traits/InspectorNullTrait.php b/src/Inspector/Traits/InspectorNullTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Inspector\Traits;
+namespace Chevere\xrDebug\PHP\Inspector\Traits;
 
 /**
  * @infection-ignore-all

diff --git a/src/Inspector/Traits/InspectorTrait.php b/src/Inspector/Traits/InspectorTrait.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Inspector\Traits;
+namespace Chevere\xrDebug\PHP\Inspector\Traits;
 
-use Chevere\Xr\Interfaces\ClientInterface;
-use Chevere\Xr\Message;
+use Chevere\xrDebug\PHP\Interfaces\ClientInterface;
+use Chevere\xrDebug\PHP\Message;
 use Throwable;
 
 trait InspectorTrait

diff --git a/src/Interfaces/ClientInterface.php b/src/Interfaces/ClientInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Interfaces;
+namespace Chevere\xrDebug\PHP\Interfaces;
 
 /**
  * Describes the component in charge of defining the client.

diff --git a/src/Interfaces/CurlInterface.php b/src/Interfaces/CurlInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Interfaces;
+namespace Chevere\xrDebug\PHP\Interfaces;
 
 use CurlHandle;
 

diff --git a/src/Interfaces/InspectorInterface.php b/src/Interfaces/InspectorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Interfaces;
+namespace Chevere\xrDebug\PHP\Interfaces;
 
 /**
  * Describes the component in charge of defining the XR inspector default interface.

diff --git a/src/Interfaces/MessageInterface.php b/src/Interfaces/MessageInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Interfaces;
+namespace Chevere\xrDebug\PHP\Interfaces;
 
 use Chevere\Writer\Interfaces\WriterInterface;
 

diff --git a/src/Interfaces/XrInterface.php b/src/Interfaces/XrInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Interfaces;
+namespace Chevere\xrDebug\PHP\Interfaces;
 
 use Chevere\Filesystem\Interfaces\DirectoryInterface;
 

diff --git a/src/Message.php b/src/Message.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr;
+namespace Chevere\xrDebug\PHP;
 
 use Chevere\ThrowableHandler\Formats\HtmlFormat as ThrowableHandlerHtmlFormat;
 use Chevere\Trace\Trace;
 use Chevere\VarDump\Formats\HtmlFormat as VarDumpHtmlFormat;
 use Chevere\VarDump\VarDump;
 use Chevere\Writer\Interfaces\WriterInterface;
 use Chevere\Writer\NullWriter;
-use Chevere\Xr\Interfaces\MessageInterface;
-use Chevere\Xr\VarDump\Output\XrVarDumpHtmlOutput;
+use Chevere\xrDebug\PHP\Interfaces\MessageInterface;
+use Chevere\xrDebug\PHP\VarDump\Output\XrVarDumpHtmlOutput;
 use Ramsey\Uuid\Provider\Node\RandomNodeProvider;
 use Ramsey\Uuid\Uuid;
 

diff --git a/src/ThrowableParser.php b/src/ThrowableParser.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr;
+namespace Chevere\xrDebug\PHP;
 
 use Chevere\ThrowableHandler\Formats\HtmlFormat;
 use Chevere\ThrowableHandler\Interfaces\FormatInterface;

diff --git a/src/Traits/ClientTrait.php b/src/Traits/ClientTrait.php
@@ -11,18 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Traits;
-
-use Chevere\Http\Interfaces\MethodInterface;
-use Chevere\Http\Methods\GetMethod;
-use Chevere\Http\Methods\PostMethod;
-use Chevere\Xr\Curl;
-use Chevere\Xr\Exceptions\StopException;
-use Chevere\Xr\Interfaces\CurlInterface;
-use Chevere\Xr\Interfaces\MessageInterface;
+namespace Chevere\xrDebug\PHP\Traits;
+
+use Chevere\xrDebug\PHP\Curl;
+use Chevere\xrDebug\PHP\Exceptions\StopException;
+use Chevere\xrDebug\PHP\Interfaces\CurlInterface;
+use Chevere\xrDebug\PHP\Interfaces\MessageInterface;
 use phpseclib3\Crypt\EC\PrivateKey;
 use function Chevere\Message\message;
-use function Chevere\Xr\sign;
+use function Chevere\xrDebug\PHP\sign;
 
 trait ClientTrait
 {
@@ -69,7 +66,7 @@ public function sendMessage(MessageInterface $message): void
     {
         try {
             $curl = $this->getCurlHandle(
-                new PostMethod(),
+                'POST',
                 'messages',
                 $message->toArray()
             );
@@ -83,7 +80,7 @@ public function sendPause(MessageInterface $message): void
     {
         try {
             $curl = $this->getCurlHandle(
-                new PostMethod(),
+                'POST',
                 'pauses',
                 $message->toArray(),
             );
@@ -103,7 +100,7 @@ public function isPaused(string $id): bool
     {
         try {
             $curl = $this->getCurlHandle(
-                new GetMethod(),
+                'GET',
                 'pauses/' . $id,
                 []
             );
@@ -144,14 +141,14 @@ public function exit(int $exitCode = 0): void
     /**
      *  @param array<string, string> $data
      */
-    private function getCurlHandle(MethodInterface $method, string $url, array $data): CurlInterface
+    private function getCurlHandle(string $method, string $url, array $data): CurlInterface
     {
         $this->options = [
             CURLINFO_HEADER_OUT => true,
             CURLOPT_ENCODING => '',
             CURLOPT_FAILONERROR => true,
             CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => $method::name(),
+            CURLOPT_CUSTOMREQUEST => $method,
             CURLOPT_POSTFIELDS => http_build_query($data),
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_SSL_VERIFYPEER => true,

diff --git a/src/Traits/CurlTrait.php b/src/Traits/CurlTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\Traits;
+namespace Chevere\xrDebug\PHP\Traits;
 
 use CurlHandle;
 use LogicException;

diff --git a/src/VarDump/Output/XrVarDumpHtmlOutput.php b/src/VarDump/Output/XrVarDumpHtmlOutput.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr\VarDump\Output;
+namespace Chevere\xrDebug\PHP\VarDump\Output;
 
 use Chevere\VarDump\Interfaces\FormatInterface as VarDumpFormatInterface;
 use Chevere\VarDump\Outputs\Output;

diff --git a/src/WriterInstance.php b/src/WriterInstance.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Xr;
+namespace Chevere\xrDebug\PHP;
 
 use Chevere\Writer\Interfaces\WriterInterface;
 use LogicException;