open-telemetry
/
opentelemetry-php
mirror of https://github.com/open-telemetry/opentelemetry-php.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing phpunit 9.6 deprecations (#922) 

phpunit v9.6 introduces a bunch of deprecations for things that will break in v10. This fixes the tests that are currently complaining.
This commit is contained in:
Brett McBride 2023-02-13 18:43:57 +11:00 committed by GitHub
parent 24af6ac173
commit e59f2c3cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.phan/config.php
View File

@ -376,7 +376,6 @@ return [
'vendor/php-http', 'vendor/php-http',
'vendor/phan/phan/src/Phan', 'vendor/phan/phan/src/Phan',
'vendor/phpunit/phpunit/src', 'vendor/phpunit/phpunit/src',
'vendor/promphp/prometheus_client_php/src',
'vendor/google/protobuf/src', 'vendor/google/protobuf/src',
], ],

3
composer.json
View File

@ -24,6 +24,7 @@
"sort-packages": true, "sort-packages": true,
"allow-plugins": { "allow-plugins": {
"composer/package-versions-deprecated": true, "composer/package-versions-deprecated": true,
"php-http/discovery": true,
"symfony/runtime": true "symfony/runtime": true
} }
}, },
@ -90,7 +91,7 @@
"phpstan/phpstan": "^1.1", "phpstan/phpstan": "^1.1",
"phpstan/phpstan-mockery": "^1.0", "phpstan/phpstan-mockery": "^1.0",
"phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^9.3", "phpunit/phpunit": "^9.6",
"psalm/plugin-mockery": "^0.9", "psalm/plugin-mockery": "^0.9",
"psalm/plugin-phpunit": "^0.18", "psalm/plugin-phpunit": "^0.18",
"psalm/psalm": "^4.0", "psalm/psalm": "^4.0",

9
tests/Unit/API/Behavior/LogsMessagesTraitTest.php
View File

@ -6,6 +6,7 @@ namespace OpenTelemetry\Tests\Unit\API\Behavior;
use OpenTelemetry\API\Behavior\LogsMessagesTrait; use OpenTelemetry\API\Behavior\LogsMessagesTrait;
use OpenTelemetry\API\Common\Log\LoggerHolder; use OpenTelemetry\API\Common\Log\LoggerHolder;
use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -37,8 +38,8 @@ class LogsMessagesTraitTest extends TestCase
$this->assertFalse(LoggerHolder::isSet()); $this->assertFalse(LoggerHolder::isSet());
$instance = $this->createInstance(); $instance = $this->createInstance();
$this->expectWarning(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectWarningMessageMatches(sprintf('/%s/', $message)); $this->expectExceptionMessageMatches(sprintf('/%s/', $message));
$instance->run('logWarning', 'foo', ['exception' => new \Exception($message)]); $instance->run('logWarning', 'foo', ['exception' => new \Exception($message)]);
} }
@ -49,8 +50,8 @@ class LogsMessagesTraitTest extends TestCase
$this->assertFalse(LoggerHolder::isSet()); $this->assertFalse(LoggerHolder::isSet());
$instance = $this->createInstance(); $instance = $this->createInstance();
$this->expectError(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectErrorMessageMatches(sprintf('/%s/', $message)); $this->expectExceptionMessageMatches(sprintf('/%s/', $message));
$instance->run('logError', 'foo', ['exception' => new \Exception($message)]); $instance->run('logError', 'foo', ['exception' => new \Exception($message)]);
} }

