Refactor

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4]
+        php: [7.2, 7.3, 7.4]
         stability: [prefer-lowest, prefer-stable]
     steps:
       - name: Checkout code
@@ -45,11 +45,21 @@ jobs:
       - name: Install dependencies
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
-      - name: Run tests
+      - name: Run tests WITHOUT ZenstruckFoundryBundle
         run: vendor/bin/phpunit -v
 
-      - name: Run tests with DAMADoctrineTestBundle
+      - name: Run tests WITH ZenstruckFoundryBundle
+        run: vendor/bin/phpunit -v
+        env:
+          USE_FOUNDRY_BUNDLE: 1
+
+      - name: Run tests WITH DAMADoctrineTestBundle and WITHOUT ZenstruckFoundryBundle
+        run: vendor/bin/phpunit -v --configuration phpunit-dama-doctrine.xml.dist
+
+      - name: Run tests WITH DAMADoctrineTestBundle and WITH ZenstruckFoundryBundle
         run: vendor/bin/phpunit -v --configuration phpunit-dama-doctrine.xml.dist
+        env:
+          USE_FOUNDRY_BUNDLE: 1
 
   code-coverage:
     name: Code Coverage
@@ -84,17 +94,29 @@ jobs:
       - name: Install dependencies
         run: composer update --prefer-dist --no-interaction --no-suggest
 
-      - name: Run code coverage
+      - name: Run code coverage WITHOUT ZenstruckFoundryBundle
         run: vendor/bin/phpunit -v --coverage-text --coverage-clover=coverage.clover
 
-      - name: Run code coverage with DAMADoctrineTestBundle
-        run: vendor/bin/phpunit -v --coverage-text --coverage-clover=dama-coverage.clover
+      - name: Run code coverage WITH ZenstruckFoundryBundle
+        run: vendor/bin/phpunit -v --coverage-text --coverage-clover=bundle-coverage.clover
+        env:
+          USE_FOUNDRY_BUNDLE: 1
+
+      - name: Run code coverage WITH DAMADoctrineTestBundle and WITHOUT ZenstruckFoundryBundle
+        run: vendor/bin/phpunit -v --coverage-text --coverage-clover=coverage-dama.clover
+
+      - name: Run code coverage WITH DAMADoctrineTestBundle and WITH ZenstruckFoundryBundle
+        run: vendor/bin/phpunit -v --coverage-text --coverage-clover=bundle-coverage-dama.clover
+        env:
+          USE_FOUNDRY_BUNDLE: 1
 
       - name: Send code coverage
         run: |
           wget https://scrutinizer-ci.com/ocular.phar
           php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-          php ocular.phar code-coverage:upload --format=php-clover dama-coverage.clover
+          php ocular.phar code-coverage:upload --format=php-clover bundle-coverage.clover
+          php ocular.phar code-coverage:upload --format=php-clover coverage-dama.clover
+          php ocular.phar code-coverage:upload --format=php-clover bundle-coverage-dama.clover
 
   composer-validate:
     name: Validate composer.json

.php_cs.dist

@@ -39,6 +39,7 @@ return PhpCsFixer\Config::create()
             'remove_inheritdoc' => true,
         ],
         'function_declaration' => ['closure_function_spacing' => 'none'],
+        'nullable_type_declaration_for_default_null_value' => true,
     ))
     ->setRiskyAllowed(true)
     ->setFinder($finder)

.scrutinizer.yml

@@ -5,7 +5,7 @@ checks:
 tools:
   external_code_coverage:
     timeout: 900
-    runs: 2
+    runs: 4
 build:
   nodes:
     analysis: