Merge branch 'bugfix/upgrade-gitignore' into 'master'

Update symfony recipes and commit composer.lock and symfony.lock file

See merge request webapps/sulu-demo!154

.env

@@ -9,6 +9,7 @@
 # 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
@@ -24,7 +25,11 @@ APP_SECRET=a4fa8f33196a803ccac58cdfded0d219
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For a PostgreSQL database, use: "postgresql://symfony:[email protected]:5432/su_myapp?serverVersion=13.4&charset=utf8"
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 DATABASE_URL=mysql://root:[email protected]:3306/su_demo?serverVersion=8.0
+# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> sulu/sulu ###

.gitignore

@@ -17,20 +17,12 @@
 /phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
-
-###> friendsofphp/php-cs-fixer ###
-/.php-cs-fixer.php
-/.php-cs-fixer.cache
-###< friendsofphp/php-cs-fixer ###
-
 # web
 /public/bundles
 /public/uploads
 
 # composer
 /composer.phar
-composer.lock
-symfony.lock
 
 # npm
 node_modules
@@ -50,3 +42,8 @@ node_modules
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+
+###> php-cs-fixer/shim ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< php-cs-fixer/shim ###

composer.json

@@ -44,8 +44,8 @@
         "symfony/webpack-encore-bundle": "^1.16"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.9",
         "jangregor/phpstan-prophecy": "^1.0",
+        "php-cs-fixer/shim": "^3.59",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.4",