bug #218 Keep .gitignore files in sync (ogizanagi)

This PR was merged into the 1.0-dev branch.

Discussion
----------

Keep .gitignore files in sync

This is only a quick fix regarding the issue mentioned in #211 , and the few recent issues related:

- #217
- symfony/symfony#16815

Commits
-------

0da1b95 Keep .gitignore files in sync

Author: javiereguiluz

src/Symfony/Installer/DownloadCommand.php

@@ -306,50 +306,48 @@ protected function checkSymfonyRequirements()
     }
 
     /**
-     * Creates the appropriate .gitignore file for a Symfony project.
+     * Creates the appropriate .gitignore file for a Symfony project if it doesn't exist.
      *
      * @return $this
      */
     protected function createGitIgnore()
     {
-        $gitIgnoreEntries = array(
-            '/app/config/parameters.yml',
-            '/bin/',
-            '/build/',
-            '/composer.phar',
-            '/vendor/',
-            '/web/bundles/',
-        );
-        if ($this->isSymfony3()) {
-            $gitIgnoreEntries = array_merge($gitIgnoreEntries, array(
-                '/var/',
-                '!var/cache/.gitkeep',
-                '!var/logs/.gitkeep',
-                '!var/sessions/.gitkeep',
-                '/phpunit.xml',
-            ));
-        } else {
-            $gitIgnoreEntries = array_merge($gitIgnoreEntries, array(
-                '/app/bootstrap.php.cache',
-                '/app/cache/*',
-                '!app/cache/.gitkeep',
-                '/app/config/parameters.yml',
-                '/app/logs/*',
-                '!app/logs/.gitkeep',
-                '/app/phpunit.xml',
-            ));
-        }
-
-        try {
-            $this->fs->dumpFile($this->projectDir.'/.gitignore', implode("\n", $gitIgnoreEntries)."\n");
-        } catch (\Exception $e) {
-            // don't throw an exception in case the .gitignore file cannot be created,
-            // because this is just an enhancement, not something mandatory for the project
+        if (!is_file($path = $this->projectDir.'/.gitignore')) {
+            try {
+                $this->fs->dumpFile($path, @file_get_contents(sprintf(
+                    'https://raw.githubusercontent.com/symfony/symfony-standard/v%s/.gitignore',
+                    $this->getInstalledSymfonyVersion()
+                )));
+            } catch (\Exception $e) {
+                // don't throw an exception in case the .gitignore file cannot be created,
+                // because this is just an enhancement, not something mandatory for the project
+            }
         }
 
         return $this;
     }
 
+    /**
+     * Returns the full Symfony version number of the project by getting
+     * it from the composer.lock file.
+     *
+     * @return string
+     */
+    protected function getInstalledSymfonyVersion()
+    {
+        $composer = json_decode(file_get_contents($this->projectDir.'/composer.lock'), true);
+
+        foreach ($composer['packages'] as $package) {
+            if ('symfony/symfony' === $package['name']) {
+                if ('v' === substr($package['version'], 0, 1)) {
+                    return substr($package['version'], 1);
+                };
+
+                return $package['version'];
+            }
+        }
+    }
+
     /**
      * Checks if the installer has enough permissions to create the project.
      */

src/Symfony/Installer/NewCommand.php

@@ -361,27 +361,6 @@ protected function updateComposerJson()
         return $this;
     }
 
-    /**
-     * Returns the full Symfony version number of the project by getting
-     * it from the composer.lock file.
-     *
-     * @return string
-     */
-    protected function getInstalledSymfonyVersion()
-    {
-        $composer = json_decode(file_get_contents($this->projectDir.'/composer.lock'), true);
-
-        foreach ($composer['packages'] as $package) {
-            if ('symfony/symfony' === $package['name']) {
-                if ('v' === substr($package['version'], 0, 1)) {
-                    return substr($package['version'], 1);
-                };
-
-                return $package['version'];
-            }
-        }
-    }
-
     /**
      * Generates a good Composer project name based on the application name
      * and on the user name.