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

update to Symfony 4.4 (#1275)

Browse Source
This commit is contained in:
Kevin Papst
2020-02-04 15:29:26 +01:00
committed by GitHub
parent 375691365e
commit 75dcae6fbe
53 changed files with 1046 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Invoice/Calculator/AbstractCalculatorTest.php
View File

@@ -25,11 +25,13 @@ abstract class AbstractCalculatorTest extends TestCase
{
protected function assertEmptyModel(CalculatorInterface $sut)
{
$sut->setModel($this->getEmptyModel());
$model = $this->getEmptyModel();
$this->assertEquals('EUR', $model->getCurrency());
$sut->setModel($model);
$this->assertEquals(0, $sut->getTotal());
$this->assertEquals(0, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals(0, $sut->getSubtotal());
$this->assertEquals(0, $sut->getTimeWorked());
$this->assertEquals(0, count($sut->getEntries()));
@@ -89,7 +91,7 @@ abstract class AbstractCalculatorTest extends TestCase
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries([$timesheet]);
$model->addEntries([$timesheet]);
$model->setQuery($query);
$sut->setModel($model);

4
tests/Invoice/Calculator/ActivityInvoiceCalculatorTest.php
View File

@@ -136,7 +136,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new ActivityInvoiceCalculator();
@@ -145,7 +145,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('activity', $sut->getId());
$this->assertEquals(3000.13, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));

4
tests/Invoice/Calculator/DateInvoiceCalculatorTest.php
View File

@@ -110,7 +110,7 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new DateInvoiceCalculator();
@@ -119,7 +119,7 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('date', $sut->getId());
$this->assertEquals(3000.13, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));

4
tests/Invoice/Calculator/DefaultCalculatorTest.php
View File

@@ -61,7 +61,7 @@ class DefaultCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery(new InvoiceQuery());
$sut = new DefaultCalculator();
@@ -70,7 +70,7 @@ class DefaultCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('default', $sut->getId());
$this->assertEquals(581.17, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
}

4
tests/Invoice/Calculator/ProjectInvoiceCalculatorTest.php
View File

@@ -110,7 +110,7 @@ class ProjectInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new ProjectInvoiceCalculator();
@@ -119,7 +119,7 @@ class ProjectInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('project', $sut->getId());
$this->assertEquals(3000.13, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));

12
tests/Invoice/Calculator/ShortInvoiceCalculatorTest.php
View File

@@ -90,7 +90,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new ShortInvoiceCalculator();
@@ -99,7 +99,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('short', $sut->getId());
$this->assertEquals(562.28, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(472.5, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
@@ -171,7 +171,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new ShortInvoiceCalculator();
@@ -180,7 +180,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('short', $sut->getId());
$this->assertEquals(581.17, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
@@ -250,7 +250,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new ShortInvoiceCalculator();
@@ -259,7 +259,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('short', $sut->getId());
$this->assertEquals(581.17, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5400, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));

4
tests/Invoice/Calculator/UserInvoiceCalculatorTest.php
View File

@@ -108,7 +108,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
$model = new InvoiceModel(new DebugFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$sut = new UserInvoiceCalculator();
@@ -117,7 +117,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('user', $sut->getId());
$this->assertEquals(3000.13, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));

16
tests/Invoice/InvoiceModelTest.php
View File

@@ -59,10 +59,6 @@ class InvoiceModelTest extends TestCase
self::assertInstanceOf(InvoiceModel::class, $sut->setCalculator($calculator));
self::assertSame($calculator, $sut->getCalculator());
$entries = [new Timesheet()];
self::assertInstanceOf(InvoiceModel::class, $sut->setEntries($entries));
self::assertSame($entries, $sut->getEntries());
$generator = new DateNumberGenerator();
self::assertInstanceOf(InvoiceModel::class, $sut->setNumberGenerator($generator));
self::assertSame($generator, $sut->getNumberGenerator());
@@ -73,4 +69,16 @@ class InvoiceModelTest extends TestCase
self::assertSame($template, $sut->getTemplate());
self::assertInstanceOf(\DateTime::class, $sut->getDueDate());
}
/**
* @group legacy
*/
public function testDeprecations()
{
$sut = new InvoiceModel(new DebugFormatter());
$entries = [new Timesheet()];
self::assertInstanceOf(InvoiceModel::class, $sut->setEntries($entries));
self::assertSame($entries, $sut->getEntries());
}
}

4
tests/Invoice/Renderer/RendererTestTrait.php
View File

@@ -204,7 +204,7 @@ trait RendererTestTrait
$model = new InvoiceModel($this->getFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$model->setUser($user);
@@ -276,7 +276,7 @@ trait RendererTestTrait
$model = new InvoiceModel($this->getFormatter());
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->addEntries($entries);
$model->setQuery($query);
$model->setUser($user);