Merge pull request #231 from davidsteinsland/feature/file_driver_perm…

…issions Added permissions for FlatFile
bernardphp · Mar 14, 2016 · 960007f · 960007f
2 parents c5a6bbe + a723c77
commit 960007f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/Driver/FlatFileDriver.php b/src/Driver/FlatFileDriver.php
@@ -12,12 +12,16 @@ class FlatFileDriver implements \Bernard\Driver
 {
     private $baseDirectory;
 
+    private $permissions;
+
     /**
      * @param string $baseDirectory The base directory
+     * @param int    $permissions   Permissions to create the file with.
      */
-    public function __construct($baseDirectory)
+    public function __construct($baseDirectory, $permissions = 0740)
     {
         $this->baseDirectory = $baseDirectory;
+        $this->permissions = $permissions;
     }
 
     /**
@@ -59,7 +63,10 @@ public function createQueue($queueName)
      */
     public function countMessages($queueName)
     {
-        $iterator = new \RecursiveDirectoryIterator($this->getQueueDirectory($queueName), \FilesystemIterator::SKIP_DOTS);
+        $iterator = new \RecursiveDirectoryIterator(
+            $this->getQueueDirectory($queueName),
+            \FilesystemIterator::SKIP_DOTS
+        );
         $iterator = new \RecursiveIteratorIterator($iterator);
         $iterator = new \RegexIterator($iterator, '#\.job$#');
 
@@ -76,6 +83,7 @@ public function pushMessage($queueName, $message)
         $filename = $this->getJobFilename($queueName);
 
         file_put_contents($queueDir.DIRECTORY_SEPARATOR.$filename, $message);
+        chmod($queueDir . DIRECTORY_SEPARATOR . $filename, $this->permissions);
     }
 
     /**
@@ -150,7 +158,10 @@ public function peekQueue($queueName, $index = 0, $limit = 20)
      */
     public function removeQueue($queueName)
     {
-        $iterator = new \RecursiveDirectoryIterator($this->getQueueDirectory($queueName), \FilesystemIterator::SKIP_DOTS);
+        $iterator = new \RecursiveDirectoryIterator(
+            $this->getQueueDirectory($queueName),
+            \FilesystemIterator::SKIP_DOTS
+        );
         $iterator = new \RecursiveIteratorIterator($iterator);
         $iterator = new \RegexIterator($iterator, '#\.job$#');
 
@@ -191,6 +202,7 @@ private function getJobFilename($queueName)
 
         if (!is_file($path)) {
             touch($path);
+            chmod($path, $this->permissions);
         }
 
         $file = new \SplFileObject($path, 'r+');

diff --git a/tests/Driver/FlatFileDriverTest.php b/tests/Driver/FlatFileDriverTest.php
@@ -56,6 +56,13 @@ public function testPushMessage()
         $this->assertCount(1, glob($this->baseDir.'/send-newsletter/*.job'));
     }
 
+    public function testPushMessagePermissions()
+    {
+        $this->driver = new FlatFileDriver($this->baseDir, 0770);
+        $this->testPushMessage();
+        $this->assertEquals('0770', substr(sprintf('%o', fileperms($this->baseDir . '/send-newsletter/1.job')), -4));
+    }
+
     public function testPopMessage()
     {
         $this->driver->createQueue('send-newsletter');