dynamic / silverstripe-locator

src/form/LocatorForm.php

Indentation +74 added lines, -74 removed lines

@@ -18,88 +18,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/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/Page/LocatorTest.php

Indentation +164 added lines, -164 removed lines

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

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

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()
-    {
-        parent::setUp();
+	/**
+	 *
+	 */
+	protected function setUp()
+	{
+		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());
+	}
 }

tests/Page/LocatorControllerTest.php

Indentation +84 added lines, -84 removed lines

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

src/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>';
     }
 }