Skip to content

Commit d3da27a

Browse files
authored
Merge pull request #608 from FriendsOfSymfony/fix-readthedocs
fix readthedocs build
2 parents 5391f80 + c6b38d0 commit d3da27a

4 files changed

Lines changed: 15 additions & 21 deletions

File tree

.github/workflows/php.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@ jobs:
6262
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
6363
run: |
6464
composer update ${{ matrix.composer-flag }} --prefer-dist --no-interaction --no-progress
65-
vendor/bin/simple-phpunit install
6665
6766
- name: Composer validate
6867
run: composer validate --strict --no-check-lock
6968
if: ${{ matrix.stability != 'dev' }}
7069

7170
- name: Run tests
72-
run: php vendor/bin/simple-phpunit -v
71+
run: php vendor/bin/phpunit -v
7372
if: ${{ matrix.stability != 'dev' }}
7473

7574
- name: Run tests allow to fail
76-
run: php vendor/bin/simple-phpunit -v || true
75+
run: php vendor/bin/phpunit -v || true
7776
continue-on-error: true
7877
if: ${{ matrix.stability == 'dev' }}

.readthedocs.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
version: 2
22

3+
build:
4+
os: ubuntu-22.04
5+
tools:
6+
python: "3.11"
7+
38
sphinx:
49
configuration: Resources/doc/conf.py
510

@@ -8,6 +13,5 @@ formats:
813
- pdf
914

1015
python:
11-
version: "3.7"
1216
install:
1317
- requirements: Resources/doc/requirements.txt

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
4141
"symfony/console": "^4.4 || ^5.0 || ^6.0",
4242
"symfony/finder": "^4.4 || ^5.0 || ^6.0",
43-
"symfony/phpunit-bridge": "v5.3.7",
43+
"phpunit/phpunit": "^9.6.15",
4444
"symfony/security-bundle": "^4.4 || ^5.0 || ^6.0",
4545
"symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
4646
"twig/twig": "^2.13",
@@ -49,8 +49,8 @@
4949
"symfony/expression-language": "^4.4 || ^5.0 || ^6.0",
5050
"symfony/monolog-bundle": "^3.0",
5151
"symfony/routing": "^4.4 || ^5.0 || ^6.0",
52-
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
53-
"sebastian/exporter": "^2.0"
52+
"matthiasnoback/symfony-config-test": "^4.3.0 || ^5.1",
53+
"matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0"
5454
},
5555
"suggest": {
5656
"jean-beru/fos-http-cache-cloudfront": "To use CloudFront proxy",
@@ -74,5 +74,10 @@
7474
"classmap": [
7575
"tests/Functional/Fixtures/app/AppKernel.php"
7676
]
77+
},
78+
"config": {
79+
"allow-plugins": {
80+
"php-http/discovery": true
81+
}
7782
}
7883
}

phpunit.xml.dist

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,11 @@
2525

2626
<listeners>
2727
<listener class="\Mockery\Adapter\Phpunit\TestListener" />
28-
<!--DebugClassLoaded is enable by default from 4.2
29-
https://github.com/symfony/symfony/pull/28412
30-
It has to be disabled to avoid tests failed
31-
-->
32-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
33-
<arguments>
34-
<array>
35-
<element key="debug-class-loader">
36-
<integer>0</integer>
37-
</element>
38-
</array>
39-
</arguments>
40-
</listener>
4128
</listeners>
4229

4330
<php>
4431
<env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
4532
<env name="KERNEL_CLASS" value="AppKernel" />
4633
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
47-
<server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
4834
</php>
4935
</phpunit>

0 commit comments

Comments
 (0)