Merge pull request #1 from imatic/parklane

Symfony4 support

.php_cs.dist

@@ -10,6 +10,7 @@ return PhpCsFixer\Config::create()
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'concat_space' => ['spacing' => 'one'],
+        'declare_strict_types' => true,
         'ereg_to_preg' => true,
         'heredoc_to_nowdoc' => true,
         'include' => true,

Command/QueryObjectQueryCommand.php

@@ -1,17 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Command;
 
 use Doctrine\Common\Util\Debug;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Imatic\Bundle\DataBundle\Data\Query\QueryExecutorInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class QueryObjectQueryCommand extends ContainerAwareCommand
+class QueryObjectQueryCommand extends Command
 {
     const OPTION_ARGS = 'args';
 
+    /** @var QueryExecutorInterface */
+    private $queryExecutor;
+
+    public function __construct(QueryExecutorInterface $queryExecutor)
+    {
+        $this->queryExecutor = $queryExecutor;
+
+        parent::__construct();
+    }
+
     protected function configure()
     {
         $this
@@ -40,8 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $queryObject = $classRef->newInstanceArgs($args);
 
-        $queryExecutor = $this->getContainer()->get('imatic_data.query_executor');
-        $result = $queryExecutor->execute($queryObject);
+        $result = $this->queryExecutor->execute($queryObject);
 
         $output->writeln(Debug::dump($result, 2, false, false));
     }

Data/Command/Command.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 use Imatic\Bundle\DataBundle\Exception\ParameterNotFoundException;

Data/Command/CommandExecutor.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 class CommandExecutor implements CommandExecutorInterface
@@ -33,6 +33,7 @@ public function __construct(HandlerRepositoryInterface $handlerRepository, $debu
     public function execute(CommandInterface $command)
     {
         $commandHandler = $this->handlerRepository->getHandler($command);
+
         if ($commandHandler instanceof CommandExecutorAwareInterface) {
             $commandHandler->setCommandExecutor($this);
         }

Data/Command/CommandExecutorAwareInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface CommandExecutorAwareInterface

Data/Command/CommandExecutorAwareTrait.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 trait CommandExecutorAwareTrait

Data/Command/CommandExecutorInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface CommandExecutorInterface

Data/Command/CommandInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 use Imatic\Bundle\DataBundle\Exception\ParameterNotFoundException;

Data/Command/CommandResult.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 class CommandResult implements CommandResultInterface

Data/Command/CommandResultInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface CommandResultInterface

Data/Command/HandlerInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface HandlerInterface

Data/Command/HandlerRepository.php

@@ -1,53 +1,47 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 use Imatic\Bundle\DataBundle\Exception\HandlerNotFoundException;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 
-class HandlerRepository implements HandlerRepositoryInterface
+class HandlerRepository implements HandlerRepositoryInterface, ServiceSubscriberInterface
 {
     /**
-     * @var HandlerInterface[]
+     * @var ContainerInterface
      */
-    private $handlers;
+    private $locator;
 
+    /**
+     * @var string[]
+     * [
+     *     handlerName => bundleName,
+     *     ...
+     * ]
+     */
     private $bundles;
 
-    public function __construct()
+    /**
+     * @param ContainerInterface $locator
+     */
+    public function __construct(ContainerInterface $locator)
     {
-        $this->handlers = [];
+        $this->locator = $locator;
         $this->bundles = [];
     }
 
-    public function addHandler($name, HandlerInterface $handler, $bundleName)
-    {
-        if ($this->hasHandler($name)) {
-            throw new \LogicException(\sprintf('Cannot register 2nd handler with name "%s".', $name));
-        }
-
-        $this->handlers[$name] = $handler;
-        $this->bundles[$name] = $bundleName;
-    }
-
-    public function getHandlers()
+    public function getHandler(CommandInterface $command): HandlerInterface
     {
-        return $this->handlers;
-    }
+        $handlerName = $command->getHandlerName();
 
-    public function getHandler(CommandInterface $command)
-    {
-        $name = $command->getHandlerName();
-        if ($this->hasHandler($name)) {
-            return $this->handlers[$name];
+        if ($this->locator->has($handlerName)) {
+            return $this->locator->get($handlerName);
         }
-        throw new HandlerNotFoundException($name);
+
+        throw new HandlerNotFoundException($handlerName);
     }
 
-    /**
-     * @param CommandInterface|string $command
-     *
-     * @return string
-     */
-    public function getBundleName($command)
+    public function getBundleName($command): ?string
     {
         if ($command instanceof CommandInterface) {
             $command = $command->getHandlerName();
@@ -56,13 +50,13 @@ public function getBundleName($command)
         return $this->bundles[$command];
     }
 
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasHandler($name)
+    public function addBundleName(string $handlerId, ?string $bundleName)
+    {
+        $this->bundles[$handlerId] = $bundleName;
+    }
+
+    public static function getSubscribedServices()
     {
-        return \array_key_exists($name, $this->handlers);
+        return [];
     }
 }

Data/Command/HandlerRepositoryInterface.php

@@ -1,38 +1,25 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface HandlerRepositoryInterface
 {
-    /**
-     * @param string           $handlerName
-     * @param HandlerInterface $handler
-     * @param string           $bundleName
-     */
-    public function addHandler($handlerName, HandlerInterface $handler, $bundleName);
-
-    /**
-     * @return HandlerInterface[]
-     */
-    public function getHandlers();
-
     /**
      * @param CommandInterface $command
      *
      * @return HandlerInterface
      */
-    public function getHandler(CommandInterface $command);
+    public function getHandler(CommandInterface $command): HandlerInterface;
 
     /**
      * @param CommandInterface|string $command
      *
-     * @return string
+     * @return string|null
      */
-    public function getBundleName($command);
+    public function getBundleName($command): ?string;
 
     /**
-     * @param string $handlerName
-     *
-     * @return bool
+     * @param string      $handlerId
+     * @param string|null $bundleName
      */
-    public function hasHandler($handlerName);
+    public function addBundleName(string $handlerId, ?string $bundleName);
 }

Data/Command/Message.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 class Message implements MessageInterface

Data/Command/MessageInterface.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Command;
 
 interface MessageInterface

Data/Driver/DoctrineCommon/DisplayCriteriaQueryBuilder.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imatic\Bundle\DataBundle\Data\Driver\DoctrineCommon;
 
 use Doctrine\DBAL\Query\QueryBuilder as DBALQueryBuilder;