Merge pull request #444 from git-marijus/dev

Merge branch sabre32 into dev

1 files changed, 24 insertions, 24 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
index 9b7eeb90c..15289ce52 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
@@ -13,8 +13,8 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
         \Sabre\TestUtil::clearTempDir();
         mkdir(SABRE_TEMPDIR . '/root');
         mkdir(SABRE_TEMPDIR . '/root/subdir');
-        file_put_contents(SABRE_TEMPDIR . '/root/file.txt','contents');
-        file_put_contents(SABRE_TEMPDIR . '/root/subdir/subfile.txt','subcontents');
+        file_put_contents(SABRE_TEMPDIR . '/root/file.txt', 'contents');
+        file_put_contents(SABRE_TEMPDIR . '/root/subdir/subfile.txt', 'subcontents');
         $rootNode = new FSExt\Directory(SABRE_TEMPDIR . '/root');
         $this->tree = new Tree($rootNode);
 
@@ -29,22 +29,22 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
     function testGetRootNode() {
 
         $root = $this->tree->getNodeForPath('');
-        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory',$root);
+        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
 
     }
 
     function testGetSubDir() {
 
         $root = $this->tree->getNodeForPath('subdir');
-        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory',$root);
+        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
 
     }
 
     function testCopyFile() {
 
-       $this->tree->copy('file.txt','file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/file2.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/file2.txt'));
+       $this->tree->copy('file.txt', 'file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
 
     }
 
@@ -53,10 +53,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testCopyDirectory() {
 
-       $this->tree->copy('subdir','subdir2');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2'));
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
-       $this->assertEquals('subcontents',file_get_contents(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
+       $this->tree->copy('subdir', 'subdir2');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
+       $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
 
     }
 
@@ -65,10 +65,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveFile() {
 
-       $this->tree->move('file.txt','file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/file2.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/file.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/file2.txt'));
+       $this->tree->move('file.txt', 'file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
 
     }
 
@@ -77,10 +77,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveFileNewParent() {
 
-       $this->tree->move('file.txt','subdir/file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir/file2.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/file.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/subdir/file2.txt'));
+       $this->tree->move('file.txt', 'subdir/file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
 
     }
 
@@ -89,11 +89,11 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveDirectory() {
 
-       $this->tree->move('subdir','subdir2');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2'));
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/subdir'));
-       $this->assertEquals('subcontents',file_get_contents(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
+       $this->tree->move('subdir', 'subdir2');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/subdir'));
+       $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
 
     }