Merge pull request #48 from swagindustries/feature/disable-forms-by-d…

…efault

.github/workflows/ci.yml

@@ -9,6 +9,30 @@ on:
         - cron:  '0 0 * * *'
 
 jobs:
+    static-analyse:
+        name: Code style
+
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.0
+
+            -   uses: actions/cache@v2
+                id: cache-composer
+                with:
+                    path: ~/.composer/cache
+                    key: composer-php-8.0-${{ github.sha }}
+                    restore-keys: composer-php-8.0-
+
+            -   name: Install dependencies
+                run: composer update --prefer-dist --no-progress --no-suggest
+
+            -   name: Run PHP CS Fixer
+                run: make test.phpcs
+
     unit-test:
         name: Unit tests
         strategy:
@@ -45,9 +69,6 @@ jobs:
             -   name: Install dependencies
                 run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-flag }}
 
-            -   name: Run PHP CS Fixer
-                run: make test.phpcs
-
             -   name: Run PHPUnit tests
                 run: make test.phpunit
 

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Removed hard dependency to the form component (it is still required for many features)
+
 ## [0.7.3] 2020-12-18
 
 ### Added

src/DependencyInjection/MelodiiaExtension.php

@@ -12,6 +12,7 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\Form\Form;
 use Twig\Environment;
 
 class MelodiiaExtension extends Extension
@@ -30,9 +31,16 @@ public function load(array $configs, ContainerBuilder $container)
         if (class_exists(AbstractManagerRegistry::class)) {
             $loader->load('doctrine.yaml');
         }
-        if ($container->hasAlias('melodiia.data_provider')) {
-            $loader->load('crud.yaml');
+
+        if (class_exists(Form::class)) {
+            $loader->load('form.yaml');
+
+            // The CRUD features requires forms as well as doctrine to be enabled
+            if ($container->hasAlias('melodiia.data_provider')) {
+                $loader->load('crud.yaml');
+            }
         }
+
         if (class_exists(Environment::class)) {
             $loader->load('twig.yaml');
         }

src/Form/Factory/ApiFormFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SwagIndustries\Melodiia\Form\Factory;

src/Form/Factory/ApiFormFactoryInterface.php

@@ -1,7 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SwagIndustries\Melodiia\Form\Factory;
+
 use SwagIndustries\Melodiia\Form\Type\ApiType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface as FormFactoryInterfaceBase;

src/Resources/config/services.yaml

@@ -35,5 +35,3 @@ services:
         arguments:
             $builders: !tagged_iterator melodiia.context_builder
 
-imports:
-    - 'form.yaml'

tests/Behat/Form/Factory/ApiFormFactoryTest.php

@@ -1,13 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SwagIndustries\Melodiia\Tests\Behat\Form\Factory;
 
-use SwagIndustries\Melodiia\Form\Factory\ApiFormFactory;
 use PHPUnit\Framework\TestCase;
+use SwagIndustries\Melodiia\Form\Factory\ApiFormFactory;
 use SwagIndustries\Melodiia\Form\Type\ApiType;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormRegistry;
-use Symfony\Component\Form\FormRegistryInterface;
 use Symfony\Component\Form\ResolvedFormTypeFactory;
 
 class ApiFormFactoryTest extends TestCase
@@ -20,6 +20,7 @@ public function testThatCreateApiReturnAFormWithoutNameAndApiTypeIsDefault()
         $this->assertInstanceOf(ApiType::class, $form->getConfig()->getType()->getInnerType());
         $this->assertEquals('', $form->getName());
     }
+
     public function testThatCreateApiBuilderReturnAFormBuilderWithoutNameAndApiTypeIsDefault()
     {
         $formFactory = new ApiFormFactory(new FormRegistry([], new ResolvedFormTypeFactory()));