jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.29 (#5325)

Browse Source 
* bump composer packages
* fixes #5329 quotes for ANSI_MODE
* improve year selection
* improve year selection via dropdown
* added range selector in month-picker
* fix week number if week starts with sunday
* fix first day of month in URL
* predefined options for week chooser
* z-index issue with sticky table header
* replace duplicated translations
* add logout button to allow user switch without having to re-login in "remember me" login
* new flag to detect if invoice entry is a fixed rate
* improve export column lengths
This commit is contained in:
Kevin Papst
2025-02-09 00:16:03 +01:00
committed by GitHub
parent 8444928ae4
commit b42c77a2a1
106 changed files with 617 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/API/ActivityControllerTest.php
View File

@@ -32,13 +32,12 @@ class ActivityControllerTest extends APIControllerBaseTestCase
{
use RateControllerTestTrait;
/**
* @param ActivityRate $rate
* @param bool $isCollection
* @return string
*/
protected function getRateUrlByRate(RateInterface $rate, bool $isCollection): string
{
self::assertInstanceOf(ActivityRate::class, $rate);
self::assertNotNull($rate->getActivity());
self::assertNotNull($rate->getActivity()->getId());
if ($isCollection) {
return $this->getRateUrl($rate->getActivity()->getId());
}
@@ -46,7 +45,7 @@ class ActivityControllerTest extends APIControllerBaseTestCase
return $this->getRateUrl($rate->getActivity()->getId(), $rate->getId());
}
protected function getRateUrl($id = '1', $rateId = null): string
protected function getRateUrl(?int $id = 1, ?int $rateId = null): string
{
if (null !== $rateId) {
return \sprintf('/api/activities/%s/rates/%s', $id, $rateId);

11
tests/API/CustomerControllerTest.php
View File

@@ -32,13 +32,12 @@ class CustomerControllerTest extends APIControllerBaseTestCase
{
use RateControllerTestTrait;
/**
* @param CustomerRate $rate
* @param bool $isCollection
* @return string
*/
protected function getRateUrlByRate(RateInterface $rate, bool $isCollection): string
{
self::assertInstanceOf(CustomerRate::class, $rate);
self::assertNotNull($rate->getCustomer());
self::assertNotNull($rate->getCustomer()->getId());
if ($isCollection) {
return $this->getRateUrl($rate->getCustomer()->getId());
}
@@ -46,7 +45,7 @@ class CustomerControllerTest extends APIControllerBaseTestCase
return $this->getRateUrl($rate->getCustomer()->getId(), $rate->getId());
}
protected function getRateUrl($id = '1', $rateId = null): string
protected function getRateUrl(?int $id = 1, ?int $rateId = null): string
{
if (null !== $rateId) {
return \sprintf('/api/customers/%s/rates/%s', $id, $rateId);

11
tests/API/ProjectControllerTest.php
View File

@@ -32,13 +32,12 @@ class ProjectControllerTest extends APIControllerBaseTestCase
{
use RateControllerTestTrait;
/**
* @param ProjectRate $rate
* @param bool $isCollection
* @return string
*/
protected function getRateUrlByRate(RateInterface $rate, bool $isCollection): string
{
self::assertInstanceOf(ProjectRate::class, $rate);
self::assertNotNull($rate->getProject());
self::assertNotNull($rate->getProject()->getId());
if ($isCollection) {
return $this->getRateUrl($rate->getProject()->getId());
}
@@ -46,7 +45,7 @@ class ProjectControllerTest extends APIControllerBaseTestCase
return $this->getRateUrl($rate->getProject()->getId(), $rate->getId());
}
protected function getRateUrl($id = '1', $rateId = null): string
protected function getRateUrl(?int $id = 1, ?int $rateId = null): string
{
if (null !== $rateId) {
return \sprintf('/api/projects/%s/rates/%s', $id, $rateId);

2
tests/API/RateControllerTestTrait.php
View File

@@ -20,7 +20,7 @@ use App\Entity\User;
*/
trait RateControllerTestTrait
{
abstract protected function getRateUrl(string|int $id = '1', string|int|null $rateId = null): string;
abstract protected function getRateUrl(?int $id = 1, ?int $rateId = null): string;
abstract protected function getRateUrlByRate(RateInterface $rate, bool $isCollection): string;

2
tests/Export/Base/CsvRendererTest.php
View File

@@ -39,7 +39,7 @@ class CsvRendererTest extends AbstractRendererTestCase
$dispatcher = new EventDispatcher();
$dispatcher->addSubscriber(new MetaFieldColumnSubscriber());
return new CsvRenderer(new SpreadsheetRenderer($translator, $dispatcher, $security));
return new CsvRenderer(new SpreadsheetRenderer($dispatcher, $security), $translator);
}
public function testConfiguration(): void

14
tests/Export/Base/SpreadsheetRendererTest.php
View File

@@ -26,23 +26,17 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
{
public function testWriteSpreadsheetCreatesSpreadsheetWithCorrectHeaders(): void
{
$translator = $this->createMock(TranslatorInterface::class);
$translator->method('trans')->willReturnArgument(0);
$dispatcher = $this->createMock(EventDispatcherInterface::class);
$security = $this->createMock(Security::class);
$spreadsheetPackage = $this->createMock(SpreadsheetPackage::class);
$spreadsheetPackage->expects(self::once())->method('setHeader')->with([
'date', 'begin', 'end', 'duration', 'currency', 'rate', 'internalRate', 'hourlyRate', 'fixedRate', 'username', 'account_number', 'customer', 'project', 'activity', 'description', 'billable', 'tags', 'type', 'category', 'number', 'project_number', 'vat_id', 'orderNumber'
]);
$spreadsheetPackage->expects(self::once())->method('setColumns');
$renderer = new SpreadsheetRenderer($translator, $dispatcher, $security);
$renderer = new SpreadsheetRenderer($dispatcher, $security);
$renderer->writeSpreadsheet($spreadsheetPackage, [], new TimesheetQuery());
}
public function testWriteSpreadsheetAddsRowsForExportItems(): void
{
$translator = $this->createMock(TranslatorInterface::class);
$translator->method('trans')->willReturnArgument(0);
$dispatcher = $this->createMock(EventDispatcherInterface::class);
$security = $this->createMock(Security::class);
$spreadsheetPackage = $this->createMock(SpreadsheetPackage::class);
@@ -66,7 +60,7 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
$exportItem->method('getType')->willReturn('type');
$exportItem->method('getCategory')->willReturn('category');
$renderer = new SpreadsheetRenderer($translator, $dispatcher, $security);
$renderer = new SpreadsheetRenderer($dispatcher, $security);
$renderer->writeSpreadsheet($spreadsheetPackage, [$exportItem], new TimesheetQuery());
}
@@ -96,7 +90,7 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
$exportItem->method('getType')->willReturn('type');
$exportItem->method('getCategory')->willReturn('category');
$renderer = new SpreadsheetRenderer($translator, $dispatcher, $security);
$renderer = new SpreadsheetRenderer($dispatcher, $security);
$renderer->writeSpreadsheet($spreadsheetPackage, [$exportItem, $exportItem], new TimesheetQuery());
}
}

3
tests/Export/Base/XlsxRendererTest.php
View File

@@ -35,11 +35,12 @@ class XlsxRendererTest extends AbstractRendererTestCase
$security->expects($this->any())->method('isGranted')->willReturn(true);
$translator = $this->createMock(TranslatorInterface::class);
$translator->method('trans')->willReturnArgument(0);
$dispatcher = new EventDispatcher();
$dispatcher->addSubscriber(new MetaFieldColumnSubscriber());
return new XlsxRenderer(new SpreadsheetRenderer($translator, $dispatcher, $security));
return new XlsxRenderer(new SpreadsheetRenderer($dispatcher, $security), $translator);
}
public function testConfiguration(): void

29
tests/Export/Package/PhpOfficeSpreadsheetTest.php
View File

@@ -9,9 +9,12 @@
namespace App\Tests\Export\Package;
use App\Export\Package\CellFormatter\DefaultFormatter;
use App\Export\Package\Column;
use App\Export\Package\PhpOfficeSpreadsheet;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use PHPUnit\Framework\TestCase;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
* @covers \App\Export\Package\PhpOfficeSpreadsheet
@@ -33,9 +36,17 @@ class PhpOfficeSpreadsheetTest extends TestCase
}
}
private function createSut(): PhpOfficeSpreadsheet
{
$translator = $this->createMock(TranslatorInterface::class);
$translator->method('trans')->willReturnArgument(0);
return new PhpOfficeSpreadsheet($translator);
}
public function testopenSetsFilename(): void
{
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$reflection = new \ReflectionClass($spreadsheetPackage);
$property = $reflection->getProperty('filename');
@@ -48,15 +59,15 @@ class PhpOfficeSpreadsheetTest extends TestCase
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Need to call open() first before save()');
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->save();
}
public function testsaveWritesFile(): void
{
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->setHeader(['Foo', 'Bar']);
$spreadsheetPackage->setColumns([new Column('Foo', new DefaultFormatter()), new Column('Bar', new DefaultFormatter())]);
$spreadsheetPackage->addRow(['Data1', 'Data2']);
$spreadsheetPackage->addRow(['Data3', 'Data4']);
$spreadsheetPackage->save();
@@ -69,7 +80,7 @@ class PhpOfficeSpreadsheetTest extends TestCase
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Cannot re-use spreadsheet after calling save()');
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->save();
$spreadsheetPackage->save();
@@ -77,9 +88,9 @@ class PhpOfficeSpreadsheetTest extends TestCase
public function testsetHeaderSetsHeaderRow(): void
{
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->setHeader(['Column1', 'Column2']);
$spreadsheetPackage->setColumns([new Column('Column1', new DefaultFormatter()), new Column('Column2', new DefaultFormatter())]);
$reflection = new \ReflectionClass($spreadsheetPackage);
$property = $reflection->getProperty('worksheet');
@@ -94,7 +105,7 @@ class PhpOfficeSpreadsheetTest extends TestCase
public function testaddRowAddsDataRow(): void
{
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->addRow(['Data1', 'Data2']);
@@ -113,7 +124,7 @@ class PhpOfficeSpreadsheetTest extends TestCase
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Cannot re-use spreadsheet after calling save()');
$spreadsheetPackage = new PhpOfficeSpreadsheet();
$spreadsheetPackage = $this->createSut();
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->save();
$spreadsheetPackage->addRow(['Data1', 'Data2']);

10
tests/Export/Package/SpoutSpreadsheetTest.php
View File

@@ -9,9 +9,12 @@
namespace App\Tests\Export\Package;
use App\Export\Package\CellFormatter\DefaultFormatter;
use App\Export\Package\Column;
use App\Export\Package\SpoutSpreadsheet;
use OpenSpout\Writer\CSV\Writer;
use PHPUnit\Framework\TestCase;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
* @covers \App\Export\Package\SpoutSpreadsheet
@@ -35,9 +38,12 @@ class SpoutSpreadsheetTest extends TestCase
public function testsaveWritesFile(): void
{
$spreadsheetPackage = new SpoutSpreadsheet(new Writer());
$translator = $this->createMock(TranslatorInterface::class);
$translator->method('trans')->willReturnArgument(0);
$spreadsheetPackage = new SpoutSpreadsheet(new Writer(), $translator);
$spreadsheetPackage->open($this->filename);
$spreadsheetPackage->setHeader(['Foo', 'Bar']);
$spreadsheetPackage->setColumns([new Column('Foo', new DefaultFormatter()), new Column('Bar', new DefaultFormatter())]);
$spreadsheetPackage->addRow(['Data1', 'Data2']);
$spreadsheetPackage->addRow(['Data3', 'Data4']);
$spreadsheetPackage->save();

1
tests/Invoice/Hydrator/InvoiceItemDefaultHydratorTest.php
View File

@@ -57,6 +57,7 @@ class InvoiceItemDefaultHydratorTest extends TestCase
'entry.description_safe',
'entry.amount',
'entry.rate',
'entry.rate_fixed',
'entry.rate_nc',
'entry.rate_plain',
'entry.rate_internal',

1
tests/Invoice/Renderer/DebugRendererTest.php
View File

@@ -271,6 +271,7 @@ class DebugRendererTest extends TestCase
'entry.description_safe',
'entry.amount',
'entry.rate',
'entry.rate_fixed',
'entry.rate_nc',
'entry.rate_plain',
'entry.rate_internal',

60
tests/phpstan.neon
View File

@@ -142,11 +142,6 @@ parameters:
count: 4
path: API/ActionsControllerTest.php
-
message: "#^Cannot call method getId\\(\\) on App\\\\Entity\\\\Activity\\|null\\.$#"
count: 2
path: API/ActivityControllerTest.php
-
message: "#^Cannot call method getValue\\(\\) on App\\\\Entity\\\\MetaTableTypeInterface\\|null\\.$#"
count: 1
@@ -162,26 +157,11 @@ parameters:
count: 1
path: API/ActivityControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ActivityControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/ActivityControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ActivityControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$rateId with no type specified\\.$#"
count: 1
path: API/ActivityControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ActivityControllerTest\\:\\:importTestRates\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/ActivityControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ActivityControllerTest\\:\\:importTestRates\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: API/ActivityControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ActivityControllerTest\\:\\:testGetCollection\\(\\) has parameter \\$expected with no type specified\\.$#"
count: 1
@@ -242,11 +222,6 @@ parameters:
count: 1
path: API/ApiDocControllerTest.php
-
message: "#^Cannot call method getId\\(\\) on App\\\\Entity\\\\Customer\\|null\\.$#"
count: 2
path: API/CustomerControllerTest.php
-
message: "#^Cannot call method getValue\\(\\) on App\\\\Entity\\\\MetaTableTypeInterface\\|null\\.$#"
count: 1
@@ -262,36 +237,16 @@ parameters:
count: 1
path: API/CustomerControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\CustomerControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/CustomerControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\CustomerControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$rateId with no type specified\\.$#"
count: 1
path: API/CustomerControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\CustomerControllerTest\\:\\:importTestRates\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/CustomerControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\CustomerControllerTest\\:\\:importTestRates\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: API/CustomerControllerTest.php
-
message: "#^Parameter \\#5 \\$content of method App\\\\Tests\\\\API\\\\APIControllerBaseTestCase\\:\\:request\\(\\) expects string\\|null, string\\|false given\\.$#"
count: 13
path: API/CustomerControllerTest.php
-
message: "#^Cannot call method getId\\(\\) on App\\\\Entity\\\\Project\\|null\\.$#"
count: 2
path: API/ProjectControllerTest.php
-
message: "#^Cannot call method getValue\\(\\) on App\\\\Entity\\\\MetaTableTypeInterface\\|null\\.$#"
count: 1
@@ -307,26 +262,11 @@ parameters:
count: 1
path: API/ProjectControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ProjectControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/ProjectControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ProjectControllerTest\\:\\:getRateUrl\\(\\) has parameter \\$rateId with no type specified\\.$#"
count: 1
path: API/ProjectControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ProjectControllerTest\\:\\:importTestRates\\(\\) has parameter \\$id with no type specified\\.$#"
count: 1
path: API/ProjectControllerTest.php
-
message: "#^Method App\\\\Tests\\\\API\\\\ProjectControllerTest\\:\\:importTestRates\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: API/ProjectControllerTest.php
-
message: "#^Parameter \\#5 \\$content of method App\\\\Tests\\\\API\\\\APIControllerBaseTestCase\\:\\:request\\(\\) expects string\\|null, string\\|false given\\.$#"
count: 15