PHP 8 Support

.appveyor.yml

@@ -1,29 +1,35 @@
 version: 2.x-{build}
 build: false
-clone_depth: 2
+clone_depth: 50
 clone_folder: c:\projects\sentry-php
 skip_branch_with_pr: true
 image: Visual Studio 2019
 
 environment:
     matrix:
         - PHP_VERSION: 7.2
-          XDEBUG_VERSION: 2.9.2-7.2-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.2-vc15-nts
           DEPENDENCIES: lowest
         - PHP_VERSION: 7.2
-          XDEBUG_VERSION: 2.9.2-7.2-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.2-vc15-nts
           DEPENDENCIES: highest
         - PHP_VERSION: 7.3
-          XDEBUG_VERSION: 2.9.2-7.3-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.3-vc15-nts
           DEPENDENCIES: lowest
         - PHP_VERSION: 7.3
-          XDEBUG_VERSION: 2.9.2-7.3-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.3-vc15-nts
           DEPENDENCIES: highest
         - PHP_VERSION: 7.4
-          XDEBUG_VERSION: 2.9.2-7.4-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.4-vc15-nts
           DEPENDENCIES: lowest
         - PHP_VERSION: 7.4
-          XDEBUG_VERSION: 2.9.2-7.4-vc15-nts
+          XDEBUG_VERSION: 3.0.1-7.4-vc15-nts
+          DEPENDENCIES: highest
+        - PHP_VERSION: 8.0
+          XDEBUG_VERSION: 3.0.1-8.0-vs16-nts
+          DEPENDENCIES: lowest
+        - PHP_VERSION: 8.0
+          XDEBUG_VERSION: 3.0.1-8.0-vs16-nts
           DEPENDENCIES: highest
 
 matrix:
@@ -52,16 +58,13 @@ install:
     - IF %INSTALL_PHP%==1 echo extension=php_mbstring.dll >> php.ini
     - IF %INSTALL_PHP%==1 echo extension=php_openssl.dll >> php.ini
     - IF %INSTALL_PHP%==1 echo zend_extension=C:\php\ext\php_xdebug.dll >> php.ini
-    - IF %INSTALL_PHP%==1 echo xdebug.overload_var_dump=0 >> php.ini
-    - IF %INSTALL_PHP%==1 echo xdebug.collect_includes=0 >> php.ini
-    - IF %INSTALL_PHP%==1 echo xdebug.dump_globals=0 >> php.ini
-    - IF %INSTALL_PHP%==1 echo xdebug.collect_vars=0 >> php.ini
-    - IF %INSTALL_PHP%==1 echo xdebug.extended_info=0 >> php.ini
+    - IF %INSTALL_PHP%==1 echo xdebug.mode=coverage >> php.ini
     - cd C:\projects\sentry-php
-    - IF NOT EXIST composer.phar appveyor-retry appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.3/composer.phar
+    - IF NOT EXIST composer.phar appveyor-retry appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.8/composer.phar
     - php composer.phar self-update
-    - IF %DEPENDENCIES%==lowest php composer.phar update --no-progress --no-interaction --no-suggest --ansi --prefer-lowest --prefer-dist
-    - IF %DEPENDENCIES%==highest php composer.phar update --no-progress --no-interaction --no-suggest --ansi --prefer-dist
+    - IF %PHP_VERSION%==8.0 php composer.phar remove --dev friendsofphp/php-cs-fixer --no-update --no-interaction
+    - IF %DEPENDENCIES%==lowest php composer.phar update --no-progress --no-interaction --ansi --prefer-lowest --prefer-dist
+    - IF %DEPENDENCIES%==highest php composer.phar update --no-progress --no-interaction --ansi --prefer-dist
 
 test_script:
     - cd C:\projects\sentry-php

.gitattributes

@@ -16,9 +16,9 @@
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs export-ignore
-/.scrutinizer.yml export-ignore
+/.php_cs.dist export-ignore
 /.travis.yml export-ignore
 /Makefile export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml.dist export-ignore

.gitignore

@@ -3,5 +3,6 @@ package.xml
 /vendor
 .idea
 .php_cs.cache
+.phpunit.result.cache
 docs/_build
 tests/clover.xml

.travis.yml

@@ -4,6 +4,7 @@ php:
     - 7.2
     - 7.3
     - 7.4
+    - 8.0
 
 env:
     - dependencies=highest
@@ -34,11 +35,12 @@ jobs:
           script: composer psalm
 
 install:
+    - if [ "$TRAVIS_PHP_VERSION" = "8.0" ]; then composer remove --dev friendsofphp/php-cs-fixer --no-update --no-interaction; fi;
     - if [ "$dependencies" = "lowest" ]; then composer update --no-interaction --no-suggest --prefer-lowest --prefer-dist; fi;
     - if [ "$dependencies" = "highest" ]; then composer update --no-interaction --no-suggest --prefer-dist; fi;
 
 script: >-
