dynamic / silverstripe-locator

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

src/form/LocatorForm.php

Indentation +74 added lines, -74 removed lines

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

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/admin/LocationAdmin.php

Indentation +69 added lines, -69 removed lines

@@ -12,80 +12,80 @@
 class LocationAdmin extends ModelAdmin
 {
 
-    /**
-     * @var array
-     */
-    private static $managed_models = array(
-        Location::class,
-        LocationCategory::class,
-    );
+	/**
+	 * @var array
+	 */
+	private static $managed_models = array(
+		Location::class,
+		LocationCategory::class,
+	);
 
-    /**
-     * @var array
-     */
-    private static $model_importers = array(
-        Location::class => LocationCsvBulkLoader::class,
-        LocationCategory::class => CsvBulkLoader::class,
-    );
+	/**
+	 * @var array
+	 */
+	private static $model_importers = array(
+		Location::class => LocationCsvBulkLoader::class,
+		LocationCategory::class => CsvBulkLoader::class,
+	);
 
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Locator';
-    /**
-     * @var string
-     */
-    private static $url_segment = 'locator';
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Locator';
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'locator';
 
-    /**
-     * @return array
-     */
-    public function getExportFields()
-    {
-        if ($this->modelClass == Location::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 == Location::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);
-        $class = $this->sanitiseClassName($this->modelClass);
-        if ($class == Location::class) {
-            $gridField = $form->Fields()->fieldByName($class);
-            $config = $gridField->getConfig();
-            $config->removeComponentsByType('GridFieldDeleteAction');
-        }
-        return $form;
-    }
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return $this|Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$form = parent::getEditForm($id, $fields);
+		$class = $this->sanitiseClassName($this->modelClass);
+		if ($class == Location::class) {
+			$gridField = $form->Fields()->fieldByName($class);
+			$config = $gridField->getConfig();
+			$config->removeComponentsByType('GridFieldDeleteAction');
+		}
+		return $form;
+	}
 }

src/objects/LocationCategory.php

Indentation +121 added lines, -121 removed lines

@@ -20,125 +20,125 @@
  */
 class LocationCategory extends DataObject
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Category';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Categories';
-
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Name' => 'Varchar(100)',
-    );
-
-    /**
-     * @var array
-     */
-    private static $belongs_many_many = array(
-        'Locators' => Locator::class,
-        'LocationSet' => Location::class,
-    );
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'LocationCategory';
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Name';
-
-    /**
-     * @return \SilverStripe\Forms\FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            $fields->removeByName([
-                'Locations',
-                'LocationSet',
-                'Locators',
-                'LinkTracking',
-                'FileTracking',
-            ]);
-
-            if ($this->ID) {
-                // Locations
-                $config = GridFieldConfig_RelationEditor::create();
-                $config->removeComponentsByType([
-                    GridFieldAddExistingAutocompleter::class,
-                    GridFieldAddNewButton::class
-                ])
-                    ->addComponents([
-                        new GridFieldAddExistingSearchButton(),
-                    ]);
-                $locations = $this->Locations();
-                $locationField = GridField::create('Locations', 'Locations', $locations, $config);
-
-                $fields->addFieldsToTab('Root.Main', array(
-                    $locationField,
-                ));
-            }
-        });
-
-        $fields = parent::getCMSFields();
-
-        return $fields;
-    }
-
-    /**
-     * For backwards compatability
-     * @return Locations|ManyManyList
-     */
-    public function Locations()
-    {
-        return $this->LocationSet();
-    }
-
-    /**
-     * @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);
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Category';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Categories';
+
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Name' => 'Varchar(100)',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $belongs_many_many = array(
+		'Locators' => Locator::class,
+		'LocationSet' => Location::class,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'LocationCategory';
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Name';
+
+	/**
+	 * @return \SilverStripe\Forms\FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			$fields->removeByName([
+				'Locations',
+				'LocationSet',
+				'Locators',
+				'LinkTracking',
+				'FileTracking',
+			]);
+
+			if ($this->ID) {
+				// Locations
+				$config = GridFieldConfig_RelationEditor::create();
+				$config->removeComponentsByType([
+					GridFieldAddExistingAutocompleter::class,
+					GridFieldAddNewButton::class
+				])
+					->addComponents([
+						new GridFieldAddExistingSearchButton(),
+					]);
+				$locations = $this->Locations();
+				$locationField = GridField::create('Locations', 'Locations', $locations, $config);
+
+				$fields->addFieldsToTab('Root.Main', array(
+					$locationField,
+				));
+			}
+		});
+
+		$fields = parent::getCMSFields();
+
+		return $fields;
+	}
+
+	/**
+	 * For backwards compatability
+	 * @return Locations|ManyManyList
+	 */
+	public function Locations()
+	{
+		return $this->LocationSet();
+	}
+
+	/**
+	 * @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);
+	}
 }

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

src/objects/Location.php

Indentation +252 added lines, -252 removed lines

@@ -28,256 +28,256 @@
  */
 class Location extends DataObject implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'Fax' => 'Varchar(45)',
