Merge pull request dynamic#86 from jsirish/enhancement/psr2

PSR2-2 formatting
jsirish · Apr 8, 2016 · a649028 · a649028
2 parents 29ed756 + c8906cb
commit a649028
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/code/LocationCategory.php b/code/LocationCategory.php
@@ -11,11 +11,11 @@ class LocationCategory extends DataObject
     );
 
     private static $belogs_many_many = array(
-        'Locators' => 'Locator'
+        'Locators' => 'Locator',
     );
 
-    private static $singular_name = "Category";
-    Private static $plural_name = "Categories";
+    private static $singular_name = 'Category';
+    private static $plural_name = 'Categories';
 
     private static $default_sort = 'Name';
 }
diff --git a/code/Locator.php b/code/Locator.php
@@ -77,11 +77,13 @@ public function getAllCategories()
     public static function getPageCategories($id = null)
     {
         if ($id) {
-            if ($locator = Locator::get()->byID($id)) {
+            if ($locator = self::get()->byID($id)) {
                 return $locator->Categories();
             }
+
             return false;
         }
+
         return false;
     }
 }

diff --git a/tests/LocatorTest.php b/tests/LocatorTest.php
@@ -56,7 +56,7 @@ public function testLocationSearch()
         $object = Locator_Controller::create($locator);
         $form = $object->LocationSearch();
         $this->assertTrue(is_a($form, 'Form'));
-        
+
         $category = $this->objFromFixture('LocationCategory', 'service');
         $category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
         $locator->Categories()->add($category);
@@ -65,6 +65,5 @@ public function testLocationSearch()
         $form = $object->LocationSearch();
         $fields = $form->Fields();
         $this->assertNotNull($fields->fieldByName('category'));
-
     }
 }