Skip to content

Commit

Permalink
chore: Bumped
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed Sep 24, 2024
1 parent e5a742b commit d6e16d6
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 40 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright © 2024 Ambroise Maupate
Copyright © 2023 Ambroise Maupate

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
55 changes: 27 additions & 28 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,32 @@
}
],
"type": "symfony-bundle",
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.1",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.8.1",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "~2.19.0",
"doctrine/orm": "~2.17.0",
"jms/serializer": "^3.9.0",
"league/flysystem": "^3.0",
"roadiz/models": "2.3.*",
"roadiz/rozier": "2.3.*",
"roadiz/models": "2.2.*",
"roadiz/rozier": "2.2.*",
"sensio/framework-extra-bundle": "^6.1",
"symfony/asset": "6.4.*",
"symfony/cache": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/yaml": "6.4.*",
"symfony/asset": "5.4.*",
"symfony/cache": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/runtime": "5.4.*",
"symfony/string": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/yaml": "5.4.*",
"twig/extra-bundle": "^3.0",
"twig/intl-extra": "*",
"twig/string-extra": "*",
Expand All @@ -55,14 +54,14 @@
"phpstan/phpstan-doctrine": "^1.3",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.5",
"symfony/browser-kit": "6.4.*",
"symfony/phpunit-bridge": "^7.0",
"symfony/stopwatch": "6.4.*",
"roadiz/core-bundle": "2.3.*",
"roadiz/compat-bundle": "2.3.*",
"roadiz/rozier-bundle": "2.3.*",
"roadiz/documents": "2.3.*",
"roadiz/entity-generator": "2.3.*"
"symfony/browser-kit": "5.4.*",
"symfony/phpunit-bridge": "5.4.*",
"symfony/stopwatch": "5.4.*",
"roadiz/core-bundle": "2.2.*",
"roadiz/compat-bundle": "2.2.*",
"roadiz/rozier-bundle": "2.2.*",
"roadiz/documents": "2.2.*",
"roadiz/entity-generator": "2.2.*"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -89,8 +88,8 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.3.x-dev",
"dev-develop": "2.4.x-dev"
"dev-main": "2.2.x-dev",
"dev-develop": "2.3.x-dev"
}
}
}
6 changes: 3 additions & 3 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
parameters:
level: 7
level: 5
paths:
- src
excludePaths:
- */node_modules/*
- */bower_components/*
- */static/*
ignoreErrors:
- identifier: missingType.iterableValue
- identifier: missingType.generics
- '#Call to an undefined method RZ\\Roadiz\\CoreBundle\\Repository#'
- '#Call to an undefined method RZ\\Roadiz\\UserBundle\\Repository#'
- '#Call to an undefined method Doctrine\\Persistence\\ObjectRepository#'
Expand All @@ -32,5 +30,7 @@ parameters:
- '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'

reportUnmatchedIgnoredErrors: false
checkGenericClassInNonGenericObjectType: false
checkMissingIterableValueType: false
includes:
- vendor/phpstan/phpstan-doctrine/extension.neon
13 changes: 10 additions & 3 deletions src/Controller/FontFaceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@

final class FontFaceController
{
private ManagerRegistry $managerRegistry;
private Environment $templating;
private FilesystemOperator $fontStorage;

public function __construct(
private readonly FilesystemOperator $fontStorage,
private readonly ManagerRegistry $managerRegistry,
private readonly Environment $templating,
FilesystemOperator $fontStorage,
ManagerRegistry $managerRegistry,
Environment $templating,
) {
$this->managerRegistry = $managerRegistry;
$this->templating = $templating;
$this->fontStorage = $fontStorage;
}

private function getFontData(Font $font, string $extension): ?array
Expand Down
10 changes: 6 additions & 4 deletions src/Doctrine/EventSubscriber/FontLifeCycleSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
final class FontLifeCycleSubscriber implements EventSubscriber
{
private static array $formats = ['svg', 'otf', 'eot', 'woff', 'woff2'];
private LoggerInterface $logger;
private FilesystemOperator $fontStorage;

public function __construct(
private readonly FilesystemOperator $fontStorage,
private readonly LoggerInterface $logger
) {
public function __construct(FilesystemOperator $fontStorage, LoggerInterface $logger)
{
$this->logger = $logger;
$this->fontStorage = $fontStorage;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/EventSubscriber/UpdateFontSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
*/
final class UpdateFontSubscriber implements EventSubscriberInterface
{
public function __construct(private readonly FontLifeCycleSubscriber $fontSubscriber)
private FontLifeCycleSubscriber $fontSubscriber;

public function __construct(FontLifeCycleSubscriber $fontSubscriber)
{
$this->fontSubscriber = $fontSubscriber;
}

/**
Expand Down

0 comments on commit d6e16d6

Please sign in to comment.