Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vendor/
.phpunit.result.cache
composer.lock
composer.lock
.vscode/
9 changes: 9 additions & 0 deletions Middleware/ContextProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,19 @@ class ContextProcessor implements MiddlewareInterface
*/
public function process($level, $message, $context): array
{
if ($context instanceof ContextualInterface) {
$context = $context->getContext();
}

if ($message instanceof \Throwable && $message->getPrevious() && $message->getPrevious() instanceof \Throwable) {
[$previousMessage, $context] = $this->process($level, $message->getPrevious(), $context);
}

if ($message instanceof ContextualInterface) {
$context = array_merge($context, $message->getContext());
}


return [$message, $context];
}
}
17 changes: 13 additions & 4 deletions Middleware/ExceptionCodeProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,27 @@
class ExceptionCodeProcessor implements MiddlewareInterface
{
/**
* @param string $level
* @param mixed $message
* @param array $context
* @param string $level
* @param mixed $message
* @param array $context
* @param bool|false $nesting
*
* @return array
*/
public function process($level, $message, $context): array
public function process($level, $message, $context, $nesting=false): array
{
if ($message instanceof \Throwable && $message->getPrevious() && $message->getPrevious() instanceof \Throwable) {
$nesting = true;
[$previousMessage, $context] = $this->process($level, $message->getPrevious(), $context, true);
}

if ($message instanceof \Throwable) {
$context = array_merge($context, [
'code' => $message->getCode(),
]);
if ($nesting) {
$context['codes'] = array_merge([$message->getCode()], $context['codes'] ?? []);
}
}

return [$message, $context];
Expand Down
155 changes: 155 additions & 0 deletions Tests/Middleware/ContextProcessorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<?php declare(strict_types=1);

namespace KoderHut\OnelogBundle\Tests\Middleware;

use KoderHut\OnelogBundle\Middleware\ContextProcessor;
use PHPUnit\Framework\TestCase;
use KoderHut\OnelogBundle\Helper\ContextualTrait;
use KoderHut\OnelogBundle\ContextualInterface;

/**
* Class ContextProcessorTest
*
* @author Joao Jacome <969041+joaojacome@users.noreply.github.com>
*
* @covers \KoderHut\OnelogBundle\Middleware\ContextProcessor
*/
class ContextProcessorTest extends TestCase
{
/**
* @test
*/
public function testProcessWithException()
{
$processor = new ContextProcessor();

$exception = new class extends \Exception implements ContextualInterface {
use ContextualTrait;
};
$exception->setContext(['this is' => 'the context']);

$processed = $processor->process('debug', $exception, []);

$this->assertEquals([
$exception,
[
'this is' => 'the context'
]],
$processed
);
}

/**
* @test
*/
public function testProcessWithExceptionAndContext()
{
$processor = new ContextProcessor();

$exception = new class extends \Exception implements ContextualInterface {
use ContextualTrait;
};
$exception->setContext(['this is' => 'the context']);

$processed = $processor->process('debug', $exception, ['and this is' => 'another context']);

$this->assertEquals([
$exception,
[
'this is' => 'the context',
'and this is' => 'another context',
]],
$processed
);
}

/**
* @test
*/
public function testProcessWithNestedException()
{
$processor = new ContextProcessor();

$grandChildException = new class('grand child exception') extends \Exception implements ContextualInterface {
use ContextualTrait;
};
$childException = new class('child exception', 0, $grandChildException) extends \Exception implements ContextualInterface {
use ContextualTrait;
};
$parentException = new class('parent exception', 0, $childException) extends \Exception implements ContextualInterface {
use ContextualTrait;
};

$parentException->setContext(['this is1' => '1the context']);
$childException->setContext(['this is2' => '2the context']);
$grandChildException->setContext(['this is3' => '3the context']);

$processed = $processor->process('debug', $parentException, ['and this is' => 'another context']);

$this->assertEquals([
$parentException,
[
'and this is' => 'another context',
'this is1' => '1the context',
'this is2' => '2the context',
'this is3' => '3the context',
]],
$processed
);
}

/**
* @test
*/
public function testProcessWithClassContext()
{
$processor = new ContextProcessor();

$classWithContext = new class() implements ContextualInterface {
use ContextualTrait;
};

$classWithContext->setContext(['this is1' => '1the context']);

$processed = $processor->process('debug', $classWithContext, []);

$this->assertEquals([
$classWithContext,
[
'this is1' => '1the context',
]],
$processed
);
}

/**
* @test
*/
public function testProcessWithNestedClassContext()
{
$processor = new ContextProcessor();

$classWithContext = new class() implements ContextualInterface {
use ContextualTrait;
};

$classWithContext->setContext(['this is1' => '1the context']);

$secondClassWithContext = new class() implements ContextualInterface {
use ContextualTrait;
};

$secondClassWithContext->setContext($classWithContext);


$processed = $processor->process('debug', $secondClassWithContext, []);

$this->assertEquals([
$secondClassWithContext,
[
'this is1' => '1the context',
]],
$processed
);
}
}
59 changes: 59 additions & 0 deletions Tests/Middleware/ExceptionCodeProcessorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php declare(strict_types=1);

namespace KoderHut\OnelogBundle\Tests\Middleware;

use KoderHut\OnelogBundle\Middleware\ExceptionCodeProcessor;
use PHPUnit\Framework\TestCase;

/**
* Class ExceptionCodeProcessorTest
*
* @author Joao Jacome <969041+joaojacome@users.noreply.github.com>
*
* @covers \KoderHut\OnelogBundle\Middleware\ExceptionCodeProcessor
*/
class ExceptionCodeProcessorTest extends TestCase
{
/**
* @test
*/
public function testProcessWithException()
{
$processor = new ExceptionCodeProcessor();

$parentException = new \Exception('parent exception', 204);

$processed = $processor->process('debug', $parentException, []);

$this->assertEquals([
$parentException,
[
'code' => 204
]],
$processed
);
}

/**
* @test
*/
public function testProcessWithNestedExceptions()
{
$processor = new ExceptionCodeProcessor();

$grandChildException = new \Exception('grand child exception', 202);
$childException = new \Exception('child exception', 203, $grandChildException);
$parentException = new \Exception('parent exception', 204, $childException);

$processed = $processor->process('debug', $parentException, []);

$this->assertEquals([
$parentException,
[
'codes' => [204, 203, 202],
'code' => 204
]],
$processed
);
}
}
30 changes: 30 additions & 0 deletions Tests/Middleware/SimpleMessageProcessorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php declare(strict_types=1);

namespace KoderHut\OnelogBundle\Tests\Middleware;

use KoderHut\OnelogBundle\Middleware\SimpleMessageProcessor;
use PHPUnit\Framework\TestCase;

/**
* Class SimpleMessageProcessorTest
*
* @author Joao Jacome <969041+joaojacome@users.noreply.github.com>
*
* @covers \KoderHut\OnelogBundle\Middleware\SimpleMessageProcessor
*/
class SimpleMessageProcessorTest extends TestCase
{
/**
* @test
*/
public function testProcess()
{
$processor = new SimpleMessageProcessor();

$simpleException = new \Exception('simple exception');

$processed = $processor->process('debug', $simpleException, []);

$this->assertEquals($processed[0], 'simple exception');
}
}
36 changes: 36 additions & 0 deletions Tests/Middleware/StackTraceProcessorTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php declare(strict_types=1);

namespace KoderHut\OnelogBundle\Tests\Middleware;

use KoderHut\OnelogBundle\Middleware\StackTraceProcessor;
use PHPUnit\Framework\TestCase;

/**
* Class StackTraceProcessorTest
*
* @author Joao Jacome <969041+joaojacome@users.noreply.github.com>
*
* @covers \KoderHut\OnelogBundle\Middleware\StackTraceProcessor
*/
class StackTraceProcessorTest extends TestCase
{
/**
* @test
*/
public function testProcess()
{
$processor = new StackTraceProcessor();

$parentException = new \Exception('parent exception', 204);

try {
throw $parentException;
} catch (\Exception $exc) {
}

$processed = $processor->process('debug', $parentException, []);

$this->assertNotEmpty($parentException);
$this->assertTrue(count($processed[1]) > 0);
}
}