Merge branch '3.5.x'

Author: Jean85

.craft.yml

@@ -5,12 +5,12 @@ github:
 changelogPolicy: simple
 statusProvider: 
   name: github
+artifactProvider:
+  name: none
 preReleaseCommand: ""
 targets:
 - name: github
-  includeNames: /none/
 - name: registry
   type: sdk
-  includeNames: /none/
   config:
     canonical: 'composer:sentry/sentry-symfony'

.github/workflows/tests.yaml

@@ -0,0 +1,95 @@
+name: CI
+
+on:
+  pull_request: null
+  push:
+    branches:
+      - master
+      - 3.5.x
+
+jobs:
+  Tests:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental == true }}
+    strategy:
+      matrix:
+        php:
+          - '7.4'
+          - '7.3'
+          - '7.2'
+          - '7.1'
+        sentry_constraint: [false]
+        symfony_constraint: [false]
+        experimental: [false]
+        include:
+#          - description: 'sentry/sentry dev-develop'
+#            php: '7.4'
+#            sentry_constraint: 'dev-develop'
+#            experimental: true
+          - description: 'Symfony 4.4'
+            php: '7.3'
+            symfony_constraint: 4.4.*
+          - description: 'Symfony 3.4'
+            php: '7.1'
+            symfony_constraint: 3.4.*
+            env:
+              SYMFONY_DEPRECATIONS_HELPER: disabled
+          - description: 'prefer lowest'
+            php: '7.1'
+            composer_option: '--prefer-lowest'
+            symfony_constraint: 3.4.*
+            env:
+              SYMFONY_DEPRECATIONS_HELPER: disabled
+
+    name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: ${{ matrix.php }}-${{ matrix.symfony_constraint }}-${{ matrix.composer_option }} 
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+      - run: |
+          sed -ri '/symfony\/(monolog-bundle|phpunit-bridge|messenger)/! s/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony_constraint }}'"/' composer.json;
+        if: matrix.symfony_constraint
+      - run: composer remove --dev symfony/messenger --no-update
+        if: matrix.symfony_constraint == '3.4.*'
+      - run: composer update --no-progress --ansi ${{ matrix.composer_option }}
+      - run: composer require sentry/sentry dev-develop
+        if: matrix.sentry_constraint == 'dev-develop'
+      - run: vendor/bin/phpunit --coverage-clover=coverage.xml
+      - uses: codecov/codecov-action@v1
+        with:
+          file: './coverage.xml'
+          fail_ci_if_error: true
+  PHP-CS-Fixer:
+    runs-on: ubuntu-latest
+    name: Code style
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: '7.4--'
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+      - run: composer install --no-progress --ansi
+      - run: vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run
+  PHPStan:
+    runs-on: ubuntu-latest
+    name: PHPStan
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: '7.4--'
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+      - run: composer install --no-progress --ansi
+      - run: vendor/bin/phpstan analyse

.travis.yml

