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

Release 2.1.0 (#4321)

Browse Source 
* fix deprecations
* remove unused config
* replace invalid annotation type with attribute
* use AsDoctrineListener to fix deprecation
* new ModifiedSubscriber to support custom logic and fix deprecation
* removed inheritdoc comment
* new ModifiedSubscriber to support custom logic and fix deprecation
* cleanup event dispatcher interface
* re-order annotation params
* one more doctrine based deprecation
* fix query to count active timesheets
* link to "all times" to identify active timesheets
* link icon instead of text
* fix "skin" translation in wizard
* use duration filter to show duration
* added login link command and controller
* bump tabler theme to 1.0
* added wizard to force password reset by user
* allow to configure that new accounts need to reset their password
* prevent uploading twig templates by default
* bump composer packages
* enable sandbox and basic security measures for custom twig templates for invoice and export
* bump to symfony 6.3.5
* allow to export single user reports to excel
* removed broken method to reload twig cache
* added api parameter to fetch user collection fully serialized
* allow to replace or append description via timesheet batch update
* show api username above form
This commit is contained in:
Kevin Papst
2023-10-19 11:21:50 +02:00
committed by GitHub
parent 7a5b12762a
commit 38e37f1c2e
210 changed files with 1784 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
tests/Invoice/Renderer/PdfRendererTest.php
View File

@@ -10,11 +10,13 @@
namespace App\Tests\Invoice\Renderer;
use App\Invoice\Renderer\PdfRenderer;
use App\Model\InvoiceDocument;
use App\Pdf\HtmlToPdfConverter;
use App\Pdf\MPdfConverter;
use App\Tests\Mocks\FileHelperFactory;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use Twig\Loader\FilesystemLoader;
@@ -28,7 +30,7 @@ class PdfRendererTest extends KernelTestCase
{
use RendererTestTrait;
public function testSupports()
public function testSupports(): void
{
$env = new Environment(new ArrayLoader([]));
$sut = new PdfRenderer($env, $this->createMock(HtmlToPdfConverter::class));
@@ -40,11 +42,12 @@ class PdfRendererTest extends KernelTestCase
$this->assertFalse($sut->supports($this->getInvoiceDocument('open-spreadsheet.ods', true)));
}
public function testRender()
public function testRenderAttachment(): void
{
$kernel = self::bootKernel();
/** @var Environment $twig */
$twig = self::getContainer()->get('twig');
/** @var RequestStack $stack */
$stack = self::getContainer()->get('request_stack');
$cacheDir = $kernel->getContainer()->getParameter('kernel.cache_dir');
@@ -64,9 +67,83 @@ class PdfRendererTest extends KernelTestCase
$this->assertEquals('application/pdf', $response->headers->get('Content-Type'));
$this->assertStringContainsString('attachment; filename', $response->headers->get('Content-Disposition'));
$this->assertNotEmpty($response->getContent());
}
public function testRenderInline(): void
{
$kernel = self::bootKernel();
/** @var Environment $twig */
$twig = self::getContainer()->get('twig');
/** @var RequestStack $stack */
$stack = self::getContainer()->get('request_stack');
/** @var string $cacheDir */
$cacheDir = $kernel->getContainer()->getParameter('kernel.cache_dir');
$request = new Request();
$request->setLocale('en');
$stack->push($request);
/** @var FilesystemLoader $loader */
$loader = $twig->getLoader();
$loader->addPath(__DIR__ . '/../templates/', 'invoice');
$sut = new PdfRenderer($twig, new MPdfConverter((new FileHelperFactory($this))->create(), $cacheDir));
$model = $this->getInvoiceModel();
$document = $this->getInvoiceDocument('default.pdf.twig', true);
$sut->setDispositionInline(true);
$response = $sut->render($document, $model);
$this->assertStringContainsString('inline; filename', $response->headers->get('Content-Disposition'));
$this->assertNotEmpty($response->getContent());
}
public function testRenderAll(): void
{
$kernel = self::bootKernel();
/** @var Environment $twig */
$twig = self::getContainer()->get('twig');
$stack = self::getContainer()->get('request_stack');
/** @var string $cacheDir */
$cacheDir = $kernel->getContainer()->getParameter('kernel.cache_dir');
$request = new Request();
$request->setLocale('en');
$stack->push($request);
/** @var FilesystemLoader $loader */
$loader = $twig->getLoader();
$loader->addPath(__DIR__ . '/../templates/', 'invoice');
$dirs = [
__DIR__ . '/../../../templates/invoice/renderer/',
__DIR__ . '/../../../var/invoices/',
__DIR__ . '/../../../var/invoices_customer/',
__DIR__ . '/../../../var/invoices_old/',
];
$files = [];
foreach ($dirs as $dir) {
if (!is_dir($dir)) {
continue;
}
$dir = realpath($dir);
$loader->addPath($dir . '/', 'invoice');
$found = glob($dir . '/*.pdf.twig');
if ($found !== false) {
$files = array_merge($files, $found);
}
}
$sut = new PdfRenderer($twig, new MPdfConverter((new FileHelperFactory($this))->create(), $cacheDir));
$model = $this->getInvoiceModel();
foreach ($files as $filename) {
$document = new InvoiceDocument(new \SplFileInfo($filename));
$response = $sut->render($document, $model);
$this->assertEquals('application/pdf', $response->headers->get('Content-Type'));
$this->assertStringContainsString('attachment; filename', $response->headers->get('Content-Disposition'));
$this->assertNotEmpty($response->getContent());
}
}
}

58
tests/Invoice/Renderer/TwigRendererTest.php
View File

@@ -10,8 +10,10 @@
namespace App\Tests\Invoice\Renderer;
use App\Invoice\Renderer\TwigRenderer;
use App\Model\InvoiceDocument;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Twig\Environment;
use Twig\Loader\FilesystemLoader;
@@ -24,7 +26,7 @@ class TwigRendererTest extends KernelTestCase
{
use RendererTestTrait;
public function testSupports()
public function testSupports(): void
{
$loader = new FilesystemLoader();
$env = new Environment($loader);
@@ -38,11 +40,12 @@ class TwigRendererTest extends KernelTestCase
$this->assertFalse($sut->supports($this->getInvoiceDocument('open-spreadsheet.ods', true)));
}
public function testRender()
public function testRender(): void
{
$kernel = self::bootKernel();
/** @var Environment $twig */
$twig = self::getContainer()->get('twig');
/** @var RequestStack $stack */
$stack = self::getContainer()->get('request_stack');
$request = new Request();
$request->setLocale('en');
@@ -55,7 +58,7 @@ class TwigRendererTest extends KernelTestCase
$sut = new TwigRenderer($twig);
$model = $this->getInvoiceModel();
$model->getTemplate()->setLanguage('de');
$model->getTemplate()?->setLanguage('de');
$document = $this->getInvoiceDocument('timesheet.html.twig');
$response = $sut->render($document, $model);
@@ -75,4 +78,53 @@ class TwigRendererTest extends KernelTestCase
"bar\r\n" .
'Hello'), $content);
}
public function testRenderAll(): void
{
$kernel = self::bootKernel();
/** @var Environment $twig */
$twig = self::getContainer()->get('twig');
/** @var RequestStack $stack */
$stack = self::getContainer()->get('request_stack');
$request = new Request();
$request->setLocale('en');
$stack->push($request);
/** @var FilesystemLoader $loader */
$loader = $twig->getLoader();
$loader->addPath($this->getInvoiceTemplatePath(), 'invoice');
$dirs = [
__DIR__ . '/../../../templates/invoice/renderer/',
__DIR__ . '/../../../var/invoices/',
__DIR__ . '/../../../var/invoices_customer/',
__DIR__ . '/../../../var/invoices_old/',
];
$files = [];
foreach ($dirs as $dir) {
if (!is_dir($dir)) {
continue;
}
$dir = realpath($dir);
$loader->addPath($dir . '/', 'invoice');
$found = glob($dir . '/*.html.twig');
if ($found !== false) {
$files = array_merge($files, $found);
}
}
$sut = new TwigRenderer($twig);
$model = $this->getInvoiceModel();
$model->getTemplate()?->setLanguage('de');
foreach ($files as $filename) {
$document = new InvoiceDocument(new \SplFileInfo($filename));
$response = $sut->render($document, $model);
$this->assertEquals('text/html; charset=UTF-8', $response->headers->get('Content-Type'));
$this->assertNotEmpty($response->getContent());
}
}
}

3
tests/Invoice/templates/default.pdf.twig
View File

@@ -1,6 +1,5 @@
<!DOCTYPE html>
{% set fallback = app.request is not null ? app.request.locale : 'en' %}
{% set language = model.template.language|default(fallback) %}
{% set language = invoice['invoice.language'] %}
{% set currency = model.currency %}
<html lang="{{ language }}">
<head>