Merge pull request #6 from holtkamp/allow-to-set-timestamp

Allow to indicate specific timestamp when writing a file or folder

Author: zaak

Diff for: src/PDOAdapter.php

@@ -52,7 +52,7 @@ public function write($path, $contents, Config $config)
         $size = strlen($contents);
         $type = 'file';
         $mimetype = Util::guessMimeType($path, $contents);
-        $timestamp = time();
+        $timestamp = $config->get('timestamp', time());
 
         $statement->bindParam(':path', $path, PDO::PARAM_STR);
         $statement->bindParam(':contents', $contents, PDO::PARAM_LOB);
@@ -81,7 +81,7 @@ public function update($path, $contents, Config $config)
 
         $size = strlen($contents);
         $mimetype = Util::guessMimeType($path, $contents);
-        $timestamp = time();
+        $timestamp = $config->get('timestamp', time());
 
         $statement->bindParam(':size', $size, PDO::PARAM_INT);
         $statement->bindParam(':mimetype', $mimetype, PDO::PARAM_STR);
@@ -211,9 +211,11 @@ public function createDir($dirname, Config $config)
     {
         $statement = $this->pdo->prepare("INSERT INTO {$this->table} (path, type, timestamp) VALUES(:path, :type, :timestamp)");
 
+        $timestamp = $config->get('timestamp', time());
+
         $statement->bindParam(':path', $dirname, PDO::PARAM_STR);
         $statement->bindValue(':type', 'dir', PDO::PARAM_STR);
-        $statement->bindValue(':timestamp', time(), PDO::PARAM_STR);
+        $statement->bindValue(':timestamp', $timestamp, PDO::PARAM_STR);
 
         return $statement->execute();
     }

Diff for: tests/PDOAdapterTest.php

@@ -50,24 +50,26 @@ public function setUp()
         $this->filesystem= new Filesystem($this->adapter);
     }
 
-    protected function getTableContents()
+    protected function getTableContents($stripTimestampFromReturnedRows = true)
     {
         $statement = $this->pdo->prepare("SELECT * FROM files");
         $statement->execute();
         $result = $statement->fetchAll(PDO::FETCH_ASSOC);
 
-        return array_map(function($v) {
+        return array_map(function($v) use($stripTimestampFromReturnedRows) {
             unset($v['id']);
-            unset($v['timestamp']);
+            if($stripTimestampFromReturnedRows) {
+                unset($v['timestamp']);
+            }
             $v['size'] = (int) $v['size'];
 
             return $v;
         }, $result);
     }
 
-    protected function assertTableContains($expected)
+    protected function assertTableContains($expected, $stripTimestampFromReturnedRows = true)
     {
-        $this->assertEquals($expected, $this->getTableContents());
+        $this->assertEquals($expected, $this->getTableContents($stripTimestampFromReturnedRows));
     }
 
     protected function filterContents($contents)
@@ -124,6 +126,25 @@ public function testBasicWrite()
         ]);
     }
 
+    public function testWriteWithSpecificTimestamp()
+    {
+        $timestamp = \mktime(0, 0, 0, 1, 1, 2000);
+        $config = array('timestamp' => $timestamp);
+
+        $this->assertTrue($this->filesystem->createDir('foo', $config));
+
+        $path1 = 'foo/bar.txt';
+        $contents1 = 'ala ma kota';
+        $this->assertTrue($this->filesystem->write($path1, $contents1, $config));
+
+        $this->assertTableContains([
+                ['path' => 'foo', 'contents' => null, 'type' => 'dir', 'size' => 0, 'mimetype' => null, 'timestamp' => $timestamp],
+                ['path' => $path1, 'contents' => $contents1, 'type' => 'file', 'size' => strlen($contents1), 'mimetype' => 'text/plain', 'timestamp' => $timestamp]
+            ],
+            false
+        );
+    }
+
     public function testListContents()
     {
         $this->testBasicWrite();