Merge pull request #19 from MacPaw/develop

Release
MacPaw · Jan 16, 2023 · 94fd19e · 94fd19e
2 parents f8f8a53 + ac0ac10
commit 94fd19e
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 73 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,10 +12,15 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
                     - '8.1'
+                    - '8.2'
                 coverage: ['none']
+                symfony-versions:
+                    - '4.4.*'
+                    - '5.4.*'
+                    - '6.0.*'
+                    - '6.1.*'
+                    - '6.2.*'
                 include:
                     - description: 'Log Code Coverage'
                       php: '8.1'
@@ -51,6 +56,13 @@ jobs:
                   key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
                   restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer
 
+            - name: Update Symfony version
+              if: matrix.symfony-versions != ''
+              run: |
+                  composer require symfony/dependency-injection:${{ matrix.symfony-versions }} --no-update --no-scripts
+                  composer require symfony/http-kernel:${{ matrix.symfony-versions }} --no-update --no-scripts
+                  composer require --dev symfony/console:${{ matrix.symfony-versions }} --no-update --no-scripts
+
             - name: Install dependencies
               run: composer install
 

diff --git a/.github/workflows/gitleaks.yaml b/.github/workflows/gitleaks.yaml
diff --git a/commitlint.config.js b/commitlint.config.js
diff --git a/composer.json b/composer.json
@@ -42,7 +42,6 @@
         "phpunit/phpunit": "^9.5",
         "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6",
-        "sensio/framework-extra-bundle": "^4.4 || ^5.4 || ^6.0",
         "symfony/console": "^4.4 || ^5.4 || ^6.0"
     },
     "autoload": {
@@ -67,5 +66,10 @@
             "@phpunit",
             "@code-style"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/package.json b/package.json
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,11 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
+    <php>
+        <ini name="display_errors" value="1" />
+        <ini name="error_reporting" value="-1" />
+        <server name="APP_ENV" value="test" force="true" />
+    </php>
     <testsuites>
         <testsuite name="Behat Doctrine Fixtures Test Suite">
             <directory>tests</directory>

diff --git a/tests/Functional/App/Entity/BaseEntity.php b/tests/Functional/App/Entity/BaseEntity.php
@@ -4,19 +4,8 @@
 
 namespace BehatDoctrineFixtures\Tests\Functional\App\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="base_entity")
- */
 class BaseEntity
 {
-    /**
-     * @ORM\Id()
-     * @ORM\Column(type="integer")
-     */
     private int $id;
 
     public function __construct(

diff --git a/...Migrations/2022/Version20220111125245.php → .../App/Migrations/Version20220111125245.php b/...Migrations/2022/Version20220111125245.php → .../App/Migrations/Version20220111125245.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace BehatDoctrineFixtures\Tests\Functional\App\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

diff --git a/tests/Functional/App/TestKernel.php b/tests/Functional/App/TestKernel.php
@@ -22,7 +22,6 @@ public function registerBundles(): iterable
             new \Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle(),
             new \Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle(),
             new \BehatDoctrineFixtures\BehatDoctrineFixturesBundle(),
-            new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle()
         ];
 
         return $bundles;
@@ -31,7 +30,6 @@ public function registerBundles(): iterable
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/config/doctrine.yml');
-        $loader->load(__DIR__ . '/config/sensio_framework_extra.yml');
         $loader->load(__DIR__ . '/config/doctrine_migrations.yml');
         $loader->load(__DIR__ . '/config/behat_doctrine_fixtures.yml');
     }

diff --git a/tests/Functional/App/config/doctrine.yml b/tests/Functional/App/config/doctrine.yml
@@ -8,7 +8,7 @@ doctrine:
     mappings:
       App:
         is_bundle: false
-        type: annotation
-        dir: '%kernel.project_dir%/Entity'
+        type: yml
+        dir: '%kernel.project_dir%/config/doctrine_entity'
         prefix: 'BehatDoctrineFixtures\Tests\Functional\App\Entity'
         alias: App
diff --git a/tests/Functional/App/config/doctrine_entity/BaseEntity.orm.yml b/tests/Functional/App/config/doctrine_entity/BaseEntity.orm.yml
@@ -0,0 +1,6 @@
+BehatDoctrineFixtures\Tests\Functional\App\Entity\BaseEntity:
+  type: entity
+  table: base_entity
+  id:
+    id:
+      type: integer