Skip to content

Commit 0fecd8a

Browse files
authored
Drop support for PHP 7.4 and 8.0, introduce support for PHP 8.4, fix semconv deprecations (#315)
* Fixed a bit of warnings and deprecations * Dropped support for PHP 7.4 and 8.0. Introduced support for PHP 8.4 * Set revision psalm to 6.4.0, more suppressions * Curl instrumentation fix * updated packages generating deprecated warnings
1 parent 83ad69d commit 0fecd8a

File tree

8 files changed

+14
-7
lines changed

8 files changed

+14
-7
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"phan/phan": "^5.0",
1717
"phpstan/phpstan": "^1.1",
1818
"phpstan/phpstan-phpunit": "^1.0",
19-
"psalm/plugin-phpunit": "^0.18.4",
19+
"psalm/plugin-phpunit": "^0.19.2",
2020
"phpunit/phpunit": "^10 || ^11",
21-
"vimeo/psalm": "^4|^5"
21+
"vimeo/psalm": "^4|^5|6.4.0"
2222
},
2323
"autoload": {
2424
"psr-4": {

psalm.xml.dist

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
<directory name="src/ComponentProvider"/>
2121
</errorLevel>
2222
</UndefinedInterfaceMethod>
23-
<PossiblyNullReference>
24-
<errorLevel type="suppress">
25-
<directory name="src/ComponentProvider"/>
26-
</errorLevel>
27-
</PossiblyNullReference>
2823
<MoreSpecificImplementedParamType>
2924
<errorLevel type="suppress">
3025
<directory name="src/ComponentProvider"/>

src/ComponentProvider/SamplerRuleBased.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public function createPlugin(array $properties, Context $context): SamplerInterf
5252
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
5353
{
5454
$node = new ArrayNodeDefinition('contrib_rule_based');
55+
56+
/** @psalm-suppress PossiblyNullReference */
5557
$node
5658
->children()
5759
->arrayNode('rule_sets')

src/ComponentProvider/SamplingRuleAttribute.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
3636
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
3737
{
3838
$node = new ArrayNodeDefinition('attribute');
39+
40+
/** @psalm-suppress PossiblyNullReference */
3941
$node
4042
->children()
4143
->scalarNode('key')

src/ComponentProvider/SamplingRuleLink.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
3434
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
3535
{
3636
$node = new ArrayNodeDefinition('link');
37+
38+
/** @psalm-suppress PossiblyNullReference */
3739
$node
3840
->children()
3941
->booleanNode('sampled')->isRequired()->end()

src/ComponentProvider/SamplingRuleParent.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
3434
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
3535
{
3636
$node = new ArrayNodeDefinition('parent');
37+
38+
/** @psalm-suppress PossiblyNullReference */
3739
$node
3840
->children()
3941
->booleanNode('sampled')->isRequired()->end()

src/ComponentProvider/SamplingRuleSpanKind.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
3939
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
4040
{
4141
$node = new ArrayNodeDefinition('span_kind');
42+
43+
/** @psalm-suppress PossiblyNullReference */
4244
$node
4345
->children()
4446
->enumNode('kind')

src/ComponentProvider/SamplingRuleSpanName.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
3434
public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
3535
{
3636
$node = new ArrayNodeDefinition('span_name');
37+
38+
/** @psalm-suppress PossiblyNullReference */
3739
$node
3840
->children()
3941
->scalarNode('pattern')

0 commit comments

Comments
 (0)