@@ -5,7 +5,15 @@ 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
- - ...
+ - CLI commands registration policy changed to lazy load
+
+## 3.5.3 (2020-10-13)
+ - Refactors and fixes class aliases for more robustness (#315 #359, thanks to @guilliamxavier)
+
+## 3.5.2 (2020-07-08)
+ - Use `jean85/pretty-package-versions` `^1.5` to leverage the new `getRootPackageVersion` method (c8799ac)
+ - Fix support for PHP preloading (#354, thanks to @annuh)
+ - Fix `capture_soft_fails: false` option for the Messenger (#353) 
 
 ## 4.0.0 (TBA)
  - Enable back all error listeners from base SDK integration (#322)

CHANGELOG.md

@@ -20,8 +20,7 @@
     },
     "require": {
         "php": "^7.1",
-        "jean85/pretty-package-versions": "^1.0",
-        "ocramius/package-versions": "^1.3.0",
+        "jean85/pretty-package-versions": "^1.5",
         "sentry/sdk": "^2.1",
         "symfony/config": "^3.4||^4.0||^5.0",
         "symfony/console": "^3.4||^4.0||^5.0",
@@ -35,6 +34,7 @@
         "jangregor/phpstan-prophecy": "^0.6.2",
         "monolog/monolog": "^1.11||^2.0",
         "php-http/mock-client": "^1.0",
+        "phpspec/prophecy": "!=1.11.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.19",
         "phpstan/phpstan-phpunit": "^0.12.8",
@@ -48,9 +48,6 @@
         "symfony/process": "^3.4||^4.0||^5.0",
         "symfony/yaml": "^3.4||^4.0||^5.0"
     },
-    "conflict": {
-        "ocramius/package-versions": "<1.3"
-    },
     "suggest": {
         "monolog/monolog": "Required to use the Monolog handler"
     },

composer.json

@@ -226,17 +226,17 @@ parameters:
 			path: test/DependencyInjection/SentryExtensionTest.php
 
 		-
-			message: "#^Method Sentry\\\\SentryBundle\\\\Test\\\\DependencyInjection\\\\ClientMock\\:\\:captureEvent\\(\\) has parameter \\$payload with no value type specified in iterable type array\\.$#"
+			message: "#^Comparison operation \"\\>\\=\" between \\d+ and 40300 is always true\\.$#"
 			count: 1
-			path: test/DependencyInjection/SentryExtensionTest.php
+			path: test/End2End/App/Kernel.php
 
 		-
-			message: "#^Method Sentry\\\\SentryBundle\\\\Test\\\\End2End\\\\App\\\\Kernel\\:\\:build\\(\\) has no return typehint specified\\.$#"
+			message: "#^Class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Client not found\\.$#"
 			count: 1
-			path: test/End2End/App/Kernel.php
+			path: test/End2End/End2EndTest.php
 
 		-
-			message: "#^Class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Client not found\\.$#"
+			message: "#^Comparison operation \"\\<\" between \\d+ and 40300 is always false\\.$#"
 			count: 1
 			path: test/End2End/End2EndTest.php
 

phpstan-baseline.neon

@@ -9,10 +9,7 @@
 
 class SentryTestCommand extends Command
 {
-    public function __construct()
-    {
-        parent::__construct('sentry:test');
-    }
+    protected static $defaultName = 'sentry:test';
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Command/SentryTestCommand.php

@@ -2,9 +2,7 @@
 
 namespace Sentry\SentryBundle\DependencyInjection;
 
-use Composer\InstalledVersions;
 use Jean85\PrettyVersions;
-use PackageVersions\Versions;
 use Sentry\Options;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -116,12 +114,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $releaseNode = $optionsChildNodes->scalarNode('release')
             ->info('Release version to be reported to sentry, see https://docs.sentry.io/workflow/releases/?platform=php')
             ->example('my/application@ff11bb');
-
-        if (class_exists(InstalledVersions::class)) {
-            $releaseNode->defaultValue(PrettyVersions::getVersion(InstalledVersions::getRootPackage()['name'])->getPrettyVersion());
-        } elseif (class_exists(Versions::class)) {
-            $releaseNode->defaultValue(PrettyVersions::getVersion(Versions::ROOT_PACKAGE_NAME)->getPrettyVersion());
-        }
+        $releaseNode->defaultValue(PrettyVersions::getRootPackageVersion()->getPrettyVersion());
 
         $optionsChildNodes->floatNode('sample_rate')
             ->min(0.0)
@@ -150,7 +143,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $listenerPriorities->scalarNode('console_error')
             ->defaultValue(128);
         $listenerPriorities->scalarNode('worker_error')
-            ->defaultValue(128);
+            ->defaultValue(99);
 
         // Monolog handler configuration
         $monologConfiguration = $rootNode->children()

src/DependencyInjection/Configuration.php

@@ -14,11 +14,19 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 if (Kernel::MAJOR_VERSION >= 5) {
-    class_alias(RequestEvent::class, RequestListenerRequestEvent::class);
-    class_alias(ControllerEvent::class, RequestListenerControllerEvent::class);
+    if (! class_exists(RequestListenerRequestEvent::class, false)) {
+        class_alias(RequestEvent::class, RequestListenerRequestEvent::class);
+    }
+    if (! class_exists(RequestListenerControllerEvent::class, false)) {
+        class_alias(ControllerEvent::class, RequestListenerControllerEvent::class);
+    }
 } else {
-    class_alias(GetResponseEvent::class, RequestListenerRequestEvent::class);
-    class_alias(FilterControllerEvent::class, RequestListenerControllerEvent::class);
+    if (! class_exists(RequestListenerRequestEvent::class, false)) {
+        class_alias(GetResponseEvent::class, RequestListenerRequestEvent::class);
+    }
+    if (! class_exists(RequestListenerControllerEvent::class, false)) {
+        class_alias(FilterControllerEvent::class, RequestListenerControllerEvent::class);
+    }
 }
 
 /**

src/EventListener/RequestListener.php

@@ -9,9 +9,13 @@
 use Symfony\Component\HttpKernel\Kernel;
 
 if (Kernel::MAJOR_VERSION >= 5) {
-    class_alias(RequestEvent::class, SubRequestListenerRequestEvent::class);
+    if (! class_exists(SubRequestListenerRequestEvent::class, false)) {
+        class_alias(RequestEvent::class, SubRequestListenerRequestEvent::class);
+    }
 } else {
-    class_alias(GetResponseEvent::class, SubRequestListenerRequestEvent::class);
+    if (! class_exists(SubRequestListenerRequestEvent::class, false)) {
+        class_alias(GetResponseEvent::class, SubRequestListenerRequestEvent::class);
+    }
 }
 
 final class SubRequestListener

src/EventListener/SubRequestListener.php

@@ -51,7 +51,7 @@ public function testConfigurationDefaults(): void
                 'console' => 1,
                 'request_error' => 128,
                 'console_error' => 128,
-                'worker_error' => 128,
+                'worker_error' => 99,
             ],
             'options' => [
                 'class_serializers' => [],

test/DependencyInjection/ConfigurationTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Sentry\SentryBundle\Test\End2End\App\Controller;
+
+use Sentry\SentryBundle\Test\End2End\App\Messenger\FooMessage;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+class MessengerController
+{
+    /** @var MessageBusInterface */
+    private $messenger;
+
+    public function __construct(MessageBusInterface $messenger)
+    {
+        $this->messenger = $messenger;
+    }
+
+    public function dispatchMessage(): Response
+    {
+        $this->messenger->dispatch(new FooMessage());
+
+        return new Response('Success');
+    }
+
+    public function dispatchUnrecoverableMessage(): Response
+    {
+        $this->messenger->dispatch(new FooMessage(false));
+
+        return new Response('Success');
+    }
+}