Skip to content

Commit 10d9cda

Browse files
committed
Add Symfony 8 support
1 parent ee3e0b7 commit 10d9cda

3 files changed

Lines changed: 62 additions & 42 deletions

File tree

composer.json

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
{
2-
"name": "tomsgu/pdf-merger-bundle",
3-
"description": "Symfony bundle that integrates tomsgu/pdf-merge lib.",
4-
"type": "symfony-bundle",
5-
"license": "MIT",
6-
"keywords": [
7-
"pdf merger bundle merge"
8-
],
9-
"authors": [
10-
{
11-
"name": "Tomas Jakl",
12-
"email": "tomasjakll@gmail.com"
13-
}
14-
],
15-
"require": {
16-
"php": "^7.2 || ^8.0",
17-
"symfony/framework-bundle": "^4.0 || ^5.0 || ^6.0 || ^7.0",
18-
"tomsgu/pdf-merger": "0.*"
19-
},
20-
"require-dev": {
21-
"symfony/phpunit-bridge": "^4.0 || ^5.0 || ^6.0"
22-
23-
},
24-
"config": {
25-
"preferred-install": {
26-
"*": "dist"
2+
"name": "tomsgu/pdf-merger-bundle",
3+
"description": "Symfony bundle that integrates tomsgu/pdf-merge lib.",
4+
"type": "symfony-bundle",
5+
"license": "MIT",
6+
"keywords": [
7+
"pdf merger bundle merge"
8+
],
9+
"authors": [
10+
{
11+
"name": "Tomas Jakl",
12+
"email": "tomasjakll@gmail.com"
13+
}
14+
],
15+
"require": {
16+
"php": "^7.2 || ^8.0",
17+
"symfony/framework-bundle": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
18+
"tomsgu/pdf-merger": "0.*"
19+
},
20+
"require-dev": {
21+
"symfony/phpunit-bridge": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
22+
},
23+
"config": {
24+
"preferred-install": {
25+
"*": "dist"
26+
},
27+
"sort-packages": true
2728
},
28-
"sort-packages": true
29-
},
30-
"autoload": {
31-
"psr-4": {
32-
"Tomsgu\\PdfMergerBundle\\": "src/"
29+
"autoload": {
30+
"psr-4": {
31+
"Tomsgu\\PdfMergerBundle\\": "src/"
32+
},
33+
"exclude-from-classmap": [
34+
"/Tests/"
35+
]
3336
},
34-
"exclude-from-classmap": [
35-
"/Tests/"
36-
]
37-
},
38-
"autoload-dev": {
39-
"psr-4": {
40-
"Tomsgu\\PdfMergerBundle\\Tests\\": "tests/"
37+
"autoload-dev": {
38+
"psr-4": {
39+
"Tomsgu\\PdfMergerBundle\\Tests\\": "tests/"
40+
}
4141
}
42-
}
4342
}

src/DependencyInjection/TomsguPdfMergerExtension.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Symfony\Component\DependencyInjection\Alias;
1010
use Symfony\Component\DependencyInjection\ContainerBuilder;
1111
use Symfony\Component\DependencyInjection\Loader;
12-
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
12+
use Symfony\Component\DependencyInjection\Extension\Extension;
1313

1414
/**
1515
* @author Tomas Jakl <tomasjakll@gmail.com>
@@ -23,11 +23,13 @@ public function load(array $configs, ContainerBuilder $container): void
2323
{
2424
$processor = new Processor();
2525
$configuration = new Configuration();
26-
$loader = new Loader\XmlFileLoader($container,
27-
new FileLocator(__DIR__.'/../Resources/config'));
26+
$loader = new Loader\PhpFileLoader(
27+
$container,
28+
new FileLocator(__DIR__ . '/../Resources/config')
29+
);
2830
$config = $processor->processConfiguration($configuration, $configs);
2931

30-
$loader->load('pdf_merger.xml');
32+
$loader->load('pdf_merger.php');
3133
$container->setAlias('Tomsgu\PdfMerger\PdfMerger', new Alias('tomsgu_pdf_merger.pdf_merger', false));
3234
}
3335
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use setasign\Fpdi\Fpdi;
6+
use Tomsgu\PdfMerger\PdfMerger;
7+
8+
return static function (ContainerConfigurator $container) {
9+
$services = $container->services();
10+
11+
$services->set('tomsgu_pdf_merger.pdf_merger', PdfMerger::class)
12+
->args([service('tomsgu_pdf_merger.fpdi')])
13+
->private()
14+
;
15+
16+
$services->set('tomsgu_pdf_merger.fpdi', Fpdi::class)
17+
->private()
18+
;
19+
};

0 commit comments

Comments
 (0)