Merge branch 'fix/php82-deprecations'

LeedRSS · Jul 16, 2023 · 0f03a24 · 0f03a24
2 parents 65e635c + fa839a2
commit 0f03a24
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/Event.class.php b/Event.class.php
@@ -8,7 +8,7 @@
 
 class Event extends MysqlEntity{
 
-    protected $id,$title,$guid,$content,$description,$pudate,$link,$feed,$category,$creator,$unread,$favorite;
+    protected $id,$title,$guid,$content,$description,$pubdate,$link,$feed,$category,$creator,$unread,$favorite,$syncId;
     protected $TABLE_NAME = 'event';
     protected $object_fields =
     array(
@@ -21,7 +21,6 @@ class Event extends MysqlEntity{
         'link'=>'longstring',
         'unread'=>'integer',
         'feed'=>'integer',
-        'unread'=>'integer',
         'favorite'=>'integer',
         'pubdate'=>'integer',
         'syncId'=>'integer',

diff --git a/Feed.class.php b/Feed.class.php
@@ -163,7 +163,7 @@ protected function getEnclosureHtml($enclosure) {
                 : substr($enclosureName, strrpos($enclosureName,'.')+1);
 
             $html ='<div class="enclosure"><h1>Fichier média :</h1>';
-            $enclosureType = $enclosure->get_type();
+            $enclosureType = $enclosure->get_type() ?? '';
             if (strpos($enclosureType, 'image/') === 0) {
                 $html .= '<img src="' . $enclosure->link . '" />';
             } elseif (strpos($enclosureType, 'audio/') === 0 || strpos($enclosureType, 'application/ogg') === 0) {

diff --git a/Install.class.php b/Install.class.php
@@ -5,6 +5,7 @@ class Install {
     const DEFAULT_TABLES_PREFIX = 'leed__';
     const CONSTANT_FILE = 'constant.php';
     public $finished = false;
+    private $logger;
     public $logs = array(
         'errors' => array(),
         'notices' => array()

diff --git a/MysqlEntity.class.php b/MysqlEntity.class.php
@@ -14,6 +14,10 @@
 class MysqlEntity
 {
 
+    protected $object_fields;
+    protected $TABLE_NAME;
+    protected $object_fields_index;
+    protected $object_fields_uniques;
     protected $dbconnector = false;
     private $debug = false;
     private $debugAllQuery = false;

diff --git a/Opml.class.php b/Opml.class.php
@@ -10,15 +10,15 @@
 
 class Opml  {
 
+    private $folders;
     // liens déjà connus, déjà abonnés, au moment de l'importation
     public $alreadyKnowns = array();
 
     /**
      * Met à jour les données des flux.
      */
     protected function update() {
-        global $feedManager, $folderManager;
-        $this->feeds = $feedManager->populate('name');
+        global $folderManager;
         $this->folders = $folderManager->loadAll(array('parent'=>-1),'name');
     }
 

diff --git a/i18n.php b/i18n.php
@@ -16,9 +16,11 @@ class Translation {
     const DEFAULT_LANGUAGE = 'fr';
 
     // tableau associatif des traductions
-    var $trans = array();
-    var $language = ''; // langue courante
-    var $translatedLanguages = array(); // langues traduites
+    private $trans = array();
+    public $languages = [];
+    public $language = ''; // langue courante
+    public $translatedLanguages = array(); // langues traduites
+    private $location = '';
 
     /** @param location L'endroit où se trouve le dossier 'locale'
      *  @param languages Les langues demandées */