| @@ -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 Monolog\Handler\RavenHandler, | |
| 13 | - Monolog\Logger, | |
| 14 | - SilverStripe\Dev\Backtrace, | |
| 15 | - SilverStripe\Security\Member, | |
| 16 | - PhpTek\Sentry\Log\SentryLogger; | |
| 12 | +use Monolog\Handler\RavenHandler; | |
| 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 | 
| @@ -168,7 +168,7 @@ | ||
| 168 | 168 | /** | 
| 169 | 169 | * Return peak memory usage. | 
| 170 | 170 | * | 
| 171 | - * @return float | |
| 171 | + * @return string | |
| 172 | 172 | */ | 
| 173 | 173 | public function getPeakMemory() | 
| 174 | 174 |      { | 
| @@ -9,8 +9,8 @@ | ||
| 9 | 9 | |
| 10 | 10 | namespace PhpTek\Sentry\Log; | 
| 11 | 11 | |
| 12 | -use SilverStripe\Control\Director, | |
| 13 | - SilverStripe\Core\Injector\Injector; | |
| 12 | +use SilverStripe\Control\Director; | |
| 13 | +use SilverStripe\Core\Injector\Injector; | |
| 14 | 14 | |
| 15 | 15 | /** | 
| 16 | 16 | * The SentryLogWriter class simply acts as a bridge between the configured Sentry | 
| @@ -217,46 +217,46 @@ | ||
| 217 | 217 | return php_sapi_name(); | 
| 218 | 218 | } | 
| 219 | 219 | |
| 220 | - /** | |
| 221 | - * Returns the client IP address which originated this request. | |
| 222 | - * Lifted and modified from SilverStripe 3's SS_HTTPRequest. | |
| 223 | - * | |
| 224 | - * @return string | |
| 225 | - */ | |
| 226 | - public function getIP() | |
| 220 | + /** | |
| 221 | + * Returns the client IP address which originated this request. | |
| 222 | + * Lifted and modified from SilverStripe 3's SS_HTTPRequest. | |
| 223 | + * | |
| 224 | + * @return string | |
| 225 | + */ | |
| 226 | + public function getIP() | |
| 227 | 227 |      { | 
| 228 | - $headerOverrideIP = null; | |
| 228 | + $headerOverrideIP = null; | |
| 229 | 229 | |
| 230 | -		if(defined('TRUSTED_PROXY')) { | |
| 231 | -			$headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ?  | |
| 230 | +        if(defined('TRUSTED_PROXY')) { | |
| 231 | +            $headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ?  | |
| 232 | 232 | array(SS_TRUSTED_PROXY_IP_HEADER) : | 
| 233 | 233 | null; | 
| 234 | 234 | |
| 235 | -			if(!$headers) { | |
| 236 | - // Backwards compatible defaults | |
| 237 | - $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR']; | |
| 238 | - } | |
| 235 | +            if(!$headers) { | |
| 236 | + // Backwards compatible defaults | |
| 237 | + $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR']; | |
| 238 | + } | |
| 239 | 239 | |
| 240 | -			foreach($headers as $header) { | |
| 241 | -				if(!empty($_SERVER[$header])) { | |
| 242 | - $headerOverrideIP = $_SERVER[$header]; | |
| 240 | +            foreach($headers as $header) { | |
| 241 | +                if(!empty($_SERVER[$header])) { | |
| 242 | + $headerOverrideIP = $_SERVER[$header]; | |
| 243 | 243 | |
| 244 | - break; | |
| 245 | - } | |
| 246 | - } | |
| 247 | - } | |
| 244 | + break; | |
| 245 | + } | |
| 246 | + } | |
| 247 | + } | |
| 248 | 248 | |
| 249 | 249 |          $proxy = Injector::inst()->create('SilverStripe\Control\Middleware\TrustedProxyMiddleware'); | 
| 250 | 250 | |
| 251 | -		if ($headerOverrideIP) { | |
| 252 | - return $proxy->getIPFromHeaderValue($headerOverrideIP); | |
| 253 | - } | |
| 251 | +        if ($headerOverrideIP) { | |
| 252 | + return $proxy->getIPFromHeaderValue($headerOverrideIP); | |
| 253 | + } | |
| 254 | 254 | |
| 255 | 255 |          if (isset($_SERVER['REMOTE_ADDR'])) { | 
| 256 | - return $_SERVER['REMOTE_ADDR']; | |
| 257 | - } | |
| 256 | + return $_SERVER['REMOTE_ADDR']; | |
| 257 | + } | |
| 258 | 258 | |
| 259 | 259 | return ''; | 
| 260 | - } | |
| 260 | + } | |
| 261 | 261 | |
| 262 | 262 | } | 
| @@ -227,18 +227,17 @@ | ||
| 227 | 227 |      { | 
| 228 | 228 | $headerOverrideIP = null; | 
| 229 | 229 | |
| 230 | -		if(defined('TRUSTED_PROXY')) { | |
| 230 | +		if (defined('TRUSTED_PROXY')) { | |
| 231 | 231 |  			$headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ?  | 
| 232 | - array(SS_TRUSTED_PROXY_IP_HEADER) : | |
| 233 | - null; | |
| 232 | + array(SS_TRUSTED_PROXY_IP_HEADER) : null; | |
| 234 | 233 | |
| 235 | -			if(!$headers) { | |
| 234 | +			if (!$headers) { | |
| 236 | 235 | // Backwards compatible defaults | 
| 237 | 236 | $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR']; | 
| 238 | 237 | } | 
| 239 | 238 | |
| 240 | -			foreach($headers as $header) { | |
| 241 | -				if(!empty($_SERVER[$header])) { | |
| 239 | +			foreach ($headers as $header) { | |
| 240 | +				if (!empty($_SERVER[$header])) { | |
| 242 | 241 | $headerOverrideIP = $_SERVER[$header]; | 
| 243 | 242 | |
| 244 | 243 | break; |