spiral / framework

src/Router/src/UriHandler.php

Braces +57 added lines, -27 removed lines

@@ -131,7 +131,8 @@ 
      */
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/'))
+        {
             $basePath .= '/';
         }
 
@@ -181,12 +182,14 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
         $matches = [];
-        if (!\preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!\preg_match($this->compiled, $this->fetchTarget($uri), $matches))
+        {
             return null;
         }
 
@@ -203,7 +206,8 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -214,19 +218,23 @@ 
         );
 
         $required = \array_keys($this->constrains);
-        if ($this->strict) {
+        if ($this->strict)
+        {
             $required = \array_unique([...$this->requiredOptions, ...$required]);
         }
 
         $missingParameters = [];
 
-        foreach ($required as $key) {
-            if (empty($parameters[$key])) {
+        foreach ($required as $key)
+        {
+            if (empty($parameters[$key]))
+            {
                 $missingParameters[] = $key;
             }
         }
 
-        if ($missingParameters !== []) {
+        if ($missingParameters !== [])
+        {
             throw new UriHandlerException(
                 \sprintf(
                     \count($missingParameters) === 1
@@ -256,18 +264,23 @@ 
         $allowed = \array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (\is_int($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (\is_int($key) && isset($allowed[$key]))
+            {
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!\array_key_exists($key, $this->options) && \is_array($parameters)) {
+            }
+            elseif (!\array_key_exists($key, $this->options) && \is_array($parameters))
+            {
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             // String must be normalized here
-            if (\is_string($parameter) && !\preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (\is_string($parameter) && !\preg_match('/^[a-z\-_0-9]+$/i', $parameter))
+            {
                 $result[$key] = ($this->pathSegmentEncoder)($parameter);
                 continue;
             }
@@ -285,7 +298,8 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
+        if (empty($path) || $path[0] !== '/')
+        {
             $path = '/' . $path;
         }
 
@@ -304,7 +318,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -318,15 +333,18 @@ 
         $pattern = \rtrim(\ltrim($pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (\str_starts_with($pattern, '[/')) {
+        if (\str_starts_with($pattern, '[/'))
+        {
             $pattern = '[' . \substr($pattern, 2);
         }
 
         // 2) Extract variables from the pattern
-        if (\preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (\preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches))
+        {
             $variables = \array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces[\sprintf('<%s>', $key)] = \sprintf('(?P<%s>%s)', $key, $segment);
                 $options[] = $key;
@@ -338,14 +356,17 @@ 
         $options = \array_fill_keys($options, null);
 
         // 3) Validate constraints
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value)
+        {
+            if ($value instanceof Autofill)
+            {
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
             // If a constraint references a param that doesn't appear in the pattern or defaults
-            if (!\array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!\array_key_exists($key, $options) && !isset($this->defaults[$key]))
+            {
                 throw new ConstrainException(
                     \sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -362,7 +383,8 @@ 
         $this->options = $options;
 
         // 5) Mark which parameters are required vs. optional
-        if ($this->strict) {
+        if ($this->strict)
+        {
             $this->requiredOptions = $this->findRequiredOptions($pattern, \array_keys($options));
         }
     }
@@ -384,21 +406,28 @@ 
         $pos = 0;
         $length = \strlen($pattern);
 
-        while ($pos < $length) {
+        while ($pos < $length)
+        {
             $char = $pattern[$pos];
 
-            if ($char === '[') {
+            if ($char === '[')
+            {
                 // We enter an optional segment
                 ++$optLevel;
-            } elseif ($char === ']') {
+            }
+            elseif ($char === ']')
+            {
                 // We exit an optional segment
                 $optLevel = \max(0, $optLevel - 1);
-            } elseif ($char === '<') {
+            }
+            elseif ($char === '<')
+            {
                 // We see a parameter like <id> or <action:\d+>
 
                 // Find the closing '>'
                 $endPos = \strpos($pattern, '>', $pos);
-                if ($endPos === false) {
+                if ($endPos === false)
+                {
                     break;
                 }
 
@@ -432,7 +461,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $replaces[\sprintf('<%s>', $key)] = match (true) {
                 $value instanceof \Stringable || \is_scalar($value) => (string) $value,
                 default => '',