Skip to content
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.

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

Release #10

Merged
merged 4 commits into from
Jan 7, 2025
Merged
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -75,6 +75,6 @@ jobs:

- name: Upload coverage reports to Codecov
if: matrix.coverage == 'xdebug'
uses: codecov/codecov-action@v4.0.1
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -3,12 +3,21 @@
"description": "Symfony Deprecated Routes Annotations",
"license": "MIT",
"type": "library",
"require": {
"php": "^8.1",
"symfony/config": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/routing": "^6.4 || ^7.0",
"symfony/event-dispatcher": "^6.4 || ^7.0"
},
"require-dev": {
"symfony/browser-kit": "^6.0",
"phpunit/phpunit": "^10.5",
"squizlabs/php_codesniffer": "^3.8",
"symfony/yaml": "^6.4|^7.0",
"symfony/framework-bundle": "^6.4|^7.0"
"symfony/yaml": "^6.4 || ^7.0",
"symfony/framework-bundle": "^6.4 || ^7.0",
"phpstan/phpstan-symfony": "^1.3 || ^2.0"
},
"autoload": {
"psr-4": {
@@ -30,14 +39,5 @@
"composer validate"
]
},
"minimum-stability": "stable",
"require": {
"php": "^8.1",
"symfony/config": "^6.4|^7.0",
"symfony/dependency-injection": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
"symfony/routing": "^6.4|^7.0",
"phpstan/phpstan-symfony": "^1.3",
"symfony/event-dispatcher": "^6.4|^7.0"
}
"minimum-stability": "stable"
}
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ parameters:
- src/DependencyInjection/Configuration.php
paths:
- src
- tests
treatPhpDocTypesAsCertain: false
12 changes: 6 additions & 6 deletions src/DependencyInjection/DeprecatedRoutesExtension.php
Original file line number Diff line number Diff line change
@@ -5,13 +5,11 @@
namespace Macpaw\SymfonyDeprecatedRoutes\DependencyInjection;

use Exception;
use Macpaw\SymfonyDeprecatedRoutes\DeprecatedRoutesBundle;
use Macpaw\SymfonyDeprecatedRoutes\Routing\AnnotationReader\MarkDeprecatedRoutes;
use Macpaw\SymfonyDeprecatedRoutes\Routing\EventSubscriber\DeprecationRoutesEventSubscriber;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

@@ -28,14 +26,16 @@ public function load(array $configs, ContainerBuilder $container): void
$loader->load('services.yaml');

$configuration = $this->getConfiguration($configs, $container);
assert($configuration instanceof ConfigurationInterface);
$configs = $this->processConfiguration($configuration, $configs);
$definition = $container->getDefinition(DeprecationRoutesEventSubscriber::class);

$headers = $configs[Configuration::HEADER_OPTION_NAME];
$headers = $configs[Configuration::HEADER_OPTION_NAME] ?? [];
$definition->setArguments([
/** @phpstan-ignore-next-line */
'$deprecationHeaderName' => $headers[Configuration::DEPRECATION_MESSAGE_OPTION_NAME],
/** @phpstan-ignore-next-line */
'$deprecationFromHeaderName' => $headers[Configuration::DEPRECATION_FROM_OPTION_NAME],
/** @phpstan-ignore-next-line */
'$deprecationSinceHeaderName' => $headers[Configuration::DEPRECATION_SINCE_OPTION_NAME],
'$isDisabled' => $configs[Configuration::IS_DISABLED_OPTION_NAME],
]);
@@ -49,9 +49,9 @@ public function load(array $configs, ContainerBuilder $container): void
}

/**
* @param array<string, mixed> $config
* @param array<mixed> $config
*/
public function getConfiguration(array $config, ContainerBuilder $container)
public function getConfiguration(array $config, ContainerBuilder $container): ConfigurationInterface
{
return new Configuration();
}