Release 2.0.5 (#3888)
- Fixed: mandatory fields / form validation for invoice template - Added: Duration as calendar title replacer (open: running records) - Fixed: HTML injection in Calendar - Fixed: Doctrine Proxies are not initialized (leads to empty customer/project) - Fixed: tag creation - Fixed: validation errors do not need to be logged in prod - Removed: Customer VCard download, as used library is outdated and not maintained - Added: supporting translations domains in many new places (menu, help_text, page_setup, report, exporter, calendar)
This commit is contained in:
@@ -181,7 +181,6 @@ class ActionsControllerTest extends APIControllerBaseTest
|
||||
'details',
|
||||
'edit',
|
||||
'permissions',
|
||||
'vcard',
|
||||
'divider0',
|
||||
'filter',
|
||||
'divider1',
|
||||
|
||||
@@ -46,8 +46,8 @@ class SecurityControllerTest extends ControllerBaseTest
|
||||
$content = $response->getContent();
|
||||
$this->assertStringContainsString('<title>Kimai – Time Tracking</title>', $content);
|
||||
$this->assertStringContainsString('<form action="/en/login_check" method="post"', $content);
|
||||
$this->assertStringContainsString('<input type="text" name="_username"', $content);
|
||||
$this->assertStringContainsString('<input name="_password" type="password"', $content);
|
||||
$this->assertStringContainsString('<input type="text" id="username" name="_username"', $content);
|
||||
$this->assertStringContainsString('<input id="password" name="_password" type="password"', $content);
|
||||
$this->assertStringContainsString('">Login</button>', $content);
|
||||
$this->assertStringContainsString('<input type="hidden" name="_csrf_token" value="', $content);
|
||||
$this->assertStringNotContainsString('<a href="/en/register/"', $content);
|
||||
|
||||
@@ -64,6 +64,11 @@ class TestDragAndDropSource implements DragAndDropSource
|
||||
return $this->title;
|
||||
}
|
||||
|
||||
public function getTranslationDomain(): string
|
||||
{
|
||||
return 'messages';
|
||||
}
|
||||
|
||||
public function getRoute(): string
|
||||
{
|
||||
return '';
|
||||
|
||||
@@ -14,14 +14,14 @@ use App\Export\Annotation as Exporter;
|
||||
#[Exporter\Order(['a-time', 'publicProperty', 'a-date', 'something', 'privateProperty'])]
|
||||
#[Exporter\Expose(name: 'accessor', label: 'accessor', exp: 'object.accessorMethod()')]
|
||||
#[Exporter\Expose(name: 'a-date', label: 'type-date', exp: 'object.getDateTime()', type: 'date')]
|
||||
#[Exporter\Expose(name: 'a-time', label: 'type-time', exp: 'object.getDateTime()', type: 'time')]
|
||||
#[Exporter\Expose(name: 'a-time', label: 'type-time', exp: 'object.getDateTime()', type: 'time', translationDomain: 'foo')]
|
||||
class DemoFull
|
||||
{
|
||||
#[Exporter\Expose(label: 'Public-Property', type: 'string')]
|
||||
public string $publicProperty = 'public-property';
|
||||
#[Exporter\Expose(name: 'fake-name', label: 'Protected-Property', type: 'boolean')]
|
||||
protected bool $protectedProperty = false;
|
||||
#[Exporter\Expose(label: 'Private-Property', type: 'integer')]
|
||||
#[Exporter\Expose(label: 'Private-Property', type: 'integer', translationDomain: 'test')]
|
||||
private int $privateProperty = 123; // @phpstan-ignore-line
|
||||
|
||||
#[Exporter\Expose(label: 'Public-Method')]
|
||||
@@ -48,7 +48,7 @@ class DemoFull
|
||||
}
|
||||
|
||||
// @phpstan-ignore-next-line
|
||||
#[Exporter\Expose(name: 'fake-method', label: 'Private-Method', type: 'boolean')]
|
||||
#[Exporter\Expose(name: 'fake-method', label: 'Private-Method', type: 'boolean', translationDomain: 'bar')]
|
||||
private function privateMethod(): bool
|
||||
{
|
||||
return true;
|
||||
|
||||
@@ -42,16 +42,16 @@ class AnnotationExtractorTest extends TestCase
|
||||
}
|
||||
|
||||
$expected = [
|
||||
['type-time', 'time', new \DateTime()],
|
||||
['Public-Property', 'string', 'public-property'],
|
||||
['type-date', 'date', new \DateTime()],
|
||||
['Private-Property', 'integer', 123],
|
||||
['accessor', 'string', 'accessor-method'],
|
||||
['Protected-Property', 'boolean', false],
|
||||
['Public-Method', 'string', 'public-method'],
|
||||
['Protected-Method', 'datetime', new \DateTime()],
|
||||
['duration', 'duration', 12345],
|
||||
['Private-Method', 'boolean', true],
|
||||
['type-time', 'time', new \DateTime(), 'foo'],
|
||||
['Public-Property', 'string', 'public-property', 'messages'],
|
||||
['type-date', 'date', new \DateTime(), 'messages'],
|
||||
['Private-Property', 'integer', 123, 'test'],
|
||||
['accessor', 'string', 'accessor-method', 'messages'],
|
||||
['Protected-Property', 'boolean', false, 'messages'],
|
||||
['Public-Method', 'string', 'public-method', 'messages'],
|
||||
['Protected-Method', 'datetime', new \DateTime(), 'messages'],
|
||||
['duration', 'duration', 12345, 'messages'],
|
||||
['Private-Method', 'boolean', true, 'bar'],
|
||||
];
|
||||
|
||||
$i = 0;
|
||||
@@ -66,6 +66,7 @@ class AnnotationExtractorTest extends TestCase
|
||||
if (\in_array(get_debug_type($result), ['string', 'int', 'bool', 'float'])) {
|
||||
self::assertEquals($item[2], $result);
|
||||
}
|
||||
self::assertEquals($item[3], $column->getTranslationDomain(), 'Failed translation domain for: ' . $item[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,8 +26,10 @@ class ReportTest extends TestCase
|
||||
self::assertEquals('route', $report->getRoute());
|
||||
self::assertEquals('label', $report->getLabel());
|
||||
self::assertEquals('reporting', $report->getReportIcon());
|
||||
self::assertEquals('reporting', $report->getTranslationDomain());
|
||||
|
||||
$report = new Report('id', 'route', 'label', 'foo');
|
||||
$report = new Report('id', 'route', 'label', 'foo', 'bar');
|
||||
self::assertEquals('foo', $report->getReportIcon());
|
||||
self::assertEquals('bar', $report->getTranslationDomain());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,10 @@ class MenuItemModelTest extends TestCase
|
||||
$sut = new MenuItemModel('test', 'foo', 'bar');
|
||||
|
||||
self::assertEquals('foo', $sut->getLabel());
|
||||
self::assertEquals('messages', $sut->getTranslationDomain());
|
||||
|
||||
$sut->setTranslationDomain('foo');
|
||||
self::assertEquals('foo', $sut->getTranslationDomain());
|
||||
|
||||
self::assertFalse($sut->isChildRoute('blub'));
|
||||
self::assertFalse($sut->isChildRoute('bla'));
|
||||
|
||||
@@ -26,6 +26,7 @@ class PageSetupTest extends TestCase
|
||||
self::assertNull($sut->getActionName());
|
||||
self::assertEquals([], $sut->getActionPayload());
|
||||
self::assertEquals('index', $sut->getActionView());
|
||||
self::assertEquals('messages', $sut->getTranslationDomain());
|
||||
self::assertNull($sut->getHelp());
|
||||
self::assertNull($sut->getDataTable());
|
||||
}
|
||||
@@ -39,7 +40,9 @@ class PageSetupTest extends TestCase
|
||||
$sut->setHelp('kjhgkjhgkjhg');
|
||||
$sut->setActionView('custom');
|
||||
$sut->setActionPayload(['foo' => 'bar']);
|
||||
$sut->setTranslationDomain('footuluuu');
|
||||
|
||||
self::assertEquals('footuluuu', $sut->getTranslationDomain());
|
||||
self::assertEquals('foo-bar', $sut->getTitle());
|
||||
self::assertEquals('some-action', $sut->getActionName());
|
||||
self::assertEquals(['foo' => 'bar'], $sut->getActionPayload());
|
||||
|
||||
Reference in New Issue
Block a user