dynamic / silverstripe-locator

src/Page/LocatorController.php

Indentation +337 added lines, -337 removed lines

@@ -21,345 +21,345 @@
  */
 class LocatorController extends \PageController
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'xml',
-        'json',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter = [];
-
-    /**
-     * @var array
-     */
-    private static $base_exclude = [
-        'Lat' => 0,
-        'Lng' => 0,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter_any = [];
-
-    /**
-     * @var bool
-     */
-    private static $bootstrapify = true;
-
-    /**
-     * ID of map container
-     *
-     * @var string
-     */
-    private static $map_container = 'map';
-
-    /**
-     * class of location list container
-     *
-     * @var string
-     */
-    private static $list_container = 'loc-list';
-
-    /**
-     * GET variable which, if isset, will trigger storeLocator init and return XML
-     *
-     * @var string
-     */
-    private static $query_trigger = 'action_doFilterLocations';
-
-    /**
-     * @var DataList|ArrayList
-     */
-    protected $locations;
-
-    /**
-     * Set Requirements based on input from CMS
-     */
-    public function init()
-    {
-        parent::init();
-
-        // prevent init of map if no query
-        $request = Controller::curr()->getRequest();
-        if (!$this->getTrigger($request)) {
-            return;
-        }
-
-        $locations = $this->getLocations();
-
-        // prevent init of map if there are no locations
-        if (!$locations) {
-            return;
-        }
-
-        // google maps api key
-        $key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
-        Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
-
-        $mapSettings = [
-            'fullMapStart' => true,
-            'maxDistance' => true,
-            'storeLimit' => -1,
-            'originMarker' => true,
-            'slideMap' => false,
-            'distanceAlert' => -1,
-            'featuredLocations' => false,
-            'defaultLat' => 0,
-            'defaultLng' => 0,
-            'mapSettings' => [
-                'zoom' => 12,
-                'mapTypeId' => 'google.maps.MapTypeId.ROADMAP',
-                'disableDoubleClickZoom' => true,
-                'scrollwheel' => false,
-                'navigationControl' => false,
-                'draggable' => false,
-            ],
-        ];
-
-        $mapSettings['listTemplatePath'] = $this->getListTemplate();
-        $mapSettings['infowindowTemplatePath'] = $this->getInfoWindowTemplate();
-        $mapSettings['lengthUnit'] = $this->data()->Unit == 'km' ? 'km' : 'm';
-        $mapSettings['mapID'] = Config::inst()->get(LocatorController::class, 'map_container');
-        $mapSettings['locationList'] = Config::inst()->get(LocatorController::class, 'list_container');
-
-        if ($locations->filter('Featured', true)->count() > 0) {
-            $mapSettings['featuredLocations'] = true;
-        }
-
-        // map config based on user input in Settings tab
-        $limit = Config::inst()->get(LocatorController::class, 'limit');
-        if (0 < $limit) {
-            $mapSettings['storeLimit'] = $limit;
-        }
-
-        if ($coords = $this->getAddressSearchCoords()) {
-            $mapSettings['defaultLat'] = $coords->getField("Lat");
-            $mapSettings['defaultLat'] = $coords->getField("Lng");
-        }
-
-        // pass GET variables to xml action
-        $vars = $this->request->getVars();
-        unset($vars['url']);
-        $url = '';
-        if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
-        }
-        $mapSettings['dataLocation'] = Controller::join_links($this->Link(), 'xml.xml', $url);
-
-        if ($stylePath = $this->getMapStyleJSONPath()) {
-            if ($style = file_get_contents($stylePath)) {
-                $mapSettings['mapSettings']['styles'] = json_decode($style);
-            }
-        }
-
-        if ($imagePath = $this->getMarkerIcon()) {
-            $mapSettings['markerImg'] = $imagePath;
-        }
-
-        $this->extend('modifyMapSettings', $mapSettings);
-
-        $encoded = json_encode($mapSettings, JSON_UNESCAPED_SLASHES);
-        // mapTypeId is a javascript object
-        $encoded = preg_replace('/("mapTypeId"\s*:\s*)"(.+?)"/i', '$1$2', $encoded);
-
-        $this->extend('modifyMapSettingsEncoded', $encoded);
-        // init map
-        Requirements::customScript("
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = [
+		'xml',
+		'json',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter = [];
+
+	/**
+	 * @var array
+	 */
+	private static $base_exclude = [
+		'Lat' => 0,
+		'Lng' => 0,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter_any = [];
+
+	/**
+	 * @var bool
+	 */
+	private static $bootstrapify = true;
+
+	/**
+	 * ID of map container
+	 *
+	 * @var string
+	 */
+	private static $map_container = 'map';
+
+	/**
+	 * class of location list container
+	 *
+	 * @var string
+	 */
+	private static $list_container = 'loc-list';
+
+	/**
+	 * GET variable which, if isset, will trigger storeLocator init and return XML
+	 *
+	 * @var string
+	 */
+	private static $query_trigger = 'action_doFilterLocations';
+
+	/**
+	 * @var DataList|ArrayList
+	 */
+	protected $locations;
+
+	/**
+	 * Set Requirements based on input from CMS
+	 */
+	public function init()
+	{
+		parent::init();
+
+		// prevent init of map if no query
+		$request = Controller::curr()->getRequest();
+		if (!$this->getTrigger($request)) {
+			return;
+		}
+
+		$locations = $this->getLocations();
+
+		// prevent init of map if there are no locations
+		if (!$locations) {
+			return;
+		}
+
+		// google maps api key
+		$key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
+		Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+
+		$mapSettings = [
+			'fullMapStart' => true,
+			'maxDistance' => true,
+			'storeLimit' => -1,
+			'originMarker' => true,
+			'slideMap' => false,
+			'distanceAlert' => -1,
+			'featuredLocations' => false,
+			'defaultLat' => 0,
+			'defaultLng' => 0,
+			'mapSettings' => [
+				'zoom' => 12,
+				'mapTypeId' => 'google.maps.MapTypeId.ROADMAP',
+				'disableDoubleClickZoom' => true,
+				'scrollwheel' => false,
+				'navigationControl' => false,
+				'draggable' => false,
+			],
+		];
+
+		$mapSettings['listTemplatePath'] = $this->getListTemplate();
+		$mapSettings['infowindowTemplatePath'] = $this->getInfoWindowTemplate();
+		$mapSettings['lengthUnit'] = $this->data()->Unit == 'km' ? 'km' : 'm';
+		$mapSettings['mapID'] = Config::inst()->get(LocatorController::class, 'map_container');
+		$mapSettings['locationList'] = Config::inst()->get(LocatorController::class, 'list_container');
+
+		if ($locations->filter('Featured', true)->count() > 0) {
+			$mapSettings['featuredLocations'] = true;
+		}
+
+		// map config based on user input in Settings tab
+		$limit = Config::inst()->get(LocatorController::class, 'limit');
+		if (0 < $limit) {
+			$mapSettings['storeLimit'] = $limit;
+		}
+
+		if ($coords = $this->getAddressSearchCoords()) {
+			$mapSettings['defaultLat'] = $coords->getField("Lat");
+			$mapSettings['defaultLat'] = $coords->getField("Lng");
+		}
+
+		// pass GET variables to xml action
+		$vars = $this->request->getVars();
+		unset($vars['url']);
+		$url = '';
+		if (count($vars)) {
+			$url .= '?' . http_build_query($vars);
+		}
+		$mapSettings['dataLocation'] = Controller::join_links($this->Link(), 'xml.xml', $url);
+
+		if ($stylePath = $this->getMapStyleJSONPath()) {
+			if ($style = file_get_contents($stylePath)) {
+				$mapSettings['mapSettings']['styles'] = json_decode($style);
+			}
+		}
+
+		if ($imagePath = $this->getMarkerIcon()) {
+			$mapSettings['markerImg'] = $imagePath;
+		}
+
+		$this->extend('modifyMapSettings', $mapSettings);
+
+		$encoded = json_encode($mapSettings, JSON_UNESCAPED_SLASHES);
+		// mapTypeId is a javascript object
+		$encoded = preg_replace('/("mapTypeId"\s*:\s*)"(.+?)"/i', '$1$2', $encoded);
+
+		$this->extend('modifyMapSettingsEncoded', $encoded);
+		// init map
+		Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({$encoded});
                 });
             ", 'jquery-locator');
-    }
-
-    /**
-     * @param HTTPRequest $request
-     *
-     * @return bool
-     */
-    public function getTrigger(HTTPRequest $request = null)
-    {
-        if ($request === null) {
-            $request = $this->getRequest();
-        }
-        $trigger = $request->getVar(Config::inst()->get(LocatorController::class, 'query_trigger'));
-
-        return isset($trigger);
-    }
-
-    /**
-     * @return ArrayList|DataList
-     */
-    public function getLocations()
-    {
-        if (!$this->locations) {
-            $this->setLocations($this->request);
-        }
-
-        return $this->locations;
-    }
-
-    /**
-     * @param HTTPRequest|null $request
-     *
-     * @return $this
-     */
-    public function setLocations(HTTPRequest $request = null)
-    {
-
-        if ($request === null) {
-            $request = $this->request;
-        }
-        $filter = $this->config()->get('base_filter');
-
-        $categoryVar = $this->data()->config()->get('category_var');
-        if ($request->getVar($categoryVar)) {
-            $filter['Categories.ID'] = $request->getVar($categoryVar);
-        } else {
-            if ($this->getPageCategories()->exists()) {
-                foreach ($this->getPageCategories() as $category) {
-                    $filter['Categories.ID'][] = $category->ID;
-                }
-            }
-        }
-
-        $this->extend('updateLocatorFilter', $filter, $request);
-
-        $filterAny = $this->config()->get('base_filter_any');
-        $this->extend('updateLocatorFilterAny', $filterAny, $request);
-
-        $exclude = $this->config()->get('base_exclude');
-        $this->extend('updateLocatorExclude', $exclude, $request);
-
-        $class = $this->data()->ClassName;
-        $locations = $class::get_locations($filter, $filterAny, $exclude);
-        $locations = DataToArrayListHelper::to_array_list($locations);
-
-        //allow for adjusting list post possible distance calculation
-        $this->extend('updateLocationList', $locations);
-
-        if ($locations->canSortBy('Distance')) {
-            $locations = $locations->sort('Distance');
-        }
-
-        if ($this->getShowRadius()) {
-            $radiusVar = $this->data()->config()->get('radius_var');
-
-            if ($radius = (int)$request->getVar($radiusVar)) {
-                $locations = $locations->filterByCallback(function ($location) use (&$radius) {
-                    return $location->Distance <= $radius;
-                });
-            }
-        }
-
-        //allow for returning list to be set as
-        $this->extend('updateListType', $locations);
-
-        $limit = $this->getLimit();
-        if ($limit > 0) {
-            $locations = $locations->limit($limit);
-        }
-
-        $this->locations = $locations;
-
-        return $this;
-    }
-
-    /**
-     * @return ArrayData|boolean
-     */
-    public function getAddressSearchCoords()
-    {
-        $addressVar = Config::inst()->get(DistanceDataExtension::class, 'address_var');
-        if (!$this->request->getVar($addressVar)) {
-            return false;
-        }
-        if (class_exists(GoogleGeocoder::class)) {
-            $geocoder = new GoogleGeocoder($this->request->getVar($addressVar));
-            $response = $geocoder->getResult();
-            $lat = $response->getLatitude();
-            $lng = $response->getLongitude();
-
-            return new ArrayData([
-                "Lat" => $lat,
-                "Lng" => $lng,
-            ]);
-        }
-    }
-
-    /**
-     * @param HTTPRequest $request
-     *
-     * @return \SilverStripe\View\ViewableData_Customised
-     */
-    public function index(HTTPRequest $request)
-    {
-        if ($this->getTrigger($request)) {
-            $locations = $this->getLocations();
-        } else {
-            $locations = ArrayList::create();
-        }
-
-        return $this->customise([
-            'Locations' => $locations,
-        ]);
-    }
-
-    /**
-     * Renders locations in xml format
-     *
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function xml()
-    {
-        $this->getResponse()->addHeader("Content-Type", "application/xml");
-        $data = new ArrayData([
-            "Locations" => $this->getLocations(),
-            "AddressCoords" => $this->getAddressSearchCoords(),
-        ]);
-
-        return $data->renderWith('Dynamic/Locator/Data/XML');
-    }
-
-    /**
-     * Renders locations in json format
-     *
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function json()
-    {
-        $this->getResponse()->addHeader("Content-Type", "application/json");
-        $data = new ArrayData([
-            "Locations" => $this->getLocations(),
-            "AddressCoords" => $this->getAddressSearchCoords(),
-        ]);
-
-        return $data->renderWith('Dynamic/Locator/Data/JSON');
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return \SilverStripe\Forms\Form
-     */
-    public function LocationSearch()
-    {
-
-        $form = LocatorForm::create($this, 'LocationSearch');
-
-        $this->extend('updateLocationSearch', $form);
-
-        return $form
-            ->setFormMethod('GET')
-            ->setFormAction($this->Link())
-            ->disableSecurityToken()
-            ->loadDataFrom($this->request->getVars());
-    }
+	}
+
+	/**
+	 * @param HTTPRequest $request
+	 *
+	 * @return bool
+	 */
+	public function getTrigger(HTTPRequest $request = null)
+	{
+		if ($request === null) {
+			$request = $this->getRequest();
+		}
+		$trigger = $request->getVar(Config::inst()->get(LocatorController::class, 'query_trigger'));
+
+		return isset($trigger);
+	}
+
+	/**
+	 * @return ArrayList|DataList
+	 */
+	public function getLocations()
+	{
+		if (!$this->locations) {
+			$this->setLocations($this->request);
+		}
+
+		return $this->locations;
+	}
+
+	/**
+	 * @param HTTPRequest|null $request
+	 *
+	 * @return $this
+	 */
+	public function setLocations(HTTPRequest $request = null)
+	{
+
+		if ($request === null) {
+			$request = $this->request;
+		}
+		$filter = $this->config()->get('base_filter');
+
+		$categoryVar = $this->data()->config()->get('category_var');
+		if ($request->getVar($categoryVar)) {
+			$filter['Categories.ID'] = $request->getVar($categoryVar);
+		} else {
+			if ($this->getPageCategories()->exists()) {
+				foreach ($this->getPageCategories() as $category) {
+					$filter['Categories.ID'][] = $category->ID;
+				}
+			}
+		}
+
+		$this->extend('updateLocatorFilter', $filter, $request);
+
+		$filterAny = $this->config()->get('base_filter_any');
+		$this->extend('updateLocatorFilterAny', $filterAny, $request);
+
+		$exclude = $this->config()->get('base_exclude');
+		$this->extend('updateLocatorExclude', $exclude, $request);
+
+		$class = $this->data()->ClassName;
+		$locations = $class::get_locations($filter, $filterAny, $exclude);
+		$locations = DataToArrayListHelper::to_array_list($locations);
+
+		//allow for adjusting list post possible distance calculation
+		$this->extend('updateLocationList', $locations);
+
+		if ($locations->canSortBy('Distance')) {
+			$locations = $locations->sort('Distance');
+		}
+
+		if ($this->getShowRadius()) {
+			$radiusVar = $this->data()->config()->get('radius_var');
+
+			if ($radius = (int)$request->getVar($radiusVar)) {
+				$locations = $locations->filterByCallback(function ($location) use (&$radius) {
+					return $location->Distance <= $radius;
+				});
+			}
+		}
+
+		//allow for returning list to be set as
+		$this->extend('updateListType', $locations);
+
+		$limit = $this->getLimit();
+		if ($limit > 0) {
+			$locations = $locations->limit($limit);
+		}
+
+		$this->locations = $locations;
+
+		return $this;
+	}
+
+	/**
+	 * @return ArrayData|boolean
+	 */
+	public function getAddressSearchCoords()
+	{
+		$addressVar = Config::inst()->get(DistanceDataExtension::class, 'address_var');
+		if (!$this->request->getVar($addressVar)) {
+			return false;
+		}
+		if (class_exists(GoogleGeocoder::class)) {
+			$geocoder = new GoogleGeocoder($this->request->getVar($addressVar));
+			$response = $geocoder->getResult();
+			$lat = $response->getLatitude();
+			$lng = $response->getLongitude();
+
+			return new ArrayData([
+				"Lat" => $lat,
+				"Lng" => $lng,
+			]);
+		}
+	}
+
+	/**
+	 * @param HTTPRequest $request
+	 *
+	 * @return \SilverStripe\View\ViewableData_Customised
+	 */
+	public function index(HTTPRequest $request)
+	{
+		if ($this->getTrigger($request)) {
+			$locations = $this->getLocations();
+		} else {
+			$locations = ArrayList::create();
+		}
+
+		return $this->customise([
+			'Locations' => $locations,
+		]);
+	}
+
+	/**
+	 * Renders locations in xml format
+	 *
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function xml()
+	{
+		$this->getResponse()->addHeader("Content-Type", "application/xml");
+		$data = new ArrayData([
+			"Locations" => $this->getLocations(),
+			"AddressCoords" => $this->getAddressSearchCoords(),
+		]);
+
+		return $data->renderWith('Dynamic/Locator/Data/XML');
+	}
+
+	/**
+	 * Renders locations in json format
+	 *
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function json()
+	{
+		$this->getResponse()->addHeader("Content-Type", "application/json");
+		$data = new ArrayData([
+			"Locations" => $this->getLocations(),
+			"AddressCoords" => $this->getAddressSearchCoords(),
+		]);
+
+		return $data->renderWith('Dynamic/Locator/Data/JSON');
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return \SilverStripe\Forms\Form
+	 */
+	public function LocationSearch()
+	{
+
+		$form = LocatorForm::create($this, 'LocationSearch');
+
+		$this->extend('updateLocationSearch', $form);
+
+		return $form
+			->setFormMethod('GET')
+			->setFormAction($this->Link())
+			->disableSecurityToken()
+			->loadDataFrom($this->request->getVars());
+	}
 }

