Fix/php8.1 depreciation

CHANGELOG.md

@@ -7,6 +7,8 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 ### Changed
 
 ### Fixed
+- fix PHP 8.1 deprecations (#1861)
+- document api item types (#1861)
 
 # Releases
 ## [18.1.1] - 2022-08-12

composer.json

@@ -61,6 +61,7 @@
     "phpstan/phpstan-strict-rules": "^1.3.0",
     "phpstan/phpstan-phpunit": "^1.0.0",
     "phpstan/extension-installer": "^1.1.0",
+    "phpstan/phpstan-deprecation-rules": "^1.0",
     "guzzlehttp/guzzle": "^7.3.0",
     "doctrine/dbal": "^3.4.1",
     "symfony/console": "^4.4.19",

docs/api/api-v1-2.md

@@ -399,6 +399,30 @@ The following attributes are **not sanitized** meaning: including them in your w
 * **mediaThumbnail**
 * **mediaDescription**
 
+#### Types
+| Name             | Default | Types        |
+|------------------|---------|--------------|
+| author           | null    | string\|null |
+| body             |         | string\|null |
+| contentHash      |         | string\|null |
+| enclosureLink    |         | string\|null |
+| enclosureMime    |         | string\|null |
+| feedId           |         | int          |
+| fingerprint      |         | string\|null |
+| guid             |         | string       |
+| guidHash         |         | string       |
+| id               |         | int          |
+| lastModified     | \"0\"   | string\|null |
+| mediaDescription |         | string\|null |
+| mediaThumbnail   |         | string\|null |
+| pubDate          |         | int\|null    |
+| rtl              | false   | bool         |
+| starred          | false   | bool         |
+| title            |         | string\|null |
+| unread           | false   | bool         |
+| updatedDate      |         | string\|null |
+| url              |         | string\|null |
+
 #### Get items
 * **Status**: Implemented
 * **Method**: GET

docs/api/api-v1-3.md

@@ -399,6 +399,30 @@ The following attributes are **not sanitized** meaning: including them in your w
 * **mediaThumbnail**
 * **mediaDescription**
 
+#### Types
+| Name             | Default | Types        |
+|------------------|---------|--------------|
+| author           | null    | string\|null |
+| body             |         | string\|null |
+| contentHash      |         | string\|null |
+| enclosureLink    |         | string\|null |
+| enclosureMime    |         | string\|null |
+| feedId           |         | int          |
+| fingerprint      |         | string\|null |
+| guid             |         | string       |
+| guidHash         |         | string       |
+| id               |         | int          |
+| lastModified     | \"0\"   | string\|null |
+| mediaDescription |         | string\|null |
+| mediaThumbnail   |         | string\|null |
+| pubDate          |         | int\|null    |
+| rtl              | false   | bool         |
+| starred          | false   | bool         |
+| title            |         | string\|null |
+| unread           | false   | bool         |
+| updatedDate      |         | string\|null |
+| url              |         | string\|null |
+
 #### Get items
 * **Status**: Implemented
 * **Method**: GET

lib/Db/Item.php

@@ -170,16 +170,24 @@ public function generateSearchIndex(): void
             ? implode('', $this->getCategories())
             : '';
 
-        $this->setSearchIndex(
-            mb_strtolower(
-                html_entity_decode(strip_tags($this->getBody())) .
-                html_entity_decode($this->getAuthor()) .
-                html_entity_decode($this->getTitle()) .
-                html_entity_decode($categoriesString) .
-                $this->getUrl(),
-                'UTF-8'
-            )
-        );
+        $stripedBody = "";
+        if (!is_null($this->getBody())) {
+            $stripedBody = strip_tags($this->getBody());
+        }
+
+        $input_list = array($stripedBody, $this->getAuthor(), $this->getTitle(), $categoriesString);
+
+        $search_string = "";
+
+        foreach ($input_list as $value) {
+            if (!is_null($value)) {
+                $search_string .= html_entity_decode($value);
+            }
+        }
+
+        $search_string .= $this->getUrl();
+
+        $this->setSearchIndex(mb_strtolower($search_string, 'UTF-8'));
         $this->setFingerprint($this->computeFingerprint());
         $this->setContentHash($this->computeContentHash());
     }
@@ -346,6 +354,9 @@ public function getCategoriesJson(): ?string
      */
     public function getCategories(): ?array
     {
+        if (is_null($this->getCategoriesJson())) {
+            return null;
+        }
         return json_decode($this->getCategoriesJson());
     }
 
@@ -594,14 +605,18 @@ public function setUnread(bool $unread): self
 
     public function setUrl(string $url = null): self
     {
+        if (is_null($url)) {
+            return $this;
+        }
+
         $url = trim($url);
         if ((strpos($url, 'http') === 0 || strpos($url, 'magnet') === 0)
             && $this->url !== $url
         ) {
             $this->url = $url;
             $this->markFieldUpdated('url');
         }
-
+    
         return $this;
     }
 

lib/Fetcher/FeedFetcher.php

@@ -354,9 +354,14 @@ protected function buildItem(
      */
     protected function getFavicon(FeedInterface $feed, string $url)
     {
+        $favicon = null;
         // trim the string because authors do funny things
-        $favicon = trim($feed->getLogo());
-
+        $feed_logo = $feed->getLogo();
+
+        if (!is_null($feed_logo)) {
+            $favicon = trim($feed_logo);
+        }
+
         ini_set('user_agent', 'NextCloud-News/1.0');
 
         $base_url = new Net_URL2($url);

lib/Utility/OPMLExporter.php

@@ -90,11 +90,21 @@ public function build(array $folders, array $feeds)
     protected function createFeedOutline(Feed $feed, DOMDocument $document)
     {
         $feedOutline = $document->createElement('outline');
-        $feedOutline->setAttribute('title', $feed->getTitle());
-        $feedOutline->setAttribute('text', $feed->getTitle());
-        $feedOutline->setAttribute('type', 'rss');
-        $feedOutline->setAttribute('xmlUrl', $feed->getUrl());
-        $feedOutline->setAttribute('htmlUrl', $feed->getLink());
+        $attributes = [
+            ['title', $feed->getTitle()],
+            ['text', $feed->getTitle()],
+            ['type', 'rss'],
+            ['xmlUrl', $feed->getUrl()],
+            ['htmlUrl', $feed->getLink()],
+        ];
+
+        foreach ($attributes as $attribute) {
+            if (is_null($attribute[1])) {
+                $feedOutline->setAttribute($attribute[0], "");
+            } else {
+                $feedOutline->setAttribute($attribute[0], $attribute[1]);
+            }
+        }
 
         return $feedOutline;
     }

tests/Unit/Db/ItemTest.php

@@ -317,6 +317,18 @@ public function testSearchIndex()
         $this->assertEquals($expected, $item->getSearchIndex());
     }
 
+    public function testSearchIndexNull()
+    {
+        $item = new Item();
+        $item->setBody('<a>somEth&auml;ng</a>');
+        $item->setUrl('http://link');
+        $item->setAuthor(null);
+        $item->setTitle('<a>t&auml;tle</a>');
+        $item->setCategories(['food', 'travel']);
+        $item->generateSearchIndex();
+        $expected = 'somethängtätlefoodtravelhttp://link';
+        $this->assertEquals($expected, $item->getSearchIndex());
+    }
 
     public function testFromImport()
     {