Merge pull request #60 from tienvx/validate-path

Validate path
tienvx · Sep 16, 2018 · 39b4a7e · 39b4a7e
2 parents 21b07d4 + 1785743
commit 39b4a7e
Show file tree

Hide file tree

Showing 40 changed files with 198 additions and 92 deletions.
diff --git a/src/Command/HandlePathReducerMessageCommand.php b/src/Command/HandlePathReducerMessageCommand.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\Command;
 
+use Exception;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -31,7 +32,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @throws \Exception
+     * @throws Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

diff --git a/src/Command/ReduceStepsCommand.php b/src/Command/ReduceStepsCommand.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\Command;
 
+use Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -34,7 +35,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @throws \Exception
+     * @throws Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

diff --git a/src/Command/ReportBugCommand.php b/src/Command/ReportBugCommand.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\Command;
 
+use Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -35,7 +36,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @throws \Exception
+     * @throws Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

diff --git a/src/DependencyInjection/Compiler/GeneratorPass.php b/src/DependencyInjection/Compiler/GeneratorPass.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection\Compiler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -21,7 +22,7 @@ public function __construct(string $generatorService = 'mbt.generator_manager',
 
     /**
      * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/src/DependencyInjection/Compiler/PathReducerPass.php b/src/DependencyInjection/Compiler/PathReducerPass.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection\Compiler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -21,7 +22,7 @@ public function __construct(string $pathReducerService = 'mbt.path_reducer_manag
 
     /**
      * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/src/DependencyInjection/Compiler/ReporterPass.php b/src/DependencyInjection/Compiler/ReporterPass.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection\Compiler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -21,7 +22,7 @@ public function __construct(string $reporterService = 'mbt.reporter_manager', st
 
     /**
      * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/src/DependencyInjection/Compiler/SecurityTokenPass.php b/src/DependencyInjection/Compiler/SecurityTokenPass.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection\Compiler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,7 +22,7 @@ public function __construct(string $tokenStorageService = 'security.token_storag
 
     /**
      * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/src/DependencyInjection/Compiler/TaggedServiceTrait.php b/src/DependencyInjection/Compiler/TaggedServiceTrait.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection\Compiler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use InvalidArgumentException;
@@ -12,7 +13,7 @@ trait TaggedServiceTrait
      * @param string $tagName
      * @param ContainerBuilder $container
      * @return array
-     * @throws \Exception
+     * @throws Exception
      */
     private function findTaggedServices(string $tagName, ContainerBuilder $container)
     {

diff --git a/src/DependencyInjection/TienvxMbtExtension.php b/src/DependencyInjection/TienvxMbtExtension.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\DependencyInjection;
 
+use Exception;
 use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Monolog\Logger;
@@ -36,7 +37,7 @@ class TienvxMbtExtension extends Extension
 {
     /**
      * {@inheritdoc}
-     * @throws \Exception
+     * @throws Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {

diff --git a/src/Entity/Bug.php b/src/Entity/Bug.php
@@ -35,6 +35,7 @@ class Bug
     /**
      * @ORM\Column(type="text")
      * @Assert\NotBlank
+     * @MbtAssert\Path
      */
     private $path;
 

diff --git a/src/Generator/GeneratorManager.php b/src/Generator/GeneratorManager.php
@@ -2,6 +2,8 @@
 
 namespace Tienvx\Bundle\MbtBundle\Generator;
 
+use Exception;
+
 class GeneratorManager
 {
     /**
@@ -30,15 +32,15 @@ public function getGenerators(): array
      * @param $name
      * @return GeneratorInterface
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function getGenerator($name): GeneratorInterface
     {
         if (isset($this->generators[$name])) {
             return $this->generators[$name];
         }
 
-        throw new \Exception(sprintf('Generator %s does not exist.', $name));
+        throw new Exception(sprintf('Generator %s does not exist.', $name));
     }
 
     /**

diff --git a/src/Graph/Path.php b/src/Graph/Path.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\Graph;
 
+use Exception;
 use Iterator;
 use Serializable;
 
@@ -27,8 +28,18 @@ class Path implements Serializable, Iterator
      */
     protected $position;
 
+    /**
+     * Path constructor.
+     * @param array $transitions
+     * @param array $data
+     * @param array $places
+     * @throws Exception
+     */
     public function __construct(array $transitions = [], array $data = [], array $places = [])
     {
+        if (count($transitions) !== count($data) || count($transitions) !== count($places)) {
+            throw new Exception('Invalid transitions, data or places for path');
+        }
         $this->transitions = $transitions;
         $this->data        = $data;
         $this->places      = $places;
@@ -42,16 +53,26 @@ public function add(?string $transition, ?array $data, array $places)
         $this->places[] = $places;
     }
 
-    public function countTransitions()
+    public function countTransitions(): int
     {
         return count(array_filter($this->transitions));
     }
 
-    public function countPlaces()
+    public function countPlaces(): int
     {
         return count($this->places);
     }
 
+    public function countUniqueTransitions(): int
+    {
+        return count(array_unique(array_filter($this->transitions)));
+    }
+
+    public function countUniquePlaces(): int
+    {
+        return count(array_unique(call_user_func_array('array_merge', $this->places)));
+    }
+
     public function getTransitionAt(int $index): ?string
     {
         return $this->transitions[$index];
@@ -72,29 +93,24 @@ public function setDataAt(int $index, array $data)
         $this->data[$index] = $data;
     }
 
-    public function getAllTransitions(): array
-    {
-        return $this->transitions;
-    }
-
-    public function getAllData(): array
-    {
-        return $this->data;
-    }
-
-    public function getAllPlaces(): array
-    {
-        return $this->places;
-    }
-
     public function serialize()
     {
         return serialize([$this->transitions, $this->data, $this->places]);
     }
 
+    /**
+     * @param string $serialized
+     * @throws Exception
+     */
     public function unserialize($serialized)
     {
-        list($this->transitions, $this->data, $this->places) = unserialize($serialized);
+        list($transitions, $data, $places) = unserialize($serialized);
+        if (count($transitions) !== count($data) || count($transitions) !== count($places)) {
+            throw new Exception('Invalid transitions, data or places for path');
+        }
+        $this->transitions = $transitions;
+        $this->data = $data;
+        $this->places = $places;
     }
 
     public function current()

diff --git a/src/Helper/PathRunner.php b/src/Helper/PathRunner.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\Helper;
 
+use Exception;
 use Symfony\Component\Workflow\Workflow;
 use Tienvx\Bundle\MbtBundle\Graph\Path;
 use Tienvx\Bundle\MbtBundle\Subject\Subject;
@@ -12,7 +13,7 @@ class PathRunner
      * @param Path $path
      * @param Workflow $workflow
      * @param Subject $subject
-     * @throws \Exception
+     * @throws Exception
      */
     public static function run(Path $path, Workflow $workflow, Subject $subject)
     {

diff --git a/src/MessageHandler/BugMessageHandler.php b/src/MessageHandler/BugMessageHandler.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\MessageHandler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Process\Process;
@@ -18,7 +19,7 @@ public function __construct(ParameterBagInterface $params)
 
     /**
      * @param BugMessage $bugMessage
-     * @throws \Exception
+     * @throws Exception
      */
     public function __invoke(BugMessage $bugMessage)
     {

diff --git a/src/MessageHandler/QueuedLoopMessageHandler.php b/src/MessageHandler/QueuedLoopMessageHandler.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\MessageHandler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Process\Process;
@@ -19,7 +20,7 @@ public function __construct(ParameterBagInterface $params)
 
     /**
      * @param QueuedLoopMessage $queuedLoopMessage
-     * @throws \Exception
+     * @throws Exception
      */
     public function __invoke(QueuedLoopMessage $queuedLoopMessage)
     {

diff --git a/src/MessageHandler/TaskMessageHandler.php b/src/MessageHandler/TaskMessageHandler.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\MessageHandler;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Process\Process;
@@ -18,7 +19,7 @@ public function __construct(ParameterBagInterface $params)
 
     /**
      * @param TaskMessage $taskMessage
-     * @throws \Exception
+     * @throws Exception
      */
     public function __invoke(TaskMessage $taskMessage)
     {

diff --git a/src/PathReducer/AbstractPathReducer.php b/src/PathReducer/AbstractPathReducer.php
@@ -2,6 +2,7 @@
 
 namespace Tienvx\Bundle\MbtBundle\PathReducer;
 
+use Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Workflow\Registry;
@@ -54,7 +55,7 @@ protected function finish(int $bugId)
     /**
      * @param Bug $bug
      * @param Path $path
-     * @throws \Exception
+     * @throws Exception
      */
     protected function updatePath(Bug $bug, Path $path)
     {

diff --git a/src/PathReducer/BinaryPathReducer.php b/src/PathReducer/BinaryPathReducer.php
@@ -14,7 +14,7 @@ class BinaryPathReducer extends AbstractPathReducer
 {
     /**
      * @param Bug $bug
-     * @throws \Exception
+     * @throws Exception
      */
     public function reduce(Bug $bug)
     {

diff --git a/src/PathReducer/GreedyPathReducer.php b/src/PathReducer/GreedyPathReducer.php
@@ -14,7 +14,7 @@ class GreedyPathReducer extends AbstractPathReducer
 {
     /**
      * @param Bug $bug
-     * @throws \Exception
+     * @throws Exception
      */
     public function reduce(Bug $bug)
     {