src/admin/LocationAdmin.php

Indentation +70 added lines, -70 removed lines

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

src/Tasks/LocationToPageTask.php

Indentation +58 added lines, -58 removed lines

@@ -15,72 +15,72 @@
  */
 class LocationToPageTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    protected $title = 'Locator - Location to Page Task';
+	/**
+	 * @var string
+	 */
+	protected $title = 'Locator - Location to Page Task';
 
-    /**
-     * @var string
-     */
-    private static $segment = 'locator-location-to-page-task';
+	/**
+	 * @var string
+	 */
+	private static $segment = 'locator-location-to-page-task';
 
-    /**
-     * @var bool
-     */
-    private static $auto_publish_location = false;
+	/**
+	 * @var bool
+	 */
+	private static $auto_publish_location = false;
 
-    /**
-     * @param \SilverStripe\Control\HTTPRequest $request
-     */
-    public function run($request)
-    {
-        $this->migrateLocations();
-    }
+	/**
+	 * @param \SilverStripe\Control\HTTPRequest $request
+	 */
+	public function run($request)
+	{
+		$this->migrateLocations();
+	}
 
-    /**
-     *
-     */
-    protected function migrateLocations()
-    {
-        if (!$parent = Locator::get()->first()) {
-            $parent = Locator::create();
-            $parent->Title = "Locator";
-            $parent->writeToStage(Versioned::DRAFT);
-        }
+	/**
+	 *
+	 */
+	protected function migrateLocations()
+	{
+		if (!$parent = Locator::get()->first()) {
+			$parent = Locator::create();
+			$parent->Title = "Locator";
+			$parent->writeToStage(Versioned::DRAFT);
+		}
 
-        /** @var Location $location */
-        foreach ($this->getLocations() as $location) {
-            if (!LocationPage::get()->filter('LegacyObjectID', $location->ID)->first()) {
-                if ($location->hasMethod('isPublished')) {
-                    $published = $location->isPublished();
-                }
+		/** @var Location $location */
+		foreach ($this->getLocations() as $location) {
+			if (!LocationPage::get()->filter('LegacyObjectID', $location->ID)->first()) {
+				if ($location->hasMethod('isPublished')) {
+					$published = $location->isPublished();
+				}
 
-                /** @var LocationPage $newLocation */
-                $newLocation = Injector::inst()->create(LocationPage::class, $location->toMap(), false);
-                $newLocation->setClassName(LocationPage::class);
-                $newLocation->ID = null;
-                $newLocation->ParentID = $parent->ID;
-                $newLocation->LegacyObjectID = $location->ID;
+				/** @var LocationPage $newLocation */
+				$newLocation = Injector::inst()->create(LocationPage::class, $location->toMap(), false);
+				$newLocation->setClassName(LocationPage::class);
+				$newLocation->ID = null;
+				$newLocation->ParentID = $parent->ID;
+				$newLocation->LegacyObjectID = $location->ID;
 
-                $this->extend('preLocationMigrationUpdate', $location, $newLocation);
+				$this->extend('preLocationMigrationUpdate', $location, $newLocation);
 
-                $newLocation->writeToStage(Versioned::DRAFT);
+				$newLocation->writeToStage(Versioned::DRAFT);
 
-                if ((isset($published) && $published) || $this->config()->get('auto_publish_location')) {
-                    $newLocation->publishSingle();
-                }
-            }
-        }
-    }
+				if ((isset($published) && $published) || $this->config()->get('auto_publish_location')) {
+					$newLocation->publishSingle();
+				}
+			}
+		}
+	}
 
