Skip to content

Commit c8799ac

Browse files
committed
Use 1.5 for pretty-package-versions to avoid issues
1 parent 6a5ffaa commit c8799ac

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require": {
2222
"php": "^7.1",
23-
"jean85/pretty-package-versions": "^1.0",
23+
"jean85/pretty-package-versions": "^1.5",
2424
"sentry/sdk": "^2.1",
2525
"symfony/config": "^3.4||^4.0||^5.0",
2626
"symfony/console": "^3.4||^4.0||^5.0",
@@ -46,9 +46,6 @@
4646
"symfony/phpunit-bridge": "^5.0",
4747
"symfony/yaml": "^3.4||^4.0||^5.0"
4848
},
49-
"conflict": {
50-
"ocramius/package-versions": "<1.3"
51-
},
5249
"suggest": {
5350
"monolog/monolog": "Required to use the Monolog handler"
5451
},

src/DependencyInjection/Configuration.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@ public function getConfigTreeBuilder(): TreeBuilder
116116
$releaseNode = $optionsChildNodes->scalarNode('release')
117117
->info('Release version to be reported to sentry, see https://docs.sentry.io/workflow/releases/?platform=php')
118118
->example('my/application@ff11bb');
119-
120-
if (class_exists(InstalledVersions::class)) {
121-
$releaseNode->defaultValue(PrettyVersions::getVersion(InstalledVersions::getRootPackage()['name'])->getPrettyVersion());
122-
} elseif (class_exists(Versions::class)) {
123-
$releaseNode->defaultValue(PrettyVersions::getVersion(Versions::ROOT_PACKAGE_NAME)->getPrettyVersion());
124-
}
119+
$releaseNode->defaultValue(PrettyVersions::getRootPackageVersion()->getPrettyVersion());
125120

126121
$optionsChildNodes->floatNode('sample_rate')
127122
->min(0.0)

0 commit comments

Comments
 (0)