Skip to content

Commit dc2aaf2

Browse files
authored
Apply Composer recipes (#1292)
* Recipe doctrine/doctrine-bundle * Recipe phpstan/phpstan * Recipe symfony/apache-pack * Recipe symfony/phpunit-bridge * Update .gitignore
1 parent 851072d commit dc2aaf2

File tree

7 files changed

+22
-14
lines changed

7 files changed

+22
-14
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ yarn-error.log
2828
/phpunit.xml
2929
.phpunit.result.cache
3030
###< phpunit/phpunit ###
31+
32+
###> phpstan/phpstan ###
33+
phpstan.neon
34+
###< phpstan/phpstan ###

bin/phpunit

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
66
}
77

88
if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
9-
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
10-
require PHPUNIT_COMPOSER_INSTALL;
11-
PHPUnit\TextUI\Command::main();
9+
if (PHP_VERSION_ID >= 80000) {
10+
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
11+
} else {
12+
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
13+
require PHPUNIT_COMPOSER_INSTALL;
14+
PHPUnit\TextUI\Command::main();
15+
}
1216
} else {
1317
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
1418
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";

config/packages/doctrine.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ doctrine:
1616
auto_mapping: true
1717
mappings:
1818
App:
19-
is_bundle: false
2019
type: attribute
20+
is_bundle: false
2121
dir: '%kernel.project_dir%/src/Entity'
2222
prefix: 'App\Entity'
2323
alias: App

phpstan.neon phpstan.dist.neon

File renamed without changes.

phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<server name="APP_ENV" value="test" force="true" />
1515
<server name="SHELL_VERBOSITY" value="-1" />
1616
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
17-
<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
17+
<server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
1818
</php>
1919

2020
<testsuites>

public/.htaccess

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DirectoryIndex index.php
99
# feature in your server configuration. Uncomment the following line if you
1010
# install assets as symlinks or if you experience problems related to symlinks
1111
# when compiling LESS/Sass/CoffeScript assets.
12-
# Options +FollowSymlinks
12+
# Options +SymLinksIfOwnerMatch
1313

1414
# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve
1515
# to the front controller "/index.php" but be rewritten to "/index.php/index".
@@ -20,7 +20,7 @@ DirectoryIndex index.php
2020
<IfModule mod_rewrite.c>
2121
# This Option needs to be enabled for RewriteRule, otherwise it will show an error like
2222
# 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden'
23-
Options +FollowSymlinks
23+
Options +SymLinksIfOwnerMatch
2424

2525
RewriteEngine On
2626

symfony.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
"version": "v0.5.3"
4141
},
4242
"doctrine/doctrine-bundle": {
43-
"version": "2.10",
43+
"version": "2.11",
4444
"recipe": {
4545
"repo": "github.com/symfony/recipes",
4646
"branch": "main",
4747
"version": "2.10",
48-
"ref": "e025a6cb69b195970543820b2f18ad21724473fa"
48+
"ref": "0b4a11ee7e60b36227502ed26874edd7e8b66353"
4949
},
5050
"files": [
5151
"config/packages/doctrine.yaml",
@@ -210,10 +210,10 @@
210210
"repo": "github.com/symfony/recipes-contrib",
211211
"branch": "main",
212212
"version": "1.0",
213-
"ref": "d74d4d719d5f53856c9c13544aa22d44144b1819"
213+
"ref": "5e490cc197fb6bb1ae22e5abbc531ddc633b6767"
214214
},
215215
"files": [
216-
"phpstan.neon"
216+
"phpstan.dist.neon"
217217
]
218218
},
219219
"phpstan/phpstan-strict-rules": {
@@ -275,7 +275,7 @@
275275
"repo": "github.com/symfony/recipes-contrib",
276276
"branch": "main",
277277
"version": "1.0",
278-
"ref": "efb318193e48384eb5c5aadff15396ed698f8ffc"
278+
"ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1"
279279
},
280280
"files": [
281281
"public/.htaccess"
@@ -472,12 +472,12 @@
472472
"version": "v6.0.2"
473473
},
474474
"symfony/phpunit-bridge": {
475-
"version": "6.3",
475+
"version": "7.0",
476476
"recipe": {
477477
"repo": "github.com/symfony/recipes",
478478
"branch": "main",
479479
"version": "6.3",
480-
"ref": "01dfaa98c58f7a7b5a9b30e6edb7074af7ed9819"
480+
"ref": "1f5830c331065b6e4c9d5fa2105e322d29fcd573"
481481
},
482482
"files": [
483483
".env.test",

0 commit comments

Comments
 (0)