spiral / framework

src/Files/src/Files.php

Spacing +41 added lines, -41 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename){
             $this->delete($filename);
         }
     }
@@ -49,30 +49,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;
             }
 
@@ -84,7 +84,7 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -103,12 +103,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);
             }
@@ -119,12 +119,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;
@@ -141,7 +141,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
@@ -160,7 +160,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));
         }
 
@@ -169,15 +169,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);
         }
 
@@ -186,7 +186,7 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -195,7 +195,7 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -204,7 +204,7 @@ 
 
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename)){
             return false;
         }
 
@@ -218,7 +218,7 @@ 
 
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -232,7 +232,7 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -241,7 +241,7 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -260,7 +260,7 @@ 
 
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -269,7 +269,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;
         }
@@ -280,9 +280,9 @@ 
     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;
             }
@@ -295,13 +295,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);
@@ -314,7 +314,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);
         }
@@ -322,7 +322,7 @@ 
         $path = \str_replace(['//', '\\'], '/', $path);
 
         //Potentially open links and ../ type directories?
-        return ($isUnc ? $leadingSlashes : '') . \rtrim($path, '/') . ($asDirectory ? '/' : '');
+        return ($isUnc ? $leadingSlashes : '').\rtrim($path, '/').($asDirectory ? '/' : '');
     }
 
     /**
@@ -337,21 +337,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];
             }
         }
 
@@ -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

@@ -36,7 +36,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }
@@ -49,30 +50,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;
             }
 
@@ -84,7 +91,8 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -103,12 +111,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);
             }
@@ -119,11 +130,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);
         }
 
@@ -141,7 +155,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
@@ -160,7 +175,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));
         }
 
@@ -169,15 +185,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);
         }
 
@@ -186,7 +207,8 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -195,7 +217,8 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -204,7 +227,8 @@ 
 
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename))
+        {
             return false;
         }
 
@@ -218,7 +242,8 @@ 
 
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -232,7 +257,8 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -241,7 +267,8 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -260,7 +287,8 @@ 
 
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -269,7 +297,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;
         }
@@ -280,8 +309,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;
@@ -295,13 +326,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);
@@ -314,7 +347,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);
         }
@@ -337,15 +371,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, '..');