Completed
Pull Request — master (#1848)
by Rico
09:33
created
app/Http/Controllers/PlaceHierarchyController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         $note       = false;
61 61
 
62 62
         if ($showmap) {
63
-            $note    = true;
63
+            $note = true;
64 64
             $content .= view('place-map', [
65 65
                 'module' => self::MAP_MODULE,
66 66
                 'ref'    => $fqpn,
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
         switch ($action) {
73 73
             case 'list':
74 74
                 $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')];
75
-                $content    .= view('place-list', $this->getList($tree));
75
+                $content .= view('place-list', $this->getList($tree));
76 76
                 break;
77 77
             case 'hierarchy':
78 78
             case 'hierarchy-e':
79 79
                 $nextaction = ['list' => I18N::translate('Show all places in a list')];
80 80
                 $data       = $this->getHierarchy($tree, $place, $parent);
81
-                $content    .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
81
+                $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
82 82
                 if (null === $data || $action === 'hierarchy-e') {
83 83
                     $content .= view('place-events', $this->getEvents($tree, $place));
84 84
                 }
Please login to merge, or discard this patch.
app/Http/Middleware/PageHitCounter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@
 block discarded – undo
157 157
      */
158 158
     public function getCount(Tree $tree, $page, $parameter): int
159 159
     {
160
-        return (int)Database::prepare(
160
+        return (int) Database::prepare(
161 161
             "SELECT page_count FROM `##hit_counter` WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
162 162
         )->execute([
163 163
             'tree_id'   => $tree->getTreeId(),
Please login to merge, or discard this patch.
resources/views/modules/pedigree-map/event-sidebar.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,14 +9,14 @@
 block discarded – undo
9 9
     </a>
10 10
 <?php endif ?>
11 11
 
12
-<?php if($value): ?>
12
+<?php if ($value): ?>
13 13
     <span>
14 14
         <?= $value ?>
15 15
     </span>
16 16
 <?php endif ?>
17 17
 
18 18
 <div>
19
-    <?php if($addtag): ?>
19
+    <?php if ($addtag): ?>
20 20
         <?= GedcomTag::getLabel('BIRT') ?>:
21 21
     <?php endif ?>
22 22
     <?= $date ?>
Please login to merge, or discard this patch.
resources/views/modules/places/event-sidebar.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,14 +9,14 @@
 block discarded – undo
9 9
     </a>
10 10
 <?php endif ?>
11 11
 
12
-<?php if($value): ?>
12
+<?php if ($value): ?>
13 13
     <span>
14 14
         <?= $value ?>
15 15
     </span>
16 16
 <?php endif ?>
17 17
 
18 18
 <div>
19
-    <?php if($addtag): ?>
19
+    <?php if ($addtag): ?>
20 20
         <?= GedcomTag::getLabel('BIRT') ?>:
21 21
     <?php endif ?>
22 22
     <?= $date ?>
Please login to merge, or discard this patch.
app/Module/PlacesModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
      */
142 142
     private function getPersonalFacts(Individual $individual)
143 143
     {
144
-        $facts      = $individual->getFacts();
144
+        $facts = $individual->getFacts();
145 145
         foreach ($individual->getSpouseFamilies() as $family) {
146 146
             $facts = array_merge($facts, $family->getFacts());
147 147
             // Add birth of children from this family to the facts array
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
                     'provider' => 'openstreetmap',
216 216
                     'style'    => 'mapnik',
217 217
                 ];
218
-                self::$map_providers  = [
218
+                self::$map_providers = [
219 219
                     'openstreetmap' => [
220 220
                         'name'   => 'OpenStreetMap',
221 221
                         'styles' => ['mapnik' => 'Mapnik'],
Please login to merge, or discard this patch.
resources/views/admin/map-import-form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 				</div>
24 24
 				<select id="serverfile" name="serverfile" class="form-control">
25 25
                     <option selected value=""></option>
26
-                    <?php foreach($files as $file): ?>
26
+                    <?php foreach ($files as $file): ?>
27 27
                         <option value="<?= e($file) ?>">
28 28
                             <?= e($file) ?>
29 29
                         </option>
Please login to merge, or discard this patch.
resources/views/admin/locations.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,12 +32,10 @@
 block discarded – undo
32 32
                 </a>
33 33
             </th>
34 34
 			<td>
35
-				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
36
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
35
+				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
37 36
 			</td>
38 37
 			<td>
39
-				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
40
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
38
+				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
41 39
 			</td>
42 40
 			<td>
43 41
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>
Please login to merge, or discard this patch.
app/Bootstrap4.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                     'type'    => 'radio',
101 101
                     'name'    => $name,
102 102
                     'value'   => $value,
103
-                    'checked' => (string)$value === (string)$selected,
103
+                    'checked' => (string) $value === (string) $selected,
104 104
                 ] + $attributes);
105 105
 
106 106
             $html .=
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         foreach ($options as $value => $option) {
130 130
             $option_attributes = self::attributes([
131 131
                 'value'    => $value,
132
-                'selected' => (string)$value === (string)$selected,
132
+                'selected' => (string) $value === (string) $selected,
133 133
             ]);
134 134
 
135 135
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
         foreach ($options as $value => $option) {
162 162
             $option_attributes = self::attributes([
163 163
                 'value'    => $value,
164
-                'selected' => in_array((string)$value, $selected),
164
+                'selected' => in_array((string) $value, $selected),
165 165
             ]);
166 166
 
167 167
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
Please login to merge, or discard this patch.
resources/views/admin/trees.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 				</div>
29 29
 				<div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>">
30 30
 					<div class="card-body">
31
-						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?>
31
+						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?>
32 32
 						<?php if ($importing): ?>
33 33
 							<div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12">
34 34
 								<div class="progress">
Please login to merge, or discard this patch.