fix TypeError caused by type conversion in controller

Signed-off-by: anoy <anoymouserver+github@mailbox.org> Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
Team-Forward · Mar 1, 2021 · e1dacc2 · e1dacc2
1 parent 6b0f863
commit e1dacc2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
 ### Fixed
 - opened state of folders is not restored (#1040)
 - Argument 3 passed to OCA\News\Db\ItemMapper::makeSelectQuery() must be of the type bool, array given (#1044)
+- Argument 2 passed to OCA\News\Db\ItemMapper::findAllNewFeed() must be of the type int, string given (#1049)
 
 ## [15.2.0-beta1] - 2021-01-11
 

diff --git a/lib/Controller/ItemApiController.php b/lib/Controller/ItemApiController.php
@@ -93,14 +93,14 @@ public function updated(int $type = 3, int $id = 0, int $lastModified = 0)
     {
         // needs to be turned into a millisecond timestamp to work properly
         if (strlen((string) $lastModified) <= 10) {
-            $paddedLastModified = $lastModified . '000000';
+            $paddedLastModified = $lastModified * 1000000;
         } else {
             $paddedLastModified = $lastModified;
         }
         $items = $this->oldItemService->findAllNew(
             $id,
             $type,
-            $paddedLastModified,
+            (int) $paddedLastModified,
             true,
             $this->getUserId()
         );

diff --git a/lib/Service/ItemService.php b/lib/Service/ItemService.php
@@ -73,7 +73,7 @@ public function __construct(
      *
      * @return array of items
      */
-    public function findAllNew(?int $id, $type, $updatedSince, $showAll, $userId)
+    public function findAllNew(?int $id, $type, int $updatedSince, bool $showAll, string $userId)
     {
         switch ($type) {
             case FeedType::FEED:

diff --git a/tests/Unit/Controller/ItemApiControllerTest.php b/tests/Unit/Controller/ItemApiControllerTest.php
@@ -150,7 +150,7 @@ public function testUpdated()
             ->with(
                 $this->equalTo(2),
                 $this->equalTo(1),
-                $this->equalTo('30000000'),
+                $this->equalTo(30000000),
                 $this->equalTo(true),
                 $this->equalTo($this->user->getUID())
             )