wernerkrauss / silverstripe-folderperpage

tests/RootFolderTest.php

Spacing +6 added lines, -6 removed lines

@@ -25,13 +25,13 @@ 
         $folder = $page->RootFolder();
 
         $this->assertEquals($page->URLSegment, $folder->Name, 'Page URLSegment and Folder Title should be the same');
-        $path = ASSETS_DIR . '/' . $root = Config::inst()->get('RootFolder', 'folder_root') . '/'
-                . $page->URLSegment . '/';
+        $path = ASSETS_DIR.'/'.$root = Config::inst()->get('RootFolder', 'folder_root').'/'
+                . $page->URLSegment.'/';
 
         $this->assertEquals(
             $path,
             $folder->getRelativePath(),
-            'folder path should be assets/Articles/' . $page->URLSegment
+            'folder path should be assets/Articles/'.$page->URLSegment
         );
     }
 
@@ -71,7 +71,7 @@ 
             $this->assertEquals(
                 0,
                 $page->RootFolderID,
-                'Ignored page type ' . $type . ' should not have a RootFolderID'
+                'Ignored page type '.$type.' should not have a RootFolderID'
             );
         }
     }
@@ -118,14 +118,14 @@ 
         $this->assertEquals($parent->ID, $child->ParentID, 'subpage should be a child of parentpage');
 
         $this->assertStringEndsWith(
-            $child->RootFolder()->Name . '/',
+            $child->RootFolder()->Name.'/',
             $child->getRootFolderName(),
             'FolderName should be at the end of getRootFolderName()'
         );
 
         $root = Config::inst()->get('RootFolder', 'folder_root');
         $this->assertStringStartsWith(
-            $root . '/' . $parent->RootFolder()->Name,
+            $root.'/'.$parent->RootFolder()->Name,
             $child->getRootFolderName(),
             'Parents FolderName should be at the beginning of getRootFolderName()'
         );

code/RootFolder.php

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
             $folderRoot = $parent->getRootFolderName();
         } else {
             //fallback to classes folder_root which is defined in your config.yml
-            $folderRoot = $this->getFolderRoot() . '/';
+            $folderRoot = $this->getFolderRoot().'/';
         }
 
         if ($folderRoot == '/') {
-            $folderRoot = getFolderRoot() . '/';
+            $folderRoot = getFolderRoot().'/';
         }
 
-        $folder = Folder::find_or_make($folderRoot . $this->getOrCreateURLSegment());
+        $folder = Folder::find_or_make($folderRoot.$this->getOrCreateURLSegment());
         $folder->Title = $this->owner->Title;
         $folder->setName($this->owner->URLSegment);
         $folder->write();
@@ -162,7 +162,7 @@ 
     {
         if ($this->owner->RootFolderID) {
             return $relativeToAssetsDir
-                ? str_replace(ASSETS_DIR . '/', '', $this->owner->RootFolder()->getRelativePath())
+                ? str_replace(ASSETS_DIR.'/', '', $this->owner->RootFolder()->getRelativePath())
                 : $this->owner->RootFolder()->getRelativePath();
         } else {
             //use folder root as fallback for now
@@ -198,7 +198,7 @@ 
         // Ensure that this object has a non-conflicting URLSegment value.
         $count = 2;
         while (!$this->owner->validURLSegment()) {
-            $this->owner->URLSegment = preg_replace('/-[0-9]+$/', null, $this->owner->URLSegment) . '-' . $count;
+            $this->owner->URLSegment = preg_replace('/-[0-9]+$/', null, $this->owner->URLSegment).'-'.$count;
             $count++;
         }