Merged into one method and renamed to chmod.

laravel · Nov 28, 2016 · c3f05ab · c3f05ab
1 parent 11c2e60
commit c3f05ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/Illuminate/Filesystem/Filesystem.php b/src/Illuminate/Filesystem/Filesystem.php
@@ -112,25 +112,18 @@ public function put($path, $contents, $lock = false)
     }
 
     /**
-     * Set UNIX mode of a file or directory.
+     * Get or set UNIX mode of a file or directory.
      *
      * @param  string  $path
-     * @param  bool  $mode
-     * @return int
+     * @param  int  $mode
+     * @return mixed
      */
-    public function setUnixMode($path, $mode)
+    public function chmod($path, $mode = null)
     {
-        return chmod($path, $mode);
-    }
+        if($mode) {
+            return chmod($path, $mode);
+        }
 
-    /**
-     * Get UNIX mode of a file or directory.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function getUnixMode($path)
-    {
         return substr(sprintf('%o', fileperms($path)), -4);
     }
 

diff --git a/tests/Filesystem/FilesystemTest.php b/tests/Filesystem/FilesystemTest.php
@@ -32,21 +32,21 @@ public function testPutStoresFiles()
         $this->assertStringEqualsFile($this->tempDir.'/file.txt', 'Hello World');
     }
 
-    public function testSetUnixMode()
+    public function testSetChmod()
     {
         file_put_contents($this->tempDir.'/file.txt', 'Hello World');
         $files = new Filesystem();
-        $files->setUnixMode($this->tempDir.'/file.txt', 0755);
+        $files->chmod($this->tempDir.'/file.txt', 0755);
         $filePermisson = substr(sprintf('%o', fileperms($this->tempDir.'/file.txt')), -4);
         $this->assertEquals('0755', $filePermisson);
     }
 
-    public function testGetUnixMode()
+    public function testGetChmod()
     {
         file_put_contents($this->tempDir.'/file.txt', 'Hello World');
         chmod($this->tempDir.'/file.txt', 0755);
         $files = new Filesystem();
-        $filePermisson = $files->getUnixMode($this->tempDir.'/file.txt');
+        $filePermisson = $files->chmod($this->tempDir.'/file.txt');
         $this->assertEquals('0755', $filePermisson);
     }