Merge branch 'master' into mh/span-ops

cleptric · cleptric · commit 1af0f5118c0b · 2022-10-06T23:28:48.000+02:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -10,6 +10,8 @@ parameters:
         - src/aliases.php
     excludePaths:
         - src/aliases.php
+        - src/Tracing/Cache/TraceableCacheAdapterForV2.php
+        - src/Tracing/Cache/TraceableTagAwareCacheAdapterForV2.php
         - src/Tracing/Doctrine/DBAL/TracingStatementForV2.php
         - src/Tracing/Doctrine/DBAL/TracingDriverForV2.php
         - tests/End2End/App
diff --git a/tests/End2End/App/config.yml b/tests/End2End/App/config.yml
@@ -1,4 +1,5 @@
 sentry:
+  dsn: http://public@example.com/sentry/1
   tracing:
     enabled: true
   options:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`sentry:`
	`2`	`+ dsn: http://[email protected]/sentry/1`
`2`	`3`	`tracing:`
`3`	`4`	`enabled: true`
`4`	`5`	`options:`