mougrim · mougrim · Oct 3, 2018 · Sep 27, 2018
diff --git a/src/Factory/DefaultFactory.php b/src/Factory/DefaultFactory.php
@@ -8,7 +8,7 @@
 use Mougrim\XdebugProxy\Handler\IdeHandler;
 use Mougrim\XdebugProxy\Handler\XdebugHandler;
 use Mougrim\XdebugProxy\Proxy;
-use Mougrim\XdebugProxy\RequestPreparer;
+use Mougrim\XdebugProxy\RequestPreparer\RequestPreparer;
 use Mougrim\XdebugProxy\Xml\DomXmlConverter;
 use Mougrim\XdebugProxy\Xml\XmlConverter;
 use Psr\Log\LoggerInterface;
@@ -41,9 +41,9 @@ public function createIdeHandler(LoggerInterface $logger, XmlConverter $xmlConve
     }
 
     /**
-     * @return RequestPreparer[]
+     * {@inheritdoc}
      */
-    public function createRequestPreparers(): array
+    public function createRequestPreparers(LoggerInterface $logger): array
     {
         return [];
     }

diff --git a/src/Factory/Factory.php b/src/Factory/Factory.php
@@ -6,7 +6,9 @@
 use Mougrim\XdebugProxy\Handler\IdeHandler;
 use Mougrim\XdebugProxy\Handler\XdebugHandler;
 use Mougrim\XdebugProxy\Proxy;
-use Mougrim\XdebugProxy\RequestPreparer;
+use Mougrim\XdebugProxy\RequestPreparer\Error as RequestPreparerError;
+use Mougrim\XdebugProxy\RequestPreparer\Exception as RequestPreparerException;
+use Mougrim\XdebugProxy\RequestPreparer\RequestPreparer;
 use Mougrim\XdebugProxy\Xml\XmlConverter;
 use Psr\Log\LoggerInterface;
 
@@ -33,9 +35,14 @@ public function createIdeHandler(
     ): IdeHandler;
 
     /**
+     * @param LoggerInterface $logger
+     *
+     * @throws RequestPreparerException
+     * @throws RequestPreparerError
+     *
      * @return RequestPreparer[]
      */
-    public function createRequestPreparers(): array;
+    public function createRequestPreparers(LoggerInterface $logger): array;
 
     public function createXdebugHandler(
         LoggerInterface $logger,

diff --git a/src/Factory/SoftMocksFactory.php b/src/Factory/SoftMocksFactory.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Mougrim\XdebugProxy\Factory;
+
+use Mougrim\XdebugProxy\RequestPreparer\Error as RequestPreparerError;
+use Mougrim\XdebugProxy\RequestPreparer\SoftMocksRequestPreparer;
+use Psr\Log\LoggerInterface;
+use function array_merge;
+
+/**
+ * @author Mougrim <[email protected]>
+ */
+class SoftMocksFactory extends DefaultFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createRequestPreparers(LoggerInterface $logger): array
+    {
+        $requestPreparers = parent::createRequestPreparers($logger);
+
+        return array_merge($requestPreparers, [$this->createSoftMocksRequestPreparer($logger)]);
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     *
+     * @throws RequestPreparerError
+     *
+     * @return SoftMocksRequestPreparer
+     */
+    public function createSoftMocksRequestPreparer(LoggerInterface $logger): SoftMocksRequestPreparer
+    {
+        return new SoftMocksRequestPreparer($logger);
+    }
+}
diff --git a/src/Handler/CommandToXdebugParser.php b/src/Handler/CommandToXdebugParser.php
@@ -13,4 +13,12 @@ interface CommandToXdebugParser
      * @return array [$command, $arguments]
      */
     public function parseCommand(string $request): array;
+
+    /**
+     * @param string $command
+     * @param array $arguments
+     *
+     * @return string
+     */
+    public function buildCommand(string $command, array $arguments): string;
 }
