spiral / framework

src/Queue/src/Interceptor/Consume/Handler.php

Spacing +7 added lines, -7 removed lines

@@ -22,9 +22,9 @@ 
     private readonly bool $isLegacy;
 
     public function __construct(
-        private readonly HandlerInterface|CoreInterface $core,
+        private readonly HandlerInterface | CoreInterface $core,
         private readonly TracerFactoryInterface $tracerFactory = new NullTracerFactory(new Container()),
-    ) {
+    ){
         $this->isLegacy = !$core instanceof HandlerInterface;
     }
 
@@ -49,16 +49,16 @@ 
         return $tracer->trace(
             name: \sprintf('Job handling [%s:%s]', $name, $id),
             callback: $this->isLegacy
-                ? fn (): mixed => $this->core->callAction($name, 'handle', $arguments)
-                : fn (): mixed => $this->core->handle(new CallContext(Target::fromPair($name, 'handle'), $arguments)),
-            attributes: [
+                ? fn () : mixed => $this->core->callAction($name, 'handle', $arguments)
+                : fn () : mixed => $this->core->handle(new CallContext(Target::fromPair($name, 'handle'), $arguments)),
+            attributes : [
                 'queue.driver' => $driver,
                 'queue.name' => $queue,
                 'queue.id' => $id,
                 'queue.headers' => $headers,
             ],
-            scoped: true,
-            traceKind: TraceKind::CONSUMER,
+            scoped : true,
+            traceKind : TraceKind::CONSUMER,
         );
     }
 }

src/Queue/src/Exception/RetryException.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     public function __construct(
         string $reason = '',
         private readonly ?OptionsInterface $options = null
-    ) {
+    ){
         parent::__construct($reason);
     }
 

src/Filters/src/Model/Schema/Builder.php

Spacing +11 added lines, -11 removed lines

@@ -42,18 +42,18 @@ 
      */
     public function makeSchema(string $name, array $schema): array
     {
-        if (empty($schema)) {
+        if (empty($schema)){
             throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name));
         }
 
         $result = [];
