Release 2.30 (#5345)

- added missing InvoiceTemplate company, title) field validator
- graceful fallback for missing working-contract mode
- improve email test command (use configured MAIL_FROM)
- additional form types for simple usage in SystemConfiguration and UserPreferences
- allow to extend the working time query via event

tests/API/ActionsControllerTest.php

@@ -25,7 +25,7 @@ class ActionsControllerTest extends APIControllerBaseTestCase
         $this->assertUrlIsSecured('/api/actions/timesheet/1/index/en');
     }
 
-    public function test_getTimesheetActions(): void
+    public function testGetTimesheetActions(): void
     {
         $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
 
@@ -73,7 +73,7 @@ class ActionsControllerTest extends APIControllerBaseTestCase
         }
     }
 
-    public function test_getActivityActions(): void
+    public function testGetActivityActions(): void
     {
         $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
 
@@ -125,7 +125,7 @@ class ActionsControllerTest extends APIControllerBaseTestCase
         }
     }
 
-    public function test_getProjectActions(): void
+    public function testGetProjectActions(): void
     {
         $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
 
@@ -176,7 +176,7 @@ class ActionsControllerTest extends APIControllerBaseTestCase
         }
     }
 
-    public function test_getCustomerActions(): void
+    public function testGetCustomerActions(): void
     {
         $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
 

tests/Twig/LocaleFormatExtensionsTest.php

@@ -381,7 +381,7 @@ class LocaleFormatExtensionsTest extends TestCase
     /**
      * @dataProvider getMoneyData62_1
      */
-    public function testMoney62_1(string $result, null|int|float $amount, string $currency, string $locale): void
+    public function testMoney621(string $result, null|int|float $amount, string $currency, string $locale): void
     {
         IntlTestHelper::requireFullIntl($this, '62.1');
 

tests/WorkingTime/Mode/WorkingTimeModeFactoryTest.php

@@ -14,6 +14,8 @@ use App\WorkingTime\Mode\WorkingTimeModeDay;
 use App\WorkingTime\Mode\WorkingTimeModeFactory;
 use App\WorkingTime\Mode\WorkingTimeModeNone;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * @covers \App\WorkingTime\Mode\WorkingTimeModeFactory
@@ -25,7 +27,7 @@ class WorkingTimeModeFactoryTest extends TestCase
         $none = new WorkingTimeModeNone();
         $day = new WorkingTimeModeDay();
         $modes = [$none, $day];
-        $sut = new WorkingTimeModeFactory($modes);
+        $sut = new WorkingTimeModeFactory($modes, new NullLogger());
         self::assertEquals($modes, $sut->getAll());
         self::assertSame($none, $sut->getMode('none'));
         self::assertSame($day, $sut->getMode('day'));
@@ -35,12 +37,24 @@ class WorkingTimeModeFactoryTest extends TestCase
         self::assertSame($day, $sut->getModeForUser($user));
     }
 
+    public function testFallbackMode(): void
+    {
+        $logger = $this->createMock(LoggerInterface::class);
+        $logger->expects(self::once())->method('error');
+        $modes = [new WorkingTimeModeNone(), new WorkingTimeModeDay()];
+        $sut = new WorkingTimeModeFactory($modes, $logger);
+
+        $user = new User();
+        $user->setWorkContractMode('foo');
+        self::assertInstanceOf(WorkingTimeModeNone::class, $sut->getModeForUser($user));
+    }
+
     public function testException(): void
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Unknown working contract mode: foo');
 
-        $sut = new WorkingTimeModeFactory([]);
+        $sut = new WorkingTimeModeFactory([], new NullLogger());
         $sut->getMode('foo');
     }
 }