-    /**
-     * @return \Generator
-     */
-    protected function getLocations()
-    {
-        foreach (Location::get() as $location) {
-            yield $location;
-        }
-    }
+	/**
+	 * @return \Generator
+	 */
+	protected function getLocations()
+	{
+		foreach (Location::get() as $location) {
+			yield $location;
+		}
+	}
 }

src/Tasks/LocationPublishTask.php

Indentation +66 added lines, -66 removed lines

@@ -11,76 +11,76 @@
  */
 class LocationPublishTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    protected $title = 'Publish all Locations';
-    /**
-     * @var string
-     */
-    protected $description = 'Migration task - pre versioning on Location';
-    /**
-     * @var bool
-     */
-    protected $enabled = true;
+	/**
+	 * @var string
+	 */
+	protected $title = 'Publish all Locations';
+	/**
+	 * @var string
+	 */
+	protected $description = 'Migration task - pre versioning on Location';
+	/**
+	 * @var bool
+	 */
+	protected $enabled = true;
 
-    /**
-     * @param $request
-     */
-    public function run($request)
-    {
-        $class = ($request->getVar('locationclass')) ? $request->getVar('locationclass') : 'Location';
-        $this->publishLocations($class);
-    }
+	/**
+	 * @param $request
+	 */
+	public function run($request)
+	{
+		$class = ($request->getVar('locationclass')) ? $request->getVar('locationclass') : 'Location';
+		$this->publishLocations($class);
+	}
 
