Changeset 887 for trunk/Modules/News/NewsSource.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/News/NewsSource.php (modified) (8 diffs)

trunk/Modules/News/NewsSource.php

@@ -1 +1 @@
 <?php
 
-function GetTextBetween(&$Text, $Start, $End)
+function GetTextBetween(string &$Text, string $Start, string $End): string
 {
   $Result = '';
@@ -34 +34 @@
 }
 
-function HumanDateTimeToTime($DateTime)
+function HumanDateTimeToTime(string $DateTime): int
 {
   if ($DateTime == '') return NULL;
@@ -49 +49 @@
 }
 
-function HumanDateToTime($Date)
+function HumanDateToTime(string $Date): int
 {
   if ($Date == '') return NULL;
@@ -55 +55 @@
 }
 
-function GetUrlBase($Url)
+function GetUrlBase(string $Url): string
 {
   $Result = parse_url($Url);
@@ -63 +63 @@
 class NewsSources
 {
-  public $Database;
+  public Database $Database;
 
   function Parse($Id = null)
@@ -94 +94 @@
 class NewsSource
 {
-  public $Name;
-  public $URL;
+  public string $Name;
+  public string $URL;
   public $Method;
-  public $Id;
-  public $Database;
-  public $NewsItems;
-  public $AddedCount;
+  public int $Id;
+  public Database $Database;
+  public array $NewsItems;
+  public int $AddedCount;
   public $Category;
 
@@ -109 +109 @@
   }
 
-  function Import()
+  function Import(): string
   {
     return '';
   }
 
-  function DoImport()
+  function DoImport(): string
   {
     $this->NewsItems = array();
@@ -133 +133 @@
 class NewsItem
 {
-  var $Database;
-  var $Title = '';
-  var $Content = '';
-  var $Date = '';
-  var $Link = '';
-  var $Category = '';
-  var $Author = '';
-  var $IP = '';
-  var $Enclosure = '';
+  public Database $Database;
+  public string $Title = '';
+  public string $Content = '';
+  public int $Date = 0;
+  public string $Link = '';
+  public string $Category = '';
+  public string $Author = '';
+  public string $IP = '';
+  public string $Enclosure = '';
 
-  function AddIfNotExist()
+  function AddIfNotExist(): int
   {
     $Where = '(`Title` = "'.$this->Database->real_escape_string($this->Title).'") AND '.