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

Commit 693d5d3

Browse files
author
DKravtsov
committed
updated php up to 8.1, symfony framework 6, packages, docs.
1 parent 36917ad commit 693d5d3

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

+3778
-4577
lines changed

‎.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COMPOSE_PROJECT_NAME=environment1
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 (new PhpCsFixer\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-fpm
1+
FROM php:8.1-fpm
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
@@ -111,8 +111,8 @@ composer-update:
111111
@make exec-bash cmd="COMPOSER_MEMORY_LIMIT=-1 composer update"
112112

113113
info:
114-
@make exec cmd="bin/console --version"
115114
@make exec cmd="php --version"
115+
@make exec cmd="bin/console about"
116116

117117
logs:
118118
@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,66 +31,74 @@
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",
40-
"symfony/asset": "5.4.*",
41-
"symfony/config": "5.4.*",
42-
"symfony/console": "5.4.*",
43-
"symfony/dotenv": "5.4.*",
44-
"symfony/expression-language": "5.4.*",
45-
"symfony/flex": "^2.0",
46-
"symfony/form": "5.4.*",
47-
"symfony/framework-bundle": "5.4.*",
48-
"symfony/http-client": "5.4.*",
49-
"symfony/intl": "5.4.*",
50-
"symfony/mailer": "5.4.*",
51-
"symfony/messenger": "5.4.*",
52-
"symfony/mime": "5.4.*",
40+
"symfony/asset": "6.0.*",
41+
"symfony/config": "6.0.*",
42+
"symfony/console": "6.0.*",
43+
"symfony/dotenv": "6.0.*",
44+
"symfony/expression-language": "6.0.*",
45+
"symfony/flex": "^2.1",
46+
"symfony/form": "6.0.*",
47+
"symfony/framework-bundle": "6.0.*",
48+
"symfony/http-client": "6.0.*",
49+
"symfony/intl": "6.0.*",
50+
"symfony/mailer": "6.0.*",
51+
"symfony/messenger": "6.0.*",
52+
"symfony/amqp-messenger": "6.0.*",
53+
"symfony/doctrine-messenger": "6.0.*",
54+
"symfony/mime": "6.0.*",
5355
"symfony/monolog-bundle": "^3.7",
54-
"symfony/notifier": "5.4.*",
55-
"symfony/process": "5.4.*",
56-
"symfony/property-access": "5.4.*",
57-
"symfony/property-info": "5.4.*",
58-
"symfony/proxy-manager-bridge": "5.4.*",
59-
"symfony/runtime": "5.4.*",
60-
"symfony/routing": "5.4.*",
61-
"symfony/security-bundle": "5.4.*",
62-
"symfony/serializer": "5.4.*",
63-
"symfony/string": "5.4.*",
64-
"symfony/translation": "5.4.*",
65-
"symfony/twig-bundle": "5.4.*",
66-
"symfony/validator": "5.4.*",
67-
"symfony/web-link": "5.4.*",
68-
"symfony/yaml": "5.4.*",
69-
"twig/extra-bundle": "^2.12|^3.0",
70-
"twig/twig": "^2.12|^3.0"
56+
"symfony/notifier": "6.0.*",
57+
"symfony/process": "6.0.*",
58+
"symfony/property-access": "6.0.*",
59+
"symfony/property-info": "6.0.*",
60+
"symfony/proxy-manager-bridge": "6.0.*",
61+
"symfony/runtime": "6.0.*",
62+
"symfony/routing": "6.0.*",
63+
"symfony/security-bundle": "6.0.*",
64+
"symfony/serializer": "6.0.*",
65+
"symfony/string": "6.0.*",
66+
"symfony/translation": "6.0.*",
67+
"symfony/twig-bundle": "6.0.*",
68+
"symfony/validator": "6.0.*",
69+
"symfony/web-link": "6.0.*",
70+
"symfony/yaml": "6.0.*",
71+
"twig/extra-bundle": "^2.12|^3.0"
7172
},
7273
"conflict": {
7374
"symfony/debug": "<3.3",
7475
"symfony/symfony": "*",
7576
"symfony/twig-bundle": "<3.3"
7677
},
7778
"require-dev": {
78-
"bamarni/composer-bin-plugin": "^1.4",
79+
"bamarni/composer-bin-plugin": "^1.5",
7980
"doctrine/doctrine-fixtures-bundle": "^3.4",
8081
"systemsdk/easy-log-bundle": "1.10.*",
81-
"ergebnis/composer-normalize": "^2.16",
82+
"ergebnis/composer-normalize": "^2.22",
8283
"roave/security-advisories": "dev-latest",
83-
"symfony/browser-kit": "5.4.*",
84-
"symfony/debug-bundle": "5.4.*",
85-
"symfony/maker-bundle": "^1.36",
84+
"symfony/browser-kit": "6.0.*",
85+
"symfony/debug-bundle": "6.0.*",
86+
"symfony/maker-bundle": "^1.40",
8687
"symfony/requirements-checker": "^2.0",
87-
"symfony/stopwatch": "5.4.*",
88-
"symfony/var-dumper": "5.4.*",
89-
"symfony/web-profiler-bundle": "5.4.*"
88+
"symfony/stopwatch": "6.0.*",
89+
"symfony/var-dumper": "6.0.*",
90+
"symfony/web-profiler-bundle": "6.0.*"
91+
},
92+
"replace": {
93+
"symfony/polyfill-ctype": "*",
94+
"symfony/polyfill-mbstring": "*",
95+
"symfony/polyfill-php72": "*",
96+
"symfony/polyfill-php80": "*",
97+
"symfony/polyfill-php81": "*"
9098
},
9199
"config": {
92100
"platform": {
93-
"php": "8.0.0"
101+
"php": "8.1.0"
94102
},
95103
"preferred-install": {
96104
"*": "dist"
@@ -105,12 +113,15 @@
105113
}
106114
},
107115
"extra": {
116+
"allow-contrib": "true",
108117
"bamarni-bin": {
118+
"bin-links": true,
119+
"forward-command": true,
109120
"target-directory": "tools"
110121
},
111122
"symfony": {
112123
"allow-contrib": true,
113-
"require": "5.4.*"
124+
"require": "6.0.*"
114125
}
115126
},
116127
"autoload": {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /