Do not set the transaction attribute of the event when in CLI (getsen…

…try#864)

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fix `TypeError` in `Sentry\Monolog\Handler` when the extra data array has numeric keys (#833).
 - Fix sending of GZIP-compressed requests when the `enable_compression` option is `true` (#857)
+- Fix error thrown when trying to set the `transaction` attribute of the event in a CLI environment (#862)
 
 ## 2.1.1 (2019-06-13)
 

src/EventFactory.php

@@ -7,7 +7,6 @@
 use Sentry\Exception\EventCreationException;
 use Sentry\Serializer\RepresentationSerializerInterface;
 use Sentry\Serializer\SerializerInterface;
-use Zend\Diactoros\ServerRequestFactory;
 
 /**
  * Factory for the {@see Event} class.
@@ -93,13 +92,8 @@ public function create(array $payload): Event
 
  if (isset($payload['transaction'])) {
  $event->setTransaction($payload['transaction']);
- } else {
- $request = ServerRequestFactory::fromGlobals();
- $serverParams = $request->getServerParams();
-
- if (isset($serverParams['PATH_INFO'])) {
- $event->setTransaction($serverParams['PATH_INFO']);
- }
+ } elseif (isset($_SERVER['PATH_INFO'])) {
+ $event->setTransaction($_SERVER['PATH_INFO']);
  }
 
  if (isset($payload['logger'])) {

tests/ClientTest.php

@@ -21,6 +21,9 @@
 
 class ClientTest extends TestCase
 {
+ /**
+ * @backupGlobals
+ */
  public function testTransactionEventAttributeIsPopulated(): void
  {
  $_SERVER['PATH_INFO'] = '/foo';
@@ -39,9 +42,6 @@ public function testTransactionEventAttributeIsPopulated(): void
 
  $client = new Client(new Options(), $transport, $this->createEventFactory());
  $client->captureMessage('test');
-
- unset($_SERVER['PATH_INFO']);
- unset($_SERVER['REQUEST_METHOD']);
  }
 
  public function testTransactionEventAttributeIsNotPopulatedInCli(): void

tests/EventFactoryTest.php

@@ -16,6 +16,9 @@
 
 class EventFactoryTest extends TestCase
 {
+ /**
+ * @backupGlobals
+ */
  public function testCreateEventWithDefaultValues(): void
  {
  $options = new Options();