dynamic / silverstripe-locator

tests/objects/LocationTest.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     public function testGetCoords()
     {
         $location = $this->objFromFixture(Location::class, 'dynamic');
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+        $coords = ((int) $location->Lat != 0 && (int) $location->Lng != 0) ? 'true' : 'false';
         $this->assertEquals($coords, $location->getCoords());
     }
 

Indentation +166 added lines, -166 removed lines

@@ -14,170 +14,170 @@
  */
 class LocationTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     *
-     */
-    public function testGetCoords()
-    {
-        $location = $this->objFromFixture(Location::class, 'dynamic');
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
-        $this->assertEquals($coords, $location->getCoords());
-    }
-
-    /**
-     *
-     */
-    public function testFieldLabels()
-    {
-        $location = $this->objFromFixture(Location::class, 'dynamic');
-        $labels = $location->FieldLabels();
-        $expected = array(
-            'Title' => 'Name',
-            'Featured' => 'Featured',
-            'Website' => 'Website',
-            'Phone' => 'Phone',
-            'Email' => 'Email',
-            'Fax' => 'Fax',
-            'Address' => 'Address',
-            'City' => 'City',
-            'State' => 'State',
-            'PostalCode' => 'Postal Code',
-            'Country' => 'Country',
-            'Lat' => 'Lat',
-            'Lng' => 'Lng',
-            'Categories' => 'Categories',
-            'Category.Name' => 'Category',
-            'Category.ID' => 'Category',
-            'Featured.NiceAsBoolean' => 'Featured',
-            'Import_ID' => 'Import_ID',
-            'Version' => 'Version',
-            'Versions' => 'Versions',
-            'Address2' => 'Address2',
-            'LinkTracking' => 'Link Tracking',
-            'FileTracking' => 'File Tracking',
-        );
-        $this->assertEquals($expected, $labels);
-    }
-
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = new Location();
-        $fieldset = $object->getCMSFields();
-        $this->assertinstanceOf(FieldList::class, $fieldset);
-    }
-
-    /**
-     *
-     */
-    public function testCanView()
-    {
-        $object = $this->objFromFixture(Location::class, 'dynamic');
-        $object->write();
-
-        $this->assertTrue($object->canView());
-
-        $nullMember = Member::create();
-        $nullMember->write();
-
-        $this->assertTrue($object->canView($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture(Location::class, 'dynamic');
-        $object->write();
-
-        $objectID = $object->ID;
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture(Member::class, 'locationcreate');
-        $edit = $this->objFromFixture(Member::class, 'locationedit');
-        $delete = $this->objFromFixture(Member::class, 'locationdelete');
-
-        $originalTitle = $object->Title;
-        $this->assertEquals($originalTitle, 'Dynamic, Inc.');
-
-        $this->assertTrue($object->canEdit($edit));
-        $this->assertFalse($object->canEdit($create));
-        $this->assertFalse($object->canEdit($delete));
-
-        $object->Title = 'Changed Title';
-        $object->write();
-
-        $testEdit = Location::get()->byID($objectID);
-        $this->assertEquals($testEdit->Title, 'Changed Title');
-    }
-
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture(Location::class, 'dynamic');
-        $object->write();
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture(Member::class, 'locationcreate');
-        $edit = $this->objFromFixture(Member::class, 'locationedit');
-        $delete = $this->objFromFixture(Member::class, 'locationdelete');
-
-        $this->assertTrue($object->canDelete($delete));
-        $this->assertFalse($object->canDelete($create));
-        $this->assertFalse($object->canDelete($edit));
-
-        $checkObject = $object;
-        $object->delete();
-
-        $this->assertEquals($checkObject->ID, 0);
-    }
-
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        $object = singleton(Location::class);
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture(Member::class, 'locationcreate');
-        $edit = $this->objFromFixture(Member::class, 'locationedit');
-        $delete = $this->objFromFixture(Member::class, 'locationdelete');
-
-        $this->assertTrue($object->canCreate($create));
-        $this->assertFalse($object->canCreate($edit));
-        $this->assertFalse($object->canCreate($delete));
-
-        $nullMember = Member::create();
-        $nullMember->write();
-        $this->assertFalse($object->canCreate($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testProvidePermissions()
-    {
-        $object = Location::create();
-        $expected = array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-        $this->assertEquals($expected, $object->providePermissions());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 *
+	 */
+	public function testGetCoords()
+	{
+		$location = $this->objFromFixture(Location::class, 'dynamic');
+		$coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+		$this->assertEquals($coords, $location->getCoords());
+	}
+
+	/**
+	 *
+	 */
+	public function testFieldLabels()
+	{
+		$location = $this->objFromFixture(Location::class, 'dynamic');
+		$labels = $location->FieldLabels();
+		$expected = array(
+			'Title' => 'Name',
+			'Featured' => 'Featured',
+			'Website' => 'Website',
+			'Phone' => 'Phone',
+			'Email' => 'Email',
+			'Fax' => 'Fax',
+			'Address' => 'Address',
+			'City' => 'City',
+			'State' => 'State',
+			'PostalCode' => 'Postal Code',
+			'Country' => 'Country',
+			'Lat' => 'Lat',
+			'Lng' => 'Lng',
+			'Categories' => 'Categories',
+			'Category.Name' => 'Category',
+			'Category.ID' => 'Category',
+			'Featured.NiceAsBoolean' => 'Featured',
+			'Import_ID' => 'Import_ID',
+			'Version' => 'Version',
+			'Versions' => 'Versions',
+			'Address2' => 'Address2',
+			'LinkTracking' => 'Link Tracking',
+			'FileTracking' => 'File Tracking',
+		);
+		$this->assertEquals($expected, $labels);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = new Location();
+		$fieldset = $object->getCMSFields();
+		$this->assertinstanceOf(FieldList::class, $fieldset);
+	}
+
+	/**
+	 *
+	 */
+	public function testCanView()
+	{
+		$object = $this->objFromFixture(Location::class, 'dynamic');
+		$object->write();
+
+		$this->assertTrue($object->canView());
+
+		$nullMember = Member::create();
+		$nullMember->write();
+
+		$this->assertTrue($object->canView($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture(Location::class, 'dynamic');
+		$object->write();
+
+		$objectID = $object->ID;
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture(Member::class, 'locationcreate');
+		$edit = $this->objFromFixture(Member::class, 'locationedit');
+		$delete = $this->objFromFixture(Member::class, 'locationdelete');
+
+		$originalTitle = $object->Title;
+		$this->assertEquals($originalTitle, 'Dynamic, Inc.');
+
+		$this->assertTrue($object->canEdit($edit));
+		$this->assertFalse($object->canEdit($create));
+		$this->assertFalse($object->canEdit($delete));
+
+		$object->Title = 'Changed Title';
+		$object->write();
+
+		$testEdit = Location::get()->byID($objectID);
+		$this->assertEquals($testEdit->Title, 'Changed Title');
+	}
+
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture(Location::class, 'dynamic');
+		$object->write();
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture(Member::class, 'locationcreate');
+		$edit = $this->objFromFixture(Member::class, 'locationedit');
+		$delete = $this->objFromFixture(Member::class, 'locationdelete');
+
+		$this->assertTrue($object->canDelete($delete));
+		$this->assertFalse($object->canDelete($create));
+		$this->assertFalse($object->canDelete($edit));
+
+		$checkObject = $object;
+		$object->delete();
+
+		$this->assertEquals($checkObject->ID, 0);
+	}
+
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		$object = singleton(Location::class);
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture(Member::class, 'locationcreate');
+		$edit = $this->objFromFixture(Member::class, 'locationedit');
+		$delete = $this->objFromFixture(Member::class, 'locationdelete');
+
+		$this->assertTrue($object->canCreate($create));
+		$this->assertFalse($object->canCreate($edit));
+		$this->assertFalse($object->canCreate($delete));
+
+		$nullMember = Member::create();
+		$nullMember->write();
+		$this->assertFalse($object->canCreate($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testProvidePermissions()
+	{
+		$object = Location::create();
+		$expected = array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+		$this->assertEquals($expected, $object->providePermissions());
+	}
 }

tests/form/LocatorFormTest.php

Indentation +29 added lines, -29 removed lines

@@ -11,34 +11,34 @@
 
 class LocatorFormTest extends FunctionalTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     *
-     */
-    public function testLocatorFormBase()
-    {
-        $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
-
-        $this->assertInstanceOf(FieldList::class, $form->Fields());
-        $this->assertInstanceOf(RequiredFields::class, $form->getValidator());
-    }
-
-    /**
-     *
-     */
-    public function testUpdateRequiredFields()
-    {
-        $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
-        $validator = $form->getValidator();
-
-        $validator->removeRequiredField('Address');
-        $validator->addRequiredField('Foo');
-
-        $this->assertEquals(['Foo'], $form->getValidator()->getRequired());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 *
+	 */
+	public function testLocatorFormBase()
+	{
+		$form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
+
+		$this->assertInstanceOf(FieldList::class, $form->Fields());
+		$this->assertInstanceOf(RequiredFields::class, $form->getValidator());
+	}
+
+	/**
+	 *
+	 */
+	public function testUpdateRequiredFields()
+	{
+		$form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
+		$validator = $form->getValidator();
+
+		$validator->removeRequiredField('Address');
+		$validator->addRequiredField('Foo');
+
+		$this->assertEquals(['Foo'], $form->getValidator()->getRequired());
+	}
 
 }

tests/objects/LocationCategoryTest.php

Indentation +54 added lines, -54 removed lines

@@ -14,69 +14,69 @@
  */
 class LocationCategoryTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
 
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = $this->objFromFixture(LocationCategory::class, 'service');
-        $fieldset = $object->getCMSFields();
-        $this->assertInstanceOf(FieldList::class, $fieldset);
-    }
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = $this->objFromFixture(LocationCategory::class, 'service');
+		$fieldset = $object->getCMSFields();
+		$this->assertInstanceOf(FieldList::class, $fieldset);
+	}
 
-    /**
-     *
-     */
-    public function testCanView()
-    {
-        $object = $this->objFromFixture(LocationCategory::class, 'service');
-        $this->assertTrue($object->canView());
-    }
+	/**
+	 *
+	 */
+	public function testCanView()
+	{
+		$object = $this->objFromFixture(LocationCategory::class, 'service');
+		$this->assertTrue($object->canView());
+	}
 
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture(LocationCategory::class, 'service');
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture(LocationCategory::class, 'service');
 
-        $admin = $this->objFromFixture(Member::class, 'locationedit');
-        $this->assertTrue($object->canEdit($admin));
+		$admin = $this->objFromFixture(Member::class, 'locationedit');
+		$this->assertTrue($object->canEdit($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canEdit($member));
-    }
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canEdit($member));
+	}
 
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture(LocationCategory::class, 'service');
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture(LocationCategory::class, 'service');
 
-        $admin = $this->objFromFixture(Member::class, 'locationdelete');
-        $this->assertTrue($object->canDelete($admin));
+		$admin = $this->objFromFixture(Member::class, 'locationdelete');
+		$this->assertTrue($object->canDelete($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canDelete($member));
-    }
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canDelete($member));
+	}
 
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        $object = $this->objFromFixture(LocationCategory::class, 'service');
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		$object = $this->objFromFixture(LocationCategory::class, 'service');
 
-        $admin = $this->objFromFixture(Member::class, 'locationcreate');
-        $this->assertTrue($object->canCreate($admin));
+		$admin = $this->objFromFixture(Member::class, 'locationcreate');
+		$this->assertTrue($object->canCreate($admin));
 
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canCreate($member));
-    }
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canCreate($member));
+	}
 }

tests/pages/LocatorTest.php

Indentation +155 added lines, -155 removed lines

@@ -21,159 +21,159 @@
  */
 class LocatorTest extends FunctionalTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        /** @var Locator $locator */
-        $locator = Injector::inst()->create(Locator::class);
-        $this->assertInstanceOf(FieldList::class, $locator->getCMSFields());
-    }
-
-    /**
-     *
-     */
-    public function testLocations()
-    {
-        $filter = Config::inst()->get(LocatorController::class, 'base_filter');
-        $filterAny = Config::inst()->get(LocatorController::class, 'base_filter_any');
-        $exclude = Config::inst()->get(LocatorController::class, 'base_exclude');
-        $locations = Locator::get_locations($filter, $filterAny, $exclude);
-        $locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
-        $this->assertEquals($locations->count(), $locations2->count());
-    }
-
-    /**
-     *
-     */
-    public function testGetAllCategories()
-    {
-        $this->assertEquals(Locator::get_all_categories()->count(), 4);
-    }
-
-    /**
-     *
-     */
-    public function testGetPageCategories()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $this->assertEquals($locator->getPageCategories()->count(), 1);
-    }
-
-    /**
-     *
-     */
-    public function testLocator_categories_by_locator()
-    {
-        $categories = Locator::locator_categories_by_locator(0);
-        $this->assertFalse($categories);
-    }
-
-    /**
-     *
-     */
-    public function testLocatorCategoriesByLocator()
-    {
-
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 1);
-
-        $newLocator = Locator::create();
-        $newLocator->Title = 'Locator 2';
-        $newLocator->write();
-
-        $this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0);
-
-    }
-
-    /**
-     *
-     */
-    public function testGetRadii()
-    {
-        /** @var Locator $locator */
-        $locator = Injector::inst()->create(Locator::class);
-        $radii = [
-            '0' => '5',
-            '1' => '10',
-            '2' => '15',
-            '3' => '100',
-        ];
-        Config::modify()->set(Locator::class, 'radii', $radii);
-        $this->assertEquals($radii, $locator->getRadii());
-    }
-
-    /**
-     *
-     */
-    public function testGetRadiiArrayList()
-    {
-        /** @var Locator $locator */
-        $locator = Injector::inst()->create(Locator::class);
-        $this->assertInstanceOf(ArrayList::class, $locator->getRadiiArrayList());
-    }
-
-    /**
-     *
-     */
-    public function testGetLimit()
-    {
-        /** @var Locator $locator */
-        $locator = Injector::inst()->create(Locator::class);
-        $this->assertEquals(50, $locator->getLimit());
-    }
-
-    /**
-     *
-     */
-    public function testGetShowRadius()
-    {
-        /** @var Locator $locator */
-        $locator = Injector::inst()->create(Locator::class);
-        $this->assertTrue($locator->getShowRadius());
-    }
-
-    /**
-     *
-     */
-    public function testGetUsedCategories()
-    {
-        /** @var Locator $locator */
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-
-        $categories = $locator->getUsedCategories()->toArray();
-        $this->assertEquals(1, count($categories));
-    }
-
-    /**
-     *
-     */
-    public function testGetInfoWindowTemplate()
-    {
-        /** @var Locator $object */
-        $object = Injector::inst()->create(Locator::class);
-        $template = $object->getInfoWindowTemplate();
-        // get rid of cache ending
-        $template = preg_replace('/\?.*$/', '', $template);
-        $this->assertStringEndsWith('client/infowindow-description.html', $template);
-    }
-
-    /**
-     *
-     */
-    public function testGetListTemplate()
-    {
-        /** @var Locator $object */
-        $object = Injector::inst()->create(Locator::class);
-        $template = $object->getListTemplate();
-        // get rid of cache ending
-        $template = preg_replace('/\?.*$/', '', $template);
-        $this->assertStringEndsWith('client/location-list-description.html', $template);
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		/** @var Locator $locator */
+		$locator = Injector::inst()->create(Locator::class);
+		$this->assertInstanceOf(FieldList::class, $locator->getCMSFields());
+	}
+
+	/**
+	 *
+	 */
+	public function testLocations()
+	{
+		$filter = Config::inst()->get(LocatorController::class, 'base_filter');
+		$filterAny = Config::inst()->get(LocatorController::class, 'base_filter_any');
+		$exclude = Config::inst()->get(LocatorController::class, 'base_exclude');
+		$locations = Locator::get_locations($filter, $filterAny, $exclude);
+		$locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
+		$this->assertEquals($locations->count(), $locations2->count());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetAllCategories()
+	{
+		$this->assertEquals(Locator::get_all_categories()->count(), 4);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetPageCategories()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$this->assertEquals($locator->getPageCategories()->count(), 1);
+	}
+
+	/**
+	 *
+	 */
+	public function testLocator_categories_by_locator()
+	{
+		$categories = Locator::locator_categories_by_locator(0);
+		$this->assertFalse($categories);
+	}
+
+	/**
+	 *
+	 */
+	public function testLocatorCategoriesByLocator()
+	{
+
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 1);
+
+		$newLocator = Locator::create();
+		$newLocator->Title = 'Locator 2';
+		$newLocator->write();
+
+		$this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0);
+
+	}
+
+	/**
+	 *
+	 */
+	public function testGetRadii()
+	{
+		/** @var Locator $locator */
+		$locator = Injector::inst()->create(Locator::class);
+		$radii = [
+			'0' => '5',
+			'1' => '10',
+			'2' => '15',
+			'3' => '100',
+		];
+		Config::modify()->set(Locator::class, 'radii', $radii);
+		$this->assertEquals($radii, $locator->getRadii());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetRadiiArrayList()
+	{
+		/** @var Locator $locator */
+		$locator = Injector::inst()->create(Locator::class);
+		$this->assertInstanceOf(ArrayList::class, $locator->getRadiiArrayList());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetLimit()
+	{
+		/** @var Locator $locator */
+		$locator = Injector::inst()->create(Locator::class);
+		$this->assertEquals(50, $locator->getLimit());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetShowRadius()
+	{
+		/** @var Locator $locator */
+		$locator = Injector::inst()->create(Locator::class);
+		$this->assertTrue($locator->getShowRadius());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetUsedCategories()
+	{
+		/** @var Locator $locator */
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+
+		$categories = $locator->getUsedCategories()->toArray();
+		$this->assertEquals(1, count($categories));
+	}
+
+	/**
+	 *
+	 */
+	public function testGetInfoWindowTemplate()
+	{
+		/** @var Locator $object */
+		$object = Injector::inst()->create(Locator::class);
+		$template = $object->getInfoWindowTemplate();
+		// get rid of cache ending
+		$template = preg_replace('/\?.*$/', '', $template);
+		$this->assertStringEndsWith('client/infowindow-description.html', $template);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetListTemplate()
+	{
+		/** @var Locator $object */
+		$object = Injector::inst()->create(Locator::class);
+		$template = $object->getListTemplate();
+		// get rid of cache ending
+		$template = preg_replace('/\?.*$/', '', $template);
+		$this->assertStringEndsWith('client/location-list-description.html', $template);
+	}
 }

tests/pages/LocatorControllerTest.php

Indentation +74 added lines, -74 removed lines

@@ -18,79 +18,79 @@
 class LocatorControllerTest extends FunctionalTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     * @var bool
-     */
-    protected static $use_draft_site = true;
-
-    /**
-     *
-     */
-    public function testIndex()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $controller = LocatorController::create($locator);
-        $this->assertInstanceOf(ViewableData::class, $controller->index($controller->getRequest()));
-    }
-
-    /**
-     *
-     */
-    public function testXml()
-    {
-        /** @var Locator $locator */
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $page = $this->get($locator->Link('xml'));
-
-        $this->assertEquals(200, $page->getStatusCode());
-        $this->assertEquals('application/xml', $page->getHeader('content-type'));
-
-        $dom = new DOMDocument();
-        // true if it loads, false if it doesn't
-        $valid = $dom->loadXML($page->getBody());
-        $this->assertTrue($valid);
-    }
-
-    /**
-     *
-     */
-    public function testJson()
-    {
-        /** @var Locator $locator */
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $page = $this->get($locator->Link('json'));
-
-        $this->assertEquals(200, $page->getStatusCode());
-        $this->assertEquals('application/json', $page->getHeader('content-type'));
-
-        $json = json_decode($page->getBody());
-        // if it is null its not valid
-        $this->assertNotNull($json);
-    }
-
-    /**
-     *
-     */
-    public function testLocationSearch()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $object = LocatorController::create($locator);
-        $form = $object->LocationSearch();
-        $this->assertInstanceOf(Form::class, $form);
-
-        $category = $this->objFromFixture(LocationCategory::class, 'service');
-        $category2 = $this->objFromFixture(LocationCategory::class, 'manufacturing');
-        $locator->Categories()->add($category);
-        $locator->Categories()->add($category2);
-
-        $form = $object->LocationSearch();
-        $fields = $form->Fields();
-        $this->assertInstanceOf(FieldList::class, $fields);
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 * @var bool
+	 */
+	protected static $use_draft_site = true;
+
+	/**
+	 *
+	 */
+	public function testIndex()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$controller = LocatorController::create($locator);
+		$this->assertInstanceOf(ViewableData::class, $controller->index($controller->getRequest()));
+	}
+
+	/**
+	 *
+	 */
+	public function testXml()
+	{
+		/** @var Locator $locator */
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$page = $this->get($locator->Link('xml'));
+
+		$this->assertEquals(200, $page->getStatusCode());
+		$this->assertEquals('application/xml', $page->getHeader('content-type'));
+
+		$dom = new DOMDocument();
+		// true if it loads, false if it doesn't
+		$valid = $dom->loadXML($page->getBody());
+		$this->assertTrue($valid);
+	}
+
+	/**
+	 *
+	 */
+	public function testJson()
+	{
+		/** @var Locator $locator */
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$page = $this->get($locator->Link('json'));
+
+		$this->assertEquals(200, $page->getStatusCode());
+		$this->assertEquals('application/json', $page->getHeader('content-type'));
+
+		$json = json_decode($page->getBody());
+		// if it is null its not valid
+		$this->assertNotNull($json);
+	}
+
+	/**
+	 *
+	 */
+	public function testLocationSearch()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$object = LocatorController::create($locator);
+		$form = $object->LocationSearch();
+		$this->assertInstanceOf(Form::class, $form);
+
+		$category = $this->objFromFixture(LocationCategory::class, 'service');
+		$category2 = $this->objFromFixture(LocationCategory::class, 'manufacturing');
+		$locator->Categories()->add($category);
+		$locator->Categories()->add($category2);
+
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertInstanceOf(FieldList::class, $fields);
+	}
 
 }

src/bulkloader/LocationCsvBulkLoader.php

Indentation +40 added lines, -40 removed lines

@@ -3,7 +3,7 @@ 
 namespace Dynamic\Locator;
 
 use SilverStripe\Dev\CsvBulkLoader,
-    SilverStripe\Core\Convert;
+	SilverStripe\Core\Convert;
 
 /**
  * Class LocationCsvBulkLoader
@@ -11,27 +11,27 @@ 
 class LocationCsvBulkLoader extends CsvBulkLoader
 {
 
-    /**
-     * @var array
-     */
-    public $columnMap = array(
-        'Name' => 'Title',
-        'City' => 'Suburb',
-        'EmailAddress' => 'Email',
-        'Import_ID' => 'Import_ID',
-    );
-
-    /**
-     * @var array
-     */
-    public $duplicateChecks = array(
-        'Import_ID' => 'Import_ID'
-    );
-
-    /**
-     * @var array
-     */
-    /*
+	/**
+	 * @var array
+	 */
+	public $columnMap = array(
+		'Name' => 'Title',
+		'City' => 'Suburb',
+		'EmailAddress' => 'Email',
+		'Import_ID' => 'Import_ID',
+	);
+
+	/**
+	 * @var array
+	 */
+	public $duplicateChecks = array(
+		'Import_ID' => 'Import_ID'
+	);
+
+	/**
+	 * @var array
+	 */
+	/*
     public $relationCallbacks = array(
        'Category.Name' => array(
            'relationname' => 'Category',
@@ -39,23 +39,23 @@ 
         ),
     );*/
 
-    /**
-     * @param $obj
-     * @param $val
-     * @param $record
-     * @return \SilverStripe\ORM\DataObject|static
-     */
-    public static function getCategoryByName(&$obj, $val, $record)
-    {
-        $val = Convert::raw2sql($val);
-        $category = LocationCategory::get()->filter(array('Name' => $val))->First();
-        if (!$category) {
-            $category = LocationCategory::create();
-            $category->Name = $val;
-            $category->write();
-        }
-
-        return $category;
-    }
+	/**
+	 * @param $obj
+	 * @param $val
+	 * @param $record
+	 * @return \SilverStripe\ORM\DataObject|static
+	 */
+	public static function getCategoryByName(&$obj, $val, $record)
+	{
+		$val = Convert::raw2sql($val);
+		$category = LocationCategory::get()->filter(array('Name' => $val))->First();
+		if (!$category) {
+			$category = LocationCategory::create();
+			$category->Name = $val;
+			$category->write();
+		}
+
+		return $category;
+	}
 
 }

src/admin/LocationAdmin.php

Indentation +63 added lines, -63 removed lines

@@ -12,72 +12,72 @@
 class LocationAdmin extends ModelAdmin
 {
 
-    /**
-     * @var array
-     */
-    private static $managed_models = array(
-        Location::class,
-        LocationCategory::class,
-    );
+	/**
+	 * @var array
+	 */
+	private static $managed_models = array(
+		Location::class,
+		LocationCategory::class,
+	);
 
-    /**
-     * @var array
-     */
-    private static $model_importers = array(
-        Location::class => LocationCsvBulkLoader::class,
-        LocationCategory::class => CsvBulkLoader::class,
-    );
+	/**
+	 * @var array
+	 */
+	private static $model_importers = array(
+		Location::class => LocationCsvBulkLoader::class,
+		LocationCategory::class => CsvBulkLoader::class,
+	);
 
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Locator';
-    /**
-     * @var string
-     */
-    private static $url_segment = 'locator';
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Locator';
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'locator';
 
-    /**
-     * @return array
-     */
-    public function getExportFields()
-    {
-        if ($this->modelClass == 'Location') {
-            return array(
-                'Title' => 'Name',
-                'Address' => 'Address',
-                'City' => 'City',
-                'State' => 'State',
-                'PostalCode' => 'PostalCode',
-                'Country' => 'Country',
-                'Website' => 'Website',
-                'Phone' => 'Phone',
-                'Fax' => 'Fax',
-                'Email' => 'Email',
-                'ShowInLocator' => 'ShowInLocator',
-                'Featured' => 'Featured',
-                'Lat' => 'Lat',
-                'Lng' => 'Lng',
-            );
-        }
+	/**
+	 * @return array
+	 */
+	public function getExportFields()
+	{
+		if ($this->modelClass == 'Location') {
+			return array(
+				'Title' => 'Name',
+				'Address' => 'Address',
+				'City' => 'City',
+				'State' => 'State',
+				'PostalCode' => 'PostalCode',
+				'Country' => 'Country',
+				'Website' => 'Website',
+				'Phone' => 'Phone',
+				'Fax' => 'Fax',
+				'Email' => 'Email',
+				'ShowInLocator' => 'ShowInLocator',
+				'Featured' => 'Featured',
+				'Lat' => 'Lat',
+				'Lng' => 'Lng',
+			);
+		}
 
-        return parent::getExportFields();
-    }
+		return parent::getExportFields();
+	}
 
-    /**
-     * @param null $id
-     * @param null $fields
-     * @return $this|Form
-     */
-    public function getEditForm($id = null, $fields = null)
-    {
-        $form = parent::getEditForm($id, $fields);
-        $class = $this->sanitiseClassName($this->modelClass);
-        if ($class == 'Location') {
-            $gridField = $form->Fields()->fieldByName($class);
-            $config = $gridField->getConfig();
-            $config->removeComponentsByType('GridFieldDeleteAction');
-        }
-        return $form;
-    }
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return $this|Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$form = parent::getEditForm($id, $fields);
+		$class = $this->sanitiseClassName($this->modelClass);
+		if ($class == 'Location') {
+			$gridField = $form->Fields()->fieldByName($class);
+			$config = $gridField->getConfig();
+			$config->removeComponentsByType('GridFieldDeleteAction');
+		}
+		return $form;
+	}
 }

src/form/LocatorForm.php

Indentation +64 added lines, -64 removed lines

@@ -19,79 +19,79 @@
 class LocatorForm extends Form
 {
 
-    /**
-     * LocatorForm constructor.
-     * @param Controller $controller
-     * @param string $name
-     */
-    public function __construct(Controller $controller, $name)
-    {
+	/**
+	 * LocatorForm constructor.
+	 * @param Controller $controller
+	 * @param string $name
+	 */
+	public function __construct(Controller $controller, $name)
+	{
 
-        $fields = FieldList::create(
-            TextField::create('Address')
-                ->setTitle('')
-                ->setAttribute('placeholder', 'address or zip code')
-        );
+		$fields = FieldList::create(
+			TextField::create('Address')
+				->setTitle('')
+				->setAttribute('placeholder', 'address or zip code')
+		);
 
-        $pageCategories = Locator::locator_categories_by_locator($controller->data()->ID);
-        if ($pageCategories && $pageCategories->count() > 0) {
-            $categories = false;
-        } else {
-            $categories = Locator::get_all_categories();
-            if ($categories->count() < 1) {
-                $categories = false;
-            }
-        }
+		$pageCategories = Locator::locator_categories_by_locator($controller->data()->ID);
+		if ($pageCategories && $pageCategories->count() > 0) {
+			$categories = false;
+		} else {
+			$categories = Locator::get_all_categories();
+			if ($categories->count() < 1) {
+				$categories = false;
+			}
+		}
 
-        if ($categories) {
-            $categoriesField = DropdownField::create('CategoryID')
-                ->setTitle('')
-                ->setEmptyString('all categories')
-                ->setSource($categories->map());
-            $fields->push($categoriesField);
-        }
+		if ($categories) {
+			$categoriesField = DropdownField::create('CategoryID')
+				->setTitle('')
+				->setEmptyString('all categories')
+				->setSource($categories->map());
+			$fields->push($categoriesField);
+		}
 
-        if ($controller->getShowRadius()) {
-            $radiusArray = array_values($controller->getRadii());
-            $this->extend('overrideRadiusArray', $radiusArray);
-            $fields->push(DropdownField::create('Radius', '', ArrayLib::valuekey($radiusArray))
-                ->setEmptyString('radius')
-            );
-        }
+		if ($controller->getShowRadius()) {
+			$radiusArray = array_values($controller->getRadii());
+			$this->extend('overrideRadiusArray', $radiusArray);
+			$fields->push(DropdownField::create('Radius', '', ArrayLib::valuekey($radiusArray))
+				->setEmptyString('radius')
+			);
+		}
 
-        $actions = FieldList::create(
-            FormAction::create('doFilterLocations')
-                ->setTitle('Search')
-        );
+		$actions = FieldList::create(
+			FormAction::create('doFilterLocations')
+				->setTitle('Search')
+		);
 
-        $validator = $this->getValidator();
+		$validator = $this->getValidator();
 
-        parent::__construct($controller, $name, $fields, $actions, $validator);
-    }
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
 
-    /**
-     * @return null|RequiredFields|\SilverStripe\Forms\Validator
-     */
-    public function getValidator()
-    {
-        $validator = parent::getValidator();
-        if (empty($validator)) {
-            if (!$this->validator instanceof RequiredFields) $this->setValidator(RequiredFields::create('Address'));
-            $validator = $this->validator;
-        }
-        $this->extend('updateRequiredFields', $validator);
-        return $validator;
-    }
+	/**
+	 * @return null|RequiredFields|\SilverStripe\Forms\Validator
+	 */
+	public function getValidator()
+	{
+		$validator = parent::getValidator();
+		if (empty($validator)) {
+			if (!$this->validator instanceof RequiredFields) $this->setValidator(RequiredFields::create('Address'));
+			$validator = $this->validator;
+		}
+		$this->extend('updateRequiredFields', $validator);
+		return $validator;
+	}
 
-    /**
-     * @return FieldList
-     */
-    public function Fields()
-    {
-        $fields = parent::Fields();
+	/**
+	 * @return FieldList
+	 */
+	public function Fields()
+	{
+		$fields = parent::Fields();
 
-        $this->extend('updateLocatorFormFields', $fields);
+		$this->extend('updateLocatorFormFields', $fields);
 
-        return $fields;
-    }
+		return $fields;
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -76,7 +76,9 @@
     {
         $validator = parent::getValidator();
         if (empty($validator)) {
-            if (!$this->validator instanceof RequiredFields) $this->setValidator(RequiredFields::create('Address'));
+            if (!$this->validator instanceof RequiredFields) {
+            	$this->setValidator(RequiredFields::create('Address'));
+            }
             $validator = $this->validator;
         }
         $this->extend('updateRequiredFields', $validator);

src/objects/Location.php

Indentation +201 added lines, -201 removed lines

@@ -26,205 +26,205 @@
  */
 class Location extends DataObject implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
-
-    /**
-     * @var bool
-     */
-    private static $versioned_gridfield_extensions = true;
-
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'Fax' => 'Varchar(45)',
-        'Import_ID' => 'Int',
-    );
-
-    private static $many_many = [
-        'Categories' => LocationCategory::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Location';
-
-    /**
-     * @var array
-     */
-    private static $casting = array(
-        'distance' => 'Decimal(9,3)',
-    );
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
-
-    /**
-     * api access via Restful Server module
-     *
-     * @var bool
-     */
-    private static $api_access = true;
-
-    /**
-     * search fields for Model Admin
-     *
-     * @var array
-     */
-    private static $searchable_fields = array(
-        'Title',
-        'Address',
-        'City',
-        'State',
-        'PostalCode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Featured',
-    );
-
-    /**
-     * columns for grid field
-     *
-     * @var array
-     */
-    private static $summary_fields = array(
-        'Title',
-        'Address',
-        'City',
-        'State',
-        'PostalCode',
-        'Country',
-        'Featured.NiceAsBoolean',
-        'Coords',
-    );
-
-    /**
-     * Coords status for $summary_fields
-     *
-     * @return string
-     */
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
-
-    /**
-     * custom labels for fields
-     *
-     * @param bool $includerelations
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Title'] = 'Name';
-        $labels['PostalCode'] = 'Postal Code';
-        $labels['Category.Name'] = 'Category';
-        $labels['Category.ID'] = 'Category';
-        $labels['Featured.NiceAsBoolean'] = 'Featured';
-        return $labels;
-    }
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            $fields->removeByName(array(
-                'Import_ID',
-                'LinkTracking',
-                'FileTracking',
-            ));
-
-            $fields->dataFieldByName('Website')
-                ->setAttribute('placeholder', 'http://');
-
-            $fields->replaceField('Email', EmailField::create('Email'));
-
-            $featured = $fields->dataFieldByName('Featured')
-                ->setDescription('Location will display near the top of the results list');
-            $fields->insertAfter(
-                $featured,
-                'CategoryID'
-            );
-        });
-
-        $fields = parent::getCMSFields();
-
-        // allow to be extended via DataExtension
-        $this->extend('updateLocationFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool
-     */
-    public function canView($member = null, $context = [])
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canEdit($member = null, $context = [])
-    {
-        return Permission::check('Location_EDIT', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canDelete($member = null, $context = [])
-    {
-        return Permission::check('Location_DELETE', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Location_CREATE', 'any', $member);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Location';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locations';
+
+	/**
+	 * @var bool
+	 */
+	private static $versioned_gridfield_extensions = true;
+
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'Fax' => 'Varchar(45)',
+		'Import_ID' => 'Int',
+	);
+
+	private static $many_many = [
+		'Categories' => LocationCategory::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Location';
+
+	/**
+	 * @var array
+	 */
+	private static $casting = array(
+		'distance' => 'Decimal(9,3)',
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
+
+	/**
+	 * api access via Restful Server module
+	 *
+	 * @var bool
+	 */
+	private static $api_access = true;
+
+	/**
+	 * search fields for Model Admin
+	 *
+	 * @var array
+	 */
+	private static $searchable_fields = array(
+		'Title',
+		'Address',
+		'City',
+		'State',
+		'PostalCode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Featured',
+	);
+
+	/**
+	 * columns for grid field
+	 *
+	 * @var array
+	 */
+	private static $summary_fields = array(
+		'Title',
+		'Address',
+		'City',
+		'State',
+		'PostalCode',
+		'Country',
+		'Featured.NiceAsBoolean',
+		'Coords',
+	);
+
+	/**
+	 * Coords status for $summary_fields
+	 *
+	 * @return string
+	 */
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
+
+	/**
+	 * custom labels for fields
+	 *
+	 * @param bool $includerelations
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Title'] = 'Name';
+		$labels['PostalCode'] = 'Postal Code';
+		$labels['Category.Name'] = 'Category';
+		$labels['Category.ID'] = 'Category';
+		$labels['Featured.NiceAsBoolean'] = 'Featured';
+		return $labels;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			$fields->removeByName(array(
+				'Import_ID',
+				'LinkTracking',
+				'FileTracking',
+			));
+
+			$fields->dataFieldByName('Website')
+				->setAttribute('placeholder', 'http://');
+
+			$fields->replaceField('Email', EmailField::create('Email'));
+
+			$featured = $fields->dataFieldByName('Featured')
+				->setDescription('Location will display near the top of the results list');
+			$fields->insertAfter(
+				$featured,
+				'CategoryID'
+			);
+		});
+
+		$fields = parent::getCMSFields();
+
+		// allow to be extended via DataExtension
+		$this->extend('updateLocationFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool
+	 */
+	public function canView($member = null, $context = [])
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canEdit($member = null, $context = [])
+	{
+		return Permission::check('Location_EDIT', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canDelete($member = null, $context = [])
+	{
+		return Permission::check('Location_DELETE', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Location_CREATE', 'any', $member);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function($fields) {
             $fields->removeByName(array(
                 'Import_ID',
                 'LinkTracking',