Skip to content

Commit 5383a3a

Browse files
authored
Merge pull request #24 from itk-dev/feature/upgrade-4-4
SERV-633: Upgraded to symfony 4.4
2 parents c29a0f5 + 5e29034 commit 5383a3a

14 files changed

Lines changed: 1867 additions & 1520 deletions

.docker/nginx.conf

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
worker_processes auto;
2+
3+
error_log /var/log/nginx/error.log notice;
4+
pid /tmp/nginx.pid;
5+
6+
events {
7+
worker_connections 1024;
8+
}
9+
10+
11+
http {
12+
proxy_temp_path /tmp/proxy_temp;
13+
client_body_temp_path /tmp/client_temp;
14+
fastcgi_temp_path /tmp/fastcgi_temp;
15+
uwsgi_temp_path /tmp/uwsgi_temp;
16+
scgi_temp_path /tmp/scgi_temp;
17+
18+
include /etc/nginx/mime.types;
19+
default_type application/octet-stream;
20+
21+
set_real_ip_from 172.16.0.0/8;
22+
real_ip_recursive on;
23+
real_ip_header X-Forwarded-For;
24+
25+
log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" '
26+
'$status $body_bytes_sent "$http_referer" '
27+
'"$http_user_agent" "$http_x_forwarded_for"';
28+
29+
access_log /var/log/nginx/access.log main;
30+
31+
sendfile on;
32+
#tcp_nopush on;
33+
34+
keepalive_timeout 65;
35+
36+
gzip on;
37+
38+
include /etc/nginx/conf.d/*.conf;
39+
}

.docker/vhost.conf

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# @see https://symfony.com/doc/current/setup/web_server_configuration.html
21
server {
3-
listen 80;
2+
listen 8080;
43
server_name localhost;
54
root /app/public;
65

@@ -14,32 +13,17 @@ server {
1413
fastcgi_split_path_info ^(.+\.php)(/.*)$;
1514
include fastcgi_params;
1615

17-
# optionally set the value of the environment variables used in the application
18-
# fastcgi_param APP_ENV prod;
19-
# fastcgi_param APP_SECRET <app-secret-id>;
20-
# fastcgi_param DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name";
21-
22-
# When you are using symlinks to link the document root to the
23-
# current version of your application, you should pass the real
24-
# application path instead of the path to the symlink to PHP
25-
# FPM.
26-
# Otherwise, PHP's OPcache may not properly detect changes to
27-
# your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
28-
# for more information).
2916
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
3017
fastcgi_param DOCUMENT_ROOT $realpath_root;
31-
# Prevents URIs that include the front controller. This will 404:
32-
# http://domain.tld/index.php/some-path
33-
# Remove the internal directive to allow URIs like this
18+
3419
internal;
3520
}
3621

37-
# return 404 for all other php files not matching the front controller
38-
# this prevents access to other php files you don't want to be accessible.
3922
location ~ \.php$ {
4023
return 404;
4124
}
4225

43-
error_log /var/log/nginx/project_error.log;
44-
access_log /var/log/nginx/project_access.log;
26+
# Send log message to files symlinked to stdout/stderr.
27+
error_log /dev/stderr;
28+
access_log /dev/stdout main;
4529
}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
###> symfony/framework-bundle ###
32
/public/bundles/
43
/var/

composer.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"php": "^7.4",
88
"ext-iconv": "*",
99
"composer/package-versions-deprecated": "1.11.99.1",
10+
"doctrine/annotations": "^1.0",
1011
"doctrine/doctrine-bundle": "^1.12",
1112
"doctrine/doctrine-migrations-bundle": "^1.3",
1213
"doctrine/orm": "^2.7",
@@ -15,8 +16,10 @@
1516
"friendsofsymfony/ckeditor-bundle": "^1.1",
1617
"friendsofsymfony/user-bundle": "~2.0",
1718
"knplabs/knp-paginator-bundle": "^4.0",
19+
"laminas/laminas-zendframework-bridge": "^1.6",
20+
"phpdocumentor/reflection-docblock": "^5.2",
1821
"phpoffice/phpspreadsheet": "^1.5",
19-
"sensio/framework-extra-bundle": "^5.1",
22+
"sensio/framework-extra-bundle": "^6.2",
2023
"stof/doctrine-extensions-bundle": "^1.3",
2124
"symfony/asset": "^4.0",
2225
"symfony/console": "^4.0",
@@ -27,31 +30,37 @@
2730
"symfony/framework-bundle": "^4.0",
2831
"symfony/monolog-bundle": "^3.1",
2932
"symfony/process": "^4.0",
33+
"symfony/property-access": "^4.0",
34+
"symfony/property-info": "^4.0",
3035
"symfony/proxy-manager-bridge": "^4.0",
3136
"symfony/security-bundle": "^4.0",
32-
"symfony/serializer-pack": "*",
37+
"symfony/serializer": "^4.0",
3338
"symfony/swiftmailer-bundle": "^3.1",
3439
"symfony/templating": "^4.0",
3540
"symfony/twig-bundle": "^4.0",
3641
"symfony/validator": "^4.0",
3742
"symfony/web-link": "^4.0",
38-
"symfony/webpack-encore-pack": "*",
3943
"symfony/yaml": "^4.0"
4044
},
4145
"require-dev": {
4246
"symfony/browser-kit": "^4.0",
4347
"symfony/css-selector": "^4.0",
44-
"symfony/debug-pack": "*",
45-
"symfony/maker-bundle": "^1.4",
48+
"symfony/debug-bundle": "^4.0",
49+
"symfony/maker-bundle": "^1.0",
4650
"symfony/phpunit-bridge": "^4.0",
47-
"symfony/profiler-pack": "*",
51+
"symfony/stopwatch": "^4.0",
52+
"symfony/var-dumper": "^4.0",
53+
"symfony/web-profiler-bundle": "^4.0",
4854
"symfony/web-server-bundle": "^4.0"
4955
},
5056
"config": {
5157
"preferred-install": {
5258
"*": "dist"
5359
},
54-
"sort-packages": true
60+
"sort-packages": true,
61+
"allow-plugins": {
62+
"symfony/flex": true
63+
}
5564
},
5665
"autoload": {
5766
"psr-4": {

0 commit comments

Comments
 (0)