Changeset 887 for trunk/Modules/Map/MapAPI.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Modules/Map/MapAPI.php (modified) (5 diffs)

trunk/Modules/Map/MapAPI.php

@@ -3 +3 @@
 class MapMarker
 {
-  var $Position;
-  var $Text;
+  public array $Position;
+  public string $Text;
 }
 
 class MapPolyLine
 {
-  var $Points = array();
-  var $Color = 'black';
+  public array $Points = array();
+  public string $Color = 'black';
 }
 
 class Map extends Model
 {
-  var $Position;
-  var $Zoom;
-  var $Key;
+  public array $Position;
+  public int $Zoom;
+  public string $Key;
   var $OnClickObject;
-  var $MarkerText;
-  var $Markers;
-  var $PolyLines;
+  public string $MarkerText;
+  public array $Markers;
+  public array $PolyLines;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -35 +35 @@
   }
 
-  function Show()
+  function Show(): string
   {
     return '';
@@ -43 +43 @@
 class MapGoogle extends Map
 {
-  function ShowPage($Page)
+  function ShowPage(Page $Page): string
   {
     $Page->Load = 'initialize()';
@@ -113 +113 @@
 class MapOpenStreetMaps extends Map
 {
-  function GetPageHeader()
+  function GetPageHeader(): string
   {
     $Output = '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
@@ -124 +124 @@
   }
 
-  function ShowPage($Page)
+  function ShowPage(Page $Page): string
   {
     $this->System->PageHeaders[] = array($this, 'GetPageHeader');