-    /**
-     * @param string $class
-     * @return \Generator
-     */
-    protected function iterateLocations($class)
-    {
-        foreach ($class::get()->filter('ShowInLocator', true) as $location) {
-            yield $location;
-        }
-    }
+	/**
+	 * @param string $class
+	 * @return \Generator
+	 */
+	protected function iterateLocations($class)
+	{
+		foreach ($class::get()->filter('ShowInLocator', true) as $location) {
+			yield $location;
+		}
+	}
 
-    /**
-     * mark all ProductDetail records as ShowInMenus = 0.
-     *
-     * @param string $class
-     */
-    public function publishLocations($class)
-    {
-        if (!isset($class) || !class_exists($class) || !$class instanceof Location) {
-            $class = 'Location';
-        }
-        $ct = 0;
-        $publish = function ($location) use (&$ct) {
-            if (!$location->isPublished()) {
-                $title = $location->Title;
-                $location->writeToStage('Stage');
-                $location->publish('Stage', 'Live');
-                static::write_message($title);
-                ++$ct;
-            }
-        };
+	/**
+	 * mark all ProductDetail records as ShowInMenus = 0.
+	 *
+	 * @param string $class
+	 */
+	public function publishLocations($class)
+	{
+		if (!isset($class) || !class_exists($class) || !$class instanceof Location) {
+			$class = 'Location';
+		}
+		$ct = 0;
+		$publish = function ($location) use (&$ct) {
+			if (!$location->isPublished()) {
+				$title = $location->Title;
+				$location->writeToStage('Stage');
+				$location->publish('Stage', 'Live');
+				static::write_message($title);
+				++$ct;
+			}
+		};
 
-        foreach ($this->iterateLocations($class) as $location) {
-            $publish($location);
-        }
+		foreach ($this->iterateLocations($class) as $location) {
+			$publish($location);
+		}
 
-        static::write_message("{$ct} locations updated.");
-    }
+		static::write_message("{$ct} locations updated.");
+	}
 
