composer: Update PHPStan to 2.0

composer.json

@@ -32,7 +32,8 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
         "php-parallel-lint/php-parallel-lint": "^1.0",
-        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
         "symfony/phpunit-bridge": "^7.0"
     },
     "license": "GPL-3.0",

phpstan.neon

@@ -27,3 +27,6 @@ parameters:
     typeAliases:
         SpoutParameterInfo: 'array{title: string, type: spouts\Parameter::TYPE_*, default: string, required: bool, validation: array<spouts\Parameter::VALIDATION_*>, values?: array<string, string>}'
         SpoutParameters: 'array<string, SpoutParameterInfo>'
+
+includes:
+    - vendor/phpstan/phpstan-deprecation-rules/rules.neon

src/controllers/Index.php

@@ -109,7 +109,7 @@ public function home(): void {
      * @return array{entries: array<array{title: string, strippedTitle: string, content: string, wordCount: int, lengthWithoutTags: int, datetime: string, updatetime: string, sourcetitle: string, tags: StringKeyedArray<array{backColor: string, foreColor: string}>}>, hasMore: bool} html with items
      */
     private function loadItems(array $params, array $tags) {
-        $options = ItemOptions::fromUser($params);
+        $options = new ItemOptions($params);
         $entries = [];
         foreach ($this->itemsDao->get($options) as $item) {
             $entries[] = $this->viewHelper->preprocessEntry($item, $this->tagsController, $tags, $options->search);

src/controllers/Items.php

@@ -149,7 +149,7 @@ public function listItems(): void {
         $this->authentication->needsLoggedInOrPublicMode();
 
         // parse params
-        $options = ItemOptions::fromUser($_GET);
+        $options = new ItemOptions($_GET);
 
         // get items
         $items = $this->itemsDao->get($options);

src/controllers/Items/Sync.php

@@ -115,9 +115,29 @@ public function sync(): void {
     public function updateStatuses(): void {
         $this->authentication->needsLoggedIn();
 
-        if (isset($_POST['updatedStatuses'])
-            && is_array($_POST['updatedStatuses'])) {
-            $this->itemsDao->bulkStatusUpdate($_POST['updatedStatuses']);
+        if (isset($_POST['updatedStatuses'])) {
+            $updatedStatuses = $_POST['updatedStatuses'];
+            if (!is_array($updatedStatuses)) {
+                $this->view->jsonError(['updatedStatuses' => 'not an array']);
+            }
+
+            foreach ($updatedStatuses as $index => $status) {
+                if (!is_array($status)) {
+                    $this->view->jsonError(["updatedStatuses[$index]" => 'not an array']);
+                }
+
+                if (!array_key_exists('id', $status)) {
+                    $this->view->jsonError(["updatedStatuses[$index]" => 'missing id argument']);
+                }
+
+                $id = (int) $status['id'];
+                if ((string) $id !== $status['id']) {
+                    $this->view->jsonError(["updatedStatuses[$index]['id']" => 'not a number']);
+                }
+                $status['id'] = $id;
+            }
+
+            $this->itemsDao->bulkStatusUpdate($updatedStatuses);
         }
 
         $this->sync();

src/controllers/Rss.php

@@ -50,7 +50,7 @@ public function rss(): void {
         $lastSourceId = 0;
         $lastSourceName = '';
 
-        $options = ItemOptions::fromUser($_GET);
+        $options = new ItemOptions($_GET);
 
         // get items
         $newestEntryDate = null;

src/daos/ItemOptions.php

@@ -11,96 +11,114 @@
  */
 final class ItemOptions {
     /** @readonly */
-    public ?int $offset = 0;
+    public ?int $offset;
 
     /** @readonly */
-    public ?string $search = null;
+    public ?string $search;
 
     /**
      * Maximum number of items to fetch from the database (unbounded)
      *
      * @readonly
      */
-    public ?int $pageSize = null;
+    public ?int $pageSize;
 
     /** @readonly */
-    public ?DateTime $fromDatetime = null;
+    public ?DateTime $fromDatetime;
 
     /** @readonly */
-    public ?int $fromId = null;
+    public ?int $fromId;
 
     /** @readonly */
-    public ?DateTime $updatedSince = null;
+    public ?DateTime $updatedSince;
 
     /** @readonly */
-    public ?string $tag = null;
+    public ?string $tag;
 
     /**
      * @var 'starred'|'unread'|null
      *
      * @readonly
      */
-    public ?string $filter = null;
+    public ?string $filter;
 
     /** @readonly */
-    public ?int $source = null;
+    public ?int $source;
 
-    /** @var int[] @readonly */
-    public array $extraIds = [];
+    /**
+     * @var int[]
+     *
+     * @readonly
+     */
+    public array $extraIds;
 
     /**
      * Creates new ItemOptions object ensuring the values are proper types.
      *
      * @param array<string, mixed> $data
-     *
-     * @return static
      */
-    public static function fromUser(array $data): self {
-        $options = new static();
-
+    public function __construct(array $data) {
         if (isset($data['offset']) && is_numeric($data['offset'])) {
-            $options->offset = (int) $data['offset'];
+            $this->offset = (int) $data['offset'];
+        } else {
+            $this->offset = 0;
         }
 
         if (isset($data['search']) && is_string($data['search']) && strlen($search = trim($data['search'])) > 0) {
-            $options->search = $search;
+            $this->search = $search;
+        } else {
+            $this->search = null;
         }
 
         if (isset($data['items']) && is_numeric($data['items'])) {
-            $options->pageSize = (int) $data['items'];
+            $this->pageSize = (int) $data['items'];
+        } else {
+            $this->pageSize = null;
         }
 
         if (isset($data['fromDatetime']) && is_string($data['fromDatetime']) && strlen($data['fromDatetime']) > 0) {
-            $options->fromDatetime = new DateTime($data['fromDatetime']);
+            $this->fromDatetime = new DateTime($data['fromDatetime']);
+        } else {
+            $this->fromDatetime = null;
         }
 
         if (isset($data['fromId']) && is_numeric($data['fromId'])) {
-            $options->fromId = (int) $data['fromId'];
+            $this->fromId = (int) $data['fromId'];
+        } else {
+            $this->fromId = null;
         }
 
         if (isset($data['updatedsince']) && is_string($data['updatedsince']) && strlen($data['updatedsince']) > 0) {
-            $options->updatedSince = new DateTime($data['updatedsince']);
+            $this->updatedSince = new DateTime($data['updatedsince']);
+        } else {
+            $this->updatedSince = null;
         }
 
         if (isset($data['tag']) && is_string($data['tag']) && strlen($tag = trim($data['tag'])) > 0) {
-            $options->tag = $tag;
+            $this->tag = $tag;
+        } else {
+            $this->tag = null;
         }
 
         if (isset($data['type']) && is_string($data['type']) && in_array($filter = trim($data['type']), ['starred', 'unread'], true)) {
-            $options->filter = $filter;
+            $this->filter = $filter;
+        } else {
+            $this->filter = null;
         }
 
         if (isset($data['source']) && is_numeric($data['source'])) {
-            $options->source = (int) $data['source'];
+            $this->source = (int) $data['source'];
+        } else {
+            $this->source = null;
         }
 
         if (isset($data['extraIds']) && is_array($data['extraIds'])) {
-            $options->extraIds = array_map(
+            $this->extraIds = array_map(
                 fn($val) => (int) $val,
                 $data['extraIds']
             );
+        } else {
+            $this->extraIds = [];
         }
-
-        return $options;
     }
 }

src/daos/Sources.php

@@ -152,6 +152,7 @@ public function validate(string $title, string $spout, array $params) {
                 }
 
                 $validation = $spout->params[$id]['validation'];
+                // @phpstan-ignore-next-line function.alreadyNarrowedType (User can create their own spouts so we cannot necessarily trust PHPDoc.)
                 if (!is_array($validation)) {
                     $validation = [$validation];
                 }