@@ -9,9 +9,9 @@  | 
                                                    ||
| 9 | 9 | |
| 10 | 10 | namespace PhpTek\Sentry\Adaptor;  | 
                                                        
| 11 | 11 | |
| 12 | -use PhpTek\Sentry\Adaptor\SentryClientAdaptor,  | 
                                                        |
| 13 | - phpTek\Sentry\Exception\SentryLogWriterException,  | 
                                                        |
| 14 | - SilverStripe\Core\Config\Config;  | 
                                                        |
| 12 | +use PhpTek\Sentry\Adaptor\SentryClientAdaptor;  | 
                                                        |
| 13 | +use phpTek\Sentry\Exception\SentryLogWriterException;  | 
                                                        |
| 14 | +use SilverStripe\Core\Config\Config;  | 
                                                        |
| 15 | 15 | |
| 16 | 16 | /**  | 
                                                        
| 17 | 17 | * The RavenClient class simply acts as a bridge between the Raven PHP SDK and  | 
                                                        
@@ -82,21 +82,21 @@  | 
                                                    ||
| 82 | 82 | public function setData($field, $data)  | 
                                                        
| 83 | 83 |      { | 
                                                        
| 84 | 84 |          switch($field) { | 
                                                        
| 85 | - case 'env':  | 
                                                        |
| 86 | - $this->client->setEnvironment($data);  | 
                                                        |
| 87 | - break;  | 
                                                        |
| 88 | - case 'tags':  | 
                                                        |
| 89 | - $this->client->tags_context($data);  | 
                                                        |
| 90 | - break;  | 
                                                        |
| 91 | - case 'user':  | 
                                                        |
| 92 | - $this->client->user_context($data);  | 
                                                        |
| 93 | - break;  | 
                                                        |
| 94 | - case 'extra':  | 
                                                        |
| 95 | - $this->client->extra_context($data);  | 
                                                        |
| 96 | - break;  | 
                                                        |
| 97 | - default:  | 
                                                        |
| 98 | -            $msg = sprintf('Unknown field "%s" passed to %s().', $field, __FUNCTION__); | 
                                                        |
| 99 | - throw new SentryLogWriterException($msg);  | 
                                                        |
| 85 | + case 'env':  | 
                                                        |
| 86 | + $this->client->setEnvironment($data);  | 
                                                        |
| 87 | + break;  | 
                                                        |
| 88 | + case 'tags':  | 
                                                        |
| 89 | + $this->client->tags_context($data);  | 
                                                        |
| 90 | + break;  | 
                                                        |
| 91 | + case 'user':  | 
                                                        |
| 92 | + $this->client->user_context($data);  | 
                                                        |
| 93 | + break;  | 
                                                        |
| 94 | + case 'extra':  | 
                                                        |
| 95 | + $this->client->extra_context($data);  | 
                                                        |
| 96 | + break;  | 
                                                        |
| 97 | + default:  | 
                                                        |
| 98 | +                $msg = sprintf('Unknown field "%s" passed to %s().', $field, __FUNCTION__); | 
                                                        |
| 99 | + throw new SentryLogWriterException($msg);  | 
                                                        |
| 100 | 100 | }  | 
                                                        
| 101 | 101 | }  | 
                                                        
| 102 | 102 | |
@@ -81,7 +81,7 @@ discard block  | 
                                                    ||
| 81 | 81 | */  | 
                                                        
| 82 | 82 | public function setData($field, $data)  | 
                                                        
