diff --git a/src/Monolog/Processor/AbstractProcessor.php b/src/Monolog/Processor/AbstractProcessor.php deleted file mode 100644 index 0cbf67a2..00000000 --- a/src/Monolog/Processor/AbstractProcessor.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Monolog\Processor; - -/** - * Basic processor class - * @author Rob Jensen - */ -abstract class AbstractProcessor -{ - - abstract public function __invoke( array $record ); - -} diff --git a/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/src/Monolog/Processor/MemoryPeakUsageProcessor.php index 12559166..cb2ca210 100644 --- a/src/Monolog/Processor/MemoryPeakUsageProcessor.php +++ b/src/Monolog/Processor/MemoryPeakUsageProcessor.php @@ -15,7 +15,7 @@ use Monolog\Processor\MemoryProcessor; /** * Injects memory_get_peak_usage in all records - * + * * @see Monolog\Processor\MemoryProcessor__construct() for options * @author Rob Jensen */ @@ -28,8 +28,8 @@ class MemoryPeakUsageProcessor extends MemoryProcessor */ public function __invoke(array $record) { - $bytes = memory_get_peak_usage( $this->realUsage ); - $formatted = MemoryProcessor::formatBytes( $bytes ); + $bytes = memory_get_peak_usage($this->realUsage); + $formatted = MemoryProcessor::formatBytes($bytes); $record['extra'] = array_merge( $record['extra'], diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php index 3513e108..e2efc7b8 100644 --- a/src/Monolog/Processor/MemoryProcessor.php +++ b/src/Monolog/Processor/MemoryProcessor.php @@ -15,21 +15,17 @@ namespace Monolog\Processor; * Some methods that are common for all memory processors * @author Rob Jensen */ -abstract class MemoryProcessor extends AbstractProcessor +class MemoryProcessor { protected $realUsage; /** - * @param array $options + * @param boolean $realUsage */ - public function __construct( $options = array() ) + public function __construct($realUsage = true) { - if(array_key_exists('realUsage', $options )){ - $this->realUsage = (boolean) $options['realUsage']; - } else { - $this->realUsage = true; - } + $this->realUsage = (boolean) $realUsage; } /** @@ -38,12 +34,12 @@ abstract class MemoryProcessor extends AbstractProcessor * @param int $bytes * @return string */ - public static function formatBytes( $bytes ) + public static function formatBytes($bytes) { $bytes = (int) $bytes; if ($bytes > 1024*1024) { $bytes = round($bytes/1024/1024, 2).' MB'; - } else if ($bytes > 1024) { + } elseif ($bytes > 1024) { $bytes = round($bytes/1024, 2).' KB'; } else { $bytes .= ' B'; diff --git a/src/Monolog/Processor/MemoryUsageProcessor.php b/src/Monolog/Processor/MemoryUsageProcessor.php index 1f6d4ab7..bcbed6b4 100644 --- a/src/Monolog/Processor/MemoryUsageProcessor.php +++ b/src/Monolog/Processor/MemoryUsageProcessor.php @@ -27,8 +27,8 @@ class MemoryUsageProcessor extends MemoryProcessor */ public function __invoke(array $record) { - $bytes = memory_get_usage( $this->realUsage ); - $formatted = MemoryProcessor::formatBytes( $bytes ); + $bytes = memory_get_usage($this->realUsage); + $formatted = MemoryProcessor::formatBytes($bytes); $record['extra'] = array_merge( $record['extra'],