Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2026-02-28 17:18:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert array syntax and other minor code style adjustments.

Browse Source
This commit is contained in:
David Molineus
2017-10-17 18:11:28 +02:00
parent 6ded7441d9
commit c465b724f4
63 changed files with 413 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/AbstractActiveModel.php
View File

@@ -29,7 +29,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return \Model|null
*/
public static function findActiveByPK($modelId, $options = array())
public static function findActiveByPK($modelId, $options = [])
{
return static::findOneBy('active=1 AND id', $modelId, $options);
}
@@ -43,7 +43,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return Collection|null
*/
public static function findActiveBy($column, $value, $options = array())
public static function findActiveBy($column, $value, $options = [])
{
if (is_array($column)) {
$column[] = 'active=1';
@@ -61,7 +61,7 @@ abstract class AbstractActiveModel extends \Model
*
* @return Collection|null
*/
public static function findActives($options = array())
public static function findActives($options = [])
{
return static::findBy('active', '1', $options);
}

8
src/Model/LayerModel.php
View File

@@ -42,18 +42,18 @@ class LayerModel extends AbstractActiveModel
*
* @return Collection|null
*/
public static function findMultipleByTypes(array $types, $options = array())
public static function findMultipleByTypes(array $types, $options = [])
{
if (empty($types)) {
return null;
}
$options['column'] = array(
$options['column'] = [
sprintf(
'type IN (%s)',
substr(str_repeat('?,', count($types)), 0, -1)
)
);
),
];
$options['value'] = $types;
$options['return'] = 'Collection';

16
src/Model/MarkerModel.php
View File

@@ -41,7 +41,7 @@ class MarkerModel extends AbstractActiveModel
public static function findByFilter($pid, Filter $filter = null)
{
if (!$filter) {
return static::findActiveBy('pid', $pid, array('order' => 'sorting'));
return static::findActiveBy('pid', $pid, ['order' => 'sorting']);
}
switch ($filter->getName()) {
@@ -63,23 +63,23 @@ class MarkerModel extends AbstractActiveModel
*/
public static function findByBBoxFilter($pid, BboxFilter $filter)
{
$columns = array(
$columns = [
'active=1',
'pid=?',
'latitude > ? AND latitude < ?',
'longitude > ? AND longitude < ?'
);
'longitude > ? AND longitude < ?',
];
/** @var LatLngBounds $bounds */
$bounds = $filter->getValues()['bounds'];
$values = array(
$values = [
$pid,
$bounds->getSouthWest()->getLatitude(),
$bounds->getNorthEast()->getLatitude(),
$bounds->getSouthWest()->getLongitude(),
$bounds->getNorthEast()->getLongitude()
);
$bounds->getNorthEast()->getLongitude(),
];
return static::findBy($columns, $values, array('order' => 'sorting'));
return static::findBy($columns, $values, ['order' => 'sorting']);
}
}