spiral / framework

src/Http/tests/HttpTest.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello world';
         });
 
@@ -73,7 +73,7 @@ 
     public function testHandlerInterface(): void
     {
         $core = $this->getCore();
-        $core->setHandler(new CallableHandler(function () {
+        $core->setHandler(new CallableHandler(function (){
             return 'hello world';
         }, new ResponseFactory(new HttpConfig(['headers' => []]))));
 
@@ -85,7 +85,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             return $resp->withAddedHeader('hello', 'value');
         });
 
@@ -98,7 +98,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -114,7 +114,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -131,7 +131,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             ob_start();
             ob_start();
             echo 'hello!';
@@ -152,7 +152,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return [
                 'status'  => 404,
                 'message' => 'not found',
@@ -168,7 +168,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return new Json([
                 'status'  => 404,
                 'message' => 'not found',
@@ -184,7 +184,7 @@ 
     {
         $core = $this->getCore([HeaderMiddleware::class]);
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -201,7 +201,7 @@ 
         $core->getPipeline()->pushMiddleware(new Header2Middleware());
         $core->getPipeline()->riseMiddleware(new HeaderMiddleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -218,7 +218,7 @@ 
         $core->getPipeline()->pushMiddleware(new HeaderMiddleware());
         $core->getPipeline()->riseMiddleware(new Header2Middleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -232,7 +232,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             $this->assertTrue($this->container->has(ServerRequestInterface::class));
 
             return 'OK';

Braces +24 added lines, -12 removed lines

@@ -44,7 +44,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello world';
         });
 
@@ -73,7 +74,8 @@ 
     public function testHandlerInterface(): void
     {
         $core = $this->getCore();
-        $core->setHandler(new CallableHandler(function () {
+        $core->setHandler(new CallableHandler(function ()
+        {
             return 'hello world';
         }, new ResponseFactory(new HttpConfig(['headers' => []]))));
 
@@ -85,7 +87,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             return $resp->withAddedHeader('hello', 'value');
         });
 
@@ -98,7 +101,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -114,7 +118,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -131,7 +136,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             ob_start();
             ob_start();
             echo 'hello!';
@@ -152,7 +158,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return [
                 'status'  => 404,
                 'message' => 'not found',
@@ -168,7 +175,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return new Json([
                 'status'  => 404,
                 'message' => 'not found',
@@ -184,7 +192,8 @@ 
     {
         $core = $this->getCore([HeaderMiddleware::class]);
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -201,7 +210,8 @@ 
         $core->getPipeline()->pushMiddleware(new Header2Middleware());
         $core->getPipeline()->riseMiddleware(new HeaderMiddleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -218,7 +228,8 @@ 
         $core->getPipeline()->pushMiddleware(new HeaderMiddleware());
         $core->getPipeline()->riseMiddleware(new Header2Middleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -232,7 +243,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             $this->assertTrue($this->container->has(ServerRequestInterface::class));
 
             return 'OK';

src/Http/tests/PipelineTest.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
     {
         $pipeline = new Pipeline(new Container());
 
-        $handler = new CallableHandler(function () {
+        $handler = new CallableHandler(function (){
             return 'response';
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
 
@@ -41,7 +41,7 @@ 
     {
         $pipeline = new Pipeline(new Container());
 
-        $handler = new CallableHandler(function () {
+        $handler = new CallableHandler(function (){
             return 'response';
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
 

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,8 @@ 
     {
         $pipeline = new Pipeline(new Container());
 
-        $handler = new CallableHandler(function () {
+        $handler = new CallableHandler(function ()
+        {
             return 'response';
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
 
@@ -41,7 +42,8 @@ 
     {
         $pipeline = new Pipeline(new Container());
 
-        $handler = new CallableHandler(function () {
+        $handler = new CallableHandler(function ()
+        {
             return 'response';
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
 

src/Http/tests/AcceptHeaderItemTest.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
     public function emptyItemProvider(): iterable
     {
         $values = ['', ' '];
-        foreach ($values as $value) {
+        foreach ($values as $value){
             yield from [
                 [AcceptHeaderItem::fromString($value)],
                 [new AcceptHeaderItem($value)],
@@ -82,11 +82,11 @@ 
      */
     public function testItemQualityBoundaries(float $quality, AcceptHeaderItem $item): void
     {
-        if ($quality > 1) {
+        if ($quality > 1){
             $this->assertSame(1.0, $item->getQuality());
         }
 
-        if ($quality < 0) {
+        if ($quality < 0){
             $this->assertSame(0.0, $item->getQuality());
         }
 
@@ -100,7 +100,7 @@ 
     public function qualityBoundariesProvider(): iterable
     {
         $qualities = [-1, 0, 0.5, 1, 2];
-        foreach ($qualities as $quality) {
+        foreach ($qualities as $quality){
             yield from [
                 [$quality, AcceptHeaderItem::fromString("*;q=$quality")],
                 [$quality, AcceptHeaderItem::fromString("*;Q=$quality")],
@@ -140,9 +140,9 @@ 
             ]
         ];
 
-        foreach ($set as $params) {
+        foreach ($set as $params){
             $formattedParams = [];
-            foreach ($params['passed'] as $k => $v) {
+            foreach ($params['passed'] as $k => $v){
                 $formattedParams[] = "$k=$v";
             }
 

Braces +12 added lines, -6 removed lines

@@ -33,7 +33,8 @@ 
     public function emptyItemProvider(): iterable
     {
         $values = ['', ' '];
-        foreach ($values as $value) {
+        foreach ($values as $value)
+        {
             yield from [
                 [AcceptHeaderItem::fromString($value)],
                 [new AcceptHeaderItem($value)],
@@ -82,11 +83,13 @@ 
      */
     public function testItemQualityBoundaries(float $quality, AcceptHeaderItem $item): void
     {
-        if ($quality > 1) {
+        if ($quality > 1)
+        {
             $this->assertSame(1.0, $item->getQuality());
         }
 
-        if ($quality < 0) {
+        if ($quality < 0)
+        {
             $this->assertSame(0.0, $item->getQuality());
         }
 
@@ -100,7 +103,8 @@ 
     public function qualityBoundariesProvider(): iterable
     {
         $qualities = [-1, 0, 0.5, 1, 2];
-        foreach ($qualities as $quality) {
+        foreach ($qualities as $quality)
+        {
             yield from [
                 [$quality, AcceptHeaderItem::fromString("*;q=$quality")],
                 [$quality, AcceptHeaderItem::fromString("*;Q=$quality")],
@@ -140,9 +144,11 @@ 
             ]
         ];
 
-        foreach ($set as $params) {
+        foreach ($set as $params)
+        {
             $formattedParams = [];
-            foreach ($params['passed'] as $k => $v) {
+            foreach ($params['passed'] as $k => $v)
+            {
                 $formattedParams[] = "$k=$v";
             }
 

src/Http/tests/Diactoros/UploadedFileFactory.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         string $clientFilename = null,
         string $clientMediaType = null
     ): UploadedFileInterface {
-        if ($size === null) {
+        if ($size === null){
             $size = $stream->getSize();
         }
 

Braces +2 added lines, -1 removed lines

@@ -26,7 +26,8 @@
         string $clientFilename = null,
         string $clientMediaType = null
     ): UploadedFileInterface {
-        if ($size === null) {
+        if ($size === null)
+        {
             $size = $stream->getSize();
         }
 

src/Http/tests/Diactoros/ResponseFactory.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value){
             $response = $response->withAddedHeader($header, $value);
         }
 

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value)
+        {
             $response = $response->withAddedHeader($header, $value);
         }
 

src/Http/tests/ServerTest.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
         $this->container->bind(ServerRequestInterface::class, $request);
 
         $this->assertSame(
-            ['PATH' => 'sample',],
+            ['PATH' => 'sample', ],
             $this->input->server->__debugInfo()
         );
     }
@@ -178,7 +178,7 @@ 
         $this->container->bind(ServerRequestInterface::class, $request);
 
         $this->assertSame(
-            ['PATH' => 'sample',],
+            ['PATH' => 'sample', ],
             iterator_to_array($this->input->server)
         );
     }

src/Http/src/CallableHandler.php

Indentation -1 removed lines

@@ -75,7 +75,6 @@
      * @param Response $response Initial pipeline response.
      * @param mixed    $result   Generated endpoint output.
      * @param string   $output   Buffer output.
-
      * @return Response
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response

Spacing +10 added lines, -10 removed lines

@@ -51,21 +51,21 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             $result = ($this->callable)($request, $response);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
-                $output = ob_get_clean() . $output;
+        }finally{
+            while (ob_get_level() > $outputLevel + 1){
+                $output = ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            ob_get_clean() . $output
+            ob_get_clean().$output
         );
     }
 
@@ -80,17 +80,17 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if (!empty($output) && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if (!empty($output) && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if (is_array($result) || $result instanceof \JsonSerializable) {
+        if (is_array($result) || $result instanceof \JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 

Braces +19 added lines, -8 removed lines

@@ -51,13 +51,19 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             $result = ($this->callable)($request, $response);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (ob_get_level() > $outputLevel + 1)
+            {
                 $output = ob_get_clean() . $output;
             }
         }
@@ -80,17 +86,22 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if (!empty($output) && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if (!empty($output) && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if (is_array($result) || $result instanceof \JsonSerializable) {
+        if (is_array($result) || $result instanceof \JsonSerializable)
+        {
             $response = $this->writeJson($response, $result);
-        } else {
+        }
+        else
+        {
             $response->getBody()->write((string)$result);
         }
 

src/Http/src/Http.php

Spacing +6 added lines, -6 removed lines

@@ -47,13 +47,13 @@ 
         Pipeline $pipeline,
         ResponseFactoryInterface $responseFactory,
         ContainerInterface $container
-    ) {
+    ){
         $this->config = $config;
         $this->pipeline = $pipeline;
         $this->responseFactory = $responseFactory;
         $this->container = $container;
 
-        foreach ($this->config->getMiddleware() as $middleware) {
+        foreach ($this->config->getMiddleware() as $middleware){
             $this->pipeline->pushMiddleware($this->container->get($middleware));
         }
     }
@@ -72,11 +72,11 @@ 
      */
     public function setHandler($handler): self
     {
-        if ($handler instanceof RequestHandlerInterface) {
+        if ($handler instanceof RequestHandlerInterface){
             $this->handler = $handler;
-        } elseif (is_callable($handler)) {
+        } elseif (is_callable($handler)){
             $this->handler = new CallableHandler($handler, $this->responseFactory);
-        } else {
+        }else{
             throw new HttpException(
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
             );
@@ -93,7 +93,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler)){
             throw new HttpException('Unable to run HttpCore, no handler is set.');
         }
 

Braces +12 added lines, -5 removed lines

@@ -53,7 +53,8 @@ 
         $this->responseFactory = $responseFactory;
         $this->container = $container;
 
-        foreach ($this->config->getMiddleware() as $middleware) {
+        foreach ($this->config->getMiddleware() as $middleware)
+        {
             $this->pipeline->pushMiddleware($this->container->get($middleware));
         }
     }
@@ -72,11 +73,16 @@ 
      */
     public function setHandler($handler): self
     {
-        if ($handler instanceof RequestHandlerInterface) {
+        if ($handler instanceof RequestHandlerInterface)
+        {
             $this->handler = $handler;
-        } elseif (is_callable($handler)) {
+        }
+        elseif (is_callable($handler))
+        {
             $this->handler = new CallableHandler($handler, $this->responseFactory);
-        } else {
+        }
+        else
+        {
             throw new HttpException(
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
             );
@@ -93,7 +99,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler))
+        {
             throw new HttpException('Unable to run HttpCore, no handler is set.');
         }
 

src/Http/src/Header/AcceptHeader.php

Spacing +17 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item){
             $this->addItem($item);
         }
     }
@@ -58,9 +58,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);
             }
         }
@@ -103,11 +103,11 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted){
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b){
                 return self::compare($a, $b) * -1;
             });
 
@@ -124,11 +124,11 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item)){
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem){
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -137,7 +137,7 @@ 
         }
 
         $value = strtolower($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;
         }
@@ -153,9 +153,9 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $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());
@@ -178,11 +178,11 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false){
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB){
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -199,23 +199,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 +34 added lines, -17 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $this->addItem($item);
         }
     }
@@ -58,9 +59,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);
             }
         }
@@ -103,11 +106,13 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted)
+        {
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b)
+            {
                 return self::compare($a, $b) * -1;
             });
 
@@ -124,11 +129,13 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item))
+        {
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem)
+        {
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -137,7 +144,8 @@ 
         }
 
         $value = strtolower($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;
         }
@@ -153,9 +161,11 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $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());
@@ -178,11 +188,13 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false)
+        {
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB)
+            {
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -199,23 +211,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;
         }