Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit906ab32

Browse files
author
DKravtsov
committed
Php 8.1, Symfony framework 6.
1 parent31cc51a commit906ab32

File tree

50 files changed

+3811
-4613
lines changed

Some content is hidden

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

50 files changed

+3811
-4613
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COMPOSE_PROJECT_NAME=environment2
2121
APP_ENV=dev
2222
APP_DEBUG=1
2323
APP_SECRET=42f011ec3a7bde0bec87364b1d967193
24-
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
24+
TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
2525
#TRUSTED_HOSTS='^localhost|example\.com$'
2626
###< symfony/framework-bundle ###
2727

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ reports/*
2121
###< symfony/phpunit-bridge ###
2222

2323
###> friendsofphp/php-cs-fixer ###
24+
.php-cs-fixer.cache
2425
.php_cs
2526
.php_cs.cache
2627
###< friendsofphp/php-cs-fixer ###

‎.php-cs-fixer.dist.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
declare(strict_types=1);
44

55
// https://mlocati.github.io/php-cs-fixer-configurator/
6-
$finder =PhpCsFixer\Finder::create()->in(__DIR__)->exclude('somedir');
6+
$finder =PhpCsFixer\Finder::create()
7+
->in(__DIR__)
8+
->exclude('somedir');
79

810
return (newPhpCsFixer\Config())
911
->setRules([
@@ -19,6 +21,8 @@
1921
'blank_line_before_statement' => ['statements' => ['continue','declare','return','throw','try']],
2022
'single_blank_line_before_namespace' =>true,
2123
'blank_line_after_namespace' =>true,
24+
'phpdoc_align' => ['align' =>'left'],
25+
'types_spaces' =>'single',
2226

2327
// skip list (see ecs.php)
2428
'no_multiline_whitespace_around_double_arrow' =>false,
@@ -30,5 +34,6 @@
3034
'no_blank_lines_before_namespace' =>false,
3135
'not_operator_with_successor_space' =>false,
3236
'single_line_throw' =>false,
33-
'blank_line_after_strict_types' =>false,
34-
])->setFinder($finder);
37+
'no_extra_blank_lines' => ['tokens' => ['break']],
38+
])
39+
->setFinder($finder);

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0-apache
1+
FROM php:8.1-apache
22

33
# set main params
44
ARG BUILD_ARGUMENT_DEBUG_ENABLED=false

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ composer-update:
108108
@make exec-bash cmd="COMPOSER_MEMORY_LIMIT=-1 composer update"
109109

110110
info:
111-
@makeexec cmd="bin/console --version"
112111
@makeexec cmd="php --version"
112+
@makeexec cmd="bin/console about"
113113

114114
logs:
115115
@docker logs -f${COMPOSE_PROJECT_NAME}_symfony

‎composer.json‎

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
],
2424
"require": {
25-
"php":"^8.0.0",
25+
"php":"^8.1.0",
2626
"ext-amqp":"*",
2727
"ext-ctype":"*",
2828
"ext-iconv":"*",
@@ -31,67 +31,75 @@
3131
"ext-pdo":"*",
3232
"ext-pdo_mysql":"*",
3333
"doctrine/annotations":"^1.13",
34-
"doctrine/doctrine-bundle":"^2.5",
34+
"doctrine/doctrine-bundle":"^2.6",
3535
"doctrine/doctrine-migrations-bundle":"^3.2",
36-
"doctrine/orm":"^2.10",
36+
"doctrine/orm":"^2.12",
3737
"phpdocumentor/reflection-docblock":"^5.3",
38-
"dukecity/command-scheduler-bundle":"^4.0",
38+
"dukecity/command-scheduler-bundle":"^5.0",
3939
"sensio/framework-extra-bundle":"^6.2",
4040
"symfony/apache-pack":"^1.0",
41-
"symfony/asset":"5.4.*",
42-
"symfony/config":"5.4.*",
43-
"symfony/console":"5.4.*",
44-
"symfony/dotenv":"5.4.*",
45-
"symfony/expression-language":"5.4.*",
46-
"symfony/flex":"^2.0",
47-
"symfony/form":"5.4.*",
48-
"symfony/framework-bundle":"5.4.*",
49-
"symfony/http-client":"5.4.*",
50-
"symfony/intl":"5.4.*",
51-
"symfony/mailer":"5.4.*",
52-
"symfony/messenger":"5.4.*",
53-
"symfony/mime":"5.4.*",
41+
"symfony/asset":"6.0.*",
42+
"symfony/config":"6.0.*",
43+
"symfony/console":"6.0.*",
44+
"symfony/dotenv":"6.0.*",
45+
"symfony/expression-language":"6.0.*",
46+
"symfony/flex":"^2.1",
47+
"symfony/form":"6.0.*",
48+
"symfony/framework-bundle":"6.0.*",
49+
"symfony/http-client":"6.0.*",
50+
"symfony/intl":"6.0.*",
51+
"symfony/mailer":"6.0.*",
52+
"symfony/messenger":"6.0.*",
53+
"symfony/amqp-messenger":"6.0.*",
54+
"symfony/doctrine-messenger":"6.0.*",
55+
"symfony/mime":"6.0.*",
5456
"symfony/monolog-bundle":"^3.7",
55-
"symfony/notifier":"5.4.*",
56-
"symfony/process":"5.4.*",
57-
"symfony/property-access":"5.4.*",
58-
"symfony/property-info":"5.4.*",
59-
"symfony/proxy-manager-bridge":"5.4.*",
60-
"symfony/runtime":"5.4.*",
61-
"symfony/routing":"5.4.*",
62-
"symfony/security-bundle":"5.4.*",
63-
"symfony/serializer":"5.4.*",
64-
"symfony/string":"5.4.*",
65-
"symfony/translation":"5.4.*",
66-
"symfony/twig-bundle":"5.4.*",
67-
"symfony/validator":"5.4.*",
68-
"symfony/web-link":"5.4.*",
69-
"symfony/yaml":"5.4.*",
70-
"twig/extra-bundle":"^2.12|^3.0",
71-
"twig/twig":"^2.12|^3.0"
57+
"symfony/notifier":"6.0.*",
58+
"symfony/process":"6.0.*",
59+
"symfony/property-access":"6.0.*",
60+
"symfony/property-info":"6.0.*",
61+
"symfony/proxy-manager-bridge":"6.0.*",
62+
"symfony/runtime":"6.0.*",
63+
"symfony/routing":"6.0.*",
64+
"symfony/security-bundle":"6.0.*",
65+
"symfony/serializer":"6.0.*",
66+
"symfony/string":"6.0.*",
67+
"symfony/translation":"6.0.*",
68+
"symfony/twig-bundle":"6.0.*",
69+
"symfony/validator":"6.0.*",
70+
"symfony/web-link":"6.0.*",
71+
"symfony/yaml":"6.0.*",
72+
"twig/extra-bundle":"^2.12|^3.0"
7273
},
7374
"conflict": {
7475
"symfony/debug":"<3.3",
7576
"symfony/symfony":"*",
7677
"symfony/twig-bundle":"<3.3"
7778
},
7879
"require-dev": {
79-
"bamarni/composer-bin-plugin":"^1.4",
80+
"bamarni/composer-bin-plugin":"^1.5",
8081
"doctrine/doctrine-fixtures-bundle":"^3.4",
8182
"systemsdk/easy-log-bundle":"1.10.*",
82-
"ergebnis/composer-normalize":"^2.16",
83+
"ergebnis/composer-normalize":"^2.22",
8384
"roave/security-advisories":"dev-latest",
84-
"symfony/browser-kit":"5.4.*",
85-
"symfony/debug-bundle":"5.4.*",
86-
"symfony/maker-bundle":"^1.36",
85+
"symfony/browser-kit":"6.0.*",
86+
"symfony/debug-bundle":"6.0.*",
87+
"symfony/maker-bundle":"^1.40",
8788
"symfony/requirements-checker":"^2.0",
88-
"symfony/stopwatch":"5.4.*",
89-
"symfony/var-dumper":"5.4.*",
90-
"symfony/web-profiler-bundle":"5.4.*"
89+
"symfony/stopwatch":"6.0.*",
90+
"symfony/var-dumper":"6.0.*",
91+
"symfony/web-profiler-bundle":"6.0.*"
92+
},
93+
"replace": {
94+
"symfony/polyfill-ctype":"*",
95+
"symfony/polyfill-mbstring":"*",
96+
"symfony/polyfill-php72":"*",
97+
"symfony/polyfill-php80":"*",
98+
"symfony/polyfill-php81":"*"
9199
},
92100
"config": {
93101
"platform": {
94-
"php":"8.0.0"
102+
"php":"8.1.0"
95103
},
96104
"preferred-install": {
97105
"*":"dist"
@@ -106,12 +114,15 @@
106114
}
107115
},
108116
"extra": {
117+
"allow-contrib":"true",
109118
"bamarni-bin": {
119+
"bin-links":true,
120+
"forward-command":true,
110121
"target-directory":"tools"
111122
},
112123
"symfony": {
113124
"allow-contrib":true,
114-
"require":"5.4.*"
125+
"require":"6.0.*"
115126
}
116127
},
117128
"autoload": {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp