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 +202 added lines, -202 removed lines

@@ -18,206 +18,206 @@
  */
 class LocationTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     * @var array
-     */
-    protected static $extra_dataobjects = [
-        ExtendedLocation::class,
-    ];
-
-    /**
-     * @var array
-     */
-    protected static $required_extensions = [
-        ExtendedLocation::class => [
-            LocationExtension::class,
-        ],
-    ];
-
-    /**
-     *
-     */
-    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()
-    {
-        $this->markTestSkipped();
-        // Link and File tracking display as "Tracking" in SS 4.2 & 4.3, "Tracking" in 4.4
-        $location = $this->objFromFixture(Location::class, 'dynamic');
-        $labels = $location->FieldLabels();
-        $expected = [
-            '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 = [
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        ];
-        $this->assertEquals($expected, $object->providePermissions());
-    }
-
-    /**
-     *
-     */
-    public function testUpdateWebsiteURL()
-    {
-        $location = $this->objFromFixture(Location::class, 'dynamic');
-
-        // Create unsaved raw duplicate
-        $map = $location->toMap();
-        unset($map['Created']);
-        /** @var static $clone */
-        $clone = Injector::inst()->create(ExtendedLocation::class, $map);
-        $clone->ID = 0;
-
-        $this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL());
-        $this->assertEquals('foo', $clone->getWebsiteURL());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 * @var array
+	 */
+	protected static $extra_dataobjects = [
+		ExtendedLocation::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	protected static $required_extensions = [
+		ExtendedLocation::class => [
+			LocationExtension::class,
+		],
+	];
+
+	/**
+	 *
+	 */
+	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()
+	{
+		$this->markTestSkipped();
+		// Link and File tracking display as "Tracking" in SS 4.2 & 4.3, "Tracking" in 4.4
+		$location = $this->objFromFixture(Location::class, 'dynamic');
+		$labels = $location->FieldLabels();
+		$expected = [
+			'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 = [
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		];
+		$this->assertEquals($expected, $object->providePermissions());
+	}
+
+	/**
+	 *
+	 */
+	public function testUpdateWebsiteURL()
+	{
+		$location = $this->objFromFixture(Location::class, 'dynamic');
+
+		// Create unsaved raw duplicate
+		$map = $location->toMap();
+		unset($map['Created']);
+		/** @var static $clone */
+		$clone = Injector::inst()->create(ExtendedLocation::class, $map);
+		$clone->ID = 0;
+
+		$this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL());
+		$this->assertEquals('foo', $clone->getWebsiteURL());
+	}
 }

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 +154 added lines, -154 removed lines

@@ -21,158 +21,158 @@
  */
 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/form/LocatorFormTest.php

Indentation +43 added lines, -43 removed lines

@@ -11,47 +11,47 @@
 
 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());
-    }
-
-
-    public function testFields()
-    {
-        $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
-        $this->assertInstanceOf(FieldList::class, $form->Fields());
-    }
-
-
-    public function testActions()
-    {
-        $form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
-        $this->assertInstanceOf(FieldList::class, $form->Actions());
-    }
+	/**
+	 * @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());
+	}
+
+
+	public function testFields()
+	{
+		$form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
+		$this->assertInstanceOf(FieldList::class, $form->Fields());
+	}
+
+
+	public function testActions()
+	{
+		$form = LocatorForm::create(LocatorController::create(Locator::get()->first()), 'LocatorForm');
+		$this->assertInstanceOf(FieldList::class, $form->Actions());
+	}
 }

src/bulkloader/LocationCsvBulkLoader.php

Indentation +76 added lines, -76 removed lines

@@ -13,89 +13,89 @@
 class LocationCsvBulkLoader extends CsvBulkLoader
 {
 
-    /**
-     * @var array
-     */
-    public $columnMap = array(
-        'Name' => 'Title',
-        'EmailAddress' => 'Email',
-        'Categories' => '->getCategoryByName',
-        'Import_ID' => 'Import_ID',
-        'Country' => '->getCountryByName',
-    );
+	/**
+	 * @var array
+	 */
+	public $columnMap = array(
+		'Name' => 'Title',
+		'EmailAddress' => 'Email',
+		'Categories' => '->getCategoryByName',
+		'Import_ID' => 'Import_ID',
+		'Country' => '->getCountryByName',
+	);
 
-    /**
-     * @var array
-     */
-    public $duplicateChecks = array(
-        'Import_ID' => 'Import_ID'
-    );
+	/**
+	 * @var array
+	 */
+	public $duplicateChecks = array(
+		'Import_ID' => 'Import_ID'
+	);
 
