Update symfony

Author: FinalAngel

.dockerignore

@@ -0,0 +1,34 @@
+**/*.log
+**/*.md
+**/*.php~
+**/*.dist.php
+**/*.dist
+**/*.cache
+**/._*
+**/.dockerignore
+**/.DS_Store
+**/.git/
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/compose.*.yaml
+**/compose.*.yml
+**/compose.yaml
+**/compose.yml
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
+**/docker-compose.yaml
+**/docker-compose.yml
+**/Dockerfile
+**/Thumbs.db
+.github/
+docs/
+public/bundles/
+tests/
+var/
+vendor/
+.editorconfig
+.env.*.local
+.env.local
+.env.local.php
+.env.test

.editorconfig

@@ -0,0 +1,58 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{js,html,ts,tsx}]
+indent_size = 2
+
+[*.json]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.sh]
+indent_style = tab
+
+[*.xml{,.dist}]
+indent_style = space
+indent_size = 4
+
+[*.{yaml,yml}]
+trim_trailing_whitespace = false
+
+[.github/workflows/*.yml]
+indent_size = 2
+
+[.gitmodules]
+indent_style = tab
+
+[.php_cs{,.dist}]
+indent_style = space
+indent_size = 4
+
+[composer.json]
+indent_size = 4
+
+[{,docker-}compose{,.*}.{yaml,yml}]
+indent_style = space
+indent_size = 2
+
+[{,*.*}Dockerfile]
+indent_style = tab
+
+[{,*.*}Caddyfile]
+indent_style = tab

.env

@@ -1,5 +1,5 @@
 # In all environments, the following files are loaded if they exist,
-# the later taking precedence over the former:
+# the latter taking precedence over the former:
 #
 #  * .env                contains default values for the environment variables needed by the app
 #  * .env.local          uncommitted file with local overrides
@@ -9,27 +9,12 @@
 # Real environment variables win over .env files.
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
-APP_SECRET='s$cretf0rt3st'
-#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-#TRUSTED_HOSTS='^localhost|example\.com$'
+APP_SECRET=changeme
 ###< symfony/framework-bundle ###
-
-###> doctrine/doctrine-bundle ###
-# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
-# Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
-###< doctrine/doctrine-bundle ###
-
-###> symfony/swiftmailer-bundle ###
-# For Gmail as a transport, use: "gmail://username:password@localhost"
-# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
-# Delivery is disabled by default via "null://localhost"
-MAILER_URL=null://localhost
-###< symfony/swiftmailer-bundle ###

.env.dev

@@ -0,0 +1,17 @@
+* text=auto eol=lf
+
+*.conf text eol=lf
+*.html text eol=lf
+*.ini text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.php text eol=lf
+*.sh text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+bin/console text eol=lf
+composer.lock text eol=lf merge=ours
+
+*.ico binary
+*.png binary

.env.test

@@ -0,0 +1,10 @@
+
+###> symfony/framework-bundle ###
+/.env.local
+/.env.local.php
+/.env.*.local
+/config/secrets/prod/prod.decrypt.private.php
+/public/bundles/
+/var/
+/vendor/
+###< symfony/framework-bundle ###

.gitattributes

@@ -1,27 +1,19 @@
 # Code of Conduct
 
-In this open-source project, our aim is to foster a welcoming and inclusive environment. We expect all contributors
-and participants interact with each other with courtesy, respect and kindness.
+## Welcome to Our Open-Source Community
 
-We will not tolerate abuse or harassment of any kind.
+This collaborative project strives to create an inclusive and welcoming environment. We value all contributors' and participants' interactions that reflect courtesy, respect, and kindness.
 
-In the event of a concern about behaviour, please contact the maintainers of the project:
+We have a zero-tolerance policy for any form of abuse or harassment.
 
-* Dennis Schwertel <dennis.swchwertel@divio.com>
+If you have concerns about behaviour, please reach out to Divio at info@divio.com.
 
-Reports will be taken seriously and treated in confidence. If necessary, the maintainers will act to exclude
-individuals from participating in this and other projects.
+Reports will be treated confidentially and taken seriously. The project maintainers may take appropriate action, including exclusion from participation in this and other projects, if necessary.
 
+## Guidelines for Code Review
 
-## Code review
+Code review is a crucial but sometimes challenging process for contributors and reviewers. It involves constructive critique, and improvements are often needed before accepting contributions.
 
-Code review can be a frustrating process for both contributors and reviewers, with many opportunities for mutual
-misunderstanding.
+We expect contributors to recognize that all aspects of their submissions, including code and underlying ideas, will be carefully reviewed.
 
-We expect participants who submit contributions for review to understand and accept that all contributions to the
-project, including code and the ideas behind it, will be reviewed carefully. Often review will include critique and
-criticism, and will almost always require improvements or other changes before contributions can be accepted.
-
-We also expect reviewers to communicate sensitively and respectfully.
-
-This is in line with a shared aim for the success of the project.
+Reviewers are encouraged to provide feedback sensitively and respectfully, aligning with our shared goal for the project's success.

.gitignore

@@ -1,32 +1,26 @@
-# How to contribute to the project
+# Contributing to the Project
 
-Thanks for contributing, welcome aboard.
+Thank you for contributing! We appreciate your involvement in making this project better. Before you start, please familiarize yourself with our [Code of Conduct](./CODE_OF_CONDUCT.md).
 
-Please see our [CODE OF CONDUCT](./CODE_OF_CONDUCT.md) for our code of conduct.
+## Submitting Proposals
 
+Proposals can be submitted through:
 
-## Submitting proposals
+- [Pull Requests](https://github.com/divio/getting-started-with-symfony/pulls)
+- [Issues](https://github.com/divio/getting-started-with-symfony/issues)
 
-Please provide proposals as
-[pull requests](https://github.com/flavours/getting-started-with-spring-boot/pulls)
-or
-[issues](https://github.com/flavours/getting-started-with-spring-boot/issues) as appropriate.
+## Pull Requests and Branches
 
+When making pull requests, adhere to the following:
 
-## Pull requests and branches
+- Submit from a properly named new branch.
+- Target the `main` branch.
 
-Please make pull requests:
-
-* from an appropriately-named new branch
-* to the ``main`` branch
-
-See:
-
-* [how to make pull requests](https://help.github.com/articles/using-pull-requests/)
-* [how to manage branches](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
+Learn more:
 
+- [How to make pull requests](https://help.github.com/articles/using-pull-requests/)
+- [Managing branches](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
 
 ### Whitespace
 
-Do not use trailing whitespace (spaces or tabs at the end of a line). They are often not visible, and can cause silent
-problems and misleading unexpected changes. For example, some editors quietly delete them by default.
+Avoid trailing whitespace (spaces or tabs at the end of a line). They might be invisible and lead to silent issues or unexpected changes. Some editors may silently delete them by default.

CODE_OF_CONDUCT.md

@@ -1,35 +1,103 @@
-FROM divio/base:0.1-php7.3-stretch
-EXPOSE 80
-
-COPY migrate.sh Procfile /app/
-COPY divio/*.php divio/*.sh /app/divio/
-COPY start.sh /usr/local/bin/start
-
-RUN echo '[www]\nclear_env = no\ncatch_workers_output = yes' > /usr/local/etc/php-fpm.d/zz-divio.conf
-RUN echo 'auto_prepend_file="/app/divio/rewrite-env.php"' > /usr/local/etc/php/conf.d/divio-conf.ini
-RUN chmod a+x /usr/local/bin/start /app/*.sh
-
-ENV NODE_VERSION=12.9.1 \
-    NPM_VERSION=6.10.2
-RUN bash -c "source $NVM_DIR/nvm.sh && \
-    nvm install $NODE_VERSION && \
-    nvm alias default $NODE_VERSION && \
-    nvm use default && \
-    npm install -g npm@$NPM_VERSION && \
-    npm cache clear --force"
-ENV NODE_PATH=$NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules \
-    PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
-
-COPY divio/nginx/vhost.conf /etc/nginx/sites-available/default
-COPY divio/php/php-fpm.conf /usr/local/etc/php-fpm.conf
-
-COPY composer.* /app/
-RUN cd /app && composer install --no-scripts
+#syntax=docker/dockerfile:1.4
+
+# Versions
+FROM dunglas/frankenphp:1-alpine AS frankenphp_upstream
+
+# The different stages of this Dockerfile are meant to be built into separate images
+# https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
+# https://docs.docker.com/compose/compose-file/#target
+
+
+# Base FrankenPHP image
+FROM frankenphp_upstream AS frankenphp_base
 
 WORKDIR /app
-COPY . /app
 
-RUN cd /app && composer run-script post-install-cmd && composer auto-scripts
+# persistent / runtime deps
+# hadolint ignore=DL3018
+RUN apk add --no-cache \
+		acl \
+		file \
+		gettext \
+		git \
+	;
+
+RUN set -eux; \
+	install-php-extensions \
+		@composer \
+		apcu \
+		intl \
+		opcache \
+		zip \
+	;
+
+# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+###> recipes ###
+###< recipes ###
+
+COPY --link frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/
+COPY --link frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
+RUN chmod 755 /usr/local/bin/docker-entrypoint
+
+ENTRYPOINT ["docker-entrypoint"]
+
+HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
+
+CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
+
+# Dev FrankenPHP image
+FROM frankenphp_base AS frankenphp_dev
+
+ENV APP_ENV=dev XDEBUG_MODE=off
+VOLUME /app/var/
+
+RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
+
+RUN set -eux; \
+	install-php-extensions \
+		xdebug \
+	;
+
+COPY --link frankenphp/conf.d/app.dev.ini $PHP_INI_DIR/conf.d/
+
+CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
+
+# Prod FrankenPHP image
+FROM frankenphp_base AS frankenphp_prod
+
+ENV APP_ENV=prod
+ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
+
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+COPY --link frankenphp/conf.d/app.prod.ini $PHP_INI_DIR/conf.d/
+COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
+
+# prevent the reinstallation of vendors at every changes in the source code
+COPY --link composer.* symfony.* ./
+RUN set -eux; \
+	composer install --no-cache --prefer-dist --no-dev --no-autoloader --no-scripts --no-progress
+
+# copy sources
+COPY --link . ./
+RUN rm -Rf frankenphp/
+
+RUN set -eux; \
+	mkdir -p var/cache var/log; \
+	composer dump-autoload --classmap-authoritative --no-dev; \
+	composer dump-env prod; \
+	composer run-script --no-dev post-install-cmd; \
+	chmod +x bin/console; sync;
+
+# Run on Divio Cloud
+FROM frankenphp_dev
+
+ENV SERVER_NAME=:80
+ENV STABILITY=stable
+ENV MERCURE_PUBLISHER_JWT_KEY=changeme
+ENV MERCURE_SUBSCRIBER_JWT_KEY=changeme
 
-ENTRYPOINT [ "" ]
-CMD ["start", "web"]
+COPY . /app/