From: Nic Wortel <nd.wortel@gmail.com>
Date: Mon, 1 Sep 2014 08:50:33 +0000 (+0200)
Subject: Update Symfony.gitignore to support Symfony3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1117%2Fhead;p=gitignore.git

Update Symfony.gitignore to support Symfony3

Symfony3 (and some versions of Symfony2) come with a new directory structure.
This updated version of Symfony.gitignore supports this new directory structure
as well as the old one.
---

diff --git a/Symfony.gitignore b/Symfony.gitignore
index d6e334bb..636b6f8e 100644
--- a/Symfony.gitignore
+++ b/Symfony.gitignore
@@ -1,16 +1,25 @@
-# Cache and logs
+# Cache and logs (Symfony2)
 /app/cache/*
 /app/logs/*
 !app/cache/.gitkeep
 !app/logs/.gitkeep
 
+# Cache and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+
 # Parameters
 /app/config/parameters.yml
 /app/config/parameters.ini
 
 # Managed by Composer
 /app/bootstrap.php.cache
-/bin/
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
 /vendor/
 
 # Assets and user uploads
@@ -19,6 +28,7 @@
 
 # PHPUnit
 /app/phpunit.xml
+/phpunit.xml
 
 # Composer PHAR
 /composer.phar