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

Release 1.29 (#3622)

Browse Source
This commit is contained in:
Kevin Papst
2022-11-06 20:44:30 +01:00
committed by GitHub
parent 323baa2d65
commit 608a45408a
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/**
* The current release version
*/
public const VERSION = '1.28.1';
public const VERSION = '1.29.0';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 12801;
public const VERSION_ID = 12900;
/**
* The current release status, either "stable" or "dev"
*/

8
src/Controller/InvoiceController.php
View File

@@ -525,13 +525,17 @@ final class InvoiceController extends AbstractController
foreach ($documentRepository->findBuiltIn() as $doc) {
if ($doc->getId() === $id) {
throw new \Exception('Document is built-in and cannot be deleted');
$this->flashError('Document is built-in and cannot be deleted.');
return $this->redirectToRoute('admin_invoice_document_upload');
}
}
foreach ($this->templateRepository->findAll() as $template) {
if ($template->getRenderer() === $id) {
throw new \Exception('Document is used and cannot be deleted');
$this->flashError('Document is used and cannot be deleted.');
return $this->redirectToRoute('admin_invoice_document_upload');
}
}

15
tests/Security/ApiAuthenticatorTest.php
View File

@@ -9,6 +9,7 @@
namespace App\Tests\Security;
use App\Security\ApiAuthenticator;
use App\Security\TokenAuthenticator;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
@@ -22,7 +23,8 @@ class ApiAuthenticatorTest extends TestCase
public function testRememberMe()
{
$factory = $this->createMock(EncoderFactoryInterface::class);
$sut = new TokenAuthenticator($factory);
$token = new TokenAuthenticator($factory);
$sut = new ApiAuthenticator($token);
self::assertFalse($sut->supportsRememberMe());
}
@@ -30,25 +32,30 @@ class ApiAuthenticatorTest extends TestCase
public function testSupports()
{
$factory = $this->createMock(EncoderFactoryInterface::class);
$sut = new TokenAuthenticator($factory);
$token = new TokenAuthenticator($factory);
$sut = new ApiAuthenticator($token);
$request = new Request([], [], [], [], [], ['REQUEST_URI' => 'dfghj/api/doc/dfghj']);
self::assertFalse($sut->supports($request));
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo']);
self::assertFalse($sut->supports($request));
self::assertTrue($sut->supports($request));
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-SESSION' => true]);
self::assertFalse($sut->supports($request));
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-USER' => 'foo', 'HTTP_X-AUTH-TOKEN' => 'bar']);
self::assertTrue($sut->supports($request));
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-USER' => 'foo', 'HTTP_X-AUTH-TOKEN' => 'bar', 'HTTP_X-AUTH-SESSION' => true]);
self::assertFalse($sut->supports($request));
}
public function testGetCredentials()
{
$factory = $this->createMock(EncoderFactoryInterface::class);
$sut = new TokenAuthenticator($factory);
$token = new TokenAuthenticator($factory);
$sut = new ApiAuthenticator($token);
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-SESSION' => true]);
self::assertEquals(['user' => null, 'token' => null], $sut->getCredentials($request));

3
tests/Security/TokenAuthenticatorTest.php
View File

@@ -43,6 +43,9 @@ class TokenAuthenticatorTest extends TestCase
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-USER' => 'foo', 'HTTP_X-AUTH-TOKEN' => 'bar']);
self::assertTrue($sut->supports($request));
$request = new Request([], [], [], [], [], ['REQUEST_URI' => '/api/fooo', 'HTTP_X-AUTH-USER' => 'foo', 'HTTP_X-AUTH-TOKEN' => 'bar', 'HTTP_X-AUTH-SESSION' => true]);
self::assertTrue($sut->supports($request));
}
public function testGetCredentials()

0
translations/about.zh-Hant.xlf → translations/about.zh_Hant.xlf
View File

0
translations/messages.zh-Hant.xlf → translations/messages.zh_Hant.xlf
View File