From d6cfcd686cbb9af847d25629541f34db57b00b0a Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 11:41:45 +0200 Subject: [PATCH 1/9] Replace app/bootstrap wildcard with explicit entry See https://github.com/symfony/symfony-standard/commit/e7b7b0f366465b15a29f44d7ba17287bb0b8392b --- Symfony2.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index d427180d..16d3ba39 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -1,5 +1,5 @@ # Bootstrap -app/bootstrap* +app/bootstrap.php.cache # Symfony directories vendor/* From 7794d39d2f648305f95348c0f61e4189ecf04cd6 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 11:53:46 +0200 Subject: [PATCH 2/9] Ignore bin folder --- Symfony2.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 16d3ba39..978d0920 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -2,6 +2,7 @@ app/bootstrap.php.cache # Symfony directories +bin/* vendor/* */logs/* */cache/* From cc716260e109ce26b3f69648091faeee205b36b0 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 11:57:41 +0200 Subject: [PATCH 3/9] Add leading slashes --- Symfony2.gitignore | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 978d0920..45473dbb 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -1,20 +1,20 @@ # Bootstrap -app/bootstrap.php.cache +/app/bootstrap.php.cache # Symfony directories -bin/* -vendor/* -*/logs/* -*/cache/* -web/uploads/* -web/bundles/* +/bin/ +/vendor/ +/app/logs/* +/app/cache/* +/web/uploads/ +/web/bundles/ # Configuration files -app/config/parameters.ini -app/config/parameters.yml +/app/config/parameters.ini +/app/config/parameters.yml # PHPUnit -app/phpunit.xml +/app/phpunit.xml # Composer -composer.phar +/composer.phar From c58fff4f3ecb665ce9f06bd75f5200ae2eb4f1df Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 11:58:44 +0200 Subject: [PATCH 4/9] Keep cache and logs directories --- Symfony2.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 45473dbb..5f50b3cb 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -6,6 +6,8 @@ /vendor/ /app/logs/* /app/cache/* +!app/cache/.gitkeep +!app/logs/.gitkeep /web/uploads/ /web/bundles/ From 97de996895c2af71e1f2a3e4a4b6ed4448005008 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 12:02:45 +0200 Subject: [PATCH 5/9] Reorder entries --- Symfony2.gitignore | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 5f50b3cb..37ff0ae8 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -1,19 +1,23 @@ # Bootstrap /app/bootstrap.php.cache -# Symfony directories -/bin/ -/vendor/ -/app/logs/* +# Cache and logs /app/cache/* +/app/logs/* !app/cache/.gitkeep !app/logs/.gitkeep -/web/uploads/ -/web/bundles/ -# Configuration files -/app/config/parameters.ini +# Parameters /app/config/parameters.yml +/app/config/parameters.ini + +# Dependencies +/bin/ +/vendor/ + +# Assets +/web/bundles/ +/web/uploads/ # PHPUnit /app/phpunit.xml From e098aa360b1b7143c308aea609a8aa87a6540c94 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 12:21:08 +0200 Subject: [PATCH 6/9] Rename "Dependencies" section into "Managed by Composer" --- Symfony2.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 37ff0ae8..ecf15846 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -11,7 +11,7 @@ /app/config/parameters.yml /app/config/parameters.ini -# Dependencies +# Managed by Composer /bin/ /vendor/ From 0c9dce69662cc76224d7c61f92778ae7479ef186 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 12:21:56 +0200 Subject: [PATCH 7/9] Move bootstrap file to "Managed by Composer" section --- Symfony2.gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index ecf15846..e3b7c520 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -1,6 +1,3 @@ -# Bootstrap -/app/bootstrap.php.cache - # Cache and logs /app/cache/* /app/logs/* @@ -12,6 +9,7 @@ /app/config/parameters.ini # Managed by Composer +/app/bootstrap.php.cache /bin/ /vendor/ From 43893107bdc1803e6894b083f95c587571ee2144 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 12:22:34 +0200 Subject: [PATCH 8/9] Rename Composer section --- Symfony2.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index e3b7c520..294dd898 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -20,5 +20,5 @@ # PHPUnit /app/phpunit.xml -# Composer +# Composer PHAR /composer.phar From e07830483e609c662da0b23f33b0bef5b2b46b46 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Wed, 28 May 2014 12:23:42 +0200 Subject: [PATCH 9/9] Rename Assets section --- Symfony2.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 294dd898..d6e334bb 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -13,7 +13,7 @@ /bin/ /vendor/ -# Assets +# Assets and user uploads /web/bundles/ /web/uploads/