Skip to content

Commit c027019

Browse files
author
DKravtsov
committed
Updated composer dependencies, fixed docker-compose path mapping for the Docker Desktop, added README notes for MacOS users.
1 parent 52460d1 commit c027019

27 files changed

+1667
-1487
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ reports/*
1818
.phpunit
1919
.phpunit.result.cache
2020
/phpunit.xml
21+
.phpunit.cache
2122
###< symfony/phpunit-bridge ###
2223

2324
###> friendsofphp/php-cs-fixer ###

composer.lock

+437-424
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose-prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- "${WEB_PORT_HTTP}:80"
1616
- "${WEB_PORT_SSL}:443"
1717
volumes:
18-
- .:/var/www/html:ro,cached
18+
- ./:/var/www/html:ro,cached
1919
depends_on:
2020
- symfony
2121
networks:

docker-compose-staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- "${WEB_PORT_HTTP}:80"
1616
- "${WEB_PORT_SSL}:443"
1717
volumes:
18-
- .:/var/www/html:ro,cached
18+
- ./:/var/www/html:ro,cached
1919
depends_on:
2020
- symfony
2121
networks:

docker-compose-test-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- "${WEB_PORT_HTTP}:80"
1616
- "${WEB_PORT_SSL}:443"
1717
volumes:
18-
- .:/var/www/html:ro,cached
18+
- ./:/var/www/html:ro,cached
1919
depends_on:
2020
- symfony
2121
networks:

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- "${WEB_PORT_HTTP}:80"
1616
- "${WEB_PORT_SSL}:443"
1717
volumes:
18-
- .:/var/www/html:ro,cached
18+
- ./:/var/www/html:ro,cached
1919
depends_on:
2020
- symfony
2121
networks:
@@ -33,7 +33,7 @@ services:
3333
dockerfile: ./Dockerfile
3434
container_name: ${COMPOSE_PROJECT_NAME}-symfony
3535
volumes:
36-
- .:/var/www/html:cached
36+
- ./:/var/www/html:cached
3737
depends_on:
3838
- mysql
3939
- rabbitmq

phpunit.xml.dist

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
43
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
65
backupGlobals="false"
7-
backupStaticAttributes="false"
86
bootstrap="tests/bootstrap.php"
97
colors="true"
108
testdox="true"
11-
convertErrorsToExceptions="true"
12-
convertNoticesToExceptions="true"
13-
convertWarningsToExceptions="true"
9+
beStrictAboutTestsThatDoNotTestAnything="true"
10+
beStrictAboutOutputDuringTests="true"
1411
processIsolation="false"
1512
stopOnFailure="false"
13+
displayDetailsOnTestsThatTriggerDeprecations="true"
14+
displayDetailsOnTestsThatTriggerNotices="true"
15+
displayDetailsOnTestsThatTriggerWarnings="true"
16+
displayDetailsOnTestsThatTriggerErrors="true"
17+
cacheDirectory=".phpunit.cache"
1618
>
17-
<coverage processUncoveredFiles="true">
19+
<coverage>
1820
<include>
1921
<directory suffix=".php">./src</directory>
2022
</include>
@@ -29,20 +31,15 @@
2931
<ini name="display_errors" value="On" />
3032
<ini name="display_startup_errors" value="On" />
3133
<ini name="date.timezone" value="UTC" />
32-
3334
<env name="KERNEL_CLASS" value="App\Kernel" />
3435
<env name="APP_ENV" value="test" force="true" />
3536
<env name="SHELL_VERBOSITY" value="-1" />
3637
<env name="APP_DEBUG" value="false" force="true" />
3738
</php>
38-
<listeners>
39-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
40-
</listeners>
4139
<testsuites>
4240
<testsuite name="Unit">
4341
<directory suffix="Test.php">./tests/Unit</directory>
4442
</testsuite>
45-
4643
<testsuite name="Functional">
4744
<directory suffix="Test.php">./tests/Functional</directory>
4845
</testsuite>

readme.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ Note: OS recommendation - Linux Ubuntu based.
2929

3030
2.For installing docker-compose as `Linux Standalone binary` please follow steps on the page [install compose](https://docs.docker.com/compose/install/other/#install-compose-standalone) if you are using Linux OS.
3131

32-
Note: Please run next cmd after above step 2 if you are using Linux OS: `sudo usermod -aG docker $USER`
32+
Note 1: Please run next cmd after above step 2 if you are using Linux OS: `sudo usermod -aG docker $USER`
33+
34+
Note 2: If you are using docker desktop for MacOS 12.2 or later - please enable [virtiofs](https://www.docker.com/blog/speed-boost-achievement-unlocked-on-docker-desktop-4-6-for-mac/) for the performance.
3335

3436
## Setting up DEV environment
3537
1.You can clone this repository from GitHub or install via composer.

rector.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
// define sets of rules
1818
$rectorConfig->sets([
19-
LevelSetList::UP_TO_PHP_81,
20-
SymfonySetList::SYMFONY_60,
19+
LevelSetList::UP_TO_PHP_82,
20+
SymfonySetList::SYMFONY_62,
2121
SymfonySetList::SYMFONY_CODE_QUALITY,
2222
SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
2323
]);

tools/01_phpunit/composer.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"name": "systemsdk/docker-nginx-php-symfony-tools",
33
"description": "",
4-
"require": {},
4+
"require": {
5+
"php": "^8.2.0"
6+
},
57
"require-dev": {
6-
"phpunit/phpunit": "9.6.*",
8+
"phpunit/phpunit": "10.0.*",
79
"symfony/browser-kit": "6.2.*",
810
"symfony/css-selector": "6.2.*",
911
"symfony/phpunit-bridge": "6.2.*",

0 commit comments

Comments
 (0)