-    /**
-     * @param $val
-     * @return string|string[]|null
-     */
-    public function getEscape($val)
-    {
-        return preg_replace("/\r|\n/", "", $val);
-    }
+	/**
+	 * @param $val
+	 * @return string|string[]|null
+	 */
+	public function getEscape($val)
+	{
+		return preg_replace("/\r|\n/", "", $val);
+	}
 
-    /**
-     * @param $obj
-     * @param $val
-     * @param $record
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function getCategoryByName(&$obj, $val, $record)
-    {
-        $val = Convert::raw2sql($val);
-        $parts = explode(', ', $val);
+	/**
+	 * @param $obj
+	 * @param $val
+	 * @param $record
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function getCategoryByName(&$obj, $val, $record)
+	{
+		$val = Convert::raw2sql($val);
+		$parts = explode(', ', $val);
 
-        foreach ($parts as $part) {
-            $category = LocationCategory::get()->filter(array('Name' => $part))->first();
-            if (!$category) {
-                $category = LocationCategory::create();
-                $category->Name = $part;
-                $category->write();
-            }
-            $obj->Categories()->add($category);
-        }
-    }
+		foreach ($parts as $part) {
+			$category = LocationCategory::get()->filter(array('Name' => $part))->first();
+			if (!$category) {
+				$category = LocationCategory::create();
+				$category->Name = $part;
+				$category->write();
+			}
+			$obj->Categories()->add($category);
+		}
+	}
 
-    /**
-     * @param $obj
-     * @param $val
-     * @param $record
-     */
-    public function getCountryByName(&$obj, $val, $record)
-    {
-        $val = $this->getEscape($val);
-        $countries = IntlLocales::singleton()->getCountries();
+	/**
+	 * @param $obj
+	 * @param $val
+	 * @param $record
+	 */
+	public function getCountryByName(&$obj, $val, $record)
+	{
+		$val = $this->getEscape($val);
+		$countries = IntlLocales::singleton()->getCountries();
 
-        if (strlen((string)$val) == 2) {
-            $val = strtolower($val);
-            if (array_key_exists($val, $countries)) {
-                $obj->Country = $val;
-            }
-        }
+		if (strlen((string)$val) == 2) {
+			$val = strtolower($val);
+			if (array_key_exists($val, $countries)) {
+				$obj->Country = $val;
+			}
+		}
 
-        if (in_array($val, $countries)) {
-            $obj->Country = array_search($val, $countries);
-        }
-    }
+		if (in_array($val, $countries)) {
+			$obj->Country = array_search($val, $countries);
+		}
+	}
 
-    /**
-     * @param array $record
-     * @param array $columnMap
-     * @param \SilverStripe\Dev\BulkLoader_Result $results
-     * @param bool $preview
-     * @return int|void
-     */
-    protected function processRecord($record, $columnMap, &$results, $preview = false)
-    {
-        $objID = parent::processRecord($record, $columnMap, $results, $preview = false);
+	/**
+	 * @param array $record
+	 * @param array $columnMap
+	 * @param \SilverStripe\Dev\BulkLoader_Result $results
+	 * @param bool $preview
+	 * @return int|void
+	 */
+	protected function processRecord($record, $columnMap, &$results, $preview = false)
+	{
+		$objID = parent::processRecord($record, $columnMap, $results, $preview = false);
 
-        $location = Location::get()->byID($objID);
-        $location->publishSingle();
-    }
+		$location = Location::get()->byID($objID);
+		$location->publishSingle();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $val = $this->getEscape($val);
         $countries = IntlLocales::singleton()->getCountries();
 
-        if (strlen((string)$val) == 2) {
+        if (strlen((string) $val) == 2) {
             $val = strtolower($val);
             if (array_key_exists($val, $countries)) {
                 $obj->Country = $val;

tests/Extension/LocationExtension.php

Indentation +8 added lines, -8 removed lines

@@ -11,12 +11,12 @@
  */
 class LocationExtension extends DataExtension implements TestOnly
 {
-    /**
-     * @param $url
-     * @return string
-     */
-    public function updateWebsiteURL(&$url)
-    {
-        $url = 'foo';
-    }
+	/**
+	 * @param $url
+	 * @return string
+	 */
+	public function updateWebsiteURL(&$url)
+	{
+		$url = 'foo';
+	}
 }

tests/Model/ExtendedLocation.php

Indentation +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@
  */
 class ExtendedLocation extends Location implements TestOnly
 {
-    /**
-     * @var array
-     */
-    private static $extensions = [
-        LocationExtension::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $extensions = [
+		LocationExtension::class,
+	];
 }

tests/pages/LocatorControllerTest.php

Indentation +63 added lines, -63 removed lines

@@ -17,78 +17,78 @@
 class LocatorControllerTest extends FunctionalTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
 
-    /**
-     * @var bool
-     */
-    protected static $use_draft_site = true;
+	/**
+	 * @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 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'));
+	/**
+	 *
+	 */
+	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'));
+		$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);
-    }
+		$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'));
+	/**
+	 *
+	 */
+	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'));
+		$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);
-    }
+		$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);
+	/**
+	 *
+	 */
+	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);
+		$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);
-    }
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertInstanceOf(FieldList::class, $fields);
+	}
 }

src/Page/Locator.php

Indentation +242 added lines, -242 removed lines

@@ -27,246 +27,246 @@
  */
 class Locator extends \Page
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Locator';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locators';
-
-    /**
-     * @var string
-     */
-    private static $description = 'Display locations on a map';
-
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Unit' => 'Enum("m,km","m")',
-    );
-
-    /**
-     * @var array
-     */
-    private static $many_many = array(
-        'Categories' => LocationCategory::class,
-    );
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Locator';
-
-    /**
-     * @var string
-     */
-    private static $location_class = LocationPage::class;
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            // Settings
-            $fields->addFieldsToTab('Root.Settings', array(
-                HeaderField::create('DisplayOptions', 'Display Options', 3),
-                OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
-            ));
-
-            // Filter categories
-            $config = GridFieldConfig_RelationEditor::create();
-            $config->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $config->addComponent(new GridFieldAddExistingSearchButton());
-            $categories = $this->Categories();
-            $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
-                ->setDescription('only show locations from the selected category');
-
-            // Filter
-            $fields->addFieldsToTab('Root.Filter', array(
-                HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
-                $categoriesField,
-            ));
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @param array $filter
-     * @param array $filterAny
-     * @param array $exclude
-     * @param null|callable $callback
-     *
-     * @return DataList|ArrayList
-     */
-    public static function get_locations(
-        $filter = [],
-        $filterAny = [],
-        $exclude = [],
-        $callback = null
-    ) {
-        $locationClass = Config::inst()->get(static::class, 'location_class');
-        $locations = $locationClass::get()->filter($filter)->exclude($exclude);
-
-        if (!empty($filterAny)) {
-            $locations = $locations->filterAny($filterAny);
-        }
-        if (!empty($exclude)) {
-            $locations = $locations->exclude($exclude);
-        }
-
-        if ($callback !== null && is_callable($callback)) {
-            $locations->filterByCallback($callback);
-        }
-
-        return $locations;
-    }
-
-    /**
-     * @return DataList
-     */
-    public static function get_all_categories()
-    {
-        return LocationCategory::get();
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPageCategories()
-    {
-        return self::locator_categories_by_locator($this->ID);
-    }
-
-    /**
-     * @param int $id
-     *
-     * @return bool|
-     */
-    public static function locator_categories_by_locator($id = 0)
-    {
-        if ($id == 0) {
-            return false;
-        }
-
-        return static::get()->byID($id)->getUsedCategories();
-    }
-
-    /**
-     * Gets the list of radii
-     *
-     * @return ArrayList
-     */
-    public function getRadii()
-    {
-        $radii = [
-            '0' => '25',
-            '1' => '50',
-            '2' => '75',
-            '3' => '100',
-        ];
-        $config_radii = $this->config()->get('radii');
-        if ($config_radii) {
-            $radii = $config_radii;
-        }
-
-        return $radii;
-    }
-
-    public function getRadiiArrayList()
-    {
-        $list = [];
-
-        foreach ($this->getRadii() as $radius) {
-            $list[] = new ArrayData(array(
-                'Radius' => $radius,
-            ));
-        }
-
-        return new ArrayList($list);
-    }
-
-    /**
-     * Gets the limit of locations
-     * @return mixed
-     */
-    public function getLimit()
-    {
-        return $this->config()->get('limit');
-    }
-
-    /**
-     * Gets if the radius drop down should be shown
-     * @return mixed
-     */
-    public function getShowRadius()
-    {
-        return $this->config()->get('show_radius');
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUsedCategories()
-    {
-        return $this->Categories()->filter([
-            'LocationSet.ID:GreaterThan' => 0,
-        ]);
-    }
-
-    /**
-     * Gets the path of the info window template
-     *
-     * @return string
-     */
-    public function getInfoWindowTemplate()
-    {
-        return ModuleResourceLoader::singleton()->resolveURL(
-            Config::inst()->get(
-                static::class,
-                'infoWindowTemplate'
-            )
-        );
-    }
-
-    /**
-     * Gets the path of the list template
-     *
-     * @return string
-     */
-    public function getListTemplate()
-    {
-        return ModuleResourceLoader::singleton()->resolveURL(
-            Config::inst()->get(
-                static::class,
-                'listTemplate'
-            )
-        );
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getMapStyle()
-    {
-        return AddressDataExtension::getMapStyleJSON();
-    }
-
-    public function getMapStyleJSONPath()
-    {
-        return AddressDataExtension::getMapStyleJSONPath();
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getMarkerIcon()
-    {
-        return AddressDataExtension::getIconImage();
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Locator';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locators';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'Display locations on a map';
+
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Unit' => 'Enum("m,km","m")',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = array(
+		'Categories' => LocationCategory::class,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Locator';
+
+	/**
+	 * @var string
+	 */
+	private static $location_class = LocationPage::class;
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			// Settings
+			$fields->addFieldsToTab('Root.Settings', array(
+				HeaderField::create('DisplayOptions', 'Display Options', 3),
+				OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
+			));
+
+			// Filter categories
+			$config = GridFieldConfig_RelationEditor::create();
+			$config->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$config->addComponent(new GridFieldAddExistingSearchButton());
+			$categories = $this->Categories();
+			$categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
+				->setDescription('only show locations from the selected category');
+
+			// Filter
+			$fields->addFieldsToTab('Root.Filter', array(
+				HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
+				$categoriesField,
+			));
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @param array $filter
+	 * @param array $filterAny
+	 * @param array $exclude
+	 * @param null|callable $callback
+	 *
+	 * @return DataList|ArrayList
+	 */
+	public static function get_locations(
+		$filter = [],
+		$filterAny = [],
+		$exclude = [],
+		$callback = null
+	) {
+		$locationClass = Config::inst()->get(static::class, 'location_class');
+		$locations = $locationClass::get()->filter($filter)->exclude($exclude);
+
+		if (!empty($filterAny)) {
+			$locations = $locations->filterAny($filterAny);
+		}
+		if (!empty($exclude)) {
+			$locations = $locations->exclude($exclude);
+		}
+
+		if ($callback !== null && is_callable($callback)) {
+			$locations->filterByCallback($callback);
+		}
+
+		return $locations;
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public static function get_all_categories()
+	{
+		return LocationCategory::get();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPageCategories()
+	{
+		return self::locator_categories_by_locator($this->ID);
+	}
+
+	/**
+	 * @param int $id
+	 *
+	 * @return bool|
+	 */
+	public static function locator_categories_by_locator($id = 0)
+	{
+		if ($id == 0) {
+			return false;
+		}
+
+		return static::get()->byID($id)->getUsedCategories();
+	}
+
+	/**
+	 * Gets the list of radii
+	 *
+	 * @return ArrayList
+	 */
+	public function getRadii()
+	{
+		$radii = [
+			'0' => '25',
+			'1' => '50',
+			'2' => '75',
+			'3' => '100',
+		];
+		$config_radii = $this->config()->get('radii');
+		if ($config_radii) {
+			$radii = $config_radii;
+		}
+
+		return $radii;
+	}
+
+	public function getRadiiArrayList()
+	{
+		$list = [];
+
+		foreach ($this->getRadii() as $radius) {
+			$list[] = new ArrayData(array(
+				'Radius' => $radius,
+			));
+		}
+
+		return new ArrayList($list);
+	}
+
+	/**
+	 * Gets the limit of locations
+	 * @return mixed
+	 */
+	public function getLimit()
+	{
+		return $this->config()->get('limit');
+	}
+
+	/**
+	 * Gets if the radius drop down should be shown
+	 * @return mixed
+	 */
+	public function getShowRadius()
+	{
+		return $this->config()->get('show_radius');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getUsedCategories()
+	{
+		return $this->Categories()->filter([
+			'LocationSet.ID:GreaterThan' => 0,
+		]);
+	}
+
+	/**
+	 * Gets the path of the info window template
+	 *
+	 * @return string
+	 */
+	public function getInfoWindowTemplate()
+	{
+		return ModuleResourceLoader::singleton()->resolveURL(
+			Config::inst()->get(
+				static::class,
+				'infoWindowTemplate'
+			)
+		);
+	}
+
+	/**
+	 * Gets the path of the list template
+	 *
+	 * @return string
+	 */
+	public function getListTemplate()
+	{
+		return ModuleResourceLoader::singleton()->resolveURL(
+			Config::inst()->get(
+				static::class,
+				'listTemplate'
+			)
+		);
+	}
+
+	/**
+	 * @return null|string
+	 */
+	public function getMapStyle()
+	{
+		return AddressDataExtension::getMapStyleJSON();
+	}
+
+	public function getMapStyleJSONPath()
+	{
+		return AddressDataExtension::getMapStyleJSONPath();
+	}
+
+	/**
+	 * @return null|string
+	 */
+	public function getMarkerIcon()
+	{
+		return AddressDataExtension::getIconImage();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function($fields) {
             // Settings
             $fields->addFieldsToTab('Root.Settings', array(
                 HeaderField::create('DisplayOptions', 'Display Options', 3),