Auto on session tracking

UPGRADING.md

@@ -1,14 +1,27 @@
 Upgrading
 =========
 
+## 3.x to 4.x
+
+#### Setting Endpoints
+
+The way endpoints will be configured has been change slightly, in order to make sure all of your requests get send to the correct place.  You'll no longer be able to pass the `endpoint` parameter to your `Bugsnag\Client::make` calls, and should instead use the [`setEndpoints` configuration option](https://docs.bugsnag.com/platforms/php/other/configuration-options/#endpoints).  If you've previously used the `BUGSNAG_ENDPOINT` environment variable, it's now been renamed to `BUGSNAG_NOTIFY_ENDPOINT`, and will only work in conjunction with the `BUGSNAG_SESSION_ENDPOINT` environment variable, to make sure that both endpoints are being used correctly.
+
+#### Configuring the GuzzleHttp Client
+
+If you've previously customized the GuzzleHttp Client we use to deliver notifications, you'll no longer be able to pass it in to a `new Bugsnag\Client` call. Instead you'll need to add it to Bugsnag using the [`setGuzzleClient` configuration option.](https://docs.bugsnag.com/platforms/php/other/configuration-options/#guzzle-client)
+
+#### Deprecation
+
+The `deploy` method has been removed, so in order to report a new version build to bugsnag you should use the `build` method, [as described here.](https://docs.bugsnag.com/platforms/php/other/#tracking-releases)
 
 ## 2.x to 3.x
 
 *Our PHP library has gone through some major improvements, and there are some small changes you'll need to make to get onto the new version.*
 
 #### PHP 5.5+
 
-We now require PHP 5.5 or higher. If you're using an older version of PHP, you can still use v2. We will containue to maintain v2 along side v3. For more information, see the [legacy PHP integration guide](https://docs.bugsnag.com/platforms/php/other/legacy/).
+We now require PHP 5.5 or higher. If you're using an older version of PHP, you can still use v2. We will continue to maintain v2 along side v3. For more information, see the [legacy PHP integration guide](https://docs.bugsnag.com/platforms/php/other/legacy/).
 
 #### Namespaces
 
@@ -22,7 +35,7 @@ The method for setting the application type (`setType`) has also been removed in
 
 #### Configuration
 
-We've changed how our configuration system works. You can now build up our config object in a similar way to how you configured the client in v2, and then pass that as the first paramater when you construct the client object. In addition, we've removed some configuration options in favour of using our new notification pipeline system. Now you can register multiple callbacks to have maximum flexibility. We've also switched to using [Guzzle](http://guzzlephp.org), so you can change the base URI and proxy details by directly interacting with guzzle. For more information, see the [advanced configuration guide](https://docs.bugsnag.com/platforms/php/other/advanced-client-configuration).
+We've changed how our configuration system works. You can now build up our config object in a similar way to how you configured the client in v2, and then pass that as the first parameter when you construct the client object. In addition, we've removed some configuration options in favour of using our new notification pipeline system. Now you can register multiple callbacks to have maximum flexibility. We've also switched to using [Guzzle](http://guzzlephp.org), so you can change the base URI and proxy details by directly interacting with guzzle. For more information, see the [advanced configuration guide](https://docs.bugsnag.com/platforms/php/other/advanced-client-configuration).
 
 #### Customizing handled errors
 

src/Client.php

@@ -17,7 +17,7 @@
 use Bugsnag\Middleware\SessionData;
 use Bugsnag\Request\BasicResolver;
 use Bugsnag\Request\ResolverInterface;
-use Composer\CaBundle\CaBundle;
+use Bugsnag\Utils;
 use GuzzleHttp\Client as Guzzle;
 use GuzzleHttp\ClientInterface;
 use ReflectionClass;
@@ -80,18 +80,18 @@ class Client
      * If you don't pass in a key, we'll try to read it from the env variables.
      *
      * @param string|null $apiKey   your bugsnag api key
-     * @param string|null $endpoint your bugsnag endpoint
      * @param bool        $default  if we should register our default callbacks
      *
      * @return static
      */
-    public static function make($apiKey = null, $endpoint = null, $defaults = true)
+    public static function make($apiKey = null, $defaults = true)
     {
         $config = new Configuration($apiKey ?: getenv('BUGSNAG_API_KEY'));
-        $guzzle = static::makeGuzzle($endpoint ?: getenv('BUGSNAG_ENDPOINT'));
-
-        $client = new static($config, null, $guzzle);
+        if (($notifyEndpoint = getenv('BUGSNAG_NOTIFY_ENDPOINT')) && ($sessionEndpoint = getenv('BUGSNAG_SESSION_ENDPOINT'))) {
+            $config->setEndpoints($notifyEndpoint, $sessionEndpoint);
+        }
 
+        $client = new static($config, null);
         if ($defaults) {
             $client->registerDefaultCallbacks();
         }
@@ -104,17 +104,16 @@ public static function make($apiKey = null, $endpoint = null, $defaults = true)
      *
      * @param \Bugsnag\Configuration                  $config
      * @param \Bugsnag\Request\ResolverInterface|null $resolver
-     * @param \GuzzleHttp\ClientInterface|null        $guzzle
      *
      * @return void
      */
-    public function __construct(Configuration $config, ResolverInterface $resolver = null, ClientInterface $guzzle = null)
+    public function __construct(Configuration $config, ResolverInterface $resolver = null)
     {
         $this->config = $config;
         $this->resolver = $resolver ?: new BasicResolver();
         $this->recorder = new Recorder();
         $this->pipeline = new Pipeline();
-        $this->http = new HttpClient($config, $guzzle ?: static::makeGuzzle());
+        $this->http = new HttpClient($config);
         $this->sessionTracker = new SessionTracker($config);
 
         $this->registerMiddleware(new NotificationSkipper($config));
@@ -124,40 +123,7 @@ public function __construct(Configuration $config, ResolverInterface $resolver =
         register_shutdown_function([$this, 'flush']);
     }
 
-    /**
-     * Make a new guzzle client instance.
-     *
-     * @param string|null $base
-     * @param array       $options
-     *
-     * @return \GuzzleHttp\ClientInterface
-     */
-    public static function makeGuzzle($base = null, array $options = [])
-    {
-        $key = version_compare(ClientInterface::VERSION, '6') === 1 ? 'base_uri' : 'base_url';
-
-        $options[$key] = $base ?: static::ENDPOINT;
-
-        if ($path = static::getCaBundlePath()) {
-            $options['verify'] = $path;
-        }
-
-        return new Guzzle($options);
-    }
-
-    /**
-     * Get the ca bundle path if one exists.
-     *
-     * @return string|false
-     */
-    protected static function getCaBundlePath()
-    {
-        if (!class_exists(CaBundle::class)) {
-            return false;
-        }
-
-        return realpath(CaBundle::getSystemCaRootBundlePath());
-    }
+
 
     /**
      * Get the config instance.
@@ -326,22 +292,6 @@ public function notify(Report $report, callable $callback = null)
         }
     }
 
-    /**
-     * Notify Bugsnag of a deployment.
-     *
-     * @deprecated This function is being deprecated in favour of `build`.
-     *
-     * @param string|null $repository the repository from which you are deploying the code
-     * @param string|null $branch     the source control branch from which you are deploying
-     * @param string|null $revision   the source control revision you are currently deploying
-     *
-     * @return void
-     */
-    public function deploy($repository = null, $branch = null, $revision = null)
-    {
-        $this->build($repository, $revision);
-    }
-
     /**
      * Notify Bugsnag of a build.
      *
@@ -785,37 +735,83 @@ public function setAutoCaptureSessions($track)
     }
 
     /**
-     * Set session delivery endpoint.
+     * Sets the notify and session endpoints
      *
-     * @param string $endpoint the session endpoint
+     * @param string $notifyEndpoint the notify endpoint
+     * @param string $sessionEndpoint the session endpoint
      *
      * @return $this
      */
-    public function setSessionEndpoint($endpoint)
+    public function setEndpoints($notifyEndpoint, $sessionEndpoint)
+    {
+        $this->config->setEndpoints($notifyEndpoint, $sessionEndpoint);
+
+        return $this;
+    }
+
+    /**
+     * Gets the notify endpoint
+     *
+     * @return string
+     */
+    public function getNotifyEndpoint()
+    {
+        return $this->config->getNotifyEndpoint();
+    }
+
+    /**
+     * Gets the session endpoint
+     *
+     * @return string
+     */
+    public function getSessionEndpoint()
     {
-        $this->config->setSessionEndpoint($endpoint);
+        return $this->config->getSessionEndpoint();
+    }
+
+    /**
+     * Gets the current guzzle client.
+     *
+     * @return GuzzleHttp\ClientInterface
+     */
+    public function getGuzzleClient()
+    {
+        return $this->config->getGuzzleClient();
+    }
 
+    /**
+     * Sets the guzzle client
+     *
+     * Delivery URLs should be set using the "setEndpoints" method
+     *
+     * @param GuzzleHttp\ClientInterface $guzzleClient the new guzzle client
+     *
+     * @return $this
+     */
+    public function setGuzzleClient($guzzleClient)
+    {
+        $this->config->setGuzzleClient($guzzleClient);
         return $this;
     }
 
     /**
-     * Get the session client.
+     * Whether any sessions are enabled.
      *
-     * @return \Guzzle\ClientInterface
+     * @return bool
      */
-    public function getSessionClient()
+    public function sessionsEnabled()
     {
-        return $this->config->getSessionClient();
+        return $this->config->sessionsEnabled();
     }
 
     /**
      * Whether should be auto-capturing sessions.
      *
      * @return bool
      */
-    public function shouldCaptureSessions()
+    public function shouldAutoCaptureSessions()
     {
-        return $this->config->shouldCaptureSessions();
+        return $this->config->shouldAutoCaptureSessions();
     }
 
     /**