improvements

doc/installation.md

@@ -80,6 +80,7 @@ sylius_address:
 6. Finish the installation updating the database schema and installing assets
 
 ```
+php bin/console doctrine:migrations:migrate
 php bin/console sylius:theme:assets:install
 php bin/console cache:clear
 ```

features/admin/adding_report.feature

@@ -39,7 +39,7 @@ Feature: Adding a new report
         When I fill the code with "2018_sales"
         And I fill the name with "2018 Sales"
         And I fill the description with "Sales statistic for year 2018"
-        And I select "odiseo_sylius_report_data_fetcher_sales_total" as data fetcher
+        And I select "odiseo_sylius_report_plugin_data_fetcher_sales_total" as data fetcher
         And I select "2018-01-01" as start date
         And I select today as end date
         And I select "month" as time period

phpcs.xml

@@ -7,5 +7,7 @@
     <arg name="extensions" value="php" />
     <arg name="standard" value="PSR12" />
 
-    <rule ref="PSR12"/>
+    <rule ref="PSR12">
+        <exclude-pattern>src/Migrations/*</exclude-pattern>
+    </rule>
 </ruleset>

psalm.xml

@@ -25,5 +25,10 @@
         <PossiblyUndefinedMethod errorLevel="info" />
         <MixedMethodCall errorLevel="info" />
         <PossiblyInvalidArgument errorLevel="info" />
+        <MixedArrayAssignment errorLevel="info" />
+        <MixedArgumentTypeCoercion errorLevel="info" />
+        <TooManyArguments errorLevel="info" />
+        <MixedOperand errorLevel="info" />
+        <MixedArrayAccess errorLevel="info" />
     </issueHandlers>
 </psalm>

spec/Controller/ReportControllerSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Controller;
 
 use Doctrine\Persistence\ObjectManager;
@@ -35,7 +37,7 @@
 /**
  * @author Diego D'amico <[email protected]>
  */