17
tests/Unit/Context/DebugScopeTest.php
View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace OpenTelemetry\Tests\Unit\Context; namespace OpenTelemetry\Tests\Unit\Context;
use OpenTelemetry\Context\Context; use OpenTelemetry\Context\Context;
use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -18,8 +19,8 @@ final class DebugScopeTest extends TestCase
$scope1->detach(); $scope1->detach();
$this->expectNotice(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectNoticeMessage('already detached'); $this->expectExceptionMessage('already detached');
$scope1->detach(); $scope1->detach();
} }
@ -29,8 +30,8 @@ final class DebugScopeTest extends TestCase
$scope2 = Context::getCurrent()->activate(); $scope2 = Context::getCurrent()->activate();
try { try {
$this->expectNotice(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectNoticeMessage('another scope'); $this->expectExceptionMessage('another scope');
$scope1->detach(); $scope1->detach();
} finally { } finally {
$scope2->detach(); $scope2->detach();
@ -45,8 +46,8 @@ final class DebugScopeTest extends TestCase
Context::storage()->switch(1); Context::storage()->switch(1);
try { try {
$this->expectNotice(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectNoticeMessage('different execution context'); $this->expectExceptionMessage('different execution context');
$scope1->detach(); $scope1->detach();
} finally { } finally {
Context::storage()->switch(0); Context::storage()->switch(0);
@ -57,8 +58,8 @@ final class DebugScopeTest extends TestCase
public function test_missing_scope_detach(): void public function test_missing_scope_detach(): void
{ {
try { try {
$this->expectNotice(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectNoticeMessage('missing call'); $this->expectExceptionMessage('missing call');
Context::getCurrent()->activate(); Context::getCurrent()->activate();
} finally { } finally {
/** @psalm-suppress PossiblyNullReference */ /** @psalm-suppress PossiblyNullReference */

21
tests/Unit/SDK/Common/Dev/Compatibility/UtilTest.php
View File

@ -6,6 +6,7 @@ namespace OpenTelemetry\Tests\Unit\SDK\Common\Dev\Compatibility;
use Generator; use Generator;
use OpenTelemetry\SDK\Common\Dev\Compatibility\Util; use OpenTelemetry\SDK\Common\Dev\Compatibility\Util;
use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -41,11 +42,11 @@ class UtilTest extends TestCase
/** /**
* @dataProvider errorLevelProvider * @dataProvider errorLevelProvider
*/ */
public function test_trigger_class_deprecation_notice(int $level, string $expectedError): void public function test_trigger_class_deprecation_notice(int $level): void
{ {
Util::setErrorLevel($level); Util::setErrorLevel($level);
$this->{$expectedError}(); $this->expectException(PHPUnitFrameworkException::class);
Util::triggerClassDeprecationNotice(Util::class, self::class); Util::triggerClassDeprecationNotice(Util::class, self::class);
} }
@ -53,11 +54,11 @@ class UtilTest extends TestCase
/** /**
* @dataProvider errorLevelProvider * @dataProvider errorLevelProvider
*/ */
public function test_trigger_method_deprecation_notice_without_class(int $level, string $expectedError): void public function test_trigger_method_deprecation_notice_without_class(int $level): void
{ {
Util::setErrorLevel($level); Util::setErrorLevel($level);
$this->{$expectedError}(); $this->expectException(PHPUnitFrameworkException::class);
Util::triggerMethodDeprecationNotice(Util::class, __METHOD__); Util::triggerMethodDeprecationNotice(Util::class, __METHOD__);
} }
@ -65,21 +66,21 @@ class UtilTest extends TestCase
/** /**
* @dataProvider errorLevelProvider * @dataProvider errorLevelProvider
*/ */
public function test_trigger_method_deprecation_notice_with_class(int $level, string $expectedError): void public function test_trigger_method_deprecation_notice_with_class(int $level): void
{ {
Util::setErrorLevel($level); Util::setErrorLevel($level);
$this->{$expectedError}(); $this->expectException(PHPUnitFrameworkException::class);
Util::triggerMethodDeprecationNotice(Util::class, 'foo', self::class); Util::triggerMethodDeprecationNotice(Util::class, 'foo', self::class);
} }
public function errorLevelProvider(): Generator public function errorLevelProvider(): Generator
{ {
yield [E_USER_DEPRECATED, 'expectDeprecation']; yield [E_USER_DEPRECATED];
yield [E_USER_NOTICE, 'expectNotice']; yield [E_USER_NOTICE];
yield [E_USER_WARNING, 'expectWarning']; yield [E_USER_WARNING];
yield [E_USER_ERROR, 'expectError']; yield [E_USER_ERROR];
} }
public function test_turn_errors_off(): void public function test_turn_errors_off(): void

7
tests/Unit/SDK/FactoryRegistryTest.php
View File

@ -8,6 +8,7 @@ use OpenTelemetry\SDK\Common\Export\TransportFactoryInterface;
use OpenTelemetry\SDK\Metrics\MetricExporterFactoryInterface; use OpenTelemetry\SDK\Metrics\MetricExporterFactoryInterface;
use OpenTelemetry\SDK\Registry; use OpenTelemetry\SDK\Registry;
use OpenTelemetry\SDK\Trace\SpanExporter\SpanExporterFactoryInterface; use OpenTelemetry\SDK\Trace\SpanExporter\SpanExporterFactoryInterface;
use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -79,7 +80,7 @@ class FactoryRegistryTest extends TestCase
*/ */
public function test_register_invalid_transport_factory($factory): void public function test_register_invalid_transport_factory($factory): void
{ {
$this->expectWarning(); $this->expectException(PHPUnitFrameworkException::class);
Registry::registerTransportFactory('http', $factory, true); Registry::registerTransportFactory('http', $factory, true);
} }
@ -88,7 +89,7 @@ class FactoryRegistryTest extends TestCase
*/ */
public function test_register_invalid_span_exporter_factory($factory): void public function test_register_invalid_span_exporter_factory($factory): void
{ {
$this->expectWarning(); $this->expectException(PHPUnitFrameworkException::class);
Registry::registerSpanExporterFactory('foo', $factory, true); Registry::registerSpanExporterFactory('foo', $factory, true);
} }
@ -97,7 +98,7 @@ class FactoryRegistryTest extends TestCase
*/ */
public function test_register_invalid_metric_exporter_factory($factory): void public function test_register_invalid_metric_exporter_factory($factory): void
{ {
$this->expectWarning(); $this->expectException(PHPUnitFrameworkException::class);
Registry::registerMetricExporterFactory('foo', $factory, true); Registry::registerMetricExporterFactory('foo', $factory, true);
} }

5
tests/Unit/SDK/Metrics/Stream/MetricStreamTest.php
View File

@ -19,6 +19,7 @@ use OpenTelemetry\SDK\Metrics\Stream\MetricAggregator;
use OpenTelemetry\SDK\Metrics\Stream\StreamWriter; use OpenTelemetry\SDK\Metrics\Stream\StreamWriter;
use OpenTelemetry\SDK\Metrics\Stream\SynchronousMetricStream; use OpenTelemetry\SDK\Metrics\Stream\SynchronousMetricStream;
use const PHP_INT_SIZE; use const PHP_INT_SIZE;
use PHPUnit\Framework\Exception as PHPUnitFrameworkException;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -337,8 +338,8 @@ final class MetricStreamTest extends TestCase
$s->register(Temporality::DELTA); $s->register(Temporality::DELTA);
} }
$this->expectWarning(); $this->expectException(PHPUnitFrameworkException::class);
$this->expectWarningMessageMatches('/^GMP extension required to register over \d++ readers$/'); $this->expectExceptionMessageMatches('/^GMP extension required to register over \d++ readers$/');
$s->register(Temporality::DELTA); $s->register(Temporality::DELTA);
} }