| 83 | 83 |      { | 
                                                        
| 84 | -        switch($field) { | 
                                                        |
| 84 | +        switch ($field) { | 
                                                        |
| 85 | 85 | case 'env':  | 
                                                        
| 86 | 86 | $this->client->setEnvironment($data);  | 
                                                        
| 87 | 87 | break;  | 
                                                        
@@ -121,8 +121,7 @@ discard block  | 
                                                    ||
| 121 | 121 | public function getLevel($level)  | 
                                                        
| 122 | 122 |      { | 
                                                        
| 123 | 123 | return isset($this->client->logLevels[$level]) ?  | 
                                                        
| 124 | - $this->client->logLevels[$level] :  | 
                                                        |
| 125 | - $this->client->logLevels[self::$default_error_level];  | 
                                                        |
| 124 | + $this->client->logLevels[$level] : $this->client->logLevels[self::$default_error_level];  | 
                                                        |
| 126 | 125 | }  | 
                                                        
| 127 | 126 | |
| 128 | 127 | }  | 
                                                        
@@ -126,6 +126,7 @@  | 
                                                    ||
| 126 | 126 | * the request.  | 
                                                        
| 127 | 127 | *  | 
                                                        
| 128 | 128 | * @param Member $member  | 
                                                        
| 129 | + * @param SentryLogger $logger  | 
                                                        |
| 129 | 130 | * @return array  | 
                                                        
| 130 | 131 | */  | 
                                                        
| 131 | 132 | private function getUserData(Member $member = null, $logger)  | 
                                                        
@@ -9,11 +9,11 @@  | 
                                                    ||
| 9 | 9 | |
| 10 | 10 | namespace PhpTek\Sentry\Handler;  | 
                                                        
| 11 | 11 | |
| 12 | -use PhpTek\Sentry\Monolog\Handler\SentryRavenHandler,  | 
                                                        |
| 13 | - Monolog\Logger,  | 
                                                        |
| 14 | - SilverStripe\Dev\Backtrace,  | 
                                                        |
| 15 | - SilverStripe\Security\Member,  | 
                                                        |
| 16 | - PhpTek\Sentry\Log\SentryLogger;  | 
                                                        |
| 12 | +use PhpTek\Sentry\Monolog\Handler\SentryRavenHandler;  | 
                                                        |
| 13 | +use Monolog\Logger;  | 
                                                        |
| 14 | +use SilverStripe\Dev\Backtrace;  | 
                                                        |
| 15 | +use SilverStripe\Security\Member;  | 
                                                        |
| 16 | +use PhpTek\Sentry\Log\SentryLogger;  | 
                                                        |
| 17 | 17 | |
| 18 | 18 | /**  | 
                                                        
| 19 | 19 | * Monolog Handler for Sentry via Raven  | 
                                                        
@@ -169,7 +169,7 @@  | 
                                                    ||
| 169 | 169 | /**  | 
                                                        
| 170 | 170 | * Return peak memory usage.  | 
                                                        
| 171 | 171 | *  | 
                                                        
| 172 | - * @return float  | 
                                                        |
| 172 | + * @return string  | 
                                                        |
| 173 | 173 | */  | 
                                                        
| 174 | 174 | public function getPeakMemory()  | 
                                                        
| 175 | 175 |      { | 
                                                        
@@ -9,9 +9,9 @@  | 
                                                    ||
| 9 | 9 | |
| 10 | 10 | namespace PhpTek\Sentry\Log;  | 
                                                        
| 11 | 11 | |
| 12 | -use SilverStripe\Control\Director,  | 
                                                        |
| 13 | - SilverStripe\Core\Injector\Injector,  | 
                                                        |
| 14 | - SilverStripe\Control\Middleware\TrustedProxyMiddleware;  | 
                                                        |
| 12 | +use SilverStripe\Control\Director;  | 
                                                        |
| 13 | +use SilverStripe\Core\Injector\Injector;  | 
                                                        |
| 14 | +use SilverStripe\Control\Middleware\TrustedProxyMiddleware;  | 
                                                        |
| 15 | 15 | |
| 16 | 16 | /**  | 
                                                        
| 17 | 17 | * The SentryLogWriter class simply acts as a bridge between the configured Sentry  | 
                                                        
@@ -218,46 +218,46 @@  | 
                                                    ||
| 218 | 218 | return php_sapi_name();  | 
                                                        
| 219 | 219 | }  | 
                                                        
| 220 | 220 | |
| 221 | - /**  | 
                                                        |
| 222 | - * Returns the client IP address which originated this request.  | 
                                                        |
| 223 | - * Lifted and modified from SilverStripe 3's SS_HTTPRequest.  | 
                                                        |
| 224 | - *  | 
                                                        |
| 225 | - * @return string  | 
                                                        |
| 226 | - */  | 
                                                        |
| 227 | - public function getIP()  | 
                                                        |
| 221 | + /**  | 
                                                        |
| 222 | + * Returns the client IP address which originated this request.  | 
                                                        |
| 223 | + * Lifted and modified from SilverStripe 3's SS_HTTPRequest.  | 
                                                        |
| 224 | + *  | 
                                                        |
| 225 | + * @return string  | 
                                                        |
| 226 | + */  | 
                                                        |
| 227 | + public function getIP()  | 
                                                        |
| 228 | 228 |      { | 
                                                        
| 229 | - $headerOverrideIP = null;  | 
                                                        |
| 229 | + $headerOverrideIP = null;  | 
                                                        |
| 230 | 230 | |
| 231 | -		if (defined('TRUSTED_PROXY')) { | 
                                                        |
| 232 | -			$headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? | 
                                                        |
| 231 | +        if (defined('TRUSTED_PROXY')) { | 
                                                        |
| 232 | +            $headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? | 
                                                        |
| 233 | 233 | array(SS_TRUSTED_PROXY_IP_HEADER) :  | 
                                                        
| 234 | 234 | null;  | 
                                                        
| 235 | 235 | |
| 236 | -			if(!$headers) { | 
                                                        |
| 237 | - // Backwards compatible defaults  | 
                                                        |
| 238 | - $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR'];  | 
                                                        |
| 239 | - }  | 
                                                        |
| 236 | +            if(!$headers) { | 
                                                        |
| 237 | + // Backwards compatible defaults  | 
                                                        |
| 238 | + $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR'];  | 
                                                        |
| 239 | + }  | 
                                                        |
| 240 | 240 | |
| 241 | -			foreach($headers as $header) { | 
                                                        |
| 242 | -				if(!empty($_SERVER[$header])) { | 
                                                        |
| 243 | - $headerOverrideIP = $_SERVER[$header];  | 
                                                        |
| 241 | +            foreach($headers as $header) { | 
                                                        |
| 242 | +                if(!empty($_SERVER[$header])) { | 
                                                        |
| 243 | + $headerOverrideIP = $_SERVER[$header];  | 
                                                        |
| 244 | 244 | |
| 245 | - break;  | 
                                                        |
| 246 | - }  | 
                                                        |
| 247 | - }  | 
                                                        |
| 248 | - }  | 
                                                        |
| 245 | + break;  | 
                                                        |
| 246 | + }  | 
                                                        |
| 247 | + }  | 
                                                        |
| 248 | + }  | 
                                                        |
| 249 | 249 | |
| 250 | 250 | $proxy = Injector::inst()->create(TrustedProxyMiddleware::class);  | 
                                                        
| 251 | 251 | |
| 252 | -		if ($headerOverrideIP) { | 
                                                        |
| 253 | - return $proxy->getIPFromHeaderValue($headerOverrideIP);  | 
                                                        |
| 254 | - }  | 
                                                        |
| 252 | +        if ($headerOverrideIP) { | 
                                                        |
| 253 | + return $proxy->getIPFromHeaderValue($headerOverrideIP);  | 
                                                        |
| 254 | + }  | 
                                                        |
| 255 | 255 | |
| 256 | 256 |          if (isset($_SERVER['REMOTE_ADDR'])) { | 
                                                        
| 257 | - return $_SERVER['REMOTE_ADDR'];  | 
                                                        |
| 258 | - }  | 
                                                        |
| 257 | + return $_SERVER['REMOTE_ADDR'];  | 
                                                        |
| 258 | + }  | 
                                                        |
| 259 | 259 | |
| 260 | 260 | return '';  | 
                                                        
| 261 | - }  | 
                                                        |
| 261 | + }  | 
                                                        |
| 262 | 262 | |
| 263 | 263 | }  | 
                                                        
