spiral / framework

src/Files/src/Files.php

Braces +73 added lines, -35 removed lines

@@ -45,7 +45,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }
@@ -60,30 +61,36 @@ 
         int $mode = null,
         bool $recursivePermissions = true
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode))
+        {
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode = $mode | 0111;
-        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 $directory) {
-            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}")) {
+        foreach (array_reverse($directoryChain) as $directory)
+        {
+            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}"))
+            {
                 return false;
             }
 
@@ -98,7 +105,8 @@ 
      */
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -119,12 +127,15 @@ 
     ): bool {
         $mode = $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);
             }
@@ -135,11 +146,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(), $e->getCode(), $e);
         }
 
@@ -163,7 +177,8 @@ 
      */
     public function delete(string $filename)
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename))
+        {
             $result = unlink($filename);
 
             //Wiping out changes in local file cache
@@ -187,7 +202,8 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): void
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory))
+        {
             throw new FilesException("Undefined or invalid directory {$directory}");
         }
 
@@ -196,15 +212,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)
+        {
             rmdir($directory);
         }
     }
@@ -214,7 +235,8 @@ 
      */
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -226,7 +248,8 @@ 
      */
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -238,7 +261,8 @@ 
      */
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!touch($filename)) {
+        if (!touch($filename))
+        {
             return false;
         }
 
@@ -258,7 +282,8 @@ 
      */
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -278,7 +303,8 @@ 
      */
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -290,7 +316,8 @@ 
      */
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -318,7 +345,8 @@ 
      */
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -330,7 +358,8 @@ 
      */
     public function setPermissions(string $filename, int $mode)
     {
-        if (is_dir($filename)) {
+        if (is_dir($filename))
+        {
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -344,8 +373,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;
@@ -362,13 +393,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))
+        {
             //I should find more original way of doing that
             rename($filename, $filename = "{$filename}.{$extension}");
             $this->destructFiles[] = $filename;
@@ -402,15 +435,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, '..');

src/Files/tests/DirectoriesTest.php

Braces +8 added lines, -4 removed lines

@@ -137,7 +137,8 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -151,7 +152,8 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
         }
     }
@@ -182,7 +184,8 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -196,7 +199,8 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
         }
     }