spiral / framework

src/Boot/tests/DirectoriesTest.php

Spacing +7 added lines, -7 removed lines

@@ -25,15 +25,15 @@ 
 
         $this->assertDir(__DIR__, $dirs->get('root'));
 
-        $this->assertDir(__DIR__ . '/app', $dirs->get('app'));
+        $this->assertDir(__DIR__.'/app', $dirs->get('app'));
 
-        $this->assertDir(__DIR__ . '/public', $dirs->get('public'));
+        $this->assertDir(__DIR__.'/public', $dirs->get('public'));
 
-        $this->assertDir(__DIR__ . '/app/config', $dirs->get('config'));
-        $this->assertDir(__DIR__ . '/app/resources', $dirs->get('resources'));
+        $this->assertDir(__DIR__.'/app/config', $dirs->get('config'));
+        $this->assertDir(__DIR__.'/app/resources', $dirs->get('resources'));
 
-        $this->assertDir(__DIR__ . '/runtime', $dirs->get('runtime'));
-        $this->assertDir(__DIR__ . '/runtime/cache', $dirs->get('cache'));
+        $this->assertDir(__DIR__.'/runtime', $dirs->get('runtime'));
+        $this->assertDir(__DIR__.'/runtime/cache', $dirs->get('cache'));
     }
 
     public function testKernelException(): void
@@ -94,6 +94,6 @@ 
     private function assertDir($path, $value): void
     {
         $path = \str_replace(['\\', '//'], '/', $path);
-        self::assertSame(\rtrim($path, '/') . '/', $value);
+        self::assertSame(\rtrim($path, '/').'/', $value);
     }
 }

src/Boot/src/helpers.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 use Spiral\Core\ContainerScope;
 use Spiral\Core\Exception\ScopeException;
 
