From 42cebd8a56d13599f015bc2604b18806768dbdd9 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 16 Mar 2020 09:20:06 +0100 Subject: [PATCH 1/5] Improve release default value using PrettyVersion --- composer.json | 1 - src/DependencyInjection/Configuration.php | 3 ++- test/DependencyInjection/ConfigurationTest.php | 4 ++-- var/cache/.gitignore | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 var/cache/.gitignore diff --git a/composer.json b/composer.json index f907e6dc..add30202 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,6 @@ "require": { "php": "^7.1", "jean85/pretty-package-versions": "^1.0", - "ocramius/package-versions": "^1.3.0", "sentry/sdk": "^2.1", "symfony/config": "^3.4||^4.0||^5.0", "symfony/console": "^3.4||^4.0||^5.0", diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 198f0394..af1326dc 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -2,6 +2,7 @@ namespace Sentry\SentryBundle\DependencyInjection; +use Jean85\PrettyVersions; use PackageVersions\Versions; use Sentry\Options; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; @@ -111,7 +112,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->prototype('scalar'); $optionsChildNodes->scalarNode('project_root'); $optionsChildNodes->scalarNode('release') - ->defaultValue(Versions::getVersion(Versions::ROOT_PACKAGE_NAME)) + ->defaultValue(PrettyVersions::getVersion(Versions::ROOT_PACKAGE_NAME)->getPrettyVersion()) ->info('Release version to be reported to sentry, see https://docs.sentry.io/workflow/releases/?platform=php') ->example('my/application@ff11bb'); $optionsChildNodes->floatNode('sample_rate') diff --git a/test/DependencyInjection/ConfigurationTest.php b/test/DependencyInjection/ConfigurationTest.php index c0f644de..0c7f6629 100644 --- a/test/DependencyInjection/ConfigurationTest.php +++ b/test/DependencyInjection/ConfigurationTest.php @@ -2,7 +2,7 @@ namespace Sentry\SentryBundle\Test\DependencyInjection; -use PackageVersions\Versions; +use Jean85\PrettyVersions; use Sentry\Options; use Sentry\SentryBundle\DependencyInjection\Configuration; use Sentry\SentryBundle\Test\BaseTestCase; @@ -63,7 +63,7 @@ public function testConfigurationDefaults(): void 'excluded_exceptions' => [], 'prefixes' => $defaultSdkValues->getPrefixes(), 'tags' => [], - 'release' => Versions::getVersion('sentry/sentry-symfony'), + 'release' => PrettyVersions::getVersion('sentry/sentry-symfony')->getPrettyVersion(), ], 'monolog' => [ 'error_handler' => [ diff --git a/var/cache/.gitignore b/var/cache/.gitignore deleted file mode 100644 index 9daeafb9..00000000 --- a/var/cache/.gitignore +++ /dev/null @@ -1 +0,0 @@ -test From 4c1d90113ec70da3d2e198bce5926410c2b60185 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 16 Mar 2020 09:21:01 +0100 Subject: [PATCH 2/5] Ignore var folder generated by E2E tests --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 25fe3e9a..48e8e05b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ package.xml .idea .php_cs.cache docs/_build +var From 5e3b50b0258be97878f572a5b3c8165e586f6ecb Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 16 Mar 2020 09:30:17 +0100 Subject: [PATCH 3/5] Add changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 801d43df..6766caf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased - - ... + - Improve `release` option default value (#325) ## 3.4.3 (2020-02-03) - Change default of `in_app_include` to empty, due to getsentry/sentry-php#958 (#311) From fb6e5eb2d9354ad786f2108ee273bc4b6e277eb8 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 16 Mar 2020 09:31:44 +0100 Subject: [PATCH 4/5] Increase test resiliency --- test/DependencyInjection/SentryExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/DependencyInjection/SentryExtensionTest.php b/test/DependencyInjection/SentryExtensionTest.php index c8233e29..e6f5e2f5 100644 --- a/test/DependencyInjection/SentryExtensionTest.php +++ b/test/DependencyInjection/SentryExtensionTest.php @@ -63,7 +63,7 @@ public function testOptionsDefaultValues(): void $this->assertNull($options->getDsn()); $this->assertSame('test', $options->getEnvironment()); - $this->assertSame([realpath('./var/cache'), '/dir/project/root/vendor'], $options->getInAppExcludedPaths()); + $this->assertSame([$container->getParameter('kernel.cache_dir'), '/dir/project/root/vendor'], $options->getInAppExcludedPaths()); $this->assertSame(1, $container->getParameter('sentry.listener_priorities.request')); $this->assertSame(1, $container->getParameter('sentry.listener_priorities.sub_request')); From 9be2e8ce8088aa8666c8a712a7748e9d63af57cd Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 16 Mar 2020 09:59:58 +0100 Subject: [PATCH 5/5] Slate it to be released as 3.4.4 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6766caf4..dfc04df9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased + - ... + +## 3.4.4 (2020-03-16) - Improve `release` option default value (#325) ## 3.4.3 (2020-02-03)