-        foreach ($schema as $field => $definition) {
+        foreach ($schema as $field => $definition){
             $optional = false;
 
             // short definition
-            if (\is_string($definition)) {
+            if (\is_string($definition)){
                 // simple scalar field definition
-                if (!\class_exists($definition)) {
+                if (!\class_exists($definition)){
                     [$source, $origin] = $this->parseDefinition($field, $definition);
                     $result[$field] = [
                         self::SCHEMA_SOURCE => $source,
@@ -74,25 +74,25 @@ 
                 continue;
             }
 
-            if (!\is_array($definition) || $definition === []) {
+            if (!\is_array($definition) || $definition === []){
                 throw new SchemaException(
                     \sprintf('Invalid schema definition at `%s`->`%s`', $name, $field)
                 );
             }
 
             // complex definition
-            if (!empty($definition[self::ORIGIN])) {
+            if (!empty($definition[self::ORIGIN])){
                 $origin = $definition[self::ORIGIN];
 
                 // [class, 'data:something.*'] vs [class, 'data:something']
                 $iterate = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]);
-                $origin = \rtrim((string) $origin, '.*');
-            } else {
+                $origin = \rtrim((string)$origin, '.*');
+            }else{
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL])) {
+            if (!empty($definition[self::OPTIONAL])){
                 $optional = true;
             }
 
@@ -105,7 +105,7 @@ 
                 self::SCHEMA_OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate){
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[self::SCHEMA_ITERATE_SOURCE] = $source;
@@ -128,7 +128,7 @@ 
      */
     private function parseDefinition(string $field, string $definition): array
     {
-        if (!\str_contains($definition, ':')) {
+        if (!\str_contains($definition, ':')){
             return ['data', empty($definition) ? $field : $definition];
         }
 

Braces +21 added lines, -10 removed lines

@@ -42,18 +42,22 @@ 
      */
     public function makeSchema(string $name, array $schema): array
     {
-        if (empty($schema)) {
+        if (empty($schema))
+        {
             throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name));
         }
 
         $result = [];
-        foreach ($schema as $field => $definition) {
+        foreach ($schema as $field => $definition)
+        {
             $optional = false;
 
             // short definition
-            if (\is_string($definition)) {
+            if (\is_string($definition))
+            {
                 // simple scalar field definition
-                if (!\class_exists($definition)) {
+                if (!\class_exists($definition))
+                {
                     [$source, $origin] = $this->parseDefinition($field, $definition);
                     $result[$field] = [
                         self::SCHEMA_SOURCE => $source,
@@ -74,25 +78,30 @@ 
                 continue;
             }
 
-            if (!\is_array($definition) || $definition === []) {
+            if (!\is_array($definition) || $definition === [])
+            {
                 throw new SchemaException(
                     \sprintf('Invalid schema definition at `%s`->`%s`', $name, $field)
                 );
             }
 
             // complex definition
-            if (!empty($definition[self::ORIGIN])) {
+            if (!empty($definition[self::ORIGIN]))
+            {
                 $origin = $definition[self::ORIGIN];
 
                 // [class, 'data:something.*'] vs [class, 'data:something']
                 $iterate = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]);
                 $origin = \rtrim((string) $origin, '.*');
-            } else {
+            }
+            else
+            {
                 $origin = $field;
                 $iterate = true;
             }
 
-            if (!empty($definition[self::OPTIONAL])) {
+            if (!empty($definition[self::OPTIONAL]))
+            {
                 $optional = true;
             }
 
@@ -105,7 +114,8 @@ 
                 self::SCHEMA_OPTIONAL => $optional,
             ];
 
-            if ($iterate) {
+            if ($iterate)
+            {
                 [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin);
 
                 $map[self::SCHEMA_ITERATE_SOURCE] = $source;
@@ -128,7 +138,8 @@ 
      */
     private function parseDefinition(string $field, string $definition): array
     {
-        if (!\str_contains($definition, ':')) {
+        if (!\str_contains($definition, ':'))
+        {
             return ['data', empty($definition) ? $field : $definition];
         }
 

src/Boot/src/Environment.php

Spacing +7 added lines, -7 removed lines

@@ -25,13 +25,13 @@ 
     public function __construct(
         array $values = [],
         private readonly bool $overwrite = false
-    ) {
+    ){
         $this->values = $values + $_ENV + $_SERVER;
     }
 
     public function getID(): string
     {
-        if (empty($this->id)) {
+        if (empty($this->id)){
             $this->id = \md5(\serialize($this->values));
         }
 
@@ -40,7 +40,7 @@ 
 
     public function set(string $name, mixed $value): self
     {
-        if (\array_key_exists($name, $this->values) && !$this->overwrite) {
+        if (\array_key_exists($name, $this->values) && !$this->overwrite){
             return $this;
         }
 
@@ -54,7 +54,7 @@ 
 
     public function get(string $name, mixed $default = null): mixed
     {
-        if (isset($this->values[$name])) {
+        if (isset($this->values[$name])){
             return $this->normalize($this->values[$name]);
         }
 
@@ -68,7 +68,7 @@ 
     {
         $result = [];
 
-        foreach ($this->values as $key => $value) {
+        foreach ($this->values as $key => $value){
             $result[$key] = $this->normalize($value);
         }
 
@@ -77,12 +77,12 @@ 
 
     protected function normalize(mixed $value): mixed
     {
-        if (!\is_string($value)) {
+        if (!\is_string($value)){
             return $value;
         }
 
         $alias = \strtolower($value);
-        if (isset(self::VALUE_MAP[$alias])) {
+        if (isset(self::VALUE_MAP[$alias])){
             return self::VALUE_MAP[$alias];
         }
 

src/Http/src/Header/AcceptHeader.php

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item){
             $this->addItem($item);
         }
     }
@@ -41,9 +41,9 @@ 
         $header = new static();
 
         $parts = \explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part){
             $part = \trim($part);
-            if ($part !== '') {
+            if ($part !== ''){
                 $header->addItem($part);
             }
         }
@@ -51,7 +51,7 @@ 
         return $header;
     }
 
-    public function add(AcceptHeaderItem|string $item): self
+    public function add(AcceptHeaderItem | string $item): self
     {
         $header = clone $this;
         $header->addItem($item);
@@ -74,7 +74,7 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted){
             /**
              * Sort item in descending order.
              */
@@ -89,14 +89,14 @@ 
     /**
      * Add new item to list.
      */
-    private function addItem(AcceptHeaderItem|string $item): void
+    private function addItem(AcceptHeaderItem | string $item): void
     {
-        if (\is_string($item)) {
+        if (\is_string($item)){
             $item = AcceptHeaderItem::fromString($item);
         }
 
-        $value = \strtolower((string) $item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        $value = \strtolower((string)$item->getValue());
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)){
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -106,11 +106,11 @@ 
      * Compare to header items, witch one is preferable.
      * Return 1 if first value preferable or -1 if second, 0 in case of same weight.
      */
-    private static function compare(AcceptHeaderItem|string $a, AcceptHeaderItem|string $b): int
+    private static function compare(AcceptHeaderItem | string $a, AcceptHeaderItem | string $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality()){
             // If quality are same value with more params has more weight.
-            if (\count($a->getParams()) === \count($b->getParams())) {
+            if (\count($a->getParams()) === \count($b->getParams())){
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -129,11 +129,11 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (\str_contains($a, '/') && \str_contains($b, '/')) {
+        if (\str_contains($a, '/') && \str_contains($b, '/')){
             [$typeA, $subtypeA] = \explode('/', $a, 2);
             [$typeB, $subtypeB] = \explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB){
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -145,23 +145,23 @@ 
 
     private static function compareAtomic(string $a, string $b): int
     {
-        if (\mb_strpos($a, '*/') === 0) {
+        if (\mb_strpos($a, '*/') === 0){
             $a = '*';
         }
 
-        if (\mb_strpos($b, '*/') === 0) {
+        if (\mb_strpos($b, '*/') === 0){
             $b = '*';
         }
 
-        if (\strtolower($a) === \strtolower($b)) {
+        if (\strtolower($a) === \strtolower($b)){
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*'){
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*'){
             return 1;
         }
 

Braces +30 added lines, -15 removed lines

@@ -26,7 +26,8 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $this->addItem($item);
         }
     }
@@ -41,9 +42,11 @@ 
         $header = new static();
 
         $parts = \explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part)
+        {
             $part = \trim($part);
-            if ($part !== '') {
+            if ($part !== '')
+            {
                 $header->addItem($part);
             }
         }
@@ -74,7 +77,8 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted)
+        {
             /**
              * Sort item in descending order.
              */
@@ -91,12 +95,14 @@ 
      */
     private function addItem(AcceptHeaderItem|string $item): void
     {
-        if (\is_string($item)) {
+        if (\is_string($item))
+        {
             $item = AcceptHeaderItem::fromString($item);
         }
 
         $value = \strtolower((string) $item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1))
+        {
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -108,9 +114,11 @@ 
      */
     private static function compare(AcceptHeaderItem|string $a, AcceptHeaderItem|string $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality())
+        {
             // If quality are same value with more params has more weight.
-            if (\count($a->getParams()) === \count($b->getParams())) {
+            if (\count($a->getParams()) === \count($b->getParams()))
+            {
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -129,11 +137,13 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (\str_contains($a, '/') && \str_contains($b, '/')) {
+        if (\str_contains($a, '/') && \str_contains($b, '/'))
+        {
             [$typeA, $subtypeA] = \explode('/', $a, 2);
             [$typeB, $subtypeB] = \explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB)
+            {
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -145,23 +155,28 @@ 
 
     private static function compareAtomic(string $a, string $b): int
     {
-        if (\mb_strpos($a, '*/') === 0) {
+        if (\mb_strpos($a, '*/') === 0)
+        {
             $a = '*';
         }
 
-        if (\mb_strpos($b, '*/') === 0) {
+        if (\mb_strpos($b, '*/') === 0)
+        {
             $b = '*';
         }
 
-        if (\strtolower($a) === \strtolower($b)) {
+        if (\strtolower($a) === \strtolower($b))
+        {
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*')
+        {
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*')
+        {
             return 1;
         }
 

src/Http/src/Request/InputManager.php

Spacing +24 added lines, -24 removed lines

@@ -121,7 +121,7 @@ 
         #[Proxy] private readonly ContainerInterface $container,
         /** @invisible */
         HttpConfig $config = new HttpConfig()
-    ) {
+    ){
         $this->bagAssociations = \array_merge($this->bagAssociations, $config->getInputBags());
     }
 
@@ -150,10 +150,10 @@ 
     {
         $input = clone $this;
 
-        if ($add) {
-            $input->prefix .= '.' . $prefix;
+        if ($add){
+            $input->prefix .= '.'.$prefix;
             $input->prefix = \trim($input->prefix, '.');
-        } else {
+        }else{
             $input->prefix = $prefix;
         }
 
@@ -169,7 +169,7 @@ 
 
         return match (true) {
             empty($path) => '/',
-            $path[0] !== '/' => '/' . $path,
+            $path[0] !== '/' => '/'.$path,
             default => $path
         };
     }
@@ -189,9 +189,9 @@ 
      */
     public function request(): Request
     {
-        try {
+        try{
             $request = $this->container->get(Request::class);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new ScopeException(
                 'Unable to get `ServerRequestInterface` in active container scope',
                 $e->getCode(),
@@ -200,7 +200,7 @@ 
         }
 
         // Flushing input state
-        if ($this->request !== $request) {
+        if ($this->request !== $request){
             $this->bags = [];
             $this->request = $request;
         }
@@ -215,10 +215,10 @@ 
     {
         $header = $this->header('Authorization', '');
 
-        $position = \strrpos((string) $header, 'Bearer ');
+        $position = \strrpos((string)$header, 'Bearer ');
 
-        if ($position !== false) {
-            $header = \substr((string) $header, $position + 7);
+        if ($position !== false){
+            $header = \substr((string)$header, $position + 7);
 
             return \str_contains($header, ',')
                 ? \strstr($header, ',', true)
@@ -271,16 +271,16 @@ 
     public function isJsonExpected(bool $softMatch = false): bool
     {
         $acceptHeader = AcceptHeader::fromString($this->request()->getHeaderLine('Accept'));
-        foreach ($this->jsonTypes as $jsonType) {
-            if ($acceptHeader->has($jsonType)) {
+        foreach ($this->jsonTypes as $jsonType){
+            if ($acceptHeader->has($jsonType)){
                 return true;
             }
         }
 
-        if ($softMatch) {
-            foreach ($acceptHeader->getAll() as $item) {
-                $itemValue = \strtolower((string) $item->getValue());
-                if (\str_ends_with($itemValue, '/json') || \str_ends_with($itemValue, '+json')) {
+        if ($softMatch){
+            foreach ($acceptHeader->getAll() as $item){
+                $itemValue = \strtolower((string)$item->getValue());
+                if (\str_ends_with($itemValue, '/json') || \str_ends_with($itemValue, '+json')){
                     return true;
                 }
             }
@@ -319,19 +319,19 @@ 
         // ensure proper request association
         $this->request();
 
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name])){
             return $this->bags[$name];
         }
 
         $definition = $this->findBagDefinition($name);
-        if (!$definition) {
+        if (!$definition){
             throw new InputException(\sprintf("Undefined input bag '%s'", $name));
         }
 
         $class = $definition['class'];
         $data = \call_user_func([$this->request(), $definition['source']]);
 
-        if (!\is_array($data)) {
+        if (!\is_array($data)){
             $data = (array)$data;
         }
 
@@ -340,7 +340,7 @@ 
 
     public function hasBag(string $name): bool
     {
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name])){
             return true;
         }
 
@@ -360,12 +360,12 @@ 
      */
     private function findBagDefinition(string $name): ?array
     {
-        if (isset($this->bagAssociations[$name])) {
+        if (isset($this->bagAssociations[$name])){
             return $this->bagAssociations[$name];
         }
 
-        foreach ($this->bagAssociations as $bag) {
-            if (isset($bag['alias']) && $bag['alias'] === $name) {
+        foreach ($this->bagAssociations as $bag){
+            if (isset($bag['alias']) && $bag['alias'] === $name){
                 return $bag;
             }
         }

Braces +38 added lines, -18 removed lines

@@ -150,10 +150,13 @@ 
     {
         $input = clone $this;
 
-        if ($add) {
+        if ($add)
+        {
             $input->prefix .= '.' . $prefix;
             $input->prefix = \trim($input->prefix, '.');
-        } else {
+        }
+        else
+        {
             $input->prefix = $prefix;
         }
 
@@ -189,9 +192,12 @@ 
      */
     public function request(): Request
     {
-        try {
+        try
+        {
             $request = $this->container->get(Request::class);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new ScopeException(
                 'Unable to get `ServerRequestInterface` in active container scope',
                 $e->getCode(),
@@ -200,7 +206,8 @@ 
         }
 
         // Flushing input state
-        if ($this->request !== $request) {
+        if ($this->request !== $request)
+        {
             $this->bags = [];
             $this->request = $request;
         }
@@ -217,7 +224,8 @@ 
 
         $position = \strrpos((string) $header, 'Bearer ');
 
-        if ($position !== false) {
+        if ($position !== false)
+        {
             $header = \substr((string) $header, $position + 7);
 
             return \str_contains($header, ',')
@@ -271,16 +279,21 @@ 
     public function isJsonExpected(bool $softMatch = false): bool
     {
         $acceptHeader = AcceptHeader::fromString($this->request()->getHeaderLine('Accept'));
-        foreach ($this->jsonTypes as $jsonType) {
-            if ($acceptHeader->has($jsonType)) {
+        foreach ($this->jsonTypes as $jsonType)
+        {
+            if ($acceptHeader->has($jsonType))
+            {
                 return true;
             }
         }
 
-        if ($softMatch) {
-            foreach ($acceptHeader->getAll() as $item) {
+        if ($softMatch)
+        {
+            foreach ($acceptHeader->getAll() as $item)
+            {
                 $itemValue = \strtolower((string) $item->getValue());
-                if (\str_ends_with($itemValue, '/json') || \str_ends_with($itemValue, '+json')) {
+                if (\str_ends_with($itemValue, '/json') || \str_ends_with($itemValue, '+json'))
+                {
                     return true;
                 }
             }
@@ -319,19 +332,22 @@ 
         // ensure proper request association
         $this->request();
 
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name]))
+        {
             return $this->bags[$name];
         }
 
         $definition = $this->findBagDefinition($name);
-        if (!$definition) {
+        if (!$definition)
+        {
             throw new InputException(\sprintf("Undefined input bag '%s'", $name));
         }
 
         $class = $definition['class'];
         $data = \call_user_func([$this->request(), $definition['source']]);
 
-        if (!\is_array($data)) {
+        if (!\is_array($data))
+        {
             $data = (array)$data;
         }
 
@@ -340,7 +356,8 @@ 
 
     public function hasBag(string $name): bool
     {
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name]))
+        {
             return true;
         }
 
@@ -360,12 +377,15 @@ 
      */
     private function findBagDefinition(string $name): ?array
     {
-        if (isset($this->bagAssociations[$name])) {
+        if (isset($this->bagAssociations[$name]))
+        {
             return $this->bagAssociations[$name];
         }
 
-        foreach ($this->bagAssociations as $bag) {
-            if (isset($bag['alias']) && $bag['alias'] === $name) {
+        foreach ($this->bagAssociations as $bag)
+        {
+            if (isset($bag['alias']) && $bag['alias'] === $name)
+            {
                 return $bag;
             }
         }

src/Http/src/Middleware/ErrorHandlerMiddleware/EnvSuppressErrors.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 {
     public function __construct(
         private readonly DebugMode $debugMode
-    ) {
+    ){
     }
 
     public function suppressed(): bool

src/Router/src/UriHandler.php

Spacing +29 added lines, -29 removed lines

@@ -55,7 +55,7 @@ 
         private readonly UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null,
         private readonly RoutePatternRegistryInterface $patternRegistry = new DefaultPatternRegistry(),
-    ) {
+    ){
         $slugify ??= new Slugify();
         $this->pathSegmentEncoder = static fn (string $segment): string => $slugify->slugify($segment);
     }
@@ -118,7 +118,7 @@ 
      */
     public function withBasePath(string $basePath): self
     {
-        if (!\str_ends_with($basePath, '/')) {
+        if (!\str_ends_with($basePath, '/')){
             $basePath .= '/';
         }
 
@@ -168,12 +168,12 @@ 
      */
     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;
         }
 
@@ -190,7 +190,7 @@ 
      */
     public function uri(iterable $parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -200,8 +200,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException(\sprintf('Unable to generate Uri, parameter `%s` is missing', $key));
             }
         }
@@ -210,7 +210,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added base path and prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->basePath) . \trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->basePath).\trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(\http_build_query($query));
     }
@@ -225,18 +225,18 @@ 
         $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;
             }
@@ -254,15 +254,15 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
-            $path = '/' . $path;
+        if (empty($path) || $path[0] !== '/'){
+            $path = '/'.$path;
         }
 
-        if ($this->matchHost) {
-            $uriString = $uri->getHost() . $path;
-        } else {
+        if ($this->matchHost){
+            $uriString = $uri->getHost().$path;
+        }else{
             $uriString = \substr($path, \strlen($this->basePath));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -278,7 +278,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -287,18 +287,18 @@ 
 
         $prefix = \rtrim($this->getPrefix(), '/ ');
         $pattern = \ltrim($this->pattern, '/ ');
-        $pattern = $prefix . '/' . $pattern;
+        $pattern = $prefix.'/'.$pattern;
         $pattern = \rtrim(\ltrim($pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (\str_starts_with($pattern, '[/')) {
-            $pattern = '[' . \substr($pattern, 2);
+        if (\str_starts_with($pattern, '[/')){
+            $pattern = '['.\substr($pattern, 2);
         }
 
-        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;
@@ -308,13 +308,13 @@ 
         $template = \preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = \array_fill_keys($options, null);
 
-        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 (!\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>`.',
@@ -325,7 +325,7 @@ 
             }
         }
 
-        $this->compiled = '/^' . \strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu';
+        $this->compiled = '/^'.\strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu';
         $this->template = \stripslashes(\str_replace('?', '', $template));
         $this->options = $options;
     }
@@ -336,7 +336,7 @@ 
     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 => '',

src/Router/src/Router.php

Spacing +25 added lines, -25 removed lines

@@ -51,8 +51,8 @@ 
         private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
         private readonly TracerInterface $tracer = new NullTracer(),
-    ) {
-        $this->basePath = '/' . \ltrim($basePath, '/');
+    ){
+        $this->basePath = '/'.\ltrim($basePath, '/');
     }
 
     /**
@@ -66,13 +66,13 @@ 
         return $this->tracer->trace(
             name: 'Routing',
             callback: function (SpanInterface $span) use ($request) {
-                try {
+                try{
                     $route = $this->matchRoute($request, $routeName);
-                } catch (RouteException $e) {
+                }catch (RouteException $e){
                     throw new RouterException('Invalid route definition', $e->getCode(), $e);
                 }
 
-                if ($route === null) {
+                if ($route === null){
                     $this->eventDispatcher?->dispatch(new RouteNotFound($request));
                     throw new RouteNotFoundException($request->getUri());
                 }
@@ -107,7 +107,7 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -116,7 +116,7 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -125,9 +125,9 @@ 
 
     public function uri(string $route, iterable $parameters = []): UriInterface
     {
-        try {
+        try{
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException) {
+        }catch (UndefinedRouteException){
             //In some cases route name can be provided as controller:action pair, we can try to
             //generate such route automatically based on our default/fallback route
             return $this->castRoute($route)->uri($parameters);
@@ -139,9 +139,9 @@ 
         /** @var GroupRegistry $groups */
         $groups = $this->container->get(GroupRegistry::class);
 
-        foreach ($routes->getCollection() as $name => $configurator) {
+        foreach ($routes->getCollection() as $name => $configurator){
             $target = $configurator->target;
-            if ($configurator->core !== null && $target instanceof AbstractTarget) {
+            if ($configurator->core !== null && $target instanceof AbstractTarget){
                 $target = $target->withCore($configurator->core);
             }
 
@@ -150,21 +150,21 @@ 
                 : \ltrim($configurator->pattern, '/');
             $route = new Route($pattern, $target, $configurator->defaults);
 
-            if ($configurator->middleware !== null) {
+            if ($configurator->middleware !== null){
                 $route = $route->withMiddleware(...$configurator->middleware);
             }
 
-            if ($configurator->methods !== null) {
+            if ($configurator->methods !== null){
                 $route = $route->withVerbs(...$configurator->methods);
             }
 
-            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $group = $groups->getGroup($configurator->group ?? $groups->getDefaultGroup());
                 $group->setPrefix($configurator->prefix);
                 $group->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $this->setDefault($route);
             }
         }
@@ -175,17 +175,17 @@ 
      */
     protected function matchRoute(ServerRequestInterface $request, string &$routeName = null): ?RouteInterface
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route){
             // Matched route will return new route instance with matched parameters
             $matched = $route->match($request);
 
-            if ($matched !== null) {
+            if ($matched !== null){
                 $routeName = $name;
                 return $matched;
             }
         }
 
-        if ($this->default !== null) {
+        if ($this->default !== null){
             return $this->default->match($request);
         }
 
@@ -198,14 +198,14 @@ 
      */
     protected function configure(RouteInterface $route): RouteInterface
     {
-        if ($route instanceof ContainerizedInterface && !$route->hasContainer()) {
+        if ($route instanceof ContainerizedInterface && !$route->hasContainer()){
             // isolating route in a given container
             $route = $route->withContainer($this->container);
         }
 
-        try {
+        try{
             $uriHandler = $route->getUriHandler();
-        } catch (\Throwable) {
+        }catch (\Throwable){
             $uriHandler = $this->uriHandler;
         }
 
@@ -228,7 +228,7 @@ 
                 $route,
                 $matches
             )
-        ) {
+        ){
             throw new UndefinedRouteException(
                 "Unable to locate route or use default route with 'name/controller:action' pattern"
             );
@@ -237,11 +237,11 @@ 
         /**
          * @var Matches $matches
          */
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name'])){
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        } elseif ($this->default !== null){
             $routeObject = $this->default;
-        } else {
+        }else{
             throw new UndefinedRouteException(\sprintf('Unable to locate route candidate for `%s`', $route));
         }