Skip to content

Commit 1e74633

Browse files
petrparolekpetrparolek
committed
clean up and minor improvements
1 parent f19b1c6 commit 1e74633

9 files changed

Lines changed: 111 additions & 139 deletions

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"mpdf/mpdf": "^8.0"
2828
},
2929
"require-dev": {
30-
"latte/latte": "~2.7",
30+
"latte/latte": "~2.10.0",
3131
"nette/application": "~3.0.0",
32-
"nette/di": "^3.0",
32+
"nette/di": "^3.0.0",
3333
"ninjify/nunjuck": "^0.3.0",
3434
"ninjify/qa": "^0.12",
3535
"phpstan/phpstan": "^0.12",

‎tests/PdfResponse/PdfResponse.full.phpt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ use Tester\Assert;
1212

1313
require __DIR__ . '/../bootstrap.php';
1414

15-
test(
16-
function (): void {
17-
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
18-
$fileResponse = new PdfResponse($origData);
19-
$fileResponse->setSaveMode(PdfResponse::INLINE);
15+
test(function (): void {
16+
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
17+
$fileResponse = new PdfResponse($origData);
18+
$fileResponse->setSaveMode(PdfResponse::INLINE);
2019

21-
ob_start();
22-
$fileResponse->send(new Request(new UrlScript()), new Response());
23-
$actualData = ob_get_clean();
20+
ob_start();
21+
$fileResponse->send(new Request(new UrlScript()), new Response());
22+
$actualData = ob_get_clean();
2423

25-
Assert::match('#^%PDF-#i', $actualData);
26-
}
27-
);
24+
Assert::match('#^%PDF-#i', $actualData);
25+
});

‎tests/PdfResponse/PdfResponse.page.format.phpt‎

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,63 +16,55 @@ use Tester\Assert;
1616
require __DIR__ . '/../bootstrap.php';
1717
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
1818

19-
test(
20-
function () use ($origData): void {
21-
$fileResponse = new PdfResponse($origData);
22-
$fileResponse->setSaveMode(PdfResponse::INLINE);
23-
$fileResponse->pageOrientation = PdfResponse::ORIENTATION_LANDSCAPE;
24-
$fileResponse->pageFormat = 'A4-L';
25-
$fileResponse->pageMargins = $fileResponse->getPageMargins();
19+
test(function () use ($origData): void {
20+
$fileResponse = new PdfResponse($origData);
21+
$fileResponse->setSaveMode(PdfResponse::INLINE);
22+
$fileResponse->pageOrientation = PdfResponse::ORIENTATION_LANDSCAPE;
23+
$fileResponse->pageFormat = 'A4-L';
24+
$fileResponse->pageMargins = $fileResponse->getPageMargins();
2625

27-
ob_start();
28-
$fileResponse->send(new Request(new UrlScript()), new Response());
29-
$actualData = ob_get_clean();
26+
ob_start();
27+
$fileResponse->send(new Request(new UrlScript()), new Response());
28+
$actualData = ob_get_clean();
3029

31-
Assert::match('#^%PDF-#i', $actualData);
32-
}
33-
);
30+
Assert::match('#^%PDF-#i', $actualData);
31+
});
3432

35-
test(
36-
function () use ($origData): void {
37-
$fileResponse = new PdfResponse($origData);
38-
$fileResponse->getMPDF();
33+
test(function () use ($origData): void {
34+
$fileResponse = new PdfResponse($origData);
35+
$fileResponse->getMPDF();
3936

40-
Assert::exception(
41-
function () use ($fileResponse): void {
42-
$fileResponse->pageOrientation = PdfResponse::ORIENTATION_LANDSCAPE;
43-
},
44-
InvalidStateException::class,
45-
'mPDF instance already created. Set page orientation before calling getMPDF'
46-
);
47-
}
48-
);
37+
Assert::exception(
38+
function () use ($fileResponse): void {
39+
$fileResponse->pageOrientation = PdfResponse::ORIENTATION_LANDSCAPE;
40+
},
41+
InvalidStateException::class,
42+
'mPDF instance already created. Set page orientation before calling getMPDF'
43+
);
44+
});
4945

50-
test(
51-
function () use ($origData): void {
52-
$fileResponse = new PdfResponse($origData);
53-
$fileResponse->getMPDF();
46+
test(function () use ($origData): void {
47+
$fileResponse = new PdfResponse($origData);
48+
$fileResponse->getMPDF();
5449

55-
Assert::exception(
56-
function () use ($fileResponse): void {
57-
$fileResponse->pageFormat = 'A4-L';
58-
},
59-
InvalidStateException::class,
60-
'mPDF instance already created. Set page format before calling getMPDF'
61-
);
62-
}
63-
);
50+
Assert::exception(
51+
function () use ($fileResponse): void {
52+
$fileResponse->pageFormat = 'A4-L';
53+
},
54+
InvalidStateException::class,
55+
'mPDF instance already created. Set page format before calling getMPDF'
56+
);
57+
});
6458

65-
test(
66-
function () use ($origData): void {
67-
$fileResponse = new PdfResponse($origData);
68-
$fileResponse->getMPDF();
59+
test(function () use ($origData): void {
60+
$fileResponse = new PdfResponse($origData);
61+
$fileResponse->getMPDF();
6962

70-
Assert::exception(
71-
function () use ($fileResponse): void {
72-
$fileResponse->pageMargins = $fileResponse->getPageMargins();
73-
},
74-
InvalidStateException::class,
75-
'mPDF instance already created. Set page margins before calling getMPDF'
76-
);
77-
}
78-
);
63+
Assert::exception(
64+
function () use ($fileResponse): void {
65+
$fileResponse->pageMargins = $fileResponse->getPageMargins();
66+
},
67+
InvalidStateException::class,
68+
'mPDF instance already created. Set page margins before calling getMPDF'
69+
);
70+
});

‎tests/PdfResponse/PdfResponse.save.phpt‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ use Tester\Assert;
99

1010
require __DIR__ . '/../bootstrap.php';
1111

12-
test(
13-
function (): void {
14-
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
15-
$fileResponse = new PdfResponse($origData);
16-
$fileResponse->setSaveMode(PdfResponse::DOWNLOAD);
17-
$fileResponse->save(TEMP_DIR, 'under_scored.pdf');
12+
test(function (): void {
13+
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
14+
$fileResponse = new PdfResponse($origData);
15+
$fileResponse->setSaveMode(PdfResponse::DOWNLOAD);
16+
$fileResponse->save(TEMP_DIR, 'under_scored.pdf');
1817

19-
Assert::true(file_exists(TEMP_DIR . '/under_scored.pdf'));
20-
}
21-
);
18+
Assert::true(file_exists(TEMP_DIR . '/under_scored.pdf'));
19+
});

‎tests/PdfResponse/PdfResponse.setters.phpt‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,26 @@ use Tester\Assert;
1010

1111
require __DIR__ . '/../bootstrap.php';
1212

13-
test(
14-
function (): void {
15-
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
16-
$fileResponse = new PdfResponse($origData);
13+
test(function (): void {
14+
$origData = file_get_contents(__DIR__ . '/templates/example1.htm');
15+
$fileResponse = new PdfResponse($origData);
1716

18-
// zoom
19-
$fileResponse->displayZoom = PdfResponse::ZOOM_REAL;
20-
$fileResponse->displayZoom = 90;
21-
Assert::exception(
22-
function () use ($fileResponse): void {
23-
$fileResponse->displayZoom = 'invalid';
24-
},
25-
InvalidArgumentException::class
26-
);
17+
// zoom
18+
$fileResponse->displayZoom = PdfResponse::ZOOM_REAL;
19+
$fileResponse->displayZoom = 90;
20+
Assert::exception(
21+
function () use ($fileResponse): void {
22+
$fileResponse->displayZoom = 'invalid';
23+
},
24+
InvalidArgumentException::class
25+
);
2726

28-
// layout
29-
$fileResponse->displayLayout = PdfResponse::LAYOUT_TWO;
30-
Assert::exception(
31-
function () use ($fileResponse): void {
32-
$fileResponse->displayLayout = 'invalid';
33-
},
34-
InvalidArgumentException::class
35-
);
36-
}
37-
);
27+
// layout
28+
$fileResponse->displayLayout = PdfResponse::LAYOUT_TWO;
29+
Assert::exception(
30+
function () use ($fileResponse): void {
31+
$fileResponse->displayLayout = 'invalid';
32+
},
33+
InvalidArgumentException::class
34+
);
35+
});

‎tests/PdfResponse/PdfResponse.symfony.crawler.phpt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ use Tester\Assert;
1212

1313
require __DIR__ . '/../bootstrap.php';
1414

15-
test(
16-
function (): void {
17-
$origData = file_get_contents(__DIR__ . '/templates/example2.htm');
18-
$fileResponse = new PdfResponse($origData);
19-
$fileResponse->setSaveMode(PdfResponse::INLINE);
20-
$fileResponse->ignoreStylesInHTMLDocument = true;
15+
test(function (): void {
16+
$origData = file_get_contents(__DIR__ . '/templates/example2.htm');
17+
$fileResponse = new PdfResponse($origData);
18+
$fileResponse->setSaveMode(PdfResponse::INLINE);
19+
$fileResponse->ignoreStylesInHTMLDocument = true;
2120

22-
ob_start();
23-
$fileResponse->send(new Request(new UrlScript()), new Response());
24-
$actualData = ob_get_clean();
21+
ob_start();
22+
$fileResponse->send(new Request(new UrlScript()), new Response());
23+
$actualData = ob_get_clean();
2524

26-
Assert::match('#^%PDF-#i', $actualData);
27-
}
28-
);
25+
Assert::match('#^%PDF-#i', $actualData);
26+
});

‎tests/PdfResponse/PdfResponseFactory.phpt‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,25 @@ use Tester\Assert;
66

77
require __DIR__ . '/../bootstrap.php';
88

9-
test(
10-
function (): void {
11-
$author = 'Jan Novák';
12-
$mpdfTmpDir = 'tmp/mpdf';
9+
test(function (): void {
10+
$author = 'Jan Novák';
11+
$mpdfTmpDir = 'tmp/mpdf';
1312

14-
$config = sprintf('
15-
parameters:
16-
mpdfConfig:
17-
tempDir: %s
18-
author: %s', $mpdfTmpDir, $author);
13+
$config = sprintf('
14+
parameters:
15+
mpdfConfig:
16+
tempDir: %s
17+
author: %s', $mpdfTmpDir, $author);
1918

20-
$config .= '
21-
services:
22-
- Contributte\PdfResponse\PdfResponseFactory(%mpdfConfig%)
23-
';
19+
$config .= '
20+
services:
21+
- Contributte\PdfResponse\PdfResponseFactory(%mpdfConfig%)
22+
';
2423

25-
$container = createContainer(new Compiler(), $config);
24+
$container = createContainer(new Compiler(), $config);
2625

27-
/** @var PdfResponseFactory $factoryInstance */
28-
$factoryInstance = $container->getByType(PdfResponseFactory::class);
29-
Assert::same($author, $factoryInstance->mpdfConfig['author']);
30-
Assert::same($mpdfTmpDir, $factoryInstance->mpdfConfig['tempDir']);
31-
}
32-
);
26+
/** @var PdfResponseFactory $factoryInstance */
27+
$factoryInstance = $container->getByType(PdfResponseFactory::class);
28+
Assert::same($author, $factoryInstance->mpdfConfig['author']);
29+
Assert::same($mpdfTmpDir, $factoryInstance->mpdfConfig['tempDir']);
30+
});

‎tests/php-unix.ini‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎tests/php-win.ini‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)