Created new Exception to throw and modified tests

GDIBass · GDIBass · commit 2ebc71a61671 · 2017-08-18T08:37:36.000-07:00
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Workflow\Event\GuardEvent;
+use Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException;
 
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
@@ -56,7 +57,7 @@ private function getVariables(GuardEvent $event)
         $token = $this->tokenStorage->getToken();
 
         if (null === $token) {
-            throw new \Exception('No token is set');
+            throw new InvalidTokenConfigurationException('No token is set');
         }
 
         if (null !== $this->roleHierarchy) {
diff --git a/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php b/src/Symfony/Component/Workflow/Exception/InvalidTokenConfigurationException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Workflow\Exception;
+
+/**
+ * Thrown by GuardListener when there is no token set, but guards are placed on a transition
+ *
+ * @author Matt Johnson <matj1985@gmail.com>
+ */
+class InvalidTokenConfigurationException extends LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -69,12 +69,14 @@ public function testWithSupportedEventAndAccept()
         $this->assertTrue($event->isBlocked());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException
+     * @expectedExceptionMessage No token is set
+     */
     public function testWithNoTokenStorage()
     {
         $event = $this->createEvent();
-        $this->tokenStorage = null;
-
-        $this->expectException(\Exception::class);
+        $this->tokenStorage->setToken(null);
 
         $this->listener->onTransition($event, 'event_name_a');
     }

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,14 @@ public function testWithSupportedEventAndAccept()`
`69`	`69`	`$this->assertTrue($event->isBlocked());`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ /**`
	`73`	`+ * @expectedException \Symfony\Component\Workflow\Exception\InvalidTokenConfigurationException`
	`74`	`+ * @expectedExceptionMessage No token is set`
	`75`	`+ */`
`72`	`76`	`public function testWithNoTokenStorage()`
`73`	`77`	`{`
`74`	`78`	`$event = $this->createEvent();`
`75`		`- $this->tokenStorage = null;`
`76`		`-`
`77`		`- $this->expectException(\Exception::class);`
	`79`	`+ $this->tokenStorage->setToken(null);`
`78`	`80`
`79`	`81`	`$this->listener->onTransition($event, 'event_name_a');`
`80`	`82`	`}`