linkeddatacenter / url-rewriter

src/UrlRewriter.php

Spacing +11 added lines, -11 removed lines

@@ -34,24 +34,24 @@ 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

     {

         $uri = $request->getUri();

-        if ($scheme = $uri->getScheme()) { $scheme .= ':';}

+        if ($scheme = $uri->getScheme()) { $scheme .= ':'; }

         $authority = $uri->getAuthority();

         $path = $uri->getPath();

-        if ($query = $uri->getQuery()) { $query = '?'.$query;};

-        if ($fragment = $uri->getFragment()) { $fragment = '#'.$fragment;};

+        if ($query = $uri->getQuery()) { $query = '?'.$query; };

+        if ($fragment = $uri->getFragment()) { $fragment = '#'.$fragment; };

         

         // invariant part is not considered in match

         $invariantUriPart = "$scheme//$authority";

         

         // $matchSubject is the portion of the uri we are interest in

-        $replacedUriPart=$this->appyRules($path.$query.$fragment);

+        $replacedUriPart = $this->appyRules($path.$query.$fragment);

         

-        $parsedNewUrl = parse_url($invariantUriPart.$replacedUriPart );

+        $parsedNewUrl = parse_url($invariantUriPart.$replacedUriPart);

         

         $request = $request->withUri(

-            $uri->withPath($parsedNewUrl['path']?:'')

-            ->withQuery($parsedNewUrl['query']?:'')

-            ->withFragment($parsedNewUrl['fragment']?:'')

+            $uri->withPath($parsedNewUrl['path'] ?: '')

+            ->withQuery($parsedNewUrl['query'] ?: '')

+            ->withFragment($parsedNewUrl['fragment'] ?: '')

         );

         

         return $handler->handle($request);

@@ -63,10 +63,10 @@ 
      */

     private function appyRules(string $subject): string

     {

-        foreach($this->rules as $pattern=>$replacement) {

-            $pattern = '#^'. $pattern.'$#';

+        foreach ($this->rules as $pattern=>$replacement) {

+            $pattern = '#^'.$pattern.'$#';

             $subject = preg_replace($pattern, $replacement, $subject);

-            if( is_null($subject)){

+            if (is_null($subject)) {

                 throw new RuntimeException("Bad replacement '$pattern', '$replacement'");

             }

         }