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

Code improvements (#1649)

Browse Source 
* use global namespace for faster lookups
* phpstan level 5
This commit is contained in:
Kevin Papst
2020-04-19 14:37:14 +02:00
committed by GitHub
parent 7b25e9acaf
commit 0f3fa8fdbe
183 changed files with 604 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ abstract class AbstractCalculatorTest extends TestCase
$this->assertEquals(0, $sut->getVat());
$this->assertEquals(0, $sut->getSubtotal());
$this->assertEquals(0, $sut->getTimeWorked());
$this->assertEquals(0, count($sut->getEntries()));
$this->assertEquals(0, \count($sut->getEntries()));
$this->assertEquals(0, $sut->getTax());
}
@@ -95,7 +95,7 @@ abstract class AbstractCalculatorTest extends TestCase
$model->setQuery($query);
$sut->setModel($model);
$this->assertEquals(1, count($sut->getEntries()));
$this->assertEquals(1, \count($sut->getEntries()));
/** @var Timesheet $result */
$result = $sut->getEntries()[0];

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

@@ -149,7 +149,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(5, count($sut->getEntries()));
$this->assertEquals(5, \count($sut->getEntries()));
$entries = $sut->getEntries();
$this->assertEquals(404.38, $entries[0]->getRate());

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

@@ -122,7 +122,7 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));
$this->assertEquals(3, \count($sut->getEntries()));
$entries = $sut->getEntries();
self::assertCount(3, $entries);

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

@@ -122,7 +122,7 @@ class ProjectInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));
$this->assertEquals(3, \count($sut->getEntries()));
$entries = $sut->getEntries();
self::assertCount(3, $entries);

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

@@ -102,7 +102,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(472.5, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
$this->assertEquals(1, \count($sut->getEntries()));
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
@@ -183,7 +183,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
$this->assertEquals(1, \count($sut->getEntries()));
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
@@ -262,7 +262,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5400, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
$this->assertEquals(1, \count($sut->getEntries()));
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];

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

@@ -120,7 +120,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $model->getCurrency());
$this->assertEquals(2521.12, $sut->getSubtotal());
$this->assertEquals(6600, $sut->getTimeWorked());
$this->assertEquals(3, count($sut->getEntries()));
$this->assertEquals(3, \count($sut->getEntries()));
$entries = $sut->getEntries();
$this->assertEquals(404.38, $entries[0]->getRate());

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

@@ -91,6 +91,6 @@ class InvoiceItemDefaultHydratorTest extends TestCase
sort($givenKeys);
$this->assertEquals($expectedKeys, $givenKeys);
$this->assertEquals(count($keys), count($givenKeys));
$this->assertEquals(\count($keys), \count($givenKeys));
}
}

3
tests/Invoice/NumberGenerator/ConfigurableNumberGeneratorTest.php
View File

@@ -68,8 +68,10 @@ class ConfigurableNumberGeneratorTest extends TestCase
['{cd}', '2', $invoiceDate],
// number formatting (not testing the lower case versions, as the tests might break depending on the date)
['{date,10}', '0000' . $invoiceDate->format('ymd'), $invoiceDate],
['{date,a}', $invoiceDate->format('ymd'), $invoiceDate], // invalid formatter length
['{Y,6}', '00' . $invoiceDate->format('Y'), $invoiceDate],
['{M,3}', '0' . $invoiceDate->format('m'), $invoiceDate],
['{M,#}', $invoiceDate->format('m'), $invoiceDate], // invalid formatter length
['{D,3}', '0' . $invoiceDate->format('d'), $invoiceDate],
['{c,2}', '02', $invoiceDate],
['{cy,2}', '02', $invoiceDate],
@@ -81,6 +83,7 @@ class ConfigurableNumberGeneratorTest extends TestCase
['{Y}-{cy}/{m}', $invoiceDate->format('Y') . '-2/' . $invoiceDate->format('n'), $invoiceDate],
['{Y}-{cy}/{m}', $invoiceDate->format('Y') . '-2/' . $invoiceDate->format('n'), $invoiceDate],
['{Y,5}/{cy,5}', '0' . $invoiceDate->format('Y') . '/00002', $invoiceDate],
['{Y,!}/{cy,o}', $invoiceDate->format('Y') . '/2', $invoiceDate], // invalid formatter length
];
}

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

@@ -58,9 +58,9 @@ class DebugRendererTest extends TestCase
$response = $sut->render($document, $model);
$data = json_decode($response->getContent(), true);
$this->assertModelStructure($data['model'], count($model->getQuery()->getProjects()), count($model->getQuery()->getActivities()));
$this->assertModelStructure($data['model'], \count($model->getQuery()->getProjects()), \count($model->getQuery()->getActivities()));
$rows = $data['entries'];
$this->assertEquals($expectedRows, count($rows));
$this->assertEquals($expectedRows, \count($rows));
$i = 0;
foreach ($rows as $row) {
@@ -246,6 +246,6 @@ class DebugRendererTest extends TestCase
sort($givenKeys);
$this->assertEquals($expectedKeys, $givenKeys);
$this->assertEquals(count($keys), count($givenKeys));
$this->assertEquals(\count($keys), \count($givenKeys));
}
}

2
tests/Invoice/Renderer/TextRendererTest.php
View File

@@ -74,6 +74,6 @@ class TextRendererTest extends KernelTestCase
self::assertStringContainsString(sprintf("%s:\n %s", $key, explode("\n", $value)[0]), $content);
}
}
self::assertEquals(count($model->getCalculator()->getEntries()), substr_count($content, PHP_EOL . '---' . PHP_EOL));
self::assertEquals(\count($model->getCalculator()->getEntries()), substr_count($content, PHP_EOL . '---' . PHP_EOL));
}
}

2
tests/Invoice/Renderer/XmlRendererTest.php
View File

@@ -78,6 +78,6 @@ class XmlRendererTest extends KernelTestCase
}
self::assertEquals((string) $expected[$name], (string) $element);
}
self::assertEquals(count($model->getCalculator()->getEntries()), count($xml->items->item));
self::assertEquals(\count($model->getCalculator()->getEntries()), \count($xml->items->item));
}
}

6
tests/Invoice/ServiceInvoiceTest.php
View File

@@ -88,12 +88,12 @@ class ServiceInvoiceTest extends TestCase
)
);
$this->assertEquals(1, count($sut->getCalculator()));
$this->assertEquals(1, \count($sut->getCalculator()));
$this->assertInstanceOf(DefaultCalculator::class, $sut->getCalculatorByName('default'));
$this->assertEquals(1, count($sut->getNumberGenerator()));
$this->assertEquals(1, \count($sut->getNumberGenerator()));
$this->assertInstanceOf(DateNumberGenerator::class, $sut->getNumberGeneratorByName('date'));
$this->assertEquals(1, count($sut->getRenderer()));
$this->assertEquals(1, \count($sut->getRenderer()));
}
}