resolve build issues

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
devlinjunker · Aug 7, 2023 · fbabb64 · fbabb64
1 parent 12189db
commit fbabb64
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -96,7 +96,7 @@ public function index(): TemplateResponse
  $csp->addAllowedImageDomain('*')
  ->addAllowedMediaDomain('*')
  ->addAllowedConnectDomain('*')// chrome breaks on audio elements
- ->allowEvalScript(true)
+ // ->allowEvalScript(true)
  ->addAllowedFrameDomain('https://youtube.com')
  ->addAllowedFrameDomain('https://www.youtube.com')
  ->addAllowedFrameDomain('https://player.vimeo.com')

diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php
@@ -155,7 +155,7 @@ public function rename(string $userId, int $folderId, string $newName): Entity
  public function markDelete(string $userId, int $folderId, bool $mark): Entity
  {
  $folder = $this->find($userId, $folderId);
- $time = $mark ? $this->timeFactory->getTime() : 0;
+ $time = $mark ? $this->timeFactory->now()->getTimestamp() : 0;
  $folder->setDeletedAt($time);
 
  return $this->mapper->update($folder);

diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
@@ -65,13 +65,34 @@ class FolderServiceTest extends TestCase
  protected function setUp(): void
  {
  $this->time = 222;
- $timeFactory = $this->getMockBuilder(TimeFactory::class)
- ->disableOriginalConstructor()
- ->getMock();
+
+ $timeFactoryBuilder = $this->getMockBuilder(TimeFactory::class)
+ ->disableOriginalConstructor();
+
+ // HACK: due to differences in NC26 and NC 27
+ if (!method_exists(TimeFactory::class, 'now')) {
+ $timeFactoryBuilder->addMethods(['now'])
+ ->onlyMethods(['getTime']); 
+ } else if(!method_exists(TimeFactory::class, 'getTime')) {
+ $timeFactoryBuilder->addMethods(['getTime']);
+ }
+
+ $timeFactory = $timeFactoryBuilder->getMock();
  $timeFactory->expects($this->any())
  ->method('getTime')
  ->will($this->returnValue($this->time));
 
+ $mockDateTime = $this->getMockBuilder(\DateTimeImmutable::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $mockDateTime->expects($this->any())
+ ->method('getTimestamp')
+ ->will($this->returnValue($this->time));
+
+ $timeFactory->expects($this->any())
+ ->method('now')
+ ->will($this->returnValue($mockDateTime));
+
  $this->feedService = $this->getMockBuilder(FeedServiceV2::class)
  ->disableOriginalConstructor()
  ->getMock();