Updated AirbrakeService to support airbrake/phpbrake v0.8

Author: juanisorondo

.gitignore

@@ -50,6 +50,6 @@ composer.phar
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
+composer.lock
 /nbproject/
 /.idea/

LICENSE

@@ -1,7 +1,5 @@
 MIT License
 
-Copyright (c) 2017 enscope, s.r.o.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

README.md

@@ -1,14 +1,17 @@
 # yii2-airbrake
+
 Airbrake integration for Yii2, which wraps around official
 [Airbrake PHP library (airbrake/phpbrake)](https://github.com/airbrake/phpbrake).
 
 ## Installation
+
     composer require biller/yii2-airbrake
 
 ## Usage
+
 While it is not explicitly required, it is recommended to configure the `AirbrakeService`
-as a component in environment (or even common) configuration, so it is easily accessible
-from the whole application (using i.e. `Yii::$app->get('airbrakeService')`).
+as a component in environment (or even common) configuration, so it is easily accessible from the whole application (
+using i.e. `Yii::$app->get('airbrakeService')`).
 
 ```php
 return [
@@ -43,6 +46,7 @@ return [
     ],
 ];
 ```
+
 *Configuration options marked with asterisk are required, all other options are optional.*
 
 * `rootDirectory`: should be set to your sources root to allow shortening of file paths
@@ -57,19 +61,21 @@ return [
 *For additional information about the API, please consult official Airbrake PHP library documentation.*
 
 ### AirbrakeFilterFactory
+
 Factory class that can be used to create various filtering rules.
 
 #### `AirbrakeFilterFactory::createParamsFilter(array $params, $replacement = 'FILTERED')`
+
 Method will create filtering callable that filters parameters, specified by
-`$params` and replaces it with specified `$replacement`. Example usage is
-available above.
+`$params` and replaces it with specified `$replacement`. Example usage is available above.
 
 ## Console Support
-Integration can be added to Yii console, where it currently provides a command
-to track deployment (new feature in Airbrake API 4 that allows to mark error
-timeline with deployments).
+
+Integration can be added to Yii console, where it currently provides a command to track deployment (new feature in
+Airbrake API 4 that allows to mark error timeline with deployments).
 
 ### Usage
+
 To use `ConsoleController`, `AirbrakeService` should be configured as component.
 
     import enscope\Yii2\Ext\Airbrake\ConsoleController;
@@ -85,8 +91,8 @@ To use `ConsoleController`, `AirbrakeService` should be configured as component.
         ],
     ];
 
-While parameters can be hard-coded in configuration, console controller
-supports `inferParameters`, `username`, `revision` and `repository`
+While parameters can be hard-coded in configuration, console controller supports `inferParameters`, `username`
+, `revision` and `repository`
 parameters to be set by arguments on command line.
 
 * `airbrakeService`: name of the component or initialized instance
@@ -96,10 +102,13 @@ parameters to be set by arguments on command line.
 * `username`: name of the user tracking deploy (default "system")
 
 ## Logging Target
+
 You can configure Yii2 logger to log errors automatically to Airbrake Service.
 
 ### Usage
+
 To use `ConsoleController`, `AirbrakeService` should be configured as component.
+
 ```php
 return [
     'components' => [
@@ -114,10 +123,14 @@ return [
     ],
 ];
 ```
-The target currently does not expose any other configuration options
-other then those exposed by `yii\log\Target`, except the service component:
+
+The target currently does not expose any other configuration options other then those exposed by `yii\log\Target`,
+except the service component:
+
 * `airbrakeService`: name of the component or initialized instance
 
 ## License
-Yii2 Airbrake integration is licensed under [The MIT License (MIT)](https://github.com/enscope/yii2-airbrake/blob/master/LICENSE)
+
+Yii2 Airbrake integration is licensed
+under [The MIT License (MIT)](https://github.com/biller/yii2-airbrake/blob/master/LICENSE)
 as is the original PHP Airbrake library and follows the versioning of that library.

composer.json

@@ -18,7 +18,8 @@
   },
   "minimum-stability": "stable",
   "require": {
-    "yiisoft/yii2": ">=2.0.5",
+    "php": "^7.0",
+    "yiisoft/yii2": "^2.0",
     "airbrake/phpbrake": "^0.8"
   },
   "autoload": {

src/AirbrakeService.php

@@ -5,7 +5,6 @@
 use Airbrake\ErrorHandler;
 use Airbrake\Errors\Base;
 use Airbrake\Exception;
-use Airbrake\Http\Factory;
 use Airbrake\Instance;
 use Throwable;
 use Yii;
@@ -14,11 +13,6 @@
 
 class AirbrakeService extends Component
 {
-
-    const CLIENT_DEFAULT = 'default';
-    const CLIENT_GUZZLE = 'guzzle';
-    const CLIENT_CURL = 'curl';
-
     /** @var bool Enabled flag to allow simpler configuration */
     public $enabled = true;
 
@@ -43,9 +37,6 @@ class AirbrakeService extends Component
     /** @var string Service server host */
     public $host = 'api.airbrake.io';
 
-    /** @var string HTTP client to use */
-    public $httpClient;
-
     /** @var bool If true, global instance is set on init() */
     public $setGlobalInstance = true;
 
@@ -86,7 +77,6 @@ public function init()
             'environment' => $this->environment,
             'rootDirectory' => Yii::getAlias($this->rootDirectory),
             'host' => $this->host,
-            'httpClient' => $this->httpClient,
         ]);
 
         if (is_array($this->filters)) {
@@ -166,36 +156,6 @@ public function sendNotice(array $notice)
         return $this->enabled ? $this->_notifier->sendNotice($notice) : true;
     }
 
-    /**
-     * Sends deployment tracking request to Airbrake.
-     * Uses Airbrake client factory internally to adhere to default
-     * implementation as much as possible.
-     *
-     * @param string $revision Revision identifier from source control
-     * @param string $username Name of the user invoking tracker (default 'system')
-     * @param string|null $repository Identifier of the repository (optional)
-     *
-     * @return bool True, if request was sent successfully
-     *
-     * @throws InvalidArgumentException
-     * @throws Exception
-     */
-    public function trackDeploy($revision, $username = 'system', $repository = null)
-    {
-        $client = Factory::createHttpClient($this->httpClient);
-        $url = sprintf('%s/projects/%s/deploys?key=%s', $this->getAirbrakeApiUrl(), $this->projectId, $this->projectKey);
-
-        $result = $client->send($url, json_encode([
-            'environment' => $this->environment,
-            'username' => $username,
-            'repository' => $repository,
-            'revision' => $revision,
-            'version' => $this->appVersion,
-        ]));
-
-        return $result !== false;
-    }
-
     /**
      * Creates and returns API endpoint for specified version
      * of Airbrake API with hostname specified in parameter.
@@ -245,5 +205,4 @@ public function getNotifier()
     {
         return $this->_notifier;
     }
-
 }