Skip to content

SF8 compatibility 2le/crudit#581 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentin-helies merged 4 commits into from
Dec 2, 2025
Merged

SF8 compatibility 2le/crudit#581 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
933f9b9
SF8 compatibility 2le/crudit#581
valentin-helies Dec 2, 2025
c629397
Fix github actions
valentin-helies Dec 2, 2025
1bc3db7
Fix phpstan
valentin-helies Dec 2, 2025
15dd607
Update composer.json
valentin-helies Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/phpstan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php_version: [8.1]
php_version: [8.4]

steps:
- uses: actions/checkout@v2

- name: "Install dependencies with Composer"
uses: php-actions/composer@v5
uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php_version }}
version: 2
args: --profile --ignore-platform-reqs

- name: 'PHPStan Static Analysis'
uses: php-actions/phpstan@v2
uses: php-actions/phpstan@v3
with:
configuration: tests/phpstan.neon
memory_limit: 256M
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php_version: [8.1]
php_version: [8.4]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php_version: [8.1]
php_version: [8.4]

steps:
- uses: actions/checkout@v2
Expand All @@ -23,7 +23,7 @@ jobs:

- name: 'Cache Composer packages'
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
18 changes: 9 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@
],
"license": "MIT",
"require": {
"php": "^8.0",
"php": "^8.4",
"laminas/laminas-escaper": "^2.11",
"symfony/property-access": "^6.0 || ^7.0",
"symfony/property-access": "^7.0 || ^8.0",
"phpoffice/phpword": "^0.18",
"tecnickcom/tcpdf": "^6.3",
"vich/uploader-bundle": "^1.19 || ^2.0",
"symfony/yaml": "^6.0 || ^7.0",
"symfony/yaml": "^7.0 || ^8.0",
"laminas/laminas-stdlib": "^3.15",
"symfony/http-foundation": "^6.0 || ^7.0",
"symfony/http-foundation": "^7.0 || ^8.0",
"symfony/http-client-contracts": "^v3.4.0",
"doctrine/orm": "^2.6 || ^3.0",
"symfony/routing": "^6.0 || ^7.0",
"symfony/framework-bundle": "^6.0 || ^7.0",
"symfony/routing": "^7.0 || ^8.0",
"symfony/framework-bundle": "^7.0 || ^8.0",
"doctrine/annotations": "^1.13",
"symfony/serializer": "^6.0 || ^7.0",
"symfony/serializer": "^7.0 || ^8.0",
"twig/twig": "^3.4.3",
"setasign/fpdi": "^2.3.6",
"symfony/process": "^6.0 || ^7.0",
"symfony/process": "^7.0 || ^8.0",
"setasign/fpdf": "1.8.4",
"alexanderpavlov/pdfmerger": "^1.0",
"symfony/dotenv": "^6.0 || ^7.0"
"symfony/dotenv": "^7.0 || ^8.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 0 additions & 2 deletions src/Command/CreateModelCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Style\SymfonyStyle;
use Lle\PdfGeneratorBundle\Entity\PdfModel;
use Lle\PdfGeneratorBundle\Generator\PdfGenerator;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

#[AsCommand(name: 'lle:pdf-generator:create-model', description: 'Create a new pdf model')]
final class CreateModelCommand extends Command
{

public function __construct(
private EntityManagerInterface $em,
private PdfGenerator $generator,
Expand Down
27 changes: 14 additions & 13 deletions src/Controller/PdfGenController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
use Symfony\Component\Yaml\Yaml;

#[Route("/admin/pdfgen")]
#[Route('/admin/pdfgen')]
class PdfGenController extends AbstractController
{
public function __construct(
Expand All @@ -27,10 +26,10 @@ public function __construct(
) {
}

#[Route("/downloadModele", name: "lle_pdf_generator_download_model")]
#[Route('/downloadModele', name: 'lle_pdf_generator_download_model')]
public function downloadModele(Request $request): Response
{
$model = $this->pdfGenerator->getRepository()->find($request->get('id'));
$model = $this->pdfGenerator->getRepository()->find($request->attributes->get('id'));

if ($model) {
$response = new BinaryFileResponse($this->pdfGenerator->getPath() . $model->getPath());
Expand All @@ -41,10 +40,10 @@ public function downloadModele(Request $request): Response
}
}

#[Route("/showModele", name: "lle_pdf_generator_show_model")]
#[Route('/showModele', name: 'lle_pdf_generator_show_model')]
public function showModele(Request $request): Response
{
$model = $this->pdfGenerator->getRepository()->find($request->get('id'));
$model = $this->pdfGenerator->getRepository()->find($request->attributes->get('id'));

if ($model) {
return $this->pdfGenerator->generateResponse($model->getCode(), [[]]);
Expand All @@ -53,14 +52,14 @@ public function showModele(Request $request): Response
}
}

#[Route("/checkModele", name: "lle_pdf_generator_check_model")]
#[Route('/checkModele', name: 'lle_pdf_generator_check_model')]
public function checkModele(Request $request): RedirectResponse
{
/** @var Session $session */
$session = $request->getSession();
$flashBag = $session->getFlashBag();

$model = $this->pdfGenerator->getRepository()->find($request->get('id'));
$model = $this->pdfGenerator->getRepository()->find($request->attributes->get('id'));

if ($model) {
$model->setCheckFile(true);
Expand Down Expand Up @@ -89,7 +88,7 @@ public function checkModele(Request $request): RedirectResponse
}
}

#[Route("/balises", name: "lle_pdf_generator_admin_balise")]
#[Route('/balises', name: 'lle_pdf_generator_admin_balise')]
public function balise(
ParameterBagInterface $parameterBag,
): Response {
Expand All @@ -99,7 +98,7 @@ public function balise(
]);
}

#[Route("/balises/{module}", name: "lle_pdf_generator_admin_model_balise")]
#[Route('/balises/{module}', name: 'lle_pdf_generator_admin_model_balise')]
public function getBalises(array $module): Response
{
$classes = [];
Expand All @@ -116,9 +115,10 @@ public function getBalises(array $module): Response
foreach ($metaDataEntity->getReflectionClass()->getProperties() as $property) {
$annotationName = $annotationReader->getPropertyAnnotation(
$property,
'Symfony\Component\Serializer\Annotation\Groups'
'Symfony\Component\Serializer\Attribute\Groups'
);

/** @phpstan-ignore-next-line */
Copy link
Contributor

@SpaghettiBolognaise SpaghettiBolognaise Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

t'aurais pu mettre un var plutôt que d'ignorer l'erreur

if ($annotationName && in_array($module, $annotationName->getGroups())) {
$fields[] = $prefix . '.' . $nameConverter->normalize($property->name);
}
Expand All @@ -128,9 +128,10 @@ public function getBalises(array $module): Response
foreach ($metaDataEntity->getReflectionClass()->getMethods() as $method) {
$annotationName = $annotationReader->getMethodAnnotation(
$method,
'Symfony\Component\Serializer\Annotation\Groups'
'Symfony\Component\Serializer\Attribute\Groups'
);

/** @phpstan-ignore-next-line */
if ($annotationName && in_array($module, $annotationName->getGroups())) {
$fields[] = $prefix . '.' . $nameConverter->normalize(str_replace('get', '', $method->name));
}
Expand Down
30 changes: 19 additions & 11 deletions src/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Lle\PdfGeneratorBundle\DependencyInjection;

use Lle\PdfGeneratorBundle\Entity\PdfModel;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;

Expand All @@ -20,17 +19,26 @@ class Configuration implements ConfigurationInterface
public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('lle_pdf_generator');

/** @var ArrayNodeDefinition $rootNode */
$rootNode = $treeBuilder->getRootNode();

$nodeBuilder = $rootNode->children();

$nodeBuilder->scalarNode('default_generator')->defaultValue('word_to_pdf')->end();
$nodeBuilder->scalarNode('path')->defaultValue('data/pdfmodel')->end();
$nodeBuilder->scalarNode('class')->defaultValue(PdfModel::class)->end();
$nodeBuilder->scalarNode('unoserver')->defaultValue('http://unoserver/convert')->end();
$nodeBuilder->arrayNode('data_models')->scalarPrototype()->end();
/** @phpstan-ignore-next-line */
$rootNode
->children()
->scalarNode('default_generator')
->defaultValue('word_to_pdf')
->end()
->scalarNode('path')
->defaultValue('data/pdfmodel')
->end()
->scalarNode('class')
->defaultValue(PdfModel::class)
->end()
->scalarNode('unoserver')
->defaultValue('http://unoserver/convert')
->end()
->arrayNode('data_models')
->scalarPrototype()
->end()
->end();

return $treeBuilder;
}
Expand Down
6 changes: 0 additions & 6 deletions src/Generator/WordToPdfGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@
use PhpOffice\PhpWord\Element\AbstractElement;
use PhpOffice\PhpWord\TemplateProcessor;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\HttpClient\HttpClient;
use Symfony\Component\HttpFoundation\ParameterBag;
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;
use Symfony\Component\PropertyAccess\PropertyAccessor;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
use Symfony\Component\PropertyAccess\PropertyPathInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
use Twig\Environment;

class WordToPdfGenerator extends AbstractPdfGenerator
{
Expand Down
2 changes: 1 addition & 1 deletion src/Lib/PdfArchive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ protected function _put_file_specification(array $file_info): void
$this->_put('<<');
$this->_put('/F (' . $this->_escape($file_info['name']) . ')');
$this->_put('/Type /Filespec');
$this->_put('/UF ' . $this->_textstring(utf8_encode($file_info['name'])));
$this->_put('/UF ' . $this->_textstring(mb_convert_encoding($file_info['name'], 'UTF-8', 'ISO-8859-1')));

if ($file_info['relationship']) {
$this->_put('/AFRelationship /' . $file_info['relationship']);
Expand Down
7 changes: 5 additions & 2 deletions tests/phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ parameters:
paths:
- ../src
- ../tests
checkMissingIterableValueType: false
checkGenericClassInNonGenericObjectType: false
ignoreErrors:
-
identifier: missingType.iterableValue
-
identifier: missingType.generics
Loading