spiral / framework

tests/Framework/GRPC/ListTest.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
     public function setUp(): void
     {
         exec('protoc 2>&1', $out);
-        if (strpos(implode("\n", $out), '--php_out') === false) {
+        if (strpos(implode("\n", $out), '--php_out') === false){
             $this->markTestSkipped('Protoc binary is missing');
             return;
         }
@@ -29,7 +29,7 @@ 
         parent::setUp();
 
         $fs = new Files();
-        $this->proto = $fs->normalizePath($this->app->dir('app') . 'proto/service.proto');
+        $this->proto = $fs->normalizePath($this->app->dir('app').'proto/service.proto');
 
         // protoc can't figure relative paths
         $this->proto = str_replace('Framework/../', '', $this->proto);
@@ -41,12 +41,12 @@ 
 
         $fs = new Files();
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) {
-            $fs->deleteDirectory($this->app->dir('app') . 'src/Service');
+        if ($fs->isDirectory($this->app->dir('app').'src/Service')){
+            $fs->deleteDirectory($this->app->dir('app').'src/Service');
         }
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) {
-            $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata');
+        if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){
+            $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata');
         }
     }
 
@@ -63,7 +63,7 @@ 
             'proto' => $this->proto
         ]);
 
-        $output = $this->app->dir('app') . 'src/Service/EchoService.php';
+        $output = $this->app->dir('app').'src/Service/EchoService.php';
         file_put_contents($output, GenerateTest::SERVICE);
 
         $out = $this->runCommandDebug('grpc:services');

Braces +6 added lines, -3 removed lines

