Merge pull request #1091 from nicwortel/update-symfony2

Update .gitignore for Symfony2

Symfony2.gitignore

@@ -1,19 +1,24 @@
-# Bootstrap
+# Cache and logs
-app/bootstrap*
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
 
-# Symfony directories
+# Parameters
-vendor/*
+/app/config/parameters.yml
-*/logs/*
+/app/config/parameters.ini
-*/cache/*
-web/uploads/*
-web/bundles/*
 
-# Configuration files
+# Managed by Composer
-app/config/parameters.ini
+/app/bootstrap.php.cache
-app/config/parameters.yml
+/bin/
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
 
 # PHPUnit
-app/phpunit.xml
+/app/phpunit.xml
 
-# Composer
+# Composer PHAR
-composer.phar
+/composer.phar