-if (!\function_exists('spiral')) {
+if (!\function_exists('spiral')){
     /**
      * Resolve given alias in current IoC scope.
      *
@@ -22,19 +22,19 @@ 
      */
     function spiral(string $alias): mixed
     {
-        if (ContainerScope::getContainer() === null) {
+        if (ContainerScope::getContainer() === null){
             throw new ScopeException('Container scope was not set.');
         }
 
-        try {
+        try{
             return ContainerScope::getContainer()->get($alias);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new ScopeException($e->getMessage(), $e->getCode(), $e);
         }
     }
 }
 
-if (!\function_exists('directory')) {
+if (!\function_exists('directory')){
     /**
      * Get directory alias value. Uses application core from the current global scope.
      *
@@ -49,7 +49,7 @@ 
     }
 }
 
-if (!\function_exists('env')) {
+if (!\function_exists('env')){
     /**
      * Gets the value of an environment variable. Uses application core from the current global scope.
      *

Braces +13 added lines, -6 removed lines

@@ -9,7 +9,8 @@ 
 use Spiral\Core\ContainerScope;
 use Spiral\Core\Exception\ScopeException;
 
-if (!\function_exists('spiral')) {
+if (!\function_exists('spiral'))
+{
     /**
      * Resolve given alias in current IoC scope.
      *
@@ -22,19 +23,24 @@ 
      */
     function spiral(string $alias): mixed
     {
-        if (ContainerScope::getContainer() === null) {
+        if (ContainerScope::getContainer() === null)
+        {
             throw new ScopeException('Container scope was not set.');
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer()->get($alias);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new ScopeException($e->getMessage(), $e->getCode(), $e);
         }
     }
 }
 
-if (!\function_exists('directory')) {
+if (!\function_exists('directory'))
+{
     /**
      * Get directory alias value. Uses application core from the current global scope.
      *
@@ -49,7 +55,8 @@ 
     }
 }
 
-if (!\function_exists('env')) {
+if (!\function_exists('env'))
+{
     /**
      * Gets the value of an environment variable. Uses application core from the current global scope.
      *

src/Files/tests/InformationTest.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
     public function testTime(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $files->write($filename, 'data', FilesInterface::READONLY);
         self::assertEquals(\filemtime($filename), $files->time($filename));
@@ -25,7 +25,7 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $files->time($filename);
     }
@@ -33,7 +33,7 @@ 
     public function testMD5(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $files->write($filename, 'data');
         self::assertEquals(\md5_file($filename), $files->md5($filename));
@@ -46,7 +46,7 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $files->md5($filename);
     }
@@ -63,7 +63,7 @@ 
     public function testExists(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
         self::assertSame(\file_exists($filename), $files->exists($filename));
@@ -76,7 +76,7 @@ 
     public function testSize(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
         $files->write($filename, 'some-data-string');
@@ -91,7 +91,7 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
         $files->size($filename);
@@ -100,7 +100,7 @@ 
     public function testLocalUri(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
         $files->write($filename, 'data');
@@ -110,7 +110,7 @@ 
     public function testIsFile(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
         $files->write($filename, 'data');
@@ -126,7 +126,7 @@ 
     public function testIsMissingFile(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         self::assertFalse($files->exists($filename));
 
@@ -140,7 +140,7 @@ 
     public function testIsDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . '/directory/';
+        $directory = self::FIXTURE_DIRECTORY.'/directory/';
 
         self::assertFalse($files->exists($directory));
         $files->ensureDirectory($directory);
@@ -156,7 +156,7 @@ 
     public function testIsMissingDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . '/directory/';
+        $directory = self::FIXTURE_DIRECTORY.'/directory/';
 
         self::assertFalse($files->exists($directory));
 
@@ -170,7 +170,7 @@ 
     public function testIsDirectoryNoSlash(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . '/directory';
+        $directory = self::FIXTURE_DIRECTORY.'/directory';
 
         self::assertFalse($files->exists($directory));
         $files->ensureDirectory($directory);

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

@@ -15,7 +15,7 @@
         $files = new Files();
         $filename = self::FIXTURE_DIRECTORY . '/test.txt';
 
-        $files->write($filename, 'data', FilesInterface::READONLY);
+        $files->write($filename, 'data', FilesInterface::readonly);
         self::assertEquals(\filemtime($filename), $files->time($filename));
     }
 

src/Files/tests/DirectoriesTest.php

Spacing +24 added lines, -24 removed lines

@@ -13,7 +13,7 @@ 
     public function testEnsureDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/';
+        $directory = self::FIXTURE_DIRECTORY.'directory/';
 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
@@ -27,7 +27,7 @@ 
     public function testEnsureExistedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/';
+        $directory = self::FIXTURE_DIRECTORY.'directory/';
 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
@@ -46,7 +46,7 @@ 
     public function testEnsureNestedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
@@ -60,7 +60,7 @@ 
     public function testEnsureNestedDirectoryNoRecursivePermissions(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
@@ -74,14 +74,14 @@ 
     public function testEnsureExistedNestedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
 
-        \mkdir(self::FIXTURE_DIRECTORY . 'directory');
-        \mkdir(self::FIXTURE_DIRECTORY . 'directory/sub');
-        \mkdir(self::FIXTURE_DIRECTORY . 'directory/sub/other');
+        \mkdir(self::FIXTURE_DIRECTORY.'directory');
+        \mkdir(self::FIXTURE_DIRECTORY.'directory/sub');
+        \mkdir(self::FIXTURE_DIRECTORY.'directory/sub/other');
 
         self::assertTrue($files->exists($directory));
         self::assertTrue($files->isDirectory($directory));
@@ -95,13 +95,13 @@ 
     public function testDeleteDirectoryContent(): void
     {
         $files = new Files();
-        $baseDirectory = self::FIXTURE_DIRECTORY . 'directory/';
-        $directory = $baseDirectory . 'sub/other';
+        $baseDirectory = self::FIXTURE_DIRECTORY.'directory/';
+        $directory = $baseDirectory.'sub/other';
 
         $filenames = [
-            $baseDirectory . 'test.file',
-            $directory . 'other.file',
-            $directory . '.sample',
+            $baseDirectory.'test.file',
+            $directory.'other.file',
+            $directory.'.sample',
         ];
 
         self::assertFalse($files->exists($baseDirectory));
@@ -118,7 +118,7 @@ 
         self::assertTrue($files->exists($directory));
         self::assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             self::assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             self::assertTrue($files->exists($filename));
@@ -132,7 +132,7 @@ 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             self::assertFalse($files->exists($filename));
         }
     }
@@ -140,13 +140,13 @@ 
     public function testDeleteDirectory(): void
     {
         $files = new Files();
-        $baseDirectory = self::FIXTURE_DIRECTORY . 'directory/';
-        $directory = $baseDirectory . 'sub/other';
+        $baseDirectory = self::FIXTURE_DIRECTORY.'directory/';
+        $directory = $baseDirectory.'sub/other';
 
         $filenames = [
-            $baseDirectory . 'test.file',
-            $directory . 'other.file',
-            $directory . '.sample',
+            $baseDirectory.'test.file',
+            $directory.'other.file',
+            $directory.'.sample',
         ];
 
         self::assertFalse($files->exists($baseDirectory));
@@ -163,7 +163,7 @@ 
         self::assertTrue($files->exists($directory));
         self::assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             self::assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             self::assertTrue($files->exists($filename));
@@ -177,7 +177,7 @@ 
         self::assertFalse($files->exists($directory));
         self::assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             self::assertFalse($files->exists($filename));
         }
     }
@@ -188,8 +188,8 @@ 
 
         $files = new Files();
 
-        $files->write(self::FIXTURE_DIRECTORY . 'test', 'data');
-        $files->deleteDirectory(self::FIXTURE_DIRECTORY . 'test');
+        $files->write(self::FIXTURE_DIRECTORY.'test', 'data');
+        $files->deleteDirectory(self::FIXTURE_DIRECTORY.'test');
     }
 
     public function testGetFiles(): void

src/Files/src/Files.php

Spacing +42 added lines, -42 removed lines

@@ -39,30 +39,30 @@ 
         ?int $mode = null,
         bool $recursivePermissions = true,
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode)){
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode |= 0o111;
-        if (\is_dir($directory)) {
+        if (\is_dir($directory)){
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions){
             return \mkdir($directory, $mode, true);
         }
 
         $directoryChain = [\basename($directory)];
 
         $baseDirectory = $directory;
-        while (!\is_dir($baseDirectory = \dirname($baseDirectory))) {
+        while (!\is_dir($baseDirectory = \dirname($baseDirectory))){
             $directoryChain[] = \basename($baseDirectory);
         }
 
-        foreach (\array_reverse($directoryChain) as $dir) {
-            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))) {
+        foreach (\array_reverse($directoryChain) as $dir){
+            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))){
                 return false;
             }
 
@@ -74,7 +74,7 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -93,12 +93,12 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try{
+            if ($ensureDirectory){
                 $this->ensureDirectory(\dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename)){
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -109,12 +109,12 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX,
             );
 
-            if ($result !== false) {
+            if ($result !== false){
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (\Exception $e) {
-            throw new WriteErrorException($e->getMessage(), (int) $e->getCode(), $e);
+        }catch (\Exception $e){
+            throw new WriteErrorException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
         return $result !== false;
@@ -131,7 +131,7 @@ 
 
     public function delete(string $filename): bool
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename)){
             $result = \unlink($filename);
 
             //Wiping out changes in local file cache
@@ -150,7 +150,7 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): bool
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)){
             throw new FilesException(\sprintf('Undefined or invalid directory %s', $directory));
         }
 
@@ -159,15 +159,15 @@ 
             \RecursiveIteratorIterator::CHILD_FIRST,
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file){
+            if ($file->isDir()){
                 \rmdir($file->getRealPath());
-            } else {
+            }else{
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly){
             return \rmdir($directory);
         }
 
@@ -176,7 +176,7 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -185,7 +185,7 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -194,7 +194,7 @@ 
 
     public function touch(string $filename, ?int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename)){
             return false;
         }
 
@@ -208,7 +208,7 @@ 
 
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -222,7 +222,7 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -231,7 +231,7 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -250,7 +250,7 @@ 
 
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -259,7 +259,7 @@ 
 
     public function setPermissions(string $filename, int $mode): bool
     {
-        if (\is_dir($filename)) {
+        if (\is_dir($filename)){
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -270,14 +270,14 @@ 
     public function getFiles(string $location, ?string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
-                $result = \array_merge($result, $this->getFiles($filename . DIRECTORY_SEPARATOR));
+        foreach ($this->filesIterator($location, $pattern) as $filename){
+            if ($this->isDirectory($filename->getPathname())){
+                $result = \array_merge($result, $this->getFiles($filename.DIRECTORY_SEPARATOR));
 
                 continue;
             }
 
-            $result[] = $this->normalizePath((string) $filename);
+            $result[] = $this->normalizePath((string)$filename);
         }
 
         return $result;
@@ -285,13 +285,13 @@ 
 
     public function tempFilename(string $extension = '', ?string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location)){
             $location = \sys_get_temp_dir();
         }
 
         $filename = \tempnam($location, 'spiral');
 
-        if (!empty($extension)) {
+        if (!empty($extension)){
             $old = $filename;
             $filename = \sprintf('%s.%s', $filename, $extension);
             \rename($old, $filename);
@@ -304,7 +304,7 @@ 
     public function normalizePath(string $path, bool $asDirectory = false): string
     {
         $isUnc = \str_starts_with($path, '\\\\') || \str_starts_with($path, '//');
-        if ($isUnc) {
+        if ($isUnc){
             $leadingSlashes = \substr($path, 0, 2);
             $path = \substr($path, 2);
         }
@@ -312,7 +312,7 @@ 
         $path = \str_replace(['//', '\\'], '/', $path);
 
         //Potentially open links and ../ type directories?
-        return ($isUnc ? $leadingSlashes : '') . \rtrim($path, '/') . ($asDirectory ? '/' : '');
+        return ($isUnc ? $leadingSlashes : '').\rtrim($path, '/').($asDirectory ? '/' : '');
     }
 
     /**
@@ -327,21 +327,21 @@ 
         $path = \explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir){
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth]){
                 //Ignore this directory
                 \array_shift($relative);
-            } else {
+            }else{
                 //Get number of remaining dirs to $from
                 $remaining = \count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1){
                     //Add traversals up to first matching directory
                     $padLength = (\count($relative) + $remaining - 1) * -1;
                     $relative = \array_pad($relative, $padLength, '..');
                     break;
                 }
-                $relative[0] = './' . $relative[0];
+                $relative[0] = './'.$relative[0];
             }
         }
 
@@ -353,7 +353,7 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename){
             $this->delete($filename);
         }
     }
@@ -361,7 +361,7 @@ 
     private function filesIterator(string $location, ?string $pattern = null): \GlobIterator
     {
         $pattern ??= '*';
-        $regexp = \rtrim($location, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . \ltrim($pattern, DIRECTORY_SEPARATOR);
+        $regexp = \rtrim($location, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.\ltrim($pattern, DIRECTORY_SEPARATOR);
 
         return new \GlobIterator($regexp);
     }

Braces +75 added lines, -36 removed lines

@@ -39,30 +39,36 @@ 
         ?int $mode = null,
         bool $recursivePermissions = true,
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode))
+        {
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode |= 0o111;
-        if (\is_dir($directory)) {
+        if (\is_dir($directory))
+        {
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions)
+        {
             return \mkdir($directory, $mode, true);
         }
 
         $directoryChain = [\basename($directory)];
 
         $baseDirectory = $directory;
-        while (!\is_dir($baseDirectory = \dirname($baseDirectory))) {
+        while (!\is_dir($baseDirectory = \dirname($baseDirectory)))
+        {
             $directoryChain[] = \basename($baseDirectory);
         }
 
-        foreach (\array_reverse($directoryChain) as $dir) {
-            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))) {
+        foreach (\array_reverse($directoryChain) as $dir)
+        {
+            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir)))
+            {
                 return false;
             }
 
@@ -74,7 +80,8 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -93,12 +100,15 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try
+        {
+            if ($ensureDirectory)
+            {
                 $this->ensureDirectory(\dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename))
+            {
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -109,11 +119,14 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX,
             );
 
-            if ($result !== false) {
+            if ($result !== false)
+            {
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e)
+        {
             throw new WriteErrorException($e->getMessage(), (int) $e->getCode(), $e);
         }
 
@@ -131,7 +144,8 @@ 
 
     public function delete(string $filename): bool
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename))
+        {
             $result = \unlink($filename);
 
             //Wiping out changes in local file cache
@@ -150,7 +164,8 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): bool
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory))
+        {
             throw new FilesException(\sprintf('Undefined or invalid directory %s', $directory));
         }
 
@@ -159,15 +174,20 @@ 
             \RecursiveIteratorIterator::CHILD_FIRST,
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file)
+        {
+            if ($file->isDir())
+            {
                 \rmdir($file->getRealPath());
-            } else {
+            }
+            else
+            {
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly)
+        {
             return \rmdir($directory);
         }
 
@@ -176,7 +196,8 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -185,7 +206,8 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -194,7 +216,8 @@ 
 
     public function touch(string $filename, ?int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename))
+        {
             return false;
         }
 
@@ -208,7 +231,8 @@ 
 
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -222,7 +246,8 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -231,7 +256,8 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -250,7 +276,8 @@ 
 
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -259,7 +286,8 @@ 
 
     public function setPermissions(string $filename, int $mode): bool
     {
-        if (\is_dir($filename)) {
+        if (\is_dir($filename))
+        {
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -270,8 +298,10 @@ 
     public function getFiles(string $location, ?string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
+        foreach ($this->filesIterator($location, $pattern) as $filename)
+        {
+            if ($this->isDirectory($filename->getPathname()))
+            {
                 $result = \array_merge($result, $this->getFiles($filename . DIRECTORY_SEPARATOR));
 
                 continue;
@@ -285,13 +315,15 @@ 
 
     public function tempFilename(string $extension = '', ?string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location))
+        {
             $location = \sys_get_temp_dir();
         }
 
         $filename = \tempnam($location, 'spiral');
 
-        if (!empty($extension)) {
+        if (!empty($extension))
+        {
             $old = $filename;
             $filename = \sprintf('%s.%s', $filename, $extension);
             \rename($old, $filename);
@@ -304,7 +336,8 @@ 
     public function normalizePath(string $path, bool $asDirectory = false): string
     {
         $isUnc = \str_starts_with($path, '\\\\') || \str_starts_with($path, '//');
-        if ($isUnc) {
+        if ($isUnc)
+        {
             $leadingSlashes = \substr($path, 0, 2);
             $path = \substr($path, 2);
         }
@@ -327,15 +360,20 @@ 
         $path = \explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir)
+        {
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth])
+            {
                 //Ignore this directory
                 \array_shift($relative);
-            } else {
+            }
+            else
+            {
                 //Get number of remaining dirs to $from
                 $remaining = \count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1)
+                {
                     //Add traversals up to first matching directory
                     $padLength = (\count($relative) + $remaining - 1) * -1;
                     $relative = \array_pad($relative, $padLength, '..');
@@ -353,7 +391,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }

src/Console/src/Traits/HelpersTrait.php

Spacing +5 added lines, -5 removed lines

@@ -152,7 +152,7 @@ 
      */
     protected function warning(string $string): void
     {
-        if (!$this->output->getFormatter()->hasStyle('warning')) {
+        if (!$this->output->getFormatter()->hasStyle('warning')){
             $style = new OutputFormatterStyle('yellow');
             $this->output->getFormatter()->setStyle('warning', $style);
         }
@@ -169,8 +169,8 @@ 
         $stringLines = \explode("\n", \wordwrap($string, 300));
 
         $this->comment(\str_repeat('*', $length));
-        foreach ($stringLines as $line) {
-            $this->comment('*     ' . $line . '     *');
+        foreach ($stringLines as $line){
+            $this->comment('*     '.$line.'     *');
         }
         $this->comment(\str_repeat('*', $length));
 
@@ -216,7 +216,7 @@ 
      *
      * @throws \InvalidArgumentException When unknown output type is given
      */
-    protected function write(string|iterable $messages, bool $newline = false): void
+    protected function write(string | iterable $messages, bool $newline = false): void
     {
         $this->output->write(messages: $messages, newline: $newline);
     }
@@ -228,7 +228,7 @@ 
      *
      * @throws \InvalidArgumentException When unknown output type is given
      */
-    protected function writeln(string|iterable $messages): void
+    protected function writeln(string | iterable $messages): void
     {
         $this->output->writeln(messages: $messages);
     }

Braces +4 added lines, -2 removed lines

@@ -152,7 +152,8 @@ 
      */
     protected function warning(string $string): void
     {
-        if (!$this->output->getFormatter()->hasStyle('warning')) {
+        if (!$this->output->getFormatter()->hasStyle('warning'))
+        {
             $style = new OutputFormatterStyle('yellow');
             $this->output->getFormatter()->setStyle('warning', $style);
         }
@@ -169,7 +170,8 @@ 
         $stringLines = \explode("\n", \wordwrap($string, 300));
 
         $this->comment(\str_repeat('*', $length));
-        foreach ($stringLines as $line) {
+        foreach ($stringLines as $line)
+        {
             $this->comment('*     ' . $line . '     *');
         }
         $this->comment(\str_repeat('*', $length));

src/Console/src/Console.php

Spacing +23 added lines, -23 removed lines

@@ -38,7 +38,7 @@ 
         #[Proxy] private readonly ContainerInterface $container = new Container(),
         private readonly ScopeInterface $scope = new Container(),
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {}
+    ){}
 
     /**
      * Run console application.
@@ -62,14 +62,14 @@ 
      */
     public function run(
         ?string $command,
-        array|InputInterface $input = [],
+        array | InputInterface $input = [],
         OutputInterface $output = new BufferedOutput(),
     ): CommandOutput {
         $input = \is_array($input) ? new ArrayInput($input) : $input;
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null){
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
@@ -96,18 +96,18 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null){
             return $this->application;
         }
 
         $this->application = new Application($this->config->getName(), $this->config->getVersion());
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
-        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface) {
+        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface){
             $this->application->setDispatcher($this->dispatcher);
         }
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null){
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -127,13 +127,13 @@ 
     {
         $interceptors = $this->config->getInterceptors();
 
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command){
+            if ($command instanceof Command){
                 $command->setContainer($this->container);
                 $command->setInterceptors($interceptors);
             }
 
-            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface) {
+            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface){
                 $command->setEventDispatcher($this->dispatcher);
             }
 
@@ -148,27 +148,27 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if ($input->hasParameterOption(['--ansi'], true)) {
+        if ($input->hasParameterOption(['--ansi'], true)){
             $output->setDecorated(true);
-        } elseif ($input->hasParameterOption(['--no-ansi'], true)) {
+        } elseif ($input->hasParameterOption(['--no-ansi'], true)){
             $output->setDecorated(false);
         }
 
-        if ($input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if ($input->hasParameterOption(['--no-interaction', '-n'], true)){
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        } elseif (\function_exists('posix_isatty')){
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface){
                 $inputStream = $input->getStream();
             }
 
-            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false) {
+            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false){
                 $input->setInteractive(false);
             }
         }
 
-        match ($shellVerbosity = (int) \getenv('SHELL_VERBOSITY')) {
+        match ($shellVerbosity = (int)\getenv('SHELL_VERBOSITY')) {
             -1 => $output->setVerbosity(OutputInterface::VERBOSITY_QUIET),
             1 => $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE),
             2 => $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE),
@@ -176,22 +176,22 @@ 
             default => $shellVerbosity = 0,
         };
 
-        if ($input->hasParameterOption(['--quiet', '-q'], true)) {
+        if ($input->hasParameterOption(['--quiet', '-q'], true)){
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }else{
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
                 || $input->getParameterOption('--verbose', false, true) === 3
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
             } elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || $input->getParameterOption('--verbose', false, true) === 2
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
             } elseif (
@@ -199,17 +199,17 @@ 
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
                 || $input->getParameterOption('--verbose', false, true)
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
                 $shellVerbosity = 1;
             }
         }
 
-        if ($shellVerbosity === -1) {
+        if ($shellVerbosity === -1){
             $input->setInteractive(false);
         }
 
-        \putenv('SHELL_VERBOSITY=' . $shellVerbosity);
+        \putenv('SHELL_VERBOSITY='.$shellVerbosity);
         $_ENV['SHELL_VERBOSITY'] = $shellVerbosity;
         $_SERVER['SHELL_VERBOSITY'] = $shellVerbosity;
     }

Braces +41 added lines, -19 removed lines

@@ -38,7 +38,8 @@ 
         #[Proxy] private readonly ContainerInterface $container = new Container(),
         private readonly ScopeInterface $scope = new Container(),
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {}
+    ) {
+}
 
     /**
      * Run console application.
@@ -69,7 +70,8 @@ 
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null)
+        {
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
@@ -96,18 +98,21 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null)
+        {
             return $this->application;
         }
 
         $this->application = new Application($this->config->getName(), $this->config->getVersion());
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
-        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface) {
+        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface)
+        {
             $this->application->setDispatcher($this->dispatcher);
         }
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null)
+        {
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -127,13 +132,16 @@ 
     {
         $interceptors = $this->config->getInterceptors();
 
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command)
+        {
+            if ($command instanceof Command)
+            {
                 $command->setContainer($this->container);
                 $command->setInterceptors($interceptors);
             }
 
-            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface) {
+            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface)
+            {
                 $command->setEventDispatcher($this->dispatcher);
             }
 
@@ -148,22 +156,30 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if ($input->hasParameterOption(['--ansi'], true)) {
+        if ($input->hasParameterOption(['--ansi'], true))
+        {
             $output->setDecorated(true);
-        } elseif ($input->hasParameterOption(['--no-ansi'], true)) {
+        }
+        elseif ($input->hasParameterOption(['--no-ansi'], true))
+        {
             $output->setDecorated(false);
         }
 
-        if ($input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if ($input->hasParameterOption(['--no-interaction', '-n'], true))
+        {
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        }
+        elseif (\function_exists('posix_isatty'))
+        {
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface)
+            {
                 $inputStream = $input->getStream();
             }
 
-            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false) {
+            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false)
+            {
                 $input->setInteractive(false);
             }
         }
@@ -176,10 +192,13 @@ 
             default => $shellVerbosity = 0,
         };
 
-        if ($input->hasParameterOption(['--quiet', '-q'], true)) {
+        if ($input->hasParameterOption(['--quiet', '-q'], true))
+        {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }
+        else
+        {
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
@@ -187,14 +206,16 @@ 
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || $input->getParameterOption('--verbose', false, true) === 2
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-v', true)
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
@@ -205,7 +226,8 @@ 
             }
         }
 
-        if ($shellVerbosity === -1) {
+        if ($shellVerbosity === -1)
+        {
             $input->setInteractive(false);
         }
 

src/Console/src/Command.php

Spacing +6 added lines, -6 removed lines

@@ -89,13 +89,13 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if ($this->container === null) {
+        if ($this->container === null){
             throw new ScopeException('Container is not set');
         }
 
         $method = \method_exists($this, 'perform') ? 'perform' : '__invoke';
 
-        try {
+        try{
             [$this->input, $this->output] = [$this->prepareInput($input), $this->prepareOutput($input, $output)];
 
             $this->eventDispatcher?->dispatch(new CommandStarting($this, $this->input, $this->output));
@@ -117,18 +117,18 @@ 
                         $arguments = ['input' => $this->input, 'output' => $this->output, 'command' => $this];
 
                         return $core instanceof HandlerInterface
-                            ? (int) $core->handle(new CallContext(
+                            ? (int)$core->handle(new CallContext(
                                 Target::fromPair($this, $method),
                                 $arguments,
                             ))
-                            : (int) $core->callAction(static::class, $method, $arguments);
+                            : (int)$core->callAction(static::class, $method, $arguments);
                     },
                 );
 
             $this->eventDispatcher?->dispatch(new CommandFinished($this, $code, $this->input, $this->output));
 
             return $code;
-        } finally {
+        }finally{
             [$this->input, $this->output] = [null, null];
         }
     }
@@ -136,7 +136,7 @@ 
     /**
      * @deprecated This method will be removed in v4.0.
      */
-    protected function buildCore(): CoreInterface|HandlerInterface
+    protected function buildCore(): CoreInterface | HandlerInterface
     {
         /** @var InvokerInterface $invoker */
         $invoker = $this->container->get(InvokerInterface::class);

Braces +7 added lines, -3 removed lines

@@ -89,13 +89,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if ($this->container === null) {
+        if ($this->container === null)
+        {
             throw new ScopeException('Container is not set');
         }
 
         $method = \method_exists($this, 'perform') ? 'perform' : '__invoke';
 
-        try {
+        try
+        {
             [$this->input, $this->output] = [$this->prepareInput($input), $this->prepareOutput($input, $output)];
 
             $this->eventDispatcher?->dispatch(new CommandStarting($this, $this->input, $this->output));
@@ -128,7 +130,9 @@ 
             $this->eventDispatcher?->dispatch(new CommandFinished($this, $code, $this->input, $this->output));
 
             return $code;
-        } finally {
+        }
+        finally
+        {
             [$this->input, $this->output] = [null, null];
         }
     }

src/Router/tests/ControllerTest.php

Spacing +8 added lines, -8 removed lines

@@ -41,15 +41,15 @@ 
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/test')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('hello world', (string) $response->getBody());
+        self::assertSame('hello world', (string)$response->getBody());
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/echo')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('echoed', (string) $response->getBody());
+        self::assertSame('echoed', (string)$response->getBody());
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/id/888')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('888', (string) $response->getBody());
+        self::assertSame('888', (string)$response->getBody());
     }
 
     public function testOptionalParam(): void
@@ -62,11 +62,11 @@ 
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/default')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('default', (string) $response->getBody());
+        self::assertSame('default', (string)$response->getBody());
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/default/123')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('123', (string) $response->getBody());
+        self::assertSame('123', (string)$response->getBody());
     }
 
     public function testFallbackHandler(): void
@@ -76,7 +76,7 @@ 
         $this->getContainer()->removeBinding(CoreInterface::class);
 
         $core = $target->getHandler($this->getContainer(), []);
-        $handler = (static fn(): HandlerInterface|CoreInterface => $core->core)->bindTo(null, $core)();
+        $handler = (static fn(): HandlerInterface | CoreInterface => $core->core)->bindTo(null, $core)();
 
         self::assertInstanceOf(AutowireHandler::class, $handler);
     }
@@ -91,11 +91,11 @@ 
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/defaultInt')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('int: 1', (string) $response->getBody());
+        self::assertSame('int: 1', (string)$response->getBody());
 
         $response = $router->handle(new ServerRequest('GET', new Uri('/defaultInt/123')));
         self::assertSame(200, $response->getStatusCode());
-        self::assertSame('string: 123', (string) $response->getBody());
+        self::assertSame('string: 123', (string)$response->getBody());
     }
 
     public function testUriGeneration(): void