@@ -21,7 +21,8 @@ 
     public function setUp(): void
     {
         exec('protoc 2>&1', $out);
-        if (strpos(implode("\n", $out), '--php_out') === false) {
+        if (strpos(implode("\n", $out), '--php_out') === false)
+        {
             $this->markTestSkipped('Protoc binary is missing');
             return;
         }
@@ -41,11 +42,13 @@ 
 
         $fs = new Files();
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) {
+        if ($fs->isDirectory($this->app->dir('app') . 'src/Service'))
+        {
             $fs->deleteDirectory($this->app->dir('app') . 'src/Service');
         }
 
-        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) {
+        if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata'))
+        {
             $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata');
         }
     }

src/Cookies/tests/CookieTest.php

Spacing +2 added lines, -2 removed lines

@@ -127,9 +127,9 @@
         $cookie = new Cookie('', '', 0, '', '', $secure, false, $sameSite);
         $this->assertSame($expected, $cookie->getSameSite());
 
-        if ($expected === null) {
+        if ($expected === null){
             $this->assertStringNotContainsString('SameSite=', $cookie->createHeader());
-        } else {
+        }else{
             $this->assertStringContainsString("SameSite=$expected", $cookie->createHeader());
         }
     }

Braces +5 added lines, -2 removed lines

@@ -127,9 +127,12 @@
         $cookie = new Cookie('', '', 0, '', '', $secure, false, $sameSite);
         $this->assertSame($expected, $cookie->getSameSite());
 
-        if ($expected === null) {
+        if ($expected === null)
+        {
             $this->assertStringNotContainsString('SameSite=', $cookie->createHeader());
-        } else {
+        }
+        else
+        {
             $this->assertStringContainsString("SameSite=$expected", $cookie->createHeader());
         }
     }

src/Cookies/tests/CookiesTest.php

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
     public function testScope(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->assertInstanceOf(
                 CookieQueue::class,
                 $this->container->get(ServerRequestInterface::class)
@@ -80,7 +80,7 @@ 
     public function testSetEncryptedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -102,7 +102,7 @@ 
     public function testSetNotProtectedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('PHPSESSID', 'value');
 
@@ -121,7 +121,7 @@ 
     public function testDecrypt(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -139,7 +139,7 @@ 
     public function testDecryptArray(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -157,7 +157,7 @@ 
     public function testDecryptBroken(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -165,7 +165,7 @@ 
             return $r->getCookieParams()['name'];
         });
 
-        $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value') . 'BROKEN';
+        $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value').'BROKEN';
 
         $response = $this->get($core, '/', [], [], ['name' => $value]);
         $this->assertSame(200, $response->getStatusCode());
@@ -175,7 +175,7 @@ 
     public function testDelete(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -203,7 +203,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -228,7 +228,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -252,7 +252,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -266,7 +266,7 @@ 
         $cookies = $this->fetchCookies($response);
         $this->assertArrayHasKey('name', $cookies);
 
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             return $r->getCookieParams()['name'];
         });
 
@@ -326,7 +326,7 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line){
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 (string)$cookie[1],

Braces +24 added lines, -12 removed lines

@@ -56,7 +56,8 @@ 
     public function testScope(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->assertInstanceOf(
                 CookieQueue::class,
                 $this->container->get(ServerRequestInterface::class)
@@ -80,7 +81,8 @@ 
     public function testSetEncryptedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -102,7 +104,8 @@ 
     public function testSetNotProtectedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('PHPSESSID', 'value');
 
@@ -121,7 +124,8 @@ 
     public function testDecrypt(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -139,7 +143,8 @@ 
     public function testDecryptArray(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -157,7 +162,8 @@ 
     public function testDecryptBroken(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -175,7 +181,8 @@ 
     public function testDelete(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -203,7 +210,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -228,7 +236,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -252,7 +261,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->container->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -266,7 +276,8 @@ 
         $cookies = $this->fetchCookies($response);
         $this->assertArrayHasKey('name', $cookies);
 
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             return $r->getCookieParams()['name'];
         });
 
@@ -326,7 +337,8 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line)
+        {
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 (string)$cookie[1],

src/Cookies/tests/TestResponseFactory.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/Cookies/src/Cookie.php

Spacing +10 added lines, -10 removed lines

@@ -129,7 +129,7 @@ 
         bool $secure = false,
         bool $httpOnly = true,
         ?string $sameSite = null
-    ) {
+    ){
         $this->name = $name;
         $this->value = $value;
         $this->lifetime = $lifetime;
@@ -253,30 +253,30 @@ 
      */
     public function createHeader(): string
     {
-        $header = [rawurlencode($this->name) . '=' . rawurlencode((string)$this->value)];
+        $header = [rawurlencode($this->name).'='.rawurlencode((string)$this->value)];
 
-        if ($this->lifetime !== null) {
-            $header[] = 'Expires=' . gmdate(\DateTime::COOKIE, $this->getExpires());
+        if ($this->lifetime !== null){
+            $header[] = 'Expires='.gmdate(\DateTime::COOKIE, $this->getExpires());
             $header[] = "Max-Age={$this->lifetime}";
         }
 
-        if (!empty($this->path)) {
+        if (!empty($this->path)){
             $header[] = "Path={$this->path}";
         }
 
-        if (!empty($this->domain)) {
+        if (!empty($this->domain)){
             $header[] = "Domain={$this->domain}";
         }
 
-        if ($this->secure) {
+        if ($this->secure){
             $header[] = 'Secure';
         }
 
-        if ($this->httpOnly) {
+        if ($this->httpOnly){
             $header[] = 'HttpOnly';
         }
 
-        if ($this->sameSite->get() !== null) {
+        if ($this->sameSite->get() !== null){
             $header[] = "SameSite={$this->sameSite->get()}";
         }
 
@@ -292,7 +292,7 @@ 
      */
     public function getExpires(): ?int
     {
-        if ($this->lifetime === null) {
+        if ($this->lifetime === null){
             return null;
         }
 

Braces +14 added lines, -7 removed lines

@@ -255,28 +255,34 @@ 
     {
         $header = [rawurlencode($this->name) . '=' . rawurlencode((string)$this->value)];
 
-        if ($this->lifetime !== null) {
+        if ($this->lifetime !== null)
+        {
             $header[] = 'Expires=' . gmdate(\DateTime::COOKIE, $this->getExpires());
             $header[] = "Max-Age={$this->lifetime}";
         }
 
-        if (!empty($this->path)) {
+        if (!empty($this->path))
+        {
             $header[] = "Path={$this->path}";
         }
 
-        if (!empty($this->domain)) {
+        if (!empty($this->domain))
+        {
             $header[] = "Domain={$this->domain}";
         }
 
-        if ($this->secure) {
+        if ($this->secure)
+        {
             $header[] = 'Secure';
         }
 
-        if ($this->httpOnly) {
+        if ($this->httpOnly)
+        {
             $header[] = 'HttpOnly';
         }
 
-        if ($this->sameSite->get() !== null) {
+        if ($this->sameSite->get() !== null)
+        {
             $header[] = "SameSite={$this->sameSite->get()}";
         }
 
@@ -292,7 +298,8 @@ 
      */
     public function getExpires(): ?int
     {
-        if ($this->lifetime === null) {
+        if ($this->lifetime === null)
+        {
             return null;
         }
 

src/Cookies/src/CookieQueue.php

Spacing +4 added lines, -4 removed lines

@@ -92,12 +92,12 @@ 
         bool $httpOnly = true,
         ?string $sameSite = null
     ): self {
-        if (is_null($domain)) {
+        if (is_null($domain)){
             //Let's resolve domain via config
             $domain = $this->domain;
         }
 
-        if (is_null($secure)) {
+        if (is_null($secure)){
             $secure = $this->secure;
         }
 
@@ -127,8 +127,8 @@ 
      */
     public function delete(string $name): void
     {
-        foreach ($this->scheduled as $index => $cookie) {
-            if ($cookie->getName() === $name) {
+        foreach ($this->scheduled as $index => $cookie){
+            if ($cookie->getName() === $name){
                 unset($this->scheduled[$index]);
             }
         }

Braces +8 added lines, -4 removed lines

@@ -92,12 +92,14 @@ 
         bool $httpOnly = true,
         ?string $sameSite = null
     ): self {
-        if (is_null($domain)) {
+        if (is_null($domain))
+        {
             //Let's resolve domain via config
             $domain = $this->domain;
         }
 
-        if (is_null($secure)) {
+        if (is_null($secure))
+        {
             $secure = $this->secure;
         }
 
@@ -127,8 +129,10 @@ 
      */
     public function delete(string $name): void
     {
-        foreach ($this->scheduled as $index => $cookie) {
-            if ($cookie->getName() === $name) {
+        foreach ($this->scheduled as $index => $cookie)
+        {
+            if ($cookie->getName() === $name)
+            {
                 unset($this->scheduled[$index]);
             }
         }

src/Cookies/src/Middleware/CookiesMiddleware.php

Spacing +15 added lines, -15 removed lines

@@ -73,8 +73,8 @@ 
     {
         $cookies = $request->getCookieParams();
 
-        foreach ($cookies as $name => $cookie) {
-            if (!$this->isProtected($name)) {
+        foreach ($cookies as $name => $cookie){
+            if (!$this->isProtected($name)){
                 continue;
             }
 
@@ -92,7 +92,7 @@ 
      */
     protected function isProtected(string $cookie): bool
     {
-        if (in_array($cookie, $this->config->getExcludedCookies(), true)) {
+        if (in_array($cookie, $this->config->getExcludedCookies(), true)){
             //Excluded
             return false;
         }
@@ -111,14 +111,14 @@ 
      */
     protected function packCookies(Response $response, CookieQueue $queue): Response
     {
-        if (empty($queue->getScheduled())) {
+        if (empty($queue->getScheduled())){
             return $response;
         }
 
         $cookies = $response->getHeader('Set-Cookie');
 
-        foreach ($queue->getScheduled() as $cookie) {
-            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())) {
+        foreach ($queue->getScheduled() as $cookie){
+            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())){
                 $cookies[] = $cookie->createHeader();
                 continue;
             }
@@ -135,26 +135,26 @@ 
      */
     private function decodeCookie($cookie)
     {
-        try {
-            if (is_array($cookie)) {
+        try{
+            if (is_array($cookie)){
                 return array_map([$this, 'decodeCookie'], $cookie);
             }
-        } catch (DecryptException $exception) {
+        }catch (DecryptException $exception){
             return null;
         }
 
-        switch ($this->config->getProtectionMethod()) {
+        switch ($this->config->getProtectionMethod()){
             case CookiesConfig::COOKIE_ENCRYPT:
-                try {
+                try{
                     return $this->encryption->getEncrypter()->decrypt($cookie);
-                } catch (DecryptException $e) {
+                }catch (DecryptException $e){
                 }
                 return null;
             case CookiesConfig::COOKIE_HMAC:
                 $hmac = substr($cookie, -1 * CookiesConfig::MAC_LENGTH);
                 $value = substr($cookie, 0, strlen($cookie) - strlen($hmac));
 
-                if (hash_equals($this->hmacSign($value), $hmac)) {
+                if (hash_equals($this->hmacSign($value), $hmac)){
                     return $value;
                 }
         }
@@ -183,13 +183,13 @@ 
      */
     private function encodeCookie(Cookie $cookie): Cookie
     {
-        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT) {
+        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT){
             $encryptor = $this->encryption->getEncrypter();
 
             return $cookie->withValue($encryptor->encrypt($cookie->getValue()));
         }
 
         //VALUE.HMAC
-        return $cookie->withValue($cookie->getValue() . $this->hmacSign($cookie->getValue()));
+        return $cookie->withValue($cookie->getValue().$this->hmacSign($cookie->getValue()));
     }
 }

Braces +30 added lines, -14 removed lines

@@ -73,8 +73,10 @@ 
     {
         $cookies = $request->getCookieParams();
 
-        foreach ($cookies as $name => $cookie) {
-            if (!$this->isProtected($name)) {
+        foreach ($cookies as $name => $cookie)
+        {
+            if (!$this->isProtected($name))
+            {
                 continue;
             }
 
@@ -92,7 +94,8 @@ 
      */
     protected function isProtected(string $cookie): bool
     {
-        if (in_array($cookie, $this->config->getExcludedCookies(), true)) {
+        if (in_array($cookie, $this->config->getExcludedCookies(), true))
+        {
             //Excluded
             return false;
         }
@@ -111,14 +114,17 @@ 
      */
     protected function packCookies(Response $response, CookieQueue $queue): Response
     {
-        if (empty($queue->getScheduled())) {
+        if (empty($queue->getScheduled()))
+        {
             return $response;
         }
 
         $cookies = $response->getHeader('Set-Cookie');
 
-        foreach ($queue->getScheduled() as $cookie) {
-            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())) {
+        foreach ($queue->getScheduled() as $cookie)
+        {
+            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName()))
+            {
                 $cookies[] = $cookie->createHeader();
                 continue;
             }
@@ -135,26 +141,35 @@ 
      */
     private function decodeCookie($cookie)
     {
-        try {
-            if (is_array($cookie)) {
+        try
+        {
+            if (is_array($cookie))
+            {
                 return array_map([$this, 'decodeCookie'], $cookie);
             }
-        } catch (DecryptException $exception) {
+        }
+        catch (DecryptException $exception)
+        {
             return null;
         }
 
-        switch ($this->config->getProtectionMethod()) {
+        switch ($this->config->getProtectionMethod())
+        {
             case CookiesConfig::COOKIE_ENCRYPT:
-                try {
+                try
+                {
                     return $this->encryption->getEncrypter()->decrypt($cookie);
-                } catch (DecryptException $e) {
+                }
+                catch (DecryptException $e)
+                {
                 }
                 return null;
             case CookiesConfig::COOKIE_HMAC:
                 $hmac = substr($cookie, -1 * CookiesConfig::MAC_LENGTH);
                 $value = substr($cookie, 0, strlen($cookie) - strlen($hmac));
 
-                if (hash_equals($this->hmacSign($value), $hmac)) {
+                if (hash_equals($this->hmacSign($value), $hmac))
+                {
                     return $value;
                 }
         }
@@ -183,7 +198,8 @@ 
      */
     private function encodeCookie(Cookie $cookie): Cookie
     {
-        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT) {
+        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT)
+        {
             $encryptor = $this->encryption->getEncrypter();
 
             return $cookie->withValue($encryptor->encrypt($cookie->getValue()));

src/Cookies/src/Config/CookiesConfig.php

Spacing +4 added lines, -4 removed lines

@@ -53,22 +53,22 @@
     public function resolveDomain(UriInterface $uri): ?string
     {
         $host = $uri->getHost();
-        if (empty($host)) {
+        if (empty($host)){
             return null;
         }
 
         $pattern = $this->config['domain'];
-        if (preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)) {
+        if (preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)){
             // remove port
             $host = $matches[1];
         }
 
-        if ($host === 'localhost' || filter_var($host, FILTER_VALIDATE_IP)) {
+        if ($host === 'localhost' || filter_var($host, FILTER_VALIDATE_IP)){
             //We can't use sub-domains when website required by IP
             $pattern = ltrim($pattern, '.');
         }
 
-        if (strpos($pattern, '%s') === false) {
+        if (strpos($pattern, '%s') === false){
             //Forced domain
             return $pattern;
         }

Braces +8 added lines, -4 removed lines

@@ -53,22 +53,26 @@
     public function resolveDomain(UriInterface $uri): ?string
     {
         $host = $uri->getHost();
-        if (empty($host)) {
+        if (empty($host))
+        {
             return null;
         }
 
         $pattern = $this->config['domain'];
-        if (preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)) {
+        if (preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches))
+        {
             // remove port
             $host = $matches[1];
         }
 
-        if ($host === 'localhost' || filter_var($host, FILTER_VALIDATE_IP)) {
+        if ($host === 'localhost' || filter_var($host, FILTER_VALIDATE_IP))
+        {
             //We can't use sub-domains when website required by IP
             $pattern = ltrim($pattern, '.');
         }
 
-        if (strpos($pattern, '%s') === false) {
+        if (strpos($pattern, '%s') === false)
+        {
             //Forced domain
             return $pattern;
         }

src/Cookies/src/Cookie/SameSite.php

Spacing +2 added lines, -2 removed lines

@@ -33,12 +33,12 @@
      */
     private function defineValue(?string $sameSite, bool $secure): ?string
     {
-        if ($sameSite === null) {
+        if ($sameSite === null){
             return null;
         }
 
         $sameSite = ucfirst(strtolower($sameSite));
-        if (!in_array($sameSite, self::VALUES, true)) {
+        if (!in_array($sameSite, self::VALUES, true)){
             return null;
         }
 

Braces +4 added lines, -2 removed lines

@@ -33,12 +33,14 @@
      */
     private function defineValue(?string $sameSite, bool $secure): ?string
     {
-        if ($sameSite === null) {
+        if ($sameSite === null)
+        {
             return null;
         }
 
         $sameSite = ucfirst(strtolower($sameSite));
-        if (!in_array($sameSite, self::VALUES, true)) {
+        if (!in_array($sameSite, self::VALUES, true))
+        {
             return null;
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public const NONE   = 'None';
 
     private const VALUES  = [self::STRICT, self::LAX, self::NONE];
-    private const DEFAULT = self::LAX;
+    private const default = self::LAX;
 
     /** @var string|null */
     private $sameSite;
@@ -42,6 +42,6 @@ 
             return null;
         }
 
-        return ($sameSite === self::NONE && !$secure) ? self::DEFAULT : $sameSite;
+        return ($sameSite === self::NONE && !$secure) ? self::default : $sameSite;
     }
 }