-    vendor/bin/phpunit --coverage-clover=build/coverage-report.xml &&
+    XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover=build/coverage-report.xml &&
     bash <(curl -s https://codecov.io/bash) -f build/coverage-report.xml
 
 notifications:

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 3.1.0 (2020-12-01)
 
+- Add support for PHP 8.0 (#1087)
+- Change the error handling for silenced fatal errors using `@` to use a mask check in order to be php 8 compatible (#1141)
+- Update the `guzzlehttp/promises` package to the minimum required version compatible with PHP 8 (#1144)
+- Update the `symfony/options-resolver` package to the minimum required version compatible with PHP 8 (#1144)
 - Fix capturing of the request body in the `RequestIntegration` integration (#1139)
 - Deprecate `SpanContext::fromTraceparent()` in favor of `TransactionContext::fromSentryTrace()` (#1134)
 - Allow setting custom data on the sampling context by passing it as 2nd argument of the `startTransaction()` function (#1134)

composer.json

@@ -20,10 +20,10 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "guzzlehttp/promises": "^1.3",
+        "guzzlehttp/promises": "^1.4",
         "guzzlehttp/psr7": "^1.7",
         "jean85/pretty-package-versions": "^1.5",
         "ocramius/package-versions": "^1.8",
@@ -35,21 +35,22 @@
         "psr/http-factory": "^1.0",
         "psr/http-message-implementation": "^1.0",
         "psr/log": "^1.0",
-        "symfony/options-resolver": "^3.4.4|^4.0|^5.0",
+        "symfony/options-resolver": "^3.4.43|^4.4.11|^5.0.11",
         "symfony/polyfill-php80": "^1.17",
         "symfony/polyfill-uuid": "^1.13.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
         "http-interop/http-factory-guzzle": "^1.0",
         "monolog/monolog": "^1.3|^2.0",
+        "nikic/php-parser": "^4.10.3",
         "php-http/mock-client": "^1.3",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-phpunit": "^0.12",
-        "phpunit/phpunit": "^7.5.18",
-        "symfony/phpunit-bridge": "^5.1",
-        "vimeo/psalm": "^3.4"
+        "phpunit/phpunit": "^8.5.13|^9.4",
+        "symfony/phpunit-bridge": "^5.2",
+        "vimeo/psalm": "^3.4|^4.2"
     },
     "suggest": {
         "monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."

phpunit.xml.dist

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="true"
          colors="true"
          bootstrap="tests/bootstrap.php"
+         cacheResult="false"
+         beStrictAboutOutputDuringTests="true"
 >
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
@@ -17,6 +18,12 @@
         </testsuite>
     </testsuites>
 
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
     <filter>
         <whitelist>
             <directory suffix=".php">src</directory>

psalm.xml.dist

@@ -34,7 +34,6 @@
         <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
         <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
 
         <PropertyNotSetInConstructor errorLevel="info">
             <errorLevel type="suppress">

src/ErrorHandler.php

@@ -265,7 +265,7 @@ public function addExceptionHandlerListener(callable $listener): void
      */
     private function handleError(int $level, string $message, string $file, int $line, ?array $errcontext = []): bool
     {
-        if (0 === error_reporting()) {
+        if (0 === (error_reporting() & $level)) {
             $errorAsException = new SilencedErrorException(self::ERROR_LEVELS_DESCRIPTION[$level] . ': ' . $message, 0, $level, $file, $line);
         } else {
             $errorAsException = new \ErrorException(self::ERROR_LEVELS_DESCRIPTION[$level] . ': ' . $message, 0, $level, $file, $line);

src/Exception/ExceptionInterface.php

@@ -8,6 +8,8 @@
  * This interface must be implemented by all exception classes of this library.
  *
  * @author Stefano Arlandini <sarlandini@alice.it>
+ *
+ * @deprecated since version 3.1, to be removed in 4.0
  */
 interface ExceptionInterface
 {

src/Exception/InvalidArgumentException.php

@@ -9,6 +9,8 @@
  * the expected value.
  *
  * @author Stefano Arlandini <sarlandini@alice.it>
+ *
+ * @deprecated since version 3.1, to be removed in 4.0
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {

tests/BreadcrumbTest.php

@@ -12,21 +12,19 @@
  */
 final class BreadcrumbTest extends TestCase
 {
-    /**
-     * @expectedException \Sentry\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The value of the $level argument must be one of the Breadcrumb::LEVEL_* constants.
-     */
     public function testConstructorThrowsOnInvalidLevel(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The value of the $level argument must be one of the Breadcrumb::LEVEL_* constants.');
+
         new Breadcrumb('foo', 'bar', 'baz');
     }
 
-    /**
-     * @expectedException \Sentry\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The value of the $level argument must be one of the Breadcrumb::LEVEL_* constants.
-     */
-    public function testSetLevelThrowsOnInvalidLevel(): void
+    public function testWithLevelThrowsOnInvalidLevel(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The value of the $level argument must be one of the Breadcrumb::LEVEL_* constants.');
+
         $breadcrumb = new Breadcrumb(Breadcrumb::LEVEL_INFO, Breadcrumb::TYPE_USER, 'foo');
         $breadcrumb->withLevel('bar');
     }

tests/ClientBuilderTest.php

@@ -13,14 +13,15 @@
 use Sentry\Options;
 use Sentry\Transport\HttpTransport;
 use Sentry\Transport\NullTransport;
+use Sentry\Transport\TransportInterface;
 
 final class ClientBuilderTest extends TestCase
 {
     public function testHttpTransportIsUsedWhenServerIsConfigured(): void
     {
         $clientBuilder = ClientBuilder::create(['dsn' => 'http://public:secret@example.com/sentry/1']);
 
-        $transport = $this->getObjectAttribute($clientBuilder->getClient(), 'transport');
+        $transport = $this->getTransport($clientBuilder->getClient());
 
         $this->assertInstanceOf(HttpTransport::class, $transport);
     }
@@ -29,7 +30,7 @@ public function testNullTransportIsUsedWhenNoServerIsConfigured(): void
     {
         $clientBuilder = new ClientBuilder();
 
-        $transport = $this->getObjectAttribute($clientBuilder->getClient(), 'transport');
+        $transport = $this->getTransport($clientBuilder->getClient());
 
         $this->assertInstanceOf(NullTransport::class, $transport);
     }
@@ -84,6 +85,17 @@ public function testCreateWithNoOptionsIsTheSameAsDefaultOptions(): void
             ClientBuilder::create([])
         );
     }
+
+    private function getTransport(Client $client): TransportInterface
+    {
+        $property = new \ReflectionProperty(Client::class, 'transport');
+
+        $property->setAccessible(true);
+        $value = $property->getValue($client);
+        $property->setAccessible(false);
+
+        return $value;
+    }
 }
 
 final class StubIntegration implements IntegrationInterface

tests/ClientTest.php

@@ -6,8 +6,8 @@
 
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\PromiseInterface;
-use PHPUnit\Framework\MockObject\Matcher\Invocation;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Sentry\Client;
@@ -271,7 +271,7 @@ public function testCaptureLastError(): void
 
         $this->assertNotNull($client->captureLastError());
 
-        $this->clearLastError();
+        error_clear_last();
     }
 
     public function testCaptureLastErrorDoesNothingWhenThereIsNoError(): void
@@ -280,14 +280,13 @@ public function testCaptureLastErrorDoesNothingWhenThereIsNoError(): void
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->never())
             ->method('send')
-            ->with($this->anything())
-            ->willReturn(null);
+            ->with($this->anything());
 
         $client = ClientBuilder::create(['dsn' => 'http://public:secret@example.com/1'])
             ->setTransportFactory($this->createTransportFactory($transport))
             ->getClient();
 
-        $this->clearLastError();
+        error_clear_last();
 
         $this->assertNull($client->captureLastError());
     }
@@ -320,14 +319,13 @@ public function testSendChecksBeforeSendOption(): void
     /**
      * @dataProvider processEventDiscardsEventWhenItIsSampledDueToSampleRateOptionDataProvider
      */
-    public function testProcessEventDiscardsEventWhenItIsSampledDueToSampleRateOption(float $sampleRate, Invocation $transportCallInvocationMatcher, Invocation $loggerCallInvocationMatcher): void
+    public function testProcessEventDiscardsEventWhenItIsSampledDueToSampleRateOption(float $sampleRate, InvocationOrder $transportCallInvocationMatcher, InvocationOrder $loggerCallInvocationMatcher): void
     {
         /** @var TransportInterface&MockObject $transport */
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($transportCallInvocationMatcher)
             ->method('send')
-            ->with($this->anything())
-            ->willReturn(null);
+            ->with($this->anything());
 
         /** @var LoggerInterface&MockObject $logger */
         $logger = $this->createMock(LoggerInterface::class);
@@ -448,20 +446,6 @@ public function testFlush(): void
         $this->assertTrue($promise->wait());
     }
 
-    /**
-     * @see https://github.com/symfony/polyfill/blob/52332f49d18c413699d2dccf465234356f8e0b2c/src/Php70/Php70.php#L52-L61
-     */
-    private function clearLastError(): void
-    {
-        set_error_handler(static function (): bool {
-            return false;
-        });
-
-        @trigger_error('');
-
-        restore_error_handler();
-    }
-
     private function createTransportFactory(TransportInterface $transport): TransportFactoryInterface
     {
         return new class($transport) implements TransportFactoryInterface {