spiral / framework

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;
     }
 }

src/Framework/GRPC/ProtoCompiler.php

Spacing +6 added lines, -6 removed lines

@@ -63,14 +63,14 @@ 
 
         $output = trim(implode("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== ''){
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file){
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -87,11 +87,11 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0){
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 
-        $target = $this->files->normalizePath($this->basePath . '/' . $source);
+        $target = $this->files->normalizePath($this->basePath.'/'.$source);
 
         $this->files->ensureDirectory(dirname($target));
         $this->files->copy($file, $target);
@@ -104,7 +104,7 @@ 
      */
     private function tmpDir(): string
     {
-        $directory = sys_get_temp_dir() . '/' . spl_object_hash($this);
+        $directory = sys_get_temp_dir().'/'.spl_object_hash($this);
         $this->files->ensureDirectory($directory);
 
         return $this->files->normalizePath($directory, true);
@@ -120,7 +120,7 @@ 
     {
         return array_filter(
             $this->files->getFiles(dirname($protoFile)),
-            function ($file) {
+            function ($file){
                 return strpos($file, '.proto') !== false;
             }
         );

Braces +8 added lines, -4 removed lines

@@ -63,14 +63,16 @@ 
 
         $output = trim(implode("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== '')
+        {
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file)
+        {
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -87,7 +89,8 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0)
+        {
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 
@@ -120,7 +123,8 @@ 
     {
         return array_filter(
             $this->files->getFiles(dirname($protoFile)),
-            function ($file) {
+            function ($file)
+            {
                 return strpos($file, '.proto') !== false;
             }
         );

src/Framework/Command/Translator/ExportCommand.php

Braces +12 added lines, -6 removed lines

@@ -39,7 +39,8 @@ 
      */
     public function perform(TranslatorConfig $config, CatalogueManager $manager): void
     {
-        if (!$config->hasDumper($this->option('dumper'))) {
+        if (!$config->hasDumper($this->option('dumper')))
+        {
             $this->writeln("<fg=red>Undefined dumper '{$this->option('dumper')}'.</fg=red>");
 
             return;
@@ -51,7 +52,8 @@ 
             $manager->get($this->argument('locale'))
         );
 
-        if ($this->isVerbose() && !empty($mc->getDomains())) {
+        if ($this->isVerbose() && !empty($mc->getDomains()))
+        {
             $this->sprintf(
                 "<info>Exporting domain(s):</info> %s\n",
                 implode(',', $mc->getDomains())
@@ -89,10 +91,14 @@ 
             $catalogue->getData()
         );
 
-        if ($this->option('fallback')) {
-            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages) {
-                foreach ($messages as $id => $message) {
-                    if (!$messageCatalogue->defines($id, $domain)) {
+        if ($this->option('fallback'))
+        {
+            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages)
+            {
+                foreach ($messages as $id => $message)
+                {
+                    if (!$messageCatalogue->defines($id, $domain))
+                    {
                         $messageCatalogue->set($id, $message, $domain);
                     }
                 }

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
         ['locale', InputArgument::REQUIRED, 'Locale to be dumped'],
         ['path', InputArgument::REQUIRED, 'Export path'],
     ];
-    protected const OPTIONS     = [
+    protected const OPTIONS = [
         ['dumper', 'd', InputOption::VALUE_OPTIONAL, 'Dumper name', 'php'],
         ['fallback', 'f', InputOption::VALUE_NONE, 'Merge messages from fallback catalogue'],
     ];
@@ -39,7 +39,7 @@ 
      */
     public function perform(TranslatorConfig $config, CatalogueManager $manager): void
     {
-        if (!$config->hasDumper($this->option('dumper'))) {
+        if (!$config->hasDumper($this->option('dumper'))){
             $this->writeln("<fg=red>Undefined dumper '{$this->option('dumper')}'.</fg=red>");
 
             return;
@@ -51,7 +51,7 @@ 
             $manager->get($this->argument('locale'))
         );
 
-        if ($this->isVerbose() && !empty($mc->getDomains())) {
+        if ($this->isVerbose() && !empty($mc->getDomains())){
             $this->sprintf(
                 "<info>Exporting domain(s):</info> %s\n",
                 implode(',', $mc->getDomains())
@@ -69,8 +69,8 @@ 
             ]
         );
 
-        $this->writeln('Export successfully completed using <info>' . get_class($dumper) . '</info>');
-        $this->writeln('Output: <comment>' . realpath($this->argument('path')) . '</comment>');
+        $this->writeln('Export successfully completed using <info>'.get_class($dumper).'</info>');
+        $this->writeln('Output: <comment>'.realpath($this->argument('path')).'</comment>');
     }
 
     /**
@@ -89,10 +89,10 @@ 
             $catalogue->getData()
         );
 
-        if ($this->option('fallback')) {
-            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages) {
-                foreach ($messages as $id => $message) {
-                    if (!$messageCatalogue->defines($id, $domain)) {
+        if ($this->option('fallback')){
+            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages){
+                foreach ($messages as $id => $message){
+                    if (!$messageCatalogue->defines($id, $domain)){
                         $messageCatalogue->set($id, $message, $domain);
                     }
                 }

src/Csrf/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);
         }