@@ -230,16 +230,15 @@  | 
                                                    ||
| 230 | 230 | |
| 231 | 231 |  		if (defined('TRUSTED_PROXY')) { | 
                                                        
| 232 | 232 |  			$headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? | 
                                                        
| 233 | - array(SS_TRUSTED_PROXY_IP_HEADER) :  | 
                                                        |
| 234 | - null;  | 
                                                        |
| 233 | + array(SS_TRUSTED_PROXY_IP_HEADER) : null;  | 
                                                        |
| 235 | 234 | |
| 236 | -			if(!$headers) { | 
                                                        |
| 235 | +			if (!$headers) { | 
                                                        |
| 237 | 236 | // Backwards compatible defaults  | 
                                                        
| 238 | 237 | $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR'];  | 
                                                        
| 239 | 238 | }  | 
                                                        
| 240 | 239 | |
| 241 | -			foreach($headers as $header) { | 
                                                        |
| 242 | -				if(!empty($_SERVER[$header])) { | 
                                                        |
| 240 | +			foreach ($headers as $header) { | 
                                                        |
| 241 | +				if (!empty($_SERVER[$header])) { | 
                                                        |
| 243 | 242 | $headerOverrideIP = $_SERVER[$header];  | 
                                                        
| 244 | 243 | |
| 245 | 244 | break;  | 
                                                        
@@ -13,9 +13,9 @@  | 
                                                    ||
| 13 | 13 | |
| 14 | 14 | namespace PhpTek\Sentry\Monolog\Handler;  | 
                                                        
| 15 | 15 | |
| 16 | -use Monolog\Handler\RavenHandler,  | 
                                                        |
| 17 | - Monolog\Logger,  | 
                                                        |
| 18 | - Raven_Client;  | 
                                                        |
| 16 | +use Monolog\Handler\RavenHandler;  | 
                                                        |
| 17 | +use Monolog\Logger;  | 
                                                        |
| 18 | +use Raven_Client;  | 
                                                        |
| 19 | 19 | |
| 20 | 20 | /**  | 
                                                        
| 21 | 21 | * Subclasses RavenHandler purely to overload its `write()` method.  |