Skip to content
Merged
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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
examples/ export-ignore
test/ export-ignore
1 change: 1 addition & 0 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

$finder = Symfony\CS\Finder\DefaultFinder::create()
->in(__DIR__ . '/src')
->in(__DIR__ . '/test')
;

return Symfony\CS\Config\Config::create()
Expand Down
10 changes: 10 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="test/bootstrap.php">
<php>
</php>
<testsuites>
<testsuite name="SentryBundle test suite">
<directory suffix="Test.php">./test</directory>
</testsuite>
</testsuites>
</phpunit>
25 changes: 15 additions & 10 deletions src/Sentry/SentryBundle/EventListener/ExceptionListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Console\Event\ConsoleExceptionEvent;

Expand Down Expand Up @@ -77,7 +78,8 @@ public function onKernelRequest(GetResponseEvent $event)
}

$token = $this->tokenStorage->getToken();
if (null !== $token && $this->authorizationChecker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {

if (null !== $token && $this->authorizationChecker->isGranted(AuthenticatedVoter::IS_AUTHENTICATED_REMEMBERED)) {
$this->setUserValue($token->getUser());
}
}
Expand All @@ -88,7 +90,6 @@ public function onKernelRequest(GetResponseEvent $event)
public function onKernelException(GetResponseForExceptionEvent $event)
{
$exception = $event->getException();

foreach ($this->skipCapture as $className) {
if ($exception instanceof $className) {
return;
Expand Down Expand Up @@ -121,14 +122,18 @@ public function onConsoleException(ConsoleExceptionEvent $event)
*/
private function setUserValue($user)
{
switch (true) {
case $user instanceof UserInterface:
$this->client->set_user_data($user->getUsername());
return;
case is_object($user):
case is_string($user):
$this->client->set_user_data((string) $user);
return;
if ($user instanceof UserInterface) {
$this->client->set_user_data($user->getUsername());
return;
}

if (is_string($user)) {
$this->client->set_user_data($user);
return;
}

if (is_object($user) && method_exists($user, '__toString')) {
$this->client->set_user_data($user->__toString());
}
}
}
257 changes: 257 additions & 0 deletions test/Sentry/SentryBundle/Test/DependencyInjection/ExtensionTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
<?php

namespace Sentry\SentryBundle\Test\DependencyInjection;

use Sentry\SentryBundle\DependencyInjection\SentryExtension;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class ExtensionTest extends \PHPUnit_Framework_TestCase
{
const CONFIG_ROOT = 'sentry';

public function test_that_it_uses_kernel_root_as_app_path_by_default()
{
$container = $this->getContainer();

$this->assertSame(
'kernel/root',
$container->getParameter('sentry.app_path')
);
}

public function test_that_it_uses_app_path_value()
{
$container = $this->getContainer([
static::CONFIG_ROOT => array(
'app_path' => 'sentry/app/path',
),
]);

$this->assertSame(
'sentry/app/path',
$container->getParameter('sentry.app_path')
);
}

public function test_that_it_uses_defined_class_as_client_class_by_default()
{
$container = $this->getContainer();

$this->assertSame(
'Sentry\SentryBundle\SentrySymfonyClient',
$container->getParameter('sentry.client')
);
}

public function test_that_it_uses_client_value()
{
$container = $this->getContainer([
static::CONFIG_ROOT => array(
'client' => 'clientClass',
),
]);

$this->assertSame(
'clientClass',
$container->getParameter('sentry.client')
);
}

public function test_that_it_uses_kernel_environment_as_environment_by_default()
{
$container = $this->getContainer();

$this->assertSame(
'test',
$container->getParameter('sentry.environment')
);
}

public function test_that_it_uses_environment_value()
{
$container = $this->getContainer(array(
static::CONFIG_ROOT => array(
'environment' => 'custom_env',
),
));

$this->assertSame(
'custom_env',
$container->getParameter('sentry.environment')
);
}

public function test_that_it_uses_null_as_dsn_default_value()
{
$container = $this->getContainer();

$this->assertSame(
null,
$container->getParameter('sentry.dsn')
);
}

public function test_that_it_uses_dsn_value()
{
$container = $this->getContainer([
static::CONFIG_ROOT => [
'dsn' => 'custom_dsn',
],
]);

$this->assertSame(
'custom_dsn',
$container->getParameter('sentry.dsn')
);
}

public function test_that_it_uses_defined_class_as_exception_listener_class_by_default()
{
$container = $this->getContainer();

$this->assertSame(
'Sentry\SentryBundle\EventListener\ExceptionListener',
$container->getParameter('sentry.exception_listener')
);
}

public function test_that_it_uses_exception_listener_value()
{
$container = $this->getContainer([
static::CONFIG_ROOT => array(
'exception_listener' => 'exceptionListenerClass',
),
]);

$this->assertSame(
'exceptionListenerClass',
$container->getParameter('sentry.exception_listener')
);
}

public function test_that_it_uses_array_with_http_exception_as_skipped_capture_by_default()
{
$container = $this->getContainer();

$this->assertSame(
array(
'Symfony\Component\HttpKernel\Exception\HttpExceptionInterface',
),
$container->getParameter('sentry.skip_capture')
);
}

public function test_that_it_uses_skipped_capture_value()
{
$container = $this->getContainer(array(
static::CONFIG_ROOT => array(
'skip_capture' => array(
'classA',
'classB',
),
),
));

$this->assertSame(
array('classA', 'classB'),
$container->getParameter('sentry.skip_capture')
);
}

public function test_that_it_uses_null_as_release_by_default()
{
$container = $this->getContainer();

$this->assertSame(
null,
$container->getParameter('sentry.release')
);
}

public function test_that_it_uses_release_value()
{
$container = $this->getContainer(array(
static::CONFIG_ROOT => array(
'release' => '1.0',
),
));

$this->assertSame(
'1.0',
$container->getParameter('sentry.release')
);
}

public function test_that_it_uses_array_with_kernel_parent_as_prefix_by_default()
{
$container = $this->getContainer();

$this->assertSame(
array('kernel/root/..'),
$container->getParameter('sentry.prefixes')
);
}

public function test_that_it_uses_prefixes_value()
{
$container = $this->getContainer(array(
static::CONFIG_ROOT => array(
'prefixes' => array(
'dirA',
'dirB',
),
),
));

$this->assertSame(
array('dirA', 'dirB'),
$container->getParameter('sentry.prefixes')
);
}

public function test_that_it_has_sentry_client_service_and_it_defaults_to_symfony_client()
{
$client = $this->getContainer()->get('sentry.client');
$this->assertInstanceOf('Sentry\SentryBundle\SentrySymfonyClient', $client);
}

public function test_that_it_has_sentry_exception_listener_and_it_defaults_to_default_exception_listener()
{
$client = $this->getContainer()->get('sentry.exception_listener');
$this->assertInstanceOf('Sentry\SentryBundle\EventListener\ExceptionListener', $client);
}

public function test_that_it_has_proper_event_listener_tags_for_exception_listener()
{
$containerBuilder = new ContainerBuilder();
$extension = new SentryExtension();
$extension->load(array(), $containerBuilder);

$definition = $containerBuilder->getDefinition('sentry.exception_listener');
$tags = $definition->getTag('kernel.event_listener');

$this->assertSame(
array(
array('event' => 'kernel.request', 'method' => 'onKernelRequest'),
array('event' => 'kernel.exception', 'method' => 'onKernelException'),
array('event' => 'console.exception', 'method' => 'onConsoleException'),
),
$tags
);
}

private function getContainer(array $options = array())
{
$containerBuilder = new ContainerBuilder();
$containerBuilder->setParameter('kernel.root_dir', 'kernel/root');
$containerBuilder->setParameter('kernel.environment', 'test');

$extension = new SentryExtension();

$extension->load($options, $containerBuilder);

$containerBuilder->compile();

return $containerBuilder;
}
}
Loading