-    /**
-     * @param $message
-     */
-    protected static function write_message($message)
-    {
-        if (Director::is_cli()) {
-            echo "{$message}\n";
-        } else {
-            echo "{$message}<br><br>";
-        }
-    }
+	/**
+	 * @param $message
+	 */
+	protected static function write_message($message)
+	{
+		if (Director::is_cli()) {
+			echo "{$message}\n";
+		} else {
+			echo "{$message}<br><br>";
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             $class = 'Location';
         }
         $ct = 0;
-        $publish = function ($location) use (&$ct) {
+        $publish = function($location) use (&$ct) {
             if (!$location->isPublished()) {
                 $title = $location->Title;
                 $location->writeToStage('Stage');

src/Tasks/LocationCategoriesTask.php

Indentation +68 added lines, -68 removed lines

@@ -14,72 +14,72 @@
 class LocationCategoriesTask extends BuildTask
 {
 
-    /**
-     * @var string
-     */
-    protected $title = 'Location categories to many_many';
-
-    /**
-     * @var string
-     */
-    protected $description = 'Migration task - Converts locations to have multiple categories';
-
-    /**
-     * @var bool
-     */
-    protected $enabled = true;
-
-    /**
-     * @param $request
-     */
-    public function run($request)
-    {
-        /** @var DataObject $class */
-        $class = ($request->getVar('locationclass')) ? $request->getVar('locationclass') : Location::class;
-        $class::add_extension(LocationCategoryExtension::class);
-
-
-        $categories = [];
-
-        $convert = function (DataObject $location) use (&$categories) {
-            /** @var Location $location */
-            // skip if no category
-            if ($location->CategoryID > 0) {
-                $categories[$location->CategoryID][] = $location->ID;
-            }
-        };
-
-        foreach ($this->iterateLocations($class) as $location) {
-            $convert($location);
-        }
-
-        $catCt = 0;
-        $locCT = 0;
-
-        foreach ($categories as $categoryID => $locations) {
-            /** @var LocationCategory $category */
-            $category = LocationCategory::get()->byID($categoryID);
-            $category->Locations()->addMany($locations);
-
-            $catCt++;
-            $locCT += count($locations);
-        }
-
-        echo "{$catCt} categories converted<br />";
-        echo "{$locCT} location relations converted<br />";
-
-        $time = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
-        echo "Process Time: {$time} seconds";
-    }
-
-    /**
-     * @param string $class
-     * @return \Generator
-     */
-    protected function iterateLocations($class)
-    {
-        foreach ($class::get() as $location) {
-            yield $location;
-        }
-    }
+	/**
+	 * @var string
+	 */
+	protected $title = 'Location categories to many_many';
+
+	/**
+	 * @var string
+	 */
+	protected $description = 'Migration task - Converts locations to have multiple categories';
+
+	/**
+	 * @var bool
+	 */
+	protected $enabled = true;
+
+	/**
+	 * @param $request
+	 */
+	public function run($request)
+	{
+		/** @var DataObject $class */
+		$class = ($request->getVar('locationclass')) ? $request->getVar('locationclass') : Location::class;
+		$class::add_extension(LocationCategoryExtension::class);
+
+
+		$categories = [];
+
+		$convert = function (DataObject $location) use (&$categories) {
+			/** @var Location $location */
+			// skip if no category
+			if ($location->CategoryID > 0) {
+				$categories[$location->CategoryID][] = $location->ID;
+			}
+		};
+
+		foreach ($this->iterateLocations($class) as $location) {
+			$convert($location);
+		}
+
+		$catCt = 0;
+		$locCT = 0;
+
+		foreach ($categories as $categoryID => $locations) {
+			/** @var LocationCategory $category */
+			$category = LocationCategory::get()->byID($categoryID);
+			$category->Locations()->addMany($locations);
+
+			$catCt++;
+			$locCT += count($locations);
+		}
+
+		echo "{$catCt} categories converted<br />";
+		echo "{$locCT} location relations converted<br />";
+
+		$time = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
+		echo "Process Time: {$time} seconds";
+	}
+
+	/**
+	 * @param string $class
+	 * @return \Generator
+	 */
+	protected function iterateLocations($class)
+	{
+		foreach ($class::get() as $location) {
+			yield $location;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
         $categories = [];
 
-        $convert = function (DataObject $location) use (&$categories) {
+        $convert = function(DataObject $location) use (&$categories) {
             /** @var Location $location */
             // skip if no category
             if ($location->CategoryID > 0) {

src/Tasks/LocationCategoryExtension.php

Indentation +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@
  */
 class LocationCategoryExtension extends DataExtension
 {
-    private static $has_one = [
-        'Category' => LocationCategory::class,
-    ];
+	private static $has_one = [
+		'Category' => LocationCategory::class,
+	];
 }

src/Model/LocationCategory.php

Indentation +121 added lines, -121 removed lines

@@ -23,125 +23,125 @@
  */
 class LocationCategory extends DataObject
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Category';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Categories';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Name' => 'Varchar(100)',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $belongs_many_many = [
-        '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 (FieldList $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', [
-                    $locationField,
-                ]);
-            }
-        });
-
-        $fields = parent::getCMSFields();
-
-        return $fields;
-    }
-
-    /**
-     * For backwards compatability
-     * @return 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 = [
+		'Name' => 'Varchar(100)',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $belongs_many_many = [
+		'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 (FieldList $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', [
+					$locationField,
+				]);
+			}
+		});
+
+		$fields = parent::getCMSFields();
+
+		return $fields;
+	}
+
+	/**
+	 * For backwards compatability
+	 * @return 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);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName([
                 'Locations',
                 'LocationSet',

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