Skip to content

Commit aa53754

Browse files
committed
wip
1 parent 4f4ef2f commit aa53754

File tree

59 files changed

+102
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+102
-14
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/phpunit-10.xml.dist export-ignore
2020
/phpunit-paratest.xml.dist export-ignore
2121
/psalm.xml export-ignore
22+
/src/Behat export-ignore
2223
/stubs export-ignore
2324
/symfony.lock export-ignore
2425
/tests export-ignore

.github/workflows/behat.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ on:
44
push:
55
paths: &paths
66
- .github/workflows/behat.yml
7-
- bin/tools/behat
8-
- src/Behat/**
9-
- tests/Behat/**
10-
- behat.yml
11-
- composer.json
7+
- src/Test/Behat/**
128
pull_request:
139
paths: *paths
1410
schedule:
1511
- cron: '0 0 1,16 * *'
1612

13+
defaults:
14+
run:
15+
shell: bash
16+
working-directory: ./src/Test/Behat
17+
1718
concurrency:
1819
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1920
cancel-in-progress: true
@@ -48,16 +49,12 @@ jobs:
4849
- name: Install dependencies
4950
uses: ramsey/composer-install@v2
5051
with:
52+
working-directory: "src/Test/Behat"
5153
dependency-versions: ${{ matrix.deps }}
5254
composer-options: --prefer-dist
5355
env:
5456
SYMFONY_REQUIRE: ${{ matrix.symfony }}
5557

56-
- name: Install Behat
57-
run: composer bin behat update ${{ matrix.deps == 'lowest' && '--prefer-lowest' || '' }} --prefer-dist
58-
env:
59-
SYMFONY_REQUIRE: ${{ matrix.symfony }}
60-
6158
- name: "Main test suite: reset DB at scenario level, with Dama support"
6259
run: vendor/bin/behat
6360

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ jobs:
4848
run: composer bin phpstan install
4949

5050
- name: Install PHPBench & Behat
51-
run: |
52-
composer bin phpbench install
53-
composer bin behat install
51+
run: composer bin phpbench install
5452

5553
- name: Run PHPStan
5654
run: bin/tools/phpstan/vendor/phpstan/phpstan/phpstan analyse

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
"src/functions.php",
6666
"src/Persistence/functions.php",
6767
"src/symfony_console.php"
68-
]
68+
],
69+
"exclude-from-classmap": ["src/Test/Behat/"]
6970
},
7071
"autoload-dev": {
7172
"psr-4": {

phpstan.neon

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,5 @@ parameters:
7676
- ./src/Maker/Factory/LegacyORMDefaultPropertiesGuesser.php
7777
- ./src/Maker/Factory/DoctrineScalarFieldsDefaultPropertiesGuesser.php
7878
- ./src/ORM/OrmV2PersistenceStrategy.php
79+
80+
- ./src/Test/Behat/

src/Test/Behat/.gitattributes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
* text=auto
2+
3+
/.gitattributes export-ignore
4+
/.gitignore export-ignore
5+
/behat.yml export-ignore
6+
/features export-ignore
7+
/symfony.lock export-ignore
8+
/tests export-ignore

src/Test/Behat/.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/composer.lock
2+
/vendor/
3+
/var/
4+
/.env.local
5+
6+
###> symfony/framework-bundle ###
7+
/.env.local
8+
/.env.local.php
9+
/.env.*.local
10+
/config/secrets/prod/prod.decrypt.private.php
11+
/public/bundles/
12+
/var/
13+
/vendor/
14+
###< symfony/framework-bundle ###

src/Test/Behat/README.md

Lines changed: 7 additions & 0 deletions
File renamed without changes.

src/Test/Behat/composer.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"name": "zenstruck/foundry-behat",
3+
"type": "behat-extension",
4+
"authors": [
5+
{
6+
"name": "Kevin Bond",
7+
"email": "kevinbond@gmail.com"
8+
},
9+
{
10+
"name": "Nicolas PHILIPPE",
11+
"email": "nikophil@gmail.com"
12+
}
13+
],
14+
"autoload": {
15+
"psr-4": {
16+
"Zenstruck\\Foundry\\Test\\Behat\\": "src/"
17+
}
18+
},
19+
"autoload-dev": {
20+
"psr-4": {
21+
"Zenstruck\\Foundry\\Tests\\Fixture\\": "../../tests/Fixture/",
22+
"Zenstruck\\Foundry\\Test\\Behat\\Tests\\": "tests"
23+
}
24+
},
25+
"require": {
26+
"php": "^8.1",
27+
"behat/behat": "^3.22",
28+
"friends-of-behat/symfony-extension": "^2.0",
29+
"zenstruck/foundry": "^2.9"
30+
},
31+
"require-dev": {
32+
"behat/mink-browserkit-driver": "^2.0",
33+
"doctrine/orm": "^2.16|^3.0",
34+
"doctrine/common": "^3.2.2",
35+
"doctrine/doctrine-bundle": "^2.10|^3.0",
36+
"friends-of-behat/mink-extension": "^2.0",
37+
"symfony/flex": "^2.10",
38+
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
39+
"symfony/uid": "^6.4|^7.0|^8.0",
40+
"yceruto/behat-extension": "^1.0"
41+
},
42+
"minimum-stability": "dev",
43+
"prefer-stable": true,
44+
"config": {
45+
"allow-plugins": {
46+
"symfony/flex": true
47+
}
48+
},
49+
"extra": {
50+
"symfony": {
51+
"allow-contrib": false
52+
}
53+
},
54+
"scripts": {
55+
"auto-scripts": {
56+
"cache:clear": "symfony-cmd",
57+
"assets:install %PUBLIC_DIR%": "symfony-cmd"
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)