Merge pull request #29 from LinioIT/build/update-project-base-code

build: update project base code

Author: tamara-dietz

.github/workflows/php.yml

@@ -25,7 +25,7 @@ jobs:
       run: composer install --prefer-dist --no-progress
 
     - name: PHP Lint
-      run: vendor/bin/php-cs-fixer fix --dry-run -v
+      run: composer lint:check
 
     - name: PHPUnit Tests
-      run: vendor/bin/phpunit
+      run: composer phpunit

.php_cs renamed to .php-cs-fixer.php

@@ -4,30 +4,37 @@
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/tests');
 
-return PhpCsFixer\Config::create()
-    ->setRules([
+$config = new PhpCsFixer\Config();
+return $config->setRules([
         '@Symfony' => true,
+        '@PHP71Migration:risky' => true,
+        '@PHPUnit60Migration:risky' => true,
+        'array_indentation' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => true,
         'concat_space' => ['spacing' => 'one'],
         'declare_strict_types' => true,
-        'is_null' => ['use_yoda_style' => false],
+        'increment_style' => ['style' => 'post'],
         'list_syntax' => ['syntax' => 'short'],
-        'method_argument_space' => ['ensure_fully_multiline' => true],
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline' ],
+        'method_chaining_indentation' => true,
         'modernize_types_casting' => true,
-        'no_multiline_whitespace_before_semicolons' => true,
+        'multiline_whitespace_before_semicolons' => false,
+        'no_superfluous_elseif' => true,
+        'no_superfluous_phpdoc_tags' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,
         'phpdoc_align' => false,
         'phpdoc_order' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
-        'pre_increment' => false,
+        'return_assignment' => true,
         'single_line_comment_style' => true,
         'ternary_to_null_coalescing' => true,
+        'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
         'void_return' => true,
     ])
     ->setFinder($finder)
     ->setUsingCache(true)
-    ->setRiskyAllowed(true);
+    ->setRiskyAllowed(true);

composer.json

@@ -23,5 +23,14 @@
     "psr-4": {
       "Linio\\DynamicFormBundle\\": "tests/"
     }
+  },
+  "scripts": {
+    "lint": "vendor/bin/php-cs-fixer fix --verbose --show-progress=dots",
+    "lint:check": "vendor/bin/php-cs-fixer fix --dry-run --verbose --show-progress=dots",
+    "phpunit": "vendor/bin/phpunit",
+    "test": [
+      "@lint:check",
+      "@phpunit"
+    ]
   }
-}
+}

src/DependencyInjection/Configuration.php

@@ -27,33 +27,27 @@ public function getConfigTreeBuilder()
         $rootNode
             ->useAttributeAsKey('name')
             ->prototype('array')
-                ->useAttributeAsKey('field')
-                ->prototype('array')
-                    ->children()
-                        ->booleanNode('enabled')
-                            ->defaultTrue()
-                        ->end()
-
-                        ->scalarNode('type')
-                            ->isRequired()
-                        ->end()
-
-                        ->variableNode('options')
-                        ->end()
-
-                        ->variableNode('transformer')
-                        ->end()
-
-                        ->variableNode('validation')
-                        ->end()
-
-                        ->scalarNode('data_provider')
-                        ->end()
-
-                        ->scalarNode('help_message_provider')
-                        ->end()
-                    ->end()
-                ->end()
+            ->useAttributeAsKey('field')
+            ->prototype('array')
+            ->children()
+            ->booleanNode('enabled')
+            ->defaultTrue()
+            ->end()
+            ->scalarNode('type')
+            ->isRequired()
+            ->end()
+            ->variableNode('options')
+            ->end()
+            ->variableNode('transformer')
+            ->end()
+            ->variableNode('validation')
+            ->end()
+            ->scalarNode('data_provider')
+            ->end()
+            ->scalarNode('help_message_provider')
+            ->end()
+            ->end()
+            ->end()
             ->end();
 
         return $treeBuilder;

src/Form/FormFactory.php

@@ -82,7 +82,7 @@ public function addEventSubscriber($formName, EventSubscriberInterface $eventSub
 
     /**
      * @param string $key     The key of the Form in the form configuration
-     * @param mixed  $data
+     * @param array  $data
      * @param array  $options
      * @param string $name    An name for the form. If empty, the key will be used
      *
@@ -242,7 +242,7 @@ public function loadHelpMessageProvider($alias)
      */
     public function getConfiguration($name = null)
     {
-        if (null === $name) {
+        if ($name === null) {
             return $this->configuration;
         }
 

tests/Form/FormFactoryTest.php

@@ -7,14 +7,15 @@
 use Linio\DynamicFormBundle\Exception\NonExistentFormException;
 use Linio\DynamicFormBundle\Form\FormFactory;
 use Linio\DynamicFormBundle\HelpMessageProvider;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactory as SymfonyFormFactory;
 use Symfony\Component\Validator\Constraints\IsTrue;
 
-class FormFactoryTest extends \PHPUnit_Framework_TestCase
+class FormFactoryTest extends TestCase
 {
     /**
      * @var ObjectProphecy
@@ -31,11 +32,10 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $formFactoryMock;
 
-    /**
-     * @expectedException \Linio\DynamicFormBundle\Exception\NonExistentFormException
-     */
     public function testIsThrowingExceptionWhenCreatingAnInexistentForm(): void
     {
+        $this->expectException(NonExistentFormException::class);
+
         $this->formFactory->setConfiguration(['foo' => []]);
         $this->formFactory->createForm('bar');
     }

tests/FormlyMapper/FormlyField/ChoiceFieldTest.php

@@ -5,8 +5,9 @@
 namespace Linio\DynamicFormBundle\Tests\FormlyMapper\FormlyField;
 
 use Linio\DynamicFormBundle\FormlyMapper\FormlyField\ChoiceField;
+use PHPUnit\Framework\TestCase;
 
-class ChoiceFieldTest extends \PHPUnit_Framework_TestCase
+class ChoiceFieldTest extends TestCase
 {
     /**
      * @var ChoiceField

tests/FormlyMapper/FormlyField/DateFieldTest.php

@@ -5,8 +5,9 @@
 namespace Linio\DynamicFormBundle\Tests\FormlyMapper\FormlyField;
 
 use Linio\DynamicFormBundle\FormlyMapper\FormlyField\DateField;
+use PHPUnit\Framework\TestCase;
 
-class DateFieldTest extends \PHPUnit_Framework_TestCase
+class DateFieldTest extends TestCase
 {
     /**
      * @var DateField

tests/FormlyMapper/FormlyField/EmailFieldTest.php

@@ -5,8 +5,9 @@
 namespace Linio\DynamicFormBundle\Tests\FormlyMapper\FormlyField;
 
 use Linio\DynamicFormBundle\FormlyMapper\FormlyField\EmailField;
+use PHPUnit\Framework\TestCase;
 
-class EmailFieldTest extends \PHPUnit_Framework_TestCase
+class EmailFieldTest extends TestCase
 {
     /**
      * @var EmailField

tests/FormlyMapper/FormlyField/EntityFieldTest.php

@@ -5,8 +5,9 @@
 namespace Linio\DynamicFormBundle\Tests\FormlyMapper\FormlyField;
 
 use Linio\DynamicFormBundle\FormlyMapper\FormlyField\EntityField;
+use PHPUnit\Framework\TestCase;
 
-class EntityFieldTest extends \PHPUnit_Framework_TestCase
+class EntityFieldTest extends TestCase
 {
     /**
      * @var EntityField