Merge remote-tracking branch 'origin/master' into 0.14

Author: pekkis

Diff for: library/Xi/Filelib/Asynchrony/FileRepository.php

@@ -20,6 +20,9 @@ class FileRepository implements FileRepositoryInterface
 {
     const COMMAND_UPLOAD = 'xi_filelib.asynchrony.upload';
     const COMMAND_AFTERUPLOAD = 'xi_filelib.asynchrony.afterUpload';
+    const COMMAND_DELETE = 'xi_filelib.asynchrony.delete';
+    const COMMAND_UPDATE = 'xi_filelib.asynchrony.update';
+    const COMMAND_COPY = 'xi_filelib.asynchrony.copy';
 
     /**
      * @var FileRepositoryInterface
@@ -46,6 +49,9 @@ public function __construct(
         $this->strategies = [
             self::COMMAND_UPLOAD => ExecutionStrategies::STRATEGY_SYNC,
             self::COMMAND_AFTERUPLOAD => ExecutionStrategies::STRATEGY_SYNC,
+            self::COMMAND_DELETE => ExecutionStrategies::STRATEGY_SYNC,
+            self::COMMAND_UPDATE => ExecutionStrategies::STRATEGY_SYNC,
+            self::COMMAND_COPY => ExecutionStrategies::STRATEGY_SYNC,
         ];
     }
 
@@ -127,7 +133,13 @@ public function afterUpload(File $file)
      */
     public function update(File $file)
     {
-        return $this->innerRepository->update($file);
+        return $this->execute(
+            self::COMMAND_UPDATE,
+            [$this->innerRepository, 'update'],
+            [
+                $file,
+            ]
+        );
     }
 
     /**
@@ -196,7 +208,13 @@ public function findAll()
      */
     public function delete(File $file)
     {
-        return $this->innerRepository->delete($file);
+        return $this->execute(
+            self::COMMAND_DELETE,
+            [$this->innerRepository, 'delete'],
+            [
+                $file,
+            ]
+        );
     }
 
     /**
@@ -207,7 +225,14 @@ public function delete(File $file)
      */
     public function copy(File $file, Folder $folder)
     {
-        return $this->innerRepository->copy($file, $folder);
+        return $this->execute(
+            self::COMMAND_COPY,
+            [$this->innerRepository, 'copy'],
+            [
+                $file,
+                $folder
+            ]
+        );
     }
 
     /**
@@ -224,4 +249,4 @@ private function execute($command, $callback, $params)
 
         return $strategy->execute($callback, $params);
     }
-}
+}

Diff for: tests/Xi/Filelib/Tests/Asynchrony/FileRepositoryTest.php

@@ -85,6 +85,42 @@ public function afterUploads()
         $this->assertEquals('jippikaijea', $ret);
     }
 
+    /**
+     * @test
+     */
+    public function copies()
+    {
+        $file = File::create();
+        $folder = Folder::create();
+
+        $this->repo->copy($file, $folder)->shouldBeCalled()->willReturn('jippikaijea');
+        $ret = $this->filelib->getFileRepository()->copy($file, $folder);
+        $this->assertEquals('jippikaijea', $ret);
+    }
+
+
+    /**
+     * @test
+     */
+    public function deletes()
+    {
+        $file = File::create();
+
+        $this->repo->delete($file)->shouldBeCalled()->willReturn('jippikaijea');
+        $ret = $this->filelib->getFileRepository()->delete($file);
+        $this->assertEquals('jippikaijea', $ret);
+    }
+
+    /**
+     * @test
+     */
+    public function updates()
+    {
+        $file = File::create();
+        $this->repo->update($file)->shouldBeCalled()->willReturn('jippikaijea');
+        $ret = $this->filelib->getFileRepository()->update($file);
+        $this->assertEquals('jippikaijea', $ret);
+    }
 
     /**
      * @test
@@ -111,10 +147,6 @@ public function setsStrategy()
             'xooxer',
             $this->filelib->getFileRepository()->getExecutionStrategy(FileRepository::COMMAND_AFTERUPLOAD)
         );
-
-
-
-
     }
 
     /**
@@ -198,31 +230,6 @@ public function findByUuidDelegates()
         $this->assertEquals($expected, $ret);
     }
 
-    /**
-     * @test
-     */
-    public function updateDelegates()
-    {
-        $param = File::create();
-        $expected = 'tus';
-
-        $this->repo->update($param)->shouldBeCalled()->willReturn($expected);
-        $ret = $this->filelib->getFileRepository()->update($param);
-        $this->assertEquals($expected, $ret);
-    }
-
-    /**
-     * @test
-     */
-    public function deleteDelegates()
-    {
-        $param = File::create();
-        $expected = 'tus';
-
-        $this->repo->delete($param)->shouldBeCalled()->willReturn($expected);
-        $ret = $this->filelib->getFileRepository()->delete($param);
-        $this->assertEquals($expected, $ret);
-    }
 
     /**
      * @test
@@ -249,18 +256,4 @@ public function findByFilenameDelegates()
         $ret = $this->filelib->getFileRepository()->findByFilename($param1, $param2);
         $this->assertEquals($expected, $ret);
     }
-
-    /**
-     * @test
-     */
-    public function copyDelegates()
-    {
-        $param1 = File::create();
-        $param2 = Folder::create();
-        $expected = 'tus';
-
-        $this->repo->copy($param1, $param2)->shouldBeCalled()->willReturn($expected);
-        $ret = $this->filelib->getFileRepository()->copy($param1, $param2);
-        $this->assertEquals($expected, $ret);
-    }
-}
+}