release 1.17.2 (#3135)

* allow to input password interactively in console
* added block to simplify overwriting export template parts
* prevent installation in PHP 8.1
* composer update
* phpunit version to 9
* support negative amounts in excel export
* added system configuration actions for calendar, weekly timesheet, users
* added method to render text with full markdown support

tests/Controller/Auth/SamlControllerTest.php

@@ -16,7 +16,6 @@ use App\Tests\Configuration\TestConfigLoader;
 use App\Tests\Mocks\Saml\SamlAuthFactoryFactory;
 use OneLogin\Saml2\Auth;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Util\Xml;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -83,7 +82,7 @@ class SamlControllerTest extends TestCase
 
     public function testMetadataAction()
     {
-        $expected = <<<EOD
+        $expectedXmlString = <<<EOD
 <?xml version="1.0"?>
     <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" validUntil="2020-07-23T10:26:50Z" cacheDuration="PT604800S" entityID="https://127.0.0.1:8010/auth/saml/metadata">
         <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
@@ -118,8 +117,13 @@ EOD;
         self::assertInstanceOf(Response::class, $result);
         self::assertEquals('xml', $result->headers->get('Content-Type'));
 
-        $expected = Xml::load($expected);
-        $actual = Xml::load($result->getContent());
+        $expected = new \DOMDocument();
+        $tmp = $expected->loadXML($expectedXmlString);
+        self::assertTrue($tmp);
+
+        $actual = new \DOMDocument();
+        $tmp = $actual->loadXML($result->getContent());
+        self::assertTrue($tmp);
 
         // the "validUntil" attribute in the outer node changes per request
         self::assertEquals($expected->firstChild->firstChild, $actual->firstChild->firstChild);

tests/Controller/CalendarControllerTest.php

@@ -10,6 +10,7 @@
 namespace App\Tests\Controller;
 
 use App\Configuration\SystemConfiguration;
+use App\Entity\User;
 use App\Tests\Configuration\TestConfigLoader;
 use App\Tests\DataFixtures\TimesheetFixtures;
 
@@ -33,6 +34,11 @@ class CalendarControllerTest extends ControllerBaseTest
         $this->request($client, '/calendar/');
         $this->assertTrue($client->getResponse()->isSuccessful());
 
+        $this->assertPageActions($client, [
+            'create modal-ajax-form' => $this->createUrl('/timesheet/create'),
+            'help' => 'https://www.kimai.org/documentation/calendar.html'
+        ]);
+
         $crawler = $client->getCrawler();
         $calendar = $crawler->filter('div#timesheet_calendar');
         $this->assertEquals(1, $calendar->count());
@@ -40,6 +46,18 @@ class CalendarControllerTest extends ControllerBaseTest
         $this->assertEquals(1, $dragAndDropBoxes->count());
     }
 
+    public function testCalendarActionAsSuperAdmin()
+    {
+        $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
+        $this->assertAccessIsGranted($client, '/calendar/');
+
+        $this->assertPageActions($client, [
+            'create modal-ajax-form' => $this->createUrl('/timesheet/create'),
+            'settings modal-ajax-form' => $this->createUrl('/admin/system-config/edit/calendar'),
+            'help' => 'https://www.kimai.org/documentation/calendar.html'
+        ]);
+    }
+
     public function testCalendarActionWithGoogleSource()
     {
         $loader = new TestConfigLoader([]);

tests/Controller/CustomerControllerTest.php

@@ -9,6 +9,7 @@
 
 namespace App\Tests\Controller;
 
+use App\Configuration\SystemConfiguration;
 use App\Entity\Customer;
 use App\Entity\CustomerComment;
 use App\Entity\CustomerMeta;
@@ -161,6 +162,13 @@ class CustomerControllerTest extends ControllerBaseTest
         $this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
         $client->followRedirect();
         $node = $client->getCrawler()->filter('div.box#comments_box .direct-chat-text');
+        self::assertStringContainsString('A beautiful and short comment **with some** markdown formatting', $node->html());
+
+        $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+        $configService = static::$kernel->getContainer()->get(SystemConfiguration::class);
+        $configService->offsetSet('timesheet.markdown_content', true);
+        $this->assertAccessIsGranted($client, '/admin/customer/1/details');
+        $node = $client->getCrawler()->filter('div.box#comments_box .direct-chat-text');
         self::assertStringContainsString('<p>A beautiful and short comment <strong>with some</strong> markdown formatting</p>', $node->html());
     }
 

tests/Controller/ProjectControllerTest.php

@@ -9,6 +9,7 @@
 
 namespace App\Tests\Controller;
 
+use App\Configuration\SystemConfiguration;
 use App\Entity\Activity;
 use App\Entity\ActivityMeta;
 use App\Entity\ActivityRate;
@@ -260,6 +261,13 @@ class ProjectControllerTest extends ControllerBaseTest
         $this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
         $client->followRedirect();
         $node = $client->getCrawler()->filter('div.box#comments_box .direct-chat-text');
+        self::assertStringContainsString('A beautiful and long comment **with some** markdown formatting', $node->html());
+
+        $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+        $configService = static::$kernel->getContainer()->get(SystemConfiguration::class);
+        $configService->offsetSet('timesheet.markdown_content', true);
+        $this->assertAccessIsGranted($client, '/admin/project/1/details');
+        $node = $client->getCrawler()->filter('div.box#comments_box .direct-chat-text');
         self::assertStringContainsString('<p>A beautiful and long comment <strong>with some</strong> markdown formatting</p>', $node->html());
     }
 

tests/Controller/UserControllerTest.php

@@ -39,6 +39,7 @@ class UserControllerTest extends ControllerBaseTest
             'visibility' => '#',
             'download toolbar-action' => $this->createUrl('/admin/user/export'),
             'create' => $this->createUrl('/admin/user/create'),
+            'settings modal-ajax-form' => $this->createUrl('/admin/system-config/edit/user'),
             'help' => 'https://www.kimai.org/documentation/users.html'
         ]);
     }