diff --git a/src/Handler/DefaultIdeHandler.php b/src/Handler/DefaultIdeHandler.php
@@ -7,7 +7,9 @@
 use Amp\Socket\ConnectException;
 use Amp\Socket\ServerSocket;
 use Generator;
-use Mougrim\XdebugProxy\RequestPreparer;
+use Mougrim\XdebugProxy\RequestPreparer\Error as RequestPreparerError;
+use Mougrim\XdebugProxy\RequestPreparer\Exception as RequestPreparerException;
+use Mougrim\XdebugProxy\RequestPreparer\RequestPreparer;
 use Mougrim\XdebugProxy\Xml\XmlContainer;
 use Mougrim\XdebugProxy\Xml\XmlConverter;
 use Mougrim\XdebugProxy\Xml\XmlDocument;
@@ -21,6 +23,7 @@
 use function array_slice;
 use function count;
 use function explode;
+use function get_class;
 use function implode;
 use function preg_match;
 use function strlen;
@@ -293,7 +296,11 @@ public function processRequest(XmlDocument $xmlRequest, string $rawRequest, Serv
         /** @var ClientSocket $ideSocket */
         $ideSocket = $this->ideSockets->offsetGet($xdebugSocket);
         $context['ide'] = $ideSocket->getRemoteAddress();
-        $this->prepareRequestToIde($xmlRequest, $rawRequest);
+        try {
+            $this->prepareRequestToIde($xmlRequest, $rawRequest, $context);
+        } catch (RequestPreparerError $error) {
+            throw new FromXdebugProcessError("Can't prepare request to ide", $context, $error);
+        }
 
         try {
             $request = $this->xmlConverter->generate($xmlRequest);
@@ -313,10 +320,28 @@ public function processRequest(XmlDocument $xmlRequest, string $rawRequest, Serv
         $this->logger->notice('[Xdebug][Ide] Request was sent to ide, waiting response.', $context);
     }
 
-    protected function prepareRequestToIde(XmlDocument $xmlRequest, string $rawRequest)
+    /**
+     * @param XmlDocument $xmlRequest
+     * @param string $rawRequest
+     * @param array $context
+     *
+     * @throws RequestPreparerError
+     *
+     * @return void
+     */
+    protected function prepareRequestToIde(XmlDocument $xmlRequest, string $rawRequest, array $context)
     {
         foreach ($this->requestPreparers as $requestPreparer) {
-            $requestPreparer->prepareRequestToIde($xmlRequest, $rawRequest);
+            try {
+                $requestPreparer->prepareRequestToIde($xmlRequest, $rawRequest);
+            } catch (RequestPreparerException $exception) {
+                $this->logger->error(
+                    "Can't prepare request to ide: {$exception}",
+                    $context + [
+                        'preparer' => get_class($requestPreparer),
+                    ]
+                );
+            }
         }
     }
 
@@ -408,7 +433,7 @@ public function handleIde(string $ideKey, ServerSocket $xdebugSocket, ClientSock
                         '[Xdebug][Ide] Prepare ide request',
                         $context + ['request' => $request]
                     );
-                    $request = $this->prepareRequestToXdebug($request);
+                    $request = $this->prepareRequestToXdebug($request, $context);
                     $this->logger->info(
                         '[Xdebug][Ide] Send prepared request to xdebug',
                         $context + ['request' => $request]
@@ -418,6 +443,12 @@ public function handleIde(string $ideKey, ServerSocket $xdebugSocket, ClientSock
             }
         } catch (ClosedException $exception) {
             // skip exception, close other connections below
+        } catch (RequestPreparerError $error) {
+            $this->logger->critical(
+                "Can't prepare request: {$error}",
+                $context
+            );
+            // close other connections below
         }
 
         if ($buffer) {
@@ -436,10 +467,28 @@ public function handleIde(string $ideKey, ServerSocket $xdebugSocket, ClientSock
         }
     }
 
-    protected function prepareRequestToXdebug(string $request): string
+    /**
+     * @param string $request
+     * @param array $context
+     *
+     * @throws RequestPreparerError
+     *
+     * @return string prepared request
+     */
+    protected function prepareRequestToXdebug(string $request, array $context): string
     {
         foreach ($this->requestPreparers as $requestPreparer) {
-            $request = $requestPreparer->prepareRequestToXdebug($request, $this);
+            try {
+                $request = $requestPreparer->prepareRequestToXdebug($request, $this);
+            } catch (RequestPreparerException $exception) {
+                $this->logger->error(
+                    "Can't prepare request to xdebug: {$exception}",
+                    $context + [
+                        'preparer' => get_class($requestPreparer),
+                        'request' => $request,
+                    ]
+                );
+            }
         }
 
         return $request;
@@ -453,6 +502,16 @@ public function parseCommand(string $request): array
         return [$command, $arguments];
     }
 
+    public function buildCommand(string $command, array $arguments): string
+    {
+        $argument_strings = [];
+        foreach ($arguments as $argument => $value) {
+            $argument_strings[] = "{$argument} {$value}";
+        }
+
+        return $command.' '.implode(' ', $argument_strings);
+    }
+
     protected function parseArguments(string $arguments): array
     {
         $context = [

diff --git a/src/RequestPreparer.php b/src/RequestPreparer.php
@@ -2,27 +2,12 @@
 
 namespace Mougrim\XdebugProxy;
 
-use Mougrim\XdebugProxy\Handler\CommandToXdebugParser;
-use Mougrim\XdebugProxy\Xml\XmlDocument;
-
 /**
+ * @deprecated
+ * @see RequestPreparer\RequestPreparer
+ *
  * @author Mougrim <[email protected]>
  */
-interface RequestPreparer
+interface RequestPreparer extends RequestPreparer\RequestPreparer
 {
-    /**
-     * @param XmlDocument $xmlRequest
-     * @param string $rawRequest
-     *
-     * @return void
-     */
-    public function prepareRequestToIde(XmlDocument $xmlRequest, string $rawRequest);
-
-    /**
-     * @param string $request
-     * @param CommandToXdebugParser $commandToXdebugParser
-     *
-     * @return string
-     */
-    public function prepareRequestToXdebug(string $request, CommandToXdebugParser $commandToXdebugParser): string;
 }
diff --git a/src/RequestPreparer/Error.php b/src/RequestPreparer/Error.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mougrim\XdebugProxy\RequestPreparer;
+
+use RuntimeException;
+
+/**
+ * @author Mougrim <[email protected]>
+ */
+class Error extends RuntimeException
+{
+}
diff --git a/src/RequestPreparer/Exception.php b/src/RequestPreparer/Exception.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mougrim\XdebugProxy\RequestPreparer;
+
+use Exception as BaseException;
+
+/**
+ * @author Mougrim <[email protected]>
+ */
+class Exception extends BaseException
+{
+}
diff --git a/src/RequestPreparer/RequestPreparer.php b/src/RequestPreparer/RequestPreparer.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Mougrim\XdebugProxy\RequestPreparer;
+
+use Mougrim\XdebugProxy\Handler\CommandToXdebugParser;
+use Mougrim\XdebugProxy\Xml\XmlDocument;
+
+/**
+ * @author Mougrim <[email protected]>
+ */
+interface RequestPreparer
+{
+    /**
+     * @param XmlDocument $xmlRequest
+     * @param string $rawRequest
+     *
+     * @throws Exception
+     * @throws Error
+     *
+     * @return void
+     */
+    public function prepareRequestToIde(XmlDocument $xmlRequest, string $rawRequest);
+
+    /**
+     * @param string $request
+     * @param CommandToXdebugParser $commandToXdebugParser
+     *
+     * @throws Exception
+     * @throws Error
+     *
+     * @return string
+     */
+    public function prepareRequestToXdebug(string $request, CommandToXdebugParser $commandToXdebugParser): string;
+}