refactor: src/Test/Behat as a subpackage

Author: nikophil

.gitattributes

@@ -19,6 +19,7 @@
 /phpunit-10.xml.dist            export-ignore
 /phpunit-paratest.xml.dist      export-ignore
 /psalm.xml                      export-ignore
+/src/Behat                      export-ignore
 /stubs                          export-ignore
 /symfony.lock                   export-ignore
 /tests                          export-ignore

.github/workflows/behat.yml

@@ -4,16 +4,17 @@ on:
   push:
     paths: &paths
       - .github/workflows/behat.yml
-      - bin/tools/behat
-      - src/Behat/**
-      - tests/Behat/**
-      - behat.yml
-      - composer.json
+      - src/Test/Behat/**
   pull_request:
     paths: *paths
   schedule:
     - cron: '0 0 1,16 * *'
 
+defaults:
+  run:
+    shell: bash
+    working-directory: ./src/Test/Behat
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -51,16 +52,12 @@ jobs:
       - name: Install dependencies
         uses: ramsey/composer-install@v2
         with:
+          working-directory: "src/Test/Behat"
           dependency-versions: ${{ matrix.deps }}
           composer-options: --prefer-dist
         env:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
-      - name: Install Behat
-        run: composer bin behat update ${{ matrix.deps == 'lowest' && '--prefer-lowest' || '' }} --prefer-dist
-        env:
-          SYMFONY_REQUIRE: ${{ matrix.symfony }}
-
       - name: "Main test suite: reset DB at scenario level, with Dama support"
         run: vendor/bin/behat --colors -vvv
 

.github/workflows/static-analysis.yml

@@ -48,9 +48,7 @@ jobs:
         run: composer bin phpstan install
 
       - name: Install PHPBench & Behat
-        run: |
-          composer bin phpbench install
-          composer bin behat install
+        run: composer bin phpbench install
 
       - name: Run PHPStan
         run: bin/tools/phpstan/vendor/phpstan/phpstan/phpstan analyse

composer.json

@@ -23,7 +23,6 @@
         "symfony/polyfill-php85": "^1.33",
         "symfony/property-access": "^6.4|^7.0|^8.0",
         "symfony/property-info": "^6.4|^7.0|^8.0",
-        "symfony/string": "^6.4|^7.0|^8.0",
         "symfony/var-exporter": "^6.4.9|~7.0.9|^7.1.2|^8.0",
         "zenstruck/assert": "^1.4"
     },
@@ -47,7 +46,6 @@
         "symfony/framework-bundle": "^6.4|^7.0|^8.0",
         "symfony/maker-bundle": "^1.55",
         "symfony/phpunit-bridge": "^6.4.26|^7.0|^8.0",
-        "symfony/polyfill-php80": "^1.16",
         "symfony/routing": "^6.4|^7.0|^8.0",
         "symfony/runtime": "^6.4|^7.0|^8.0",
         "symfony/translation-contracts": "^3.4",
@@ -66,7 +64,8 @@
             "src/functions.php",
             "src/Persistence/functions.php",
             "src/symfony_console.php"
-        ]
+        ],
+        "exclude-from-classmap": ["src/Test/Behat/"]
     },
     "autoload-dev": {
         "psr-4": {

phpstan.neon

@@ -20,7 +20,6 @@ parameters:
 
     bootstrapFiles:
         - bin/tools/phpbench/vendor/autoload.php
-        - bin/tools/behat/vendor/autoload.php
 
     ignoreErrors:
         # suppress strange behavior of PHPStan where it considers proxy() return type as *NEVER*
@@ -76,3 +75,5 @@ parameters:
         - ./src/Maker/Factory/LegacyORMDefaultPropertiesGuesser.php
         - ./src/Maker/Factory/DoctrineScalarFieldsDefaultPropertiesGuesser.php
         - ./src/ORM/OrmV2PersistenceStrategy.php
+
+        - ./src/Test/Behat/

phpunit-10.xml.dist

@@ -11,7 +11,7 @@
          defaultTestSuite="main">
     <php>
         <ini name="error_reporting" value="-1"/>
-        <server name="KERNEL_CLASS" value="Zenstruck\Foundry\Tests\Fixture\TestKernel"/>
+        <server name="KERNEL_CLASS" value="Zenstruck\Foundry\Test\Behat\Tests\Fixture\BehatTestKernel"/>
         <server name="SHELL_VERBOSITY" value="-1"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
         <env name="APP_ENV" value="test"/>

src/Test/Behat/.env.test

@@ -0,0 +1,3 @@
+# define your env variables for the test env here
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'

src/Test/Behat/.gitattributes

@@ -0,0 +1,8 @@
+* text=auto
+
+/.gitattributes                 export-ignore
+/.gitignore                     export-ignore
+/behat.yml                      export-ignore
+/features                       export-ignore
+/symfony.lock                   export-ignore
+/tests                          export-ignore

src/Test/Behat/.gitignore

@@ -0,0 +1,19 @@
+/composer.lock
+/vendor/
+/var/
+/.env.local
+
+###> symfony/framework-bundle ###
+/.env.local
+/.env.local.php
+/.env.*.local
+/config/secrets/prod/prod.decrypt.private.php
+/public/bundles/
+/var/
+/vendor/
+###< symfony/framework-bundle ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+/.phpunit.cache/
+###< phpunit/phpunit ###

src/Test/Behat/README.md

@@ -0,0 +1,7 @@
+# Behat extension for Foundry
+
+This is a subpackage of [Foundry](https://github.com/zenstruck/foundry). 
+
+Please open any issue or pull request on the main repository.
+
+See docs at: https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#behat-integration