only nc26+ supported

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
nextcloud · Aug 11, 2023 · a825d4f · a825d4f
1 parent f64b9b6
commit a825d4f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/lib/Service/StatusService.php b/lib/Service/StatusService.php
@@ -92,12 +92,8 @@ public function getUpdateTime(): int
 
         $time = 0;
 
-        [$major, $minor, $micro] = Util::getVersion();
-
-        if ($major >= 26) {
-            $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
-            $time = $myJobList->current()->getLastRun();
-        }
+        $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
+        $time = $myJobList->current()->getLastRun();
 
         return $time;
     }

diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
@@ -13,6 +13,8 @@
 
 namespace OCA\News\Tests\Unit\Service;
 
+use DateTime;
+use DateTimeImmutable;
 use OC\AppFramework\Utility\TimeFactory;
 use OCA\News\Db\Feed;
 use \OCA\News\Db\Folder;
@@ -48,10 +50,15 @@ class FolderServiceTest extends TestCase
     private $class;
 
     /**
-     * @var int
+     * @var DateTimeImmutable
      */
     private $time;
 
+    /**
+     * @var int
+     */
+    private $timestamp;
+
     /**
      * @var string
      */
@@ -64,12 +71,14 @@ class FolderServiceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->time = 222;
+        $this->time = new DateTimeImmutable("now");
+        $this->timestamp = $this->time->getTimestamp();
+
         $timeFactory = $this->getMockBuilder(TimeFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
         $timeFactory->expects($this->any())
-            ->method('getTime')
+            ->method('now')
             ->will($this->returnValue($this->time));
 
         $this->feedService = $this->getMockBuilder(FeedServiceV2::class)
@@ -192,7 +201,7 @@ public function testMarkDeleted()
     {
         $folder = new Folder();
         $folder2 = new Folder();
-        $folder2->setDeletedAt($this->time);
+        $folder2->setDeletedAt($this->timestamp);
 
         $this->mapper->expects($this->once())
             ->method('findFromUser')