From 494921f90c81db9c4e11c302bf0b8998dac37789 Mon Sep 17 00:00:00 2001 From: anahan Date: Wed, 13 May 2020 17:58:01 +0300 Subject: [PATCH 1/8] Allow symfony 5 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index cd5eeb2..dbd76f1 100644 --- a/composer.json +++ b/composer.json @@ -8,9 +8,9 @@ }, "require": { "php": ">=7.1", - "symfony/config": "~2 || ~3 || ~4", - "symfony/http-kernel": "~2 || ~3 || ~4", - "symfony/dependency-injection": "~2 || ~3 || ~4", + "symfony/config": "~2 || ~3 || ~4 || ~5", + "symfony/http-kernel": "~2 || ~3 || ~4 || ~5", + "symfony/dependency-injection": "~2 || ~3 || ~4 || ~5", "code-tool/jaeger-client-php": "@stable", "code-tool/jaeger-mongodb-collector": "~1" }, From 805ea22ac5cd912ea4859c71eb1ff57f5b1b635a Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Thu, 14 Apr 2022 18:58:51 +0300 Subject: [PATCH 2/8] Drop support for not maintained Symfony dependencies. Use latest phpunit --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index dbd76f1..be036ad 100644 --- a/composer.json +++ b/composer.json @@ -8,14 +8,14 @@ }, "require": { "php": ">=7.1", - "symfony/config": "~2 || ~3 || ~4 || ~5", - "symfony/http-kernel": "~2 || ~3 || ~4 || ~5", - "symfony/dependency-injection": "~2 || ~3 || ~4 || ~5", + "symfony/config": "^4.4 || ^5.4", + "symfony/http-kernel": "^4.4 || ^5.4", + "symfony/dependency-injection": "^4.4 || ^5.4", "code-tool/jaeger-client-php": "@stable", "code-tool/jaeger-mongodb-collector": "~1" }, "require-dev": { - "phpunit/phpunit": "@stable" + "phpunit/phpunit": "^9.5" }, "minimum-stability": "dev", "prefer-stable": true From 68b5ad227e69b88754e1ea94de00e48d587d7a85 Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Thu, 14 Apr 2022 19:02:09 +0300 Subject: [PATCH 3/8] :package: Explicitly specify supported PHP versions (7.4+,8.0+) to avoid installation for possible broken PHP versions (there is no information about future deprecations that may be used by library) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index be036ad..541d3ad 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ } }, "require": { - "php": ">=7.1", + "php": "^7.4 || ^8.0", "symfony/config": "^4.4 || ^5.4", "symfony/http-kernel": "^4.4 || ^5.4", "symfony/dependency-injection": "^4.4 || ^5.4", From 27db5b2abf070be610e6b071cf7644ef8adc2fc4 Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Thu, 14 Apr 2022 19:03:09 +0300 Subject: [PATCH 4/8] :package: Add return types for Symfony-related classes --- src/JaegerMongoDbBundle.php | 6 +++--- src/Resources/DependencyInjection/Configuration.php | 9 ++------- .../DependencyInjection/JaegerMongoDbExtension.php | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/JaegerMongoDbBundle.php b/src/JaegerMongoDbBundle.php index 587c561..fa4093a 100644 --- a/src/JaegerMongoDbBundle.php +++ b/src/JaegerMongoDbBundle.php @@ -4,11 +4,12 @@ namespace Jaeger\MongoDb\Symfony; use Jaeger\MongoDb\Symfony\Resources\DependencyInjection\JaegerMongoDbExtension; +use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; use Symfony\Component\HttpKernel\Bundle\Bundle; class JaegerMongoDbBundle extends Bundle { - public function boot() + public function boot(): void { parent::boot(); @@ -17,8 +18,7 @@ public function boot() } } - - public function getContainerExtension() + public function getContainerExtension(): ExtensionInterface { return new JaegerMongoDbExtension(); } diff --git a/src/Resources/DependencyInjection/Configuration.php b/src/Resources/DependencyInjection/Configuration.php index 102e16b..2d5c5f9 100644 --- a/src/Resources/DependencyInjection/Configuration.php +++ b/src/Resources/DependencyInjection/Configuration.php @@ -8,17 +8,12 @@ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('jaeger_mongodb'); - if (method_exists($treeBuilder, 'getRootNode')) { - $rootNode = $treeBuilder->getRootNode(); - } else { - $rootNode = $treeBuilder->root('jaeger_mongodb'); - } // @formatter:off - $rootNode + $treeBuilder->getRootNode() ->children() ->booleanNode('auto_subscribe') ->info('Register collector on bundle boot') diff --git a/src/Resources/DependencyInjection/JaegerMongoDbExtension.php b/src/Resources/DependencyInjection/JaegerMongoDbExtension.php index efbe9c6..334f6fd 100644 --- a/src/Resources/DependencyInjection/JaegerMongoDbExtension.php +++ b/src/Resources/DependencyInjection/JaegerMongoDbExtension.php @@ -11,7 +11,7 @@ class JaegerMongoDbExtension extends Extension { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $loader = new YamlFileLoader( $container, From 66e41c393897ad2a947caed4521bc4b411c4136f Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Thu, 14 Apr 2022 19:04:34 +0300 Subject: [PATCH 5/8] :package: Help SA know about type --- src/JaegerMongoDbBundle.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/JaegerMongoDbBundle.php b/src/JaegerMongoDbBundle.php index fa4093a..e3d4898 100644 --- a/src/JaegerMongoDbBundle.php +++ b/src/JaegerMongoDbBundle.php @@ -4,6 +4,7 @@ namespace Jaeger\MongoDb\Symfony; use Jaeger\MongoDb\Symfony\Resources\DependencyInjection\JaegerMongoDbExtension; +use MongoDB\Driver\Monitoring\CommandSubscriber; use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -14,7 +15,9 @@ public function boot(): void parent::boot(); if ($this->container->getParameter('jaeger.mongodb.auto_subscribe')) { - \MongoDB\Driver\Monitoring\addSubscriber($this->container->get('jaeger.mongodb.query.time.collector')); + /** @var CommandSubscriber $collector */ + $collector = $this->container->get('jaeger.mongodb.query.time.collector'); + \MongoDB\Driver\Monitoring\addSubscriber($collector); } } From 0f35fc908bfd1890d64efeff879c596981479439 Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Thu, 14 Apr 2022 19:06:09 +0300 Subject: [PATCH 6/8] :package: Add support for Symfony 6 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 541d3ad..2d1d18c 100644 --- a/composer.json +++ b/composer.json @@ -8,9 +8,9 @@ }, "require": { "php": "^7.4 || ^8.0", - "symfony/config": "^4.4 || ^5.4", - "symfony/http-kernel": "^4.4 || ^5.4", - "symfony/dependency-injection": "^4.4 || ^5.4", + "symfony/config": "^4.4 || ^5.4 || ^6.0", + "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", "code-tool/jaeger-client-php": "@stable", "code-tool/jaeger-mongodb-collector": "~1" }, From f70a8793e00e8157446259719f9fa6be8bad43f6 Mon Sep 17 00:00:00 2001 From: dozer Date: Tue, 26 Dec 2023 10:29:29 +0200 Subject: [PATCH 7/8] add symfony7 support --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 2d1d18c..1c3ba18 100644 --- a/composer.json +++ b/composer.json @@ -8,9 +8,9 @@ }, "require": { "php": "^7.4 || ^8.0", - "symfony/config": "^4.4 || ^5.4 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", + "symfony/config": "^4.4 || ^5.4 || ^6.0 || ^7.0", + "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0 || ^7.0", "code-tool/jaeger-client-php": "@stable", "code-tool/jaeger-mongodb-collector": "~1" }, From 396d8a950c2355b3fb1deebdccc6f4435d0e9b7f Mon Sep 17 00:00:00 2001 From: dozer Date: Tue, 26 Dec 2023 10:30:28 +0200 Subject: [PATCH 8/8] remove phpunit/phpunit because the tests are absent --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 1c3ba18..3506a03 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,6 @@ "code-tool/jaeger-client-php": "@stable", "code-tool/jaeger-mongodb-collector": "~1" }, - "require-dev": { - "phpunit/phpunit": "^9.5" - }, "minimum-stability": "dev", "prefer-stable": true }