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

composer update (#1104)

Browse Source
This commit is contained in:
Kevin Papst
2019-09-13 17:16:53 +02:00
committed by GitHub
parent 8f2b82b832
commit 35c65ba890
10 changed files with 664 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -73,7 +73,7 @@
"symfony/phpunit-bridge": "^4.0",
"symfony/profiler-pack": "^1.0",
"symfony/thanks": "^1.0",
"symfony/web-server-bundle": "~4.2.0"
"symfony/web-server-bundle": "^4.0"
},
"config": {
"platform": {

1103
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

7
src/Twig/Extensions.php
View File

@@ -168,7 +168,12 @@ class Extensions extends AbstractExtension
*/
public function country($country)
{
return Countries::getName($country);
$country = strtoupper($country);
if (Countries::exists($country)) {
return Countries::getName($country);
}
return $country;
}
/**

15
symfony.lock
View File

@@ -426,6 +426,9 @@
"symfony/cache": {
"version": "v4.0.3"
},
"symfony/cache-contracts": {
"version": "v1.1.5"
},
"symfony/config": {
"version": "v4.0.3"
},
@@ -438,9 +441,6 @@
"ref": "9f94d3ea453cd8a3b95db7f82592d7344fe3a76a"
}
},
"symfony/contracts": {
"version": "v1.0.2"
},
"symfony/css-selector": {
"version": "v4.0.4"
},
@@ -474,6 +474,9 @@
"symfony/event-dispatcher": {
"version": "v4.0.3"
},
"symfony/event-dispatcher-contracts": {
"version": "v1.1.5"
},
"symfony/expression-language": {
"version": "v4.0.3"
},
@@ -621,6 +624,9 @@
"symfony/serializer": {
"version": "v4.1.2"
},
"symfony/service-contracts": {
"version": "v1.1.6"
},
"symfony/stopwatch": {
"version": "v4.0.3"
},
@@ -648,6 +654,9 @@
"ref": "6bcd6c570c017ea6ae5a7a6a027c929fd3542cd8"
}
},
"symfony/translation-contracts": {
"version": "v1.1.6"
},
"symfony/twig-bridge": {
"version": "v4.0.3"
},

5
tests/Controller/ControllerBaseTest.php
View File

@@ -209,6 +209,7 @@ abstract class ControllerBaseTest extends WebTestCase
{
$node = $client->getCrawler()->filter('section.content-header div.breadcrumb div.box-tools div.btn-group a.btn');
/** @var \DOMElement $element */
foreach ($node->getIterator() as $element) {
$expectedClass = str_replace('btn btn-default btn-', '', $element->getAttribute('class'));
self::assertArrayHasKey($expectedClass, $buttons);
@@ -255,7 +256,9 @@ abstract class ControllerBaseTest extends WebTestCase
$validation = $list->filter('li.text-danger');
if (count($validation) < 1) {
// decorated form fields with icon have a different html structure, see kimai-theme.html.twig
$classes = $field->parents()->getNode(1)->getAttribute('class');
/** @var \DOMElement $listMsg */
$listMsg = $field->parents()->getNode(1);
$classes = $listMsg->getAttribute('class');
self::assertContains('has-error', $classes, 'Form field has no validation message: ' . $name);
}
}

1
tests/Controller/ExportControllerTest.php
View File

@@ -60,6 +60,7 @@ class ExportControllerTest extends ControllerBaseTest
$expected = ['csv', 'html', 'pdf', 'xlsx'];
$node = $client->getCrawler()->filter('#export-buttons button');
$this->assertEquals(count($expected), $node->count());
/** @var \DOMElement $button */
foreach ($node->getIterator() as $button) {
$type = $button->getAttribute('data-type');
$this->assertContains($type, $expected);

2
tests/Controller/ProfileControllerTest.php
View File

@@ -113,6 +113,8 @@ class ProfileControllerTest extends ControllerBaseTest
$tabs = $client->getCrawler()->filter('div.nav-tabs-custom ul.nav-tabs li');
$this->assertEquals(count($expectedTabs), $tabs->count());
$foundTabs = [];
/** @var \DOMElement $tab */
foreach ($tabs->filter('a') as $tab) {
$foundTabs[] = $tab->getAttribute('href');
}

4
tests/Controller/TimesheetControllerTest.php
View File

@@ -144,7 +144,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$node = $client->getCrawler()->filter('body');
$this->assertEquals('invoice_print', $node->getNode(0)->getAttribute('class'));
/** @var \DOMElement $body */
$body = $node->getNode(0);
$this->assertEquals('invoice_print', $body->getAttribute('class'));
$result = $node->filter('section.invoice table.table tbody tr');
$this->assertEquals(5, count($result));

4
tests/Controller/TimesheetTeamControllerTest.php
View File

@@ -153,7 +153,9 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$node = $client->getCrawler()->filter('body');
$this->assertEquals('invoice_print', $node->getNode(0)->getAttribute('class'));
/** @var \DOMElement $body */
$body = $node->getNode(0);
$this->assertEquals('invoice_print', $body->getAttribute('class'));
$result = $node->filter('section.invoice table.table tbody tr');
$this->assertEquals(10, count($result));

1
tests/Controller/UserControllerTest.php
View File

@@ -78,6 +78,7 @@ class UserControllerTest extends ControllerBaseTest
$tabs = $client->getCrawler()->filter('div.nav-tabs-custom ul.nav-tabs li');
$this->assertEquals(count($expectedTabs), $tabs->count());
$foundTabs = [];
/** @var \DOMElement $tab */
foreach ($tabs->filter('a') as $tab) {
$foundTabs[] = $tab->getAttribute('href');
}