Merge pull request #4834 from wispgitgecko9/patch-2

Update macOS.gitignore

Global/macOS.gitignore

@@ -1,5 +1,6 @@
 # General
 .DS_Store
+.localized
 __MACOSX/
 .AppleDouble
 .LSOverride

Symfony.gitignore

@@ -1,30 +1,52 @@
-# Composer
-/vendor/
-/composer.phar
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
 
-# Cache, session files and logs
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
 /var/cache/*
-/var/log/*
+/var/logs/*
 /var/sessions/*
 !var/cache/.gitkeep
-!var/log/.gitkeep
+!var/logs/.gitkeep
 !var/sessions/.gitkeep
 
-# Env vars & Secrets
-/.env.local
-/.env.local.php
-/.env.*.local
-/config/secrets/prod/prod.decrypt.private.php
+# Logs (Symfony4)
+/var/log/*
+!var/log/.gitkeep
 
-# Bundles assets
-/public/bundles/
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
 
-# Webpack Encore
-/node_modules/
-npm-debug.log
-yarn-error.log
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
 
 # PHPUnit
-.phpunit.result.cache
+/app/phpunit.xml
 /phpunit.xml
-/phpunit.xml.dist
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid

community/PHP/Symfony.gitignore

@@ -1,52 +0,0 @@
-# Cache and logs (Symfony2)
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Email spool folder
-/app/spool/*
-
-# Cache, session files and logs (Symfony3)
-/var/cache/*
-/var/logs/*
-/var/sessions/*
-!var/cache/.gitkeep
-!var/logs/.gitkeep
-!var/sessions/.gitkeep
-
-# Logs (Symfony4)
-/var/log/*
-!var/log/.gitkeep
-
-# Parameters
-/app/config/parameters.yml
-/app/config/parameters.ini
-
-# Managed by Composer
-/app/bootstrap.php.cache
-/var/bootstrap.php.cache
-/bin/*
-!bin/console
-!bin/symfony_requirements
-/vendor/
-
-# Assets and user uploads
-/web/bundles/
-/web/uploads/
-
-# PHPUnit
-/app/phpunit.xml
-/phpunit.xml
-
-# Build data
-/build/
-
-# Composer PHAR
-/composer.phar
-
-# Backup entities generated with doctrine:generate:entities command
-**/Entity/*~
-
-# Embedded web-server pid file
-/.web-server-pid