wip

Author: mpociot

src/Concerns/HandlesParameters.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace BeyondCode\Mailbox\Concerns;
+
+trait HandlesParameters
+{
+    public function parameterNames()
+    {
+        preg_match_all('/\{(.*?)\}/', $this->pattern, $matches);
+
+        return array_map(function ($m) {
+            return trim($m, '?');
+        }, $matches[1]);
+    }
+
+    public function parameters()
+    {
+        return $this->matchToKeys(array_slice($this->matches, 1));
+    }
+
+    public function parametersWithoutNulls()
+    {
+        return array_filter($this->parameters(), function ($p) {
+            return ! is_null($p);
+        });
+    }
+
+    protected function matchToKeys(array $matches)
+    {
+        if (empty($parameterNames = $this->parameterNames())) {
+            return [];
+        }
+
+        $parameters = array_intersect_key($matches, array_flip($parameterNames));
+
+        return array_filter($parameters, function ($value) {
+            return is_string($value) && strlen($value) > 0;
+        });
+    }
+}

src/Concerns/HandlesRegularExpressions.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace BeyondCode\Mailbox\Concerns;
+
+use Symfony\Component\Routing\Route;
+
+trait HandlesRegularExpressions
+{
+    protected function matchesRegularExpression(string $subject)
+    {
+        return (bool) preg_match($this->getRegularExpression(), $subject, $this->matches);
+    }
+
+    /**
+     * We do not want to create the regular expression on our own,
+     * so we just use Symfonys Route for this.
+     *
+     * @return string
+     */
+    protected function getRegularExpression(): string
+    {
+        $route = new Route($this->pattern);
+        $route->setRequirements($this->wheres);
+
+        $regex = $route->compile()->getRegex();
+
+        $regex = preg_replace('/^#\^\/(.*)/', '#^$1', $regex);
+
+        $regex = str_replace('>[^/]+)', '>.+)', $regex);
+
+        $regex = str_replace('$#sD', '$#sDi', $regex);
+
+        return $regex;
+    }
+
+    public function where($name, $expression = null)
+    {
+        foreach ($this->parseWhere($name, $expression) as $name => $expression) {
+            $this->wheres[$name] = $expression;
+        }
+
+        return $this;
+    }
+
+    protected function parseWhere($name, $expression)
+    {
+        return is_array($name) ? $name : [$name => $expression];
+    }
+}

src/MailboxRoute.php

@@ -2,18 +2,19 @@
 
 namespace BeyondCode\Mailbox;
 
+use BeyondCode\Mailbox\Concerns\HandlesParameters;
+use BeyondCode\Mailbox\Concerns\HandlesRegularExpressions;
 use Illuminate\Container\Container;
-use Illuminate\Routing\ControllerDispatcher;
 use Illuminate\Routing\RouteDependencyResolverTrait;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use ReflectionFunction;
-use Symfony\Component\Routing\Route;
 use ZBateson\MailMimeParser\Header\Part\AddressPart;
-use Illuminate\Routing\Contracts\ControllerDispatcher as ControllerDispatcherContract;
 
 class MailboxRoute
 {
+    use HandlesParameters;
+    use HandlesRegularExpressions;
     use RouteDependencyResolverTrait;
 
     const FROM = 'from';
@@ -64,40 +65,6 @@ public function pattern()
         return $this->pattern;
     }
 
-    public function parameterNames()
-    {
-        preg_match_all('/\{(.*?)\}/', $this->pattern, $matches);
-
-        return array_map(function ($m) {
-            return trim($m, '?');
-        }, $matches[1]);
-    }
-
-    public function parameters()
-    {
-        return $this->matchToKeys(array_slice($this->matches, 1));
-    }
-
-    public function parametersWithoutNulls()
-    {
-        return array_filter($this->parameters(), function ($p) {
-            return ! is_null($p);
-        });
-    }
-
-    protected function matchToKeys(array $matches)
-    {
-        if (empty($parameterNames = $this->parameterNames())) {
-            return [];
-        }
-
-        $parameters = array_intersect_key($matches, array_flip($parameterNames));
-
-        return array_filter($parameters, function ($value) {
-            return is_string($value) && strlen($value) > 0;
-        });
-    }
-
     public function matches(InboundEmail $message): bool
     {
         $subjects = $this->gatherMatchSubjectsFromMessage($message);
@@ -107,33 +74,6 @@ public function matches(InboundEmail $message): bool
         }) !== null;
     }
 
-    protected function matchesRegularExpression(string $subject)
-    {
-        return (bool) preg_match($this->getRegularExpression(), $subject, $this->matches);
-    }
-
-    /**
-     * We do not want to create the regular expression on our own,
-     * so we just use Symfonys Route for this.
-     *
-     * @return string
-     */
-    protected function getRegularExpression(): string
-    {
-        $route = new Route($this->pattern);
-        $route->setRequirements($this->wheres);
-
-        $regex = $route->compile()->getRegex();
-
-        $regex = preg_replace('/^#\^\/(.*)/', '#^$1', $regex);
-
-        $regex = str_replace('>[^/]+)', '>.+)', $regex);
-
-        $regex = str_replace('$#sD', '$#sDi', $regex);
-
-        return $regex;
-    }
-
     protected function gatherMatchSubjectsFromMessage(InboundEmail $message)
     {
         switch ($this->subject) {
@@ -164,20 +104,6 @@ protected function convertMessageAddresses($addresses): array
             })->toArray();
     }
 
-    public function where($name, $expression = null)
-    {
-        foreach ($this->parseWhere($name, $expression) as $name => $expression) {
-            $this->wheres[$name] = $expression;
-        }
-
-        return $this;
-    }
-
-    protected function parseWhere($name, $expression)
-    {
-        return is_array($name) ? $name : [$name => $expression];
-    }
-
     public function run(InboundEmail $email)
     {
         $this->container = $this->container ?: new Container;
@@ -214,15 +140,6 @@ protected function runCallable(InboundEmail $email)
         )));
     }
 
-    public function mailboxDispatcher()
-    {
-        if ($this->container->bound(ControllerDispatcherContract::class)) {
-            return $this->container->make(ControllerDispatcherContract::class);
-        }
-
-        return new ControllerDispatcher($this->container);
-    }
-
     public function getMailbox()
     {
         if (! $this->mailbox) {