dynamic / silverstripe-locator

tests/Model/LocationCategoryTest.php

Indentation +54 added lines, -54 removed lines

@@ -13,69 +13,69 @@
  */
 class LocationCategoryTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'categoryfixture.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'categoryfixture.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/Model/LocationTest.php

Indentation +202 added lines, -202 removed lines

@@ -16,206 +16,206 @@
  */
 class LocationTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'locationfixture.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 = 'locationfixture.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());
+	}
 }

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());
     }
 

tests/TestOnly/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/TestOnly/Extension/LocationExtension.php

Indentation +7 added lines, -7 removed lines

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

src/Tasks/EmailAddressTask.php

Indentation +31 added lines, -31 removed lines

@@ -13,35 +13,35 @@
  */
 class EmailAddressTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    protected $title = 'Email Address Task'; // title of the script
-
-    /**
-     * @var string
-     */
-    protected $description = "Convert depreciated 'Email Address' field to new 'Email' field.";
-
-    /**
-     * @param HTTPRequest $request
-     */
-    public function run($request)
-    {
-        Config::modify()->set('DataObject', 'validation_enabled', false);
-
-        $ct = 0;
-        $updateEmail = function ($location) use (&$ct) {
-            if (!$location->Email && $location->EmailAddress) {
-                $location->Email = $location->EmailAddress;
-                $location->write();
-                ++$ct;
-            }
-        };
-
-        Location::get()->each($updateEmail);
-        Config::modify()->set('DataObject', 'validation_enabled', true);
-
-        echo '<p>' . $ct . ' Locations updated</p>';
-    }
+	/**
+	 * @var string
+	 */
+	protected $title = 'Email Address Task'; // title of the script
+
+	/**
+	 * @var string
+	 */
+	protected $description = "Convert depreciated 'Email Address' field to new 'Email' field.";
+
+	/**
+	 * @param HTTPRequest $request
+	 */
+	public function run($request)
+	{
+		Config::modify()->set('DataObject', 'validation_enabled', false);
+
+		$ct = 0;
+		$updateEmail = function ($location) use (&$ct) {
+			if (!$location->Email && $location->EmailAddress) {
+				$location->Email = $location->EmailAddress;
+				$location->write();
+				++$ct;
+			}
+		};
+
+		Location::get()->each($updateEmail);
+		Config::modify()->set('DataObject', 'validation_enabled', true);
+
+		echo '<p>' . $ct . ' Locations updated</p>';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
         Config::modify()->set('DataObject', 'validation_enabled', false);
 
         $ct = 0;
-        $updateEmail = function ($location) use (&$ct) {
+        $updateEmail = function($location) use (&$ct) {
             if (!$location->Email && $location->EmailAddress) {
                 $location->Email = $location->EmailAddress;
                 $location->write();
@@ -42,6 +42,6 @@ 
         Location::get()->each($updateEmail);
         Config::modify()->set('DataObject', 'validation_enabled', true);
 
-        echo '<p>' . $ct . ' Locations updated</p>';
+        echo '<p>'.$ct.' Locations updated</p>';
     }
 }

src/admin/LocationsAdmin.php

Indentation +69 added lines, -69 removed lines

@@ -17,83 +17,83 @@
 class LocationsAdmin extends CatalogPageAdmin
 {
 
-    /**
-     * @var array
-     */
-    private static $managed_models = [
-        LocationPage::class,
-        LocationCategory::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $managed_models = [
+		LocationPage::class,
+		LocationCategory::class,
+	];
 
-    /**
-     * @var array
-     */
-    private static $model_importers = [
-        LocationCategory::class => CsvBulkLoader::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $model_importers = [
+		LocationCategory::class => CsvBulkLoader::class,
+	];
 
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Locations';
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Locations';
 
-    /**
-     * @var string
-     */
-    private static $url_segment = 'locations';
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'locations';
 
-    /**
-     * @return array
-     */
-    public function getExportFields()
-    {
-        if ($this->modelClass == LocationPage::class) {
-            $fields = [
-                'Title' => 'Name',
-                'Address' => 'Address',
-                'Address2' => 'Address2',
-                'City' => 'City',
-                'State' => 'State',
-                'PostalCode' => 'PostalCode',
-                'CountryCode' => 'Country',
-                'Phone' => 'Phone',
-                'Fax' => 'Fax',
-                'Email' => 'Email',
-                'Website' => 'Website',
-                'Featured' => 'Featured',
-                'CategoryList' => 'Categories',
-                'Lat' => 'Lat',
-                'Lng' => 'Lng',
-                'Import_ID' => 'Import_ID',
-            ];
-        }
+	/**
+	 * @return array
+	 */
+	public function getExportFields()
+	{
+		if ($this->modelClass == LocationPage::class) {
+			$fields = [
+				'Title' => 'Name',
+				'Address' => 'Address',
+				'Address2' => 'Address2',
+				'City' => 'City',
+				'State' => 'State',
+				'PostalCode' => 'PostalCode',
+				'CountryCode' => 'Country',
+				'Phone' => 'Phone',
+				'Fax' => 'Fax',
+				'Email' => 'Email',
+				'Website' => 'Website',
+				'Featured' => 'Featured',
+				'CategoryList' => 'Categories',
+				'Lat' => 'Lat',
+				'Lng' => 'Lng',
+				'Import_ID' => 'Import_ID',
+			];
+		}
 
-        if (!isset($fields)) {
-            $fields = parent::getExportFields();
-        }
+		if (!isset($fields)) {
+			$fields = parent::getExportFields();
+		}
 
-        $this->extend('updateGetExportFields', $fields);
+		$this->extend('updateGetExportFields', $fields);
 
-        return $fields;
-    }
+		return $fields;
+	}
 
-    /**
-     * @param null $id
-     * @param null $fields
-     * @return $this|Form
-     */
-    public function getEditForm($id = null, $fields = null)
-    {
-        $form = parent::getEditForm($id, $fields);
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return $this|Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$form = parent::getEditForm($id, $fields);
 
-        if ($this->modelClass == LocationPage::class) {
-            /** @var GridField $gridField */
-            if ($gridField = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass))) {
-                $gridField->getConfig()
-                    ->removeComponentsByType('GridFieldDeleteAction');
-            }
-        }
+		if ($this->modelClass == LocationPage::class) {
+			/** @var GridField $gridField */
+			if ($gridField = $form->Fields()->fieldByName($this->sanitiseClassName($this->modelClass))) {
+				$gridField->getConfig()
+					->removeComponentsByType('GridFieldDeleteAction');
+			}
+		}
 
-        return $form;
-    }
+		return $form;
+	}
 }

src/Page/Locator.php

Indentation +265 added lines, -265 removed lines

@@ -28,269 +28,269 @@
  */
 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 = [
-        'Unit' => 'Enum("m,km","m")',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $many_many = [
-        'Categories' => LocationCategory::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Locator';
-
-    /**
-     * @var string
-     */
-    private static $location_class = LocationPage::class;
-
-    /**
-     * @var string[]
-     */
-    private static $extensions = [
-        Lumberjack::class,
-    ];
-
-    /**
-     * @var string[]
-     */
-    private static $allowed_children = [
-        LocationPage::class,
-    ];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            // Settings
-            $fields->addFieldsToTab('Root.Settings', [
-                HeaderField::create('DisplayOptions', 'Display Options', 3),
-                OptionsetField::create('Unit', 'Unit of measure', ['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', [
-                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;
-        }
-
-        /** @var Locator $locator */
-        if ($locator = static::get()->byID($id)) {
-            return $locator->getUsedCategories();
-        }
-
-        return false;
-    }
-
-    /**
-     * 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([
-                '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();
-    }
-
-    /**
-     * @return string
-     */
-    public function getLumberjackTitle()
-    {
-        return _t(__CLASS__ . '.LumberjackTitle', 'Locations');
-    }
+	/**
+	 * @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 = [
+		'Unit' => 'Enum("m,km","m")',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = [
+		'Categories' => LocationCategory::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Locator';
+
+	/**
+	 * @var string
+	 */
+	private static $location_class = LocationPage::class;
+
+	/**
+	 * @var string[]
+	 */
+	private static $extensions = [
+		Lumberjack::class,
+	];
+
+	/**
+	 * @var string[]
+	 */
+	private static $allowed_children = [
+		LocationPage::class,
+	];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			// Settings
+			$fields->addFieldsToTab('Root.Settings', [
+				HeaderField::create('DisplayOptions', 'Display Options', 3),
+				OptionsetField::create('Unit', 'Unit of measure', ['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', [
+				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;
+		}
+
+		/** @var Locator $locator */
+		if ($locator = static::get()->byID($id)) {
+			return $locator->getUsedCategories();
+		}
+
+		return false;
+	}
+
+	/**
+	 * 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([
+				'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();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLumberjackTitle()
+	{
+		return _t(__CLASS__ . '.LumberjackTitle', 'Locations');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function($fields) {
             // Settings
             $fields->addFieldsToTab('Root.Settings', [
                 HeaderField::create('DisplayOptions', 'Display Options', 3),
@@ -291,6 +291,6 @@ 
      */
     public function getLumberjackTitle()
     {
-        return _t(__CLASS__ . '.LumberjackTitle', 'Locations');
+        return _t(__CLASS__.'.LumberjackTitle', 'Locations');
     }
 }

src/Page/LocationPage.php

Spacing +2 added lines, -2 removed lines

@@ -199,7 +199,7 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldsToTab(
                 'Root.Main',
                 [
@@ -303,7 +303,7 @@ 
         $url = $this->Website;
 
         if ($url && !preg_match('/^(http|https):\/\//', $url)) {
-            $url = 'http://' . $url;
+            $url = 'http://'.$url;
         }
 
         $this->extend('updateWebsiteURL', $url);

Indentation +279 added lines, -279 removed lines

@@ -31,283 +31,283 @@
  */
 class LocationPage extends \Page implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'Fax' => 'Varchar(45)',
-        'Import_ID' => 'Int',
-        'LegacyObjectID' => 'Int',
-    ];
-
-    private static $many_many = [
-        'Categories' => LocationCategory::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'LocationPage';
-
-    /**
-     * @var array
-     */
-    private static $casting = [
-        'distance' => 'Decimal(9,3)',
-    ];
-
-    /**
-     * @var int[]
-     */
-    private static $defaults = [
-        'ShowInMenus' => 0,
-    ];
-
-    /**
-     * @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 = [
-        'Title',
-        'Address',
-        'City',
-        'State',
-        'PostalCode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Featured',
-    ];
-
-    /**
-     * columns for grid field
-     *
-     * @var array
-     */
-    private static $summary_fields = [
-        'Title',
-        'Address',
-        'Address2',
-        'City',
-        'State',
-        'PostalCode',
-        'CountryCode',
-        'Phone' => 'Phone',
-        'Fax' => 'Fax',
-        'Email' => 'Email',
-        'Website' => 'Website',
-        'Featured',
-        'CategoryList',
-        'Lat',
-        'Lng',
-        'Import_ID',
-    ];
-
-    /**
-     * @var bool
-     */
-    private static $show_in_sitetree = false;
-
-    /**
-     * @var array
-     */
-    private static $allowed_children = [];
-
-    /**
-     * Coords status for $summary_fields
-     *
-     * @return string
-     */
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
-
-    /**
-     * @return string
-     */
-    public function getCategoryList()
-    {
-        if ($this->Categories()->count()) {
-            return implode(', ', $this->Categories()->column('Name'));
-        }
-
-        return '';
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getCountryCode()
-    {
-        if ($this->Country) {
-            return strtoupper($this->Country);
-        }
-
-        return false;
-    }
-
-    /**
-     * custom labels for fields
-     *
-     * @param bool $includerelations
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-
-        $labels['Title'] = 'Name';
-        $labels['Address2'] = 'Address 2';
-        $labels['PostalCode'] = 'Postal Code';
-        $labels['Categories.Name'] = 'Categories';
-        $labels['Featured.NiceAsBoolean'] = 'Featured';
-
-        return $labels;
-    }
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldsToTab(
-                'Root.Main',
-                [
-                    CheckboxField::create('Featured')
-                        ->setTitle('Featured'),
-                ],
-                'Content'
-            );
-
-            if ($this->exists()) {
-                $fields->addFieldToTab(
-                    'Root.Categories',
-                    GridField::create(
-                        'Categories',
-                        'Categories',
-                        $this->Categories(),
-                        $catConfig = GridFieldConfig_RelationEditor::create()
-                    )
-                );
-
-                $catConfig->removeComponentsByType([
-                    GridFieldAddExistingAutocompleter::class,
-                ])->addComponents([
-                    new GridFieldAddExistingSearchButton()
-                ]);
-            }
-
-            $fields->addFieldsToTab('Root.Contact', [
-                TextField::create('Website')
-                    ->setTitle('Website')
-                    ->setDescription('Include the http/https (example: https://google.com)'),
-                TextField::create('Phone')
-                    ->setTitle('Phone'),
-                EmailField::create('Email')
-                    ->setTitle('Email'),
-                TextField::create('Fax')
-                    ->setTitle('Fax'),
-            ]);
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @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 [
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function getWebsiteURL()
-    {
-        $url = $this->Website;
-
-        if ($url && !preg_match('/^(http|https):\/\//', $url)) {
-            $url = 'http://' . $url;
-        }
-
-        $this->extend('updateWebsiteURL', $url);
-
-        return $url;
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Location';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locations';
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'Fax' => 'Varchar(45)',
+		'Import_ID' => 'Int',
+		'LegacyObjectID' => 'Int',
+	];
+
+	private static $many_many = [
+		'Categories' => LocationCategory::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'LocationPage';
+
+	/**
+	 * @var array
+	 */
+	private static $casting = [
+		'distance' => 'Decimal(9,3)',
+	];
+
+	/**
+	 * @var int[]
+	 */
+	private static $defaults = [
+		'ShowInMenus' => 0,
+	];
+
+	/**
+	 * @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 = [
+		'Title',
+		'Address',
+		'City',
+		'State',
+		'PostalCode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Featured',
+	];
+
+	/**
+	 * columns for grid field
+	 *
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'Title',
+		'Address',
+		'Address2',
+		'City',
+		'State',
+		'PostalCode',
+		'CountryCode',
+		'Phone' => 'Phone',
+		'Fax' => 'Fax',
+		'Email' => 'Email',
+		'Website' => 'Website',
+		'Featured',
+		'CategoryList',
+		'Lat',
+		'Lng',
+		'Import_ID',
+	];
+
+	/**
+	 * @var bool
+	 */
+	private static $show_in_sitetree = false;
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_children = [];
+
+	/**
+	 * Coords status for $summary_fields
+	 *
+	 * @return string
+	 */
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCategoryList()
+	{
+		if ($this->Categories()->count()) {
+			return implode(', ', $this->Categories()->column('Name'));
+		}
+
+		return '';
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getCountryCode()
+	{
+		if ($this->Country) {
+			return strtoupper($this->Country);
+		}
+
+		return false;
+	}
+
+	/**
+	 * custom labels for fields
+	 *
+	 * @param bool $includerelations
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+
+		$labels['Title'] = 'Name';
+		$labels['Address2'] = 'Address 2';
+		$labels['PostalCode'] = 'Postal Code';
+		$labels['Categories.Name'] = 'Categories';
+		$labels['Featured.NiceAsBoolean'] = 'Featured';
+
+		return $labels;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldsToTab(
+				'Root.Main',
+				[
+					CheckboxField::create('Featured')
+						->setTitle('Featured'),
+				],
+				'Content'
+			);
+
+			if ($this->exists()) {
+				$fields->addFieldToTab(
+					'Root.Categories',
+					GridField::create(
+						'Categories',
+						'Categories',
+						$this->Categories(),
+						$catConfig = GridFieldConfig_RelationEditor::create()
+					)
+				);
+
+				$catConfig->removeComponentsByType([
+					GridFieldAddExistingAutocompleter::class,
+				])->addComponents([
+					new GridFieldAddExistingSearchButton()
+				]);
+			}
+
+			$fields->addFieldsToTab('Root.Contact', [
+				TextField::create('Website')
+					->setTitle('Website')
+					->setDescription('Include the http/https (example: https://google.com)'),
+				TextField::create('Phone')
+					->setTitle('Phone'),
+				EmailField::create('Email')
+					->setTitle('Email'),
+				TextField::create('Fax')
+					->setTitle('Fax'),
+			]);
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @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 [
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWebsiteURL()
+	{
+		$url = $this->Website;
+
+		if ($url && !preg_match('/^(http|https):\/\//', $url)) {
+			$url = 'http://' . $url;
+		}
+
+		$this->extend('updateWebsiteURL', $url);
+
+		return $url;
+	}
 }

tests/form/LocatorFormTest.php

Indentation +49 added lines, -49 removed lines

@@ -17,62 +17,62 @@
  */
 class LocatorFormTest extends FunctionalTest
 {
-    protected static $fixture_file = 'locatorformfixture.yml';
+	protected static $fixture_file = 'locatorformfixture.yml';
 
-    /**
-     *
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
+	/**
+	 *
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
 
-        Config::modify()->set(Locator::class, 'location_class', Location::class);
-    }
+		Config::modify()->set(Locator::class, 'location_class', Location::class);
+	}
 
-    /**
-     *
-     */
-    public function testLocatorFormBase()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
+	/**
+	 *
+	 */
+	public function testLocatorFormBase()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
 
-        $this->assertInstanceOf(FieldList::class, $form->Fields());
-        $this->assertInstanceOf(RequiredFields::class, $form->getValidator());
-    }
+		$this->assertInstanceOf(FieldList::class, $form->Fields());
+		$this->assertInstanceOf(RequiredFields::class, $form->getValidator());
+	}
 
-    /**
-     *
-     */
-    public function testUpdateRequiredFields()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
-        $validator = $form->getValidator();
+	/**
+	 *
+	 */
+	public function testUpdateRequiredFields()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
+		$validator = $form->getValidator();
 
-        $validator->removeRequiredField('Address');
-        $validator->addRequiredField('Foo');
+		$validator->removeRequiredField('Address');
+		$validator->addRequiredField('Foo');
 
-        $this->assertEquals(['Foo'], $form->getValidator()->getRequired());
-    }
+		$this->assertEquals(['Foo'], $form->getValidator()->getRequired());
+	}
 
-    /**
-     *
-     */
-    public function testFields()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
-        $this->assertInstanceOf(FieldList::class, $form->Fields());
-    }
+	/**
+	 *
+	 */
+	public function testFields()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
+		$this->assertInstanceOf(FieldList::class, $form->Fields());
+	}
 
-    /**
-     *
-     */
-    public function testActions()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
-        $this->assertInstanceOf(FieldList::class, $form->Actions());
-    }
+	/**
+	 *
+	 */
+	public function testActions()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$form = LocatorForm::create(LocatorController::create($locator), 'LocatorForm');
+		$this->assertInstanceOf(FieldList::class, $form->Actions());
+	}
 }