-        'Import_ID' => 'Int',
-    ];
-
-    private static $many_many = [
-        'Categories' => LocationCategory::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Location';
-
-    /**
-     * @var array
-     */
-    private static $casting = [
-        'distance' => 'Decimal(9,3)',
-    ];
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
-
-    /**
-     * api access via Restful Server module
-     *
-     * @var bool
-     */
-    private static $api_access = true;
-
-    /**
-     * search fields for Model Admin
-     *
-     * @var array
-     */
-    private static $searchable_fields = [
-        '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',
-    ];
-
-    /**
-     * 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 ($fields) {
-            $fields->removeByName([
-                'Import_ID',
-                'LinkTracking',
-                'FileTracking',
-            ]);
-
-            $fields->dataFieldByName('Website')
-                ->setAttribute('placeholder', 'http://');
-
-            $fields->replaceField('Email', EmailField::create('Email'));
-
-            $featured = $fields->dataFieldByName('Featured')
-                ->setDescription('Location will display near the top of the results list');
-            $fields->insertAfter(
-                'Fax',
-                $featured
-            );
-
-            if ($this->ID) {
-                $categories = $fields->dataFieldByName('Categories');
-                $config = $categories->getConfig();
-                $config->removeComponentsByType([
-                    GridFieldAddExistingAutocompleter::class,
-                ])
-                    ->addComponents([
-                        new GridFieldAddExistingSearchButton(),
-                    ]);
-            }
-        });
-
-        $fields = parent::getCMSFields();
-
-        // allow to be extended via DataExtension
-        $this->extend('updateLocationFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool
-     */
-    public function canView($member = null, $context = [])
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canEdit($member = null, $context = [])
-    {
-        return Permission::check('Location_EDIT', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canDelete($member = null, $context = [])
-    {
-        return Permission::check('Location_DELETE', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Location_CREATE', 'any', $member);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function getWebsiteURL()
-    {
-        $url = $this->Website;
-
-        $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 = [
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'Fax' => 'Varchar(45)',
+		'Import_ID' => 'Int',
+	];
+
+	private static $many_many = [
+		'Categories' => LocationCategory::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Location';
+
+	/**
+	 * @var array
+	 */
+	private static $casting = [
+		'distance' => 'Decimal(9,3)',
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
+
+	/**
+	 * api access via Restful Server module
+	 *
+	 * @var bool
+	 */
+	private static $api_access = true;
+
+	/**
+	 * search fields for Model Admin
+	 *
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'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',
+	];
+
+	/**
+	 * 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 ($fields) {
+			$fields->removeByName([
+				'Import_ID',
+				'LinkTracking',
+				'FileTracking',
+			]);
+
+			$fields->dataFieldByName('Website')
+				->setAttribute('placeholder', 'http://');
+
+			$fields->replaceField('Email', EmailField::create('Email'));
+
+			$featured = $fields->dataFieldByName('Featured')
+				->setDescription('Location will display near the top of the results list');
+			$fields->insertAfter(
+				'Fax',
+				$featured
+			);
+
+			if ($this->ID) {
+				$categories = $fields->dataFieldByName('Categories');
+				$config = $categories->getConfig();
+				$config->removeComponentsByType([
+					GridFieldAddExistingAutocompleter::class,
+				])
+					->addComponents([
+						new GridFieldAddExistingSearchButton(),
+					]);
+			}
+		});
+
+		$fields = parent::getCMSFields();
+
+		// allow to be extended via DataExtension
+		$this->extend('updateLocationFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool
+	 */
+	public function canView($member = null, $context = [])
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canEdit($member = null, $context = [])
+	{
+		return Permission::check('Location_EDIT', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canDelete($member = null, $context = [])
+	{
+		return Permission::check('Location_DELETE', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Location_CREATE', 'any', $member);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWebsiteURL()
+	{
+		$url = $this->Website;
+
+		$this->extend('updateWebsiteURL', $url);
+
+		return $url;
+	}
 }

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';
+	}
 }