From c65aa23536cbe9ff4ea78fc36f970feb44ee90c2 Mon Sep 17 00:00:00 2001 From: mtopolski Date: Thu, 22 Oct 2015 10:34:56 -0700 Subject: [PATCH 1/3] added param in InstrospectionProcessor __construct to allow stacktrace offset --- src/Monolog/Processor/IntrospectionProcessor.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Processor/IntrospectionProcessor.php b/src/Monolog/Processor/IntrospectionProcessor.php index 7a9de925..a0e58250 100644 --- a/src/Monolog/Processor/IntrospectionProcessor.php +++ b/src/Monolog/Processor/IntrospectionProcessor.php @@ -30,15 +30,18 @@ class IntrospectionProcessor private $skipClassesPartials; + private $extra_stack; + private $skipFunctions = array( 'call_user_func', 'call_user_func_array', ); - public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array()) + public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $extra_stack = 0) { $this->level = Logger::toMonologLevel($level); $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials); + $this->extra_stack = $extra_stack; } /** @@ -77,6 +80,8 @@ class IntrospectionProcessor break; } + $i += $this->extra_stack; + // we should have the call source now $record['extra'] = array_merge( $record['extra'], From 2ae6b3338b29b434f4ad6815a3afee8c968c2cfe Mon Sep 17 00:00:00 2001 From: mtopolski Date: Thu, 22 Oct 2015 11:12:48 -0700 Subject: [PATCH 2/3] camelcase --- src/Monolog/Processor/IntrospectionProcessor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Processor/IntrospectionProcessor.php b/src/Monolog/Processor/IntrospectionProcessor.php index a0e58250..35db2964 100644 --- a/src/Monolog/Processor/IntrospectionProcessor.php +++ b/src/Monolog/Processor/IntrospectionProcessor.php @@ -30,18 +30,18 @@ class IntrospectionProcessor private $skipClassesPartials; - private $extra_stack; + private $extraStack; private $skipFunctions = array( 'call_user_func', 'call_user_func_array', ); - public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $extra_stack = 0) + public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $extraStack = 0) { $this->level = Logger::toMonologLevel($level); $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials); - $this->extra_stack = $extra_stack; + $this->extraStack = $extraStack; } /** @@ -80,7 +80,7 @@ class IntrospectionProcessor break; } - $i += $this->extra_stack; + $i += $this->extraStack; // we should have the call source now $record['extra'] = array_merge( From 1dbc4c3b515233cfae293ddd5873169fdb82dc2c Mon Sep 17 00:00:00 2001 From: mtopolski Date: Mon, 26 Oct 2015 10:20:58 -0700 Subject: [PATCH 3/3] changed variable to be more descriptive --- src/Monolog/Processor/IntrospectionProcessor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Processor/IntrospectionProcessor.php b/src/Monolog/Processor/IntrospectionProcessor.php index 35db2964..2691630a 100644 --- a/src/Monolog/Processor/IntrospectionProcessor.php +++ b/src/Monolog/Processor/IntrospectionProcessor.php @@ -30,18 +30,18 @@ class IntrospectionProcessor private $skipClassesPartials; - private $extraStack; + private $skipStackFramesCount; private $skipFunctions = array( 'call_user_func', 'call_user_func_array', ); - public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $extraStack = 0) + public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $skipStackFramesCount = 0) { $this->level = Logger::toMonologLevel($level); $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials); - $this->extraStack = $extraStack; + $this->skipStackFramesCount = $skipStackFramesCount; } /** @@ -80,7 +80,7 @@ class IntrospectionProcessor break; } - $i += $this->extraStack; + $i += $this->skipStackFramesCount; // we should have the call source now $record['extra'] = array_merge(