Skip to content

Commit

Permalink
Merge branch '2.0.x' into load-default-services-before-configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
gennadigennadigennadi authored Jun 26, 2024
2 parents f822987 + 72caeb5 commit 1e61ce7
Show file tree
Hide file tree
Showing 4 changed files with 198 additions and 205 deletions.
1 change: 1 addition & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
tty: true
environment:
- PHP_IDE_CONFIG=serverName=deptrac
- COMPOSER_CACHE_DIR=/var/www/deptrac/.composer
userns_mode: keep-id
volumes:
- ./:/var/www/deptrac:z
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"php": "^8.1",
"ext-json": "*",
"composer/xdebug-handler": "^3.0",
"jetbrains/phpstorm-stubs": "2023.3",
"nikic/php-parser": "^4.18",
"jetbrains/phpstorm-stubs": "2024.1",
"nikic/php-parser": "^4.19",
"phpdocumentor/graphviz": "^2.1",
"phpdocumentor/type-resolver": "^1.6",
"phpstan/phpdoc-parser": "^1.5",
Expand Down
Loading

0 comments on commit 1e61ce7

Please sign in to comment.