-class ReportControllerSpec extends ObjectBehavior
+final class ReportControllerSpec extends ObjectBehavior
 {
     function let(
         MetadataInterface $metadata,

spec/DataFetcher/DataSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\Data;

spec/DataFetcher/DelegatingDataFetcherSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\Data;

spec/DependencyInjection/Compiler/RegisterDataFetchersPassSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\DependencyInjection\Compiler;
 
 use PhpSpec\ObjectBehavior;
@@ -21,42 +23,42 @@ function it_should_implement_compiler_pass_interface()
 
     function it_processes_with_given_container(ContainerBuilder $container, Definition $dataFetcherDefinition)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.data_fetcher')->willReturn(true);
-        $container->getDefinition('odiseo_sylius_report.registry.data_fetcher')->willReturn($dataFetcherDefinition);
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->willReturn(true);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->willReturn($dataFetcherDefinition);
 
         $dataFetcherServices = [
-            'odiseo_sylius_report.form.type.data_fetcher.test' => [
+            'odiseo_sylius_report_plugin.form.type.data_fetcher.test' => [
                 ['fetcher' => 'test', 'label' => 'Test data fetcher'],
             ],
         ];
-        $container->findTaggedServiceIds('odiseo_sylius_report.data_fetcher')->willReturn($dataFetcherServices);
+        $container->findTaggedServiceIds('odiseo_sylius_report_plugin.data_fetcher')->willReturn($dataFetcherServices);
 
-        $dataFetcherDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report.form.type.data_fetcher.test')])->shouldBeCalled();
-        $container->setParameter('odiseo_sylius_report.data_fetchers', ['test' => 'Test data fetcher'])->shouldBeCalled();
+        $dataFetcherDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report_plugin.form.type.data_fetcher.test')])->shouldBeCalled();
+        $container->setParameter('odiseo_sylius_report_plugin.data_fetchers', ['test' => 'Test data fetcher'])->shouldBeCalled();
 
         $this->process($container);
     }
 
     function it_does_not_process_if_container_has_not_proper_definition(ContainerBuilder $container)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.data_fetcher')->willReturn(false);
-        $container->getDefinition('odiseo_sylius_report.registry.data_fetcher')->shouldNotBeCalled();
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->willReturn(false);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->shouldNotBeCalled();
 
         $this->process($container);
     }
 
     function it_throws_exception_if_any_data_fetcher_has_improper_attributes(ContainerBuilder $container, Definition $dataFetcherDefinition)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.data_fetcher')->willReturn(true);
-        $container->getDefinition('odiseo_sylius_report.registry.data_fetcher')->willReturn($dataFetcherDefinition);
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->willReturn(true);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.data_fetcher')->willReturn($dataFetcherDefinition);
 
         $dataFetcherServices = [
-            'odiseo_sylius_report.form.type.data_fetcher.test' => [
+            'odiseo_sylius_report_plugin.form.type.data_fetcher.test' => [
                 ['data_fetcher' => 'test'],
             ],
         ];
-        $container->findTaggedServiceIds('odiseo_sylius_report.data_fetcher')->willReturn($dataFetcherServices);
-        $dataFetcherDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report.form.type.data_fetcher.test')])->shouldNotBeCalled();
+        $container->findTaggedServiceIds('odiseo_sylius_report_plugin.data_fetcher')->willReturn($dataFetcherServices);
+        $dataFetcherDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report_plugin.form.type.data_fetcher.test')])->shouldNotBeCalled();
 
         $this->shouldThrow(new \InvalidArgumentException('Tagged report data fetchers needs to have `fetcher` and `label` attributes.'))
             ->during('process', [$container]);

spec/DependencyInjection/Compiler/RegisterRenderersPassSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\DependencyInjection\Compiler;
 
 use PhpSpec\ObjectBehavior;
@@ -21,42 +23,42 @@ function it_should_implement_compiler_pass_interface()
 
     function it_processes_with_given_container(ContainerBuilder $container, Definition $rendererDefinition)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.renderer')->willReturn(true);
-        $container->getDefinition('odiseo_sylius_report.registry.renderer')->willReturn($rendererDefinition);
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.renderer')->willReturn(true);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.renderer')->willReturn($rendererDefinition);
 
         $rendererServices = [
-            'odiseo_sylius_report.form.type.renderer.test' => [
+            'odiseo_sylius_report_plugin.form.type.renderer.test' => [
                 ['renderer' => 'test', 'label' => 'Test renderer'],
             ],
         ];
-        $container->findTaggedServiceIds('odiseo_sylius_report.renderer')->willReturn($rendererServices);
+        $container->findTaggedServiceIds('odiseo_sylius_report_plugin.renderer')->willReturn($rendererServices);
 
-        $rendererDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report.form.type.renderer.test')])->shouldBeCalled();
-        $container->setParameter('odiseo_sylius_report.renderers', ['test' => 'Test renderer'])->shouldBeCalled();
+        $rendererDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report_plugin.form.type.renderer.test')])->shouldBeCalled();
+        $container->setParameter('odiseo_sylius_report_plugin.renderers', ['test' => 'Test renderer'])->shouldBeCalled();
 
         $this->process($container);
     }
 
     function it_does_not_process_if_container_has_not_proper_definition(ContainerBuilder $container)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.renderer')->willReturn(false);
-        $container->getDefinition('odiseo_sylius_report.registry.renderer')->shouldNotBeCalled();
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.renderer')->willReturn(false);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.renderer')->shouldNotBeCalled();
 
         $this->process($container);
     }
 
     function it_throws_exception_if_any_renderer_has_improper_attributes(ContainerBuilder $container, Definition $rendererDefinition)
     {
-        $container->hasDefinition('odiseo_sylius_report.registry.renderer')->willReturn(true);
-        $container->getDefinition('odiseo_sylius_report.registry.renderer')->willReturn($rendererDefinition);
+        $container->hasDefinition('odiseo_sylius_report_plugin.registry.renderer')->willReturn(true);
+        $container->getDefinition('odiseo_sylius_report_plugin.registry.renderer')->willReturn($rendererDefinition);
 
         $rendererServices = [
-            'odiseo_sylius_report.form.type.renderer.test' => [
+            'odiseo_sylius_report_plugin.form.type.renderer.test' => [
                 ['renderer' => 'test'],
             ],
         ];
-        $container->findTaggedServiceIds('odiseo_sylius_report.renderer')->willReturn($rendererServices);
-        $rendererDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report.form.type.renderer.test')])->shouldNotBeCalled();
+        $container->findTaggedServiceIds('odiseo_sylius_report_plugin.renderer')->willReturn($rendererServices);
+        $rendererDefinition->addMethodCall('register', ['test', new Reference('odiseo_sylius_report_plugin.form.type.renderer.test')])->shouldNotBeCalled();
 
         $this->shouldThrow(new \InvalidArgumentException('Tagged renderers needs to have `renderer` and `label` attributes.'))
             ->during('process', [$container]);

spec/Model/ReportSpec.php → spec/Entity/ReportSpec.php

@@ -1,21 +1,22 @@
 <?php
 
-namespace spec\Odiseo\SyliusReportPlugin\Model;
+declare(strict_types=1);
+
+namespace spec\Odiseo\SyliusReportPlugin\Entity;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\DefaultDataFetchers;
 use Odiseo\SyliusReportPlugin\Entity\Report;
 use Odiseo\SyliusReportPlugin\Entity\ReportInterface;
 use Odiseo\SyliusReportPlugin\Renderer\DefaultRenderers;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Component\Resource\Model\CodeAwareInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TimestampableInterface;
 
 /**
  * @author Diego D'amico <[email protected]>
  */
-class ReportSpec extends ObjectBehavior
+final class ReportSpec extends ObjectBehavior
 {
     function it_is_initializable()
     {

spec/Form/EventListener/BuildReportDataFetcherFormSubscriberSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\EventListener;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\DataFetcherInterface;

spec/Form/EventListener/BuildReportRendererFormSubscriberSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\EventListener;
 
 use Odiseo\SyliusReportPlugin\Form\EventListener\BuildReportRendererFormSubscriber;

spec/Form/Type/DataFetcher/DataFetcherChoiceTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\Form\Type\DataFetcher\DataFetcherChoiceType;
@@ -8,7 +10,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class DataFetcherChoiceTypeSpec extends ObjectBehavior
+final class DataFetcherChoiceTypeSpec extends ObjectBehavior
 {
     function let()
     {

spec/Form/Type/DataFetcher/NumberOfOrdersTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\Form\Builder\QueryFilterFormBuilderInterface;
@@ -12,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilder;
 
-class NumberOfOrdersTypeSpec extends ObjectBehavior
+final class NumberOfOrdersTypeSpec extends ObjectBehavior
 {
     function let(QueryFilterFormBuilderInterface $queryFilterFormBuilder)
     {

spec/Form/Type/DataFetcher/SalesTotalTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\Form\Builder\QueryFilterFormBuilderInterface;
@@ -12,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilder;
 
-class SalesTotalTypeSpec extends ObjectBehavior
+final class SalesTotalTypeSpec extends ObjectBehavior
 {
     function let(QueryFilterFormBuilderInterface $queryFilterFormBuilder)
     {

spec/Form/Type/DataFetcher/TimePeriodTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\Form\Type\DataFetcher\TimePeriodType;
@@ -11,7 +13,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilder;
 
-class TimePeriodTypeSpec extends ObjectBehavior
+final class TimePeriodTypeSpec extends ObjectBehavior
 {
     function it_is_initializable()
     {

spec/Form/Type/DataFetcher/UserRegistrationTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\DataFetcher;
 
 use Odiseo\SyliusReportPlugin\Form\Builder\QueryFilterFormBuilderInterface;
@@ -12,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilder;
 
-class UserRegistrationTypeSpec extends ObjectBehavior
+final class UserRegistrationTypeSpec extends ObjectBehavior
 {
     function let(QueryFilterFormBuilderInterface $queryFilterFormBuilder)
     {

spec/Form/Type/Renderer/ChartConfigurationTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\Renderer;
 
 use PhpSpec\ObjectBehavior;

spec/Form/Type/Renderer/RendererChoiceTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\Renderer;
 
 use PhpSpec\ObjectBehavior;

spec/Form/Type/Renderer/TableConfigurationTypeSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type\Renderer;
 
 use PhpSpec\ObjectBehavior;

spec/Form/Type/ReportTypeSpec.php

@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Form\Type;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\DataFetcherInterface;
+use Odiseo\SyliusReportPlugin\Entity\Report;
+use Odiseo\SyliusReportPlugin\Form\EventListener\BuildReportDataFetcherFormSubscriber;
+use Odiseo\SyliusReportPlugin\Form\EventListener\BuildReportRendererFormSubscriber;
 use Odiseo\SyliusReportPlugin\Form\Type\DataFetcher\DataFetcherChoiceType;
 use Odiseo\SyliusReportPlugin\Form\Type\Renderer\RendererChoiceType;
-use Odiseo\SyliusReportPlugin\Entity\Report;
 use Odiseo\SyliusReportPlugin\Renderer\RendererInterface;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Odiseo\SyliusReportPlugin\Form\EventListener\BuildReportDataFetcherFormSubscriber;
-use Odiseo\SyliusReportPlugin\Form\EventListener\BuildReportRendererFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Component\Registry\ServiceRegistryInterface;

spec/Renderer/ChartRendererSpec.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace spec\Odiseo\SyliusReportPlugin\Renderer;
 
 use Odiseo\SyliusReportPlugin\DataFetcher\Data;
@@ -8,7 +10,6 @@
 use Odiseo\SyliusReportPlugin\Renderer\ChartRenderer;
 use Odiseo\SyliusReportPlugin\Renderer\RendererInterface;
 use PhpSpec\ObjectBehavior;
-use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 /**