feature #198 Forward to 3.0 (Pierstoval)

This PR was squashed before being merged into the 1.0-dev branch (closes #198).

Discussion
----------

Forward to 3.0

Hey guys, now released 😄

Commits
-------

6d75524 Forward to 3.0

Author: javiereguiluz

src/Symfony/Installer/DownloadCommand.php

@@ -261,7 +261,8 @@ protected function extract()
     protected function checkSymfonyRequirements()
     {
         try {
-            require $this->projectDir.'/app/SymfonyRequirements.php';
+            $requirementsDir = $this->isSymfony3() ? 'var' : 'app';
+            require $this->projectDir.'/'.$requirementsDir.'/SymfonyRequirements.php';
             $symfonyRequirements = new \SymfonyRequirements();
             $this->requirementsErrors = array();
             foreach ($symfonyRequirements->getRequirements() as $req) {
@@ -284,18 +285,32 @@ protected function checkSymfonyRequirements()
     protected function createGitIgnore()
     {
         $gitIgnoreEntries = array(
-            '/app/bootstrap.php.cache',
-            '/app/cache/*',
-            '!app/cache/.gitkeep',
             '/app/config/parameters.yml',
-            '/app/logs/*',
-            '!app/logs/.gitkeep',
-            '/app/phpunit.xml',
             '/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");
@@ -416,6 +431,16 @@ protected function isEmptyDirectory($dir)
         return 2 === count(scandir($dir.'/'));
     }
 
+    /**
+     * Checks that the asked version is in the 3.x branch.
+     *
+     * @return bool
+     */
+    protected function isSymfony3()
+    {
+        return '3' === $this->version[0];
+    }
+
     private function enableSignalHandler()
     {
         if (!function_exists('pcntl_signal')) {

src/Symfony/Installer/NewCommand.php

@@ -111,11 +111,11 @@ protected function checkSymfonyVersionIsInstallable()
         }
 
         // validate semver syntax
-        if (!preg_match('/^2\.\d(?:\.\d{1,2})?(?:-(?:dev|BETA\d*|RC\d*))?$/i', $this->version)) {
-            throw new \RuntimeException('The Symfony version must be 2.N or 2.N.M (where N and M are positive integers). The special "-dev", "-BETA" and "-RC" versions are also supported.');
+        if (!preg_match('/^[23]\.\d(?:\.\d{1,2})?(?:-(?:dev|BETA\d*|RC\d*))?$/i', $this->version)) {
+            throw new \RuntimeException('The Symfony version must be 2.N, 2.N.M, 3.N or 3.N.M (where N and M are positive integers). The special "-dev", "-BETA" and "-RC" versions are also supported.');
         }
 
-        if (preg_match('/^2\.\d$/', $this->version)) {
+        if (preg_match('/^[23]\.\d$/', $this->version)) {
             // Check if we have a minor version in order to retrieve the last patch from symfony.com
 
             $client = $this->getGuzzleClient();
@@ -246,26 +246,31 @@ protected function displayInstallationResult()
                 $this->output->writeln(' * '.$helpText);
             }
 
+            $checkFile = $this->isSymfony3() ? 'bin/symfony_requirements' : 'app/check.php';
+
             $this->output->writeln(sprintf(
                 " After fixing these issues, re-check Symfony requirements executing this command:\n\n".
-                "   <comment>php %s/app/check.php</comment>\n\n".
+                "   <comment>php %s/%s</comment>\n\n".
                 " Then, you can:\n",
-                $this->projectName
+                $this->projectName, $checkFile
             ));
         }
 
         if ('.' !== $this->projectDir) {
             $this->output->writeln(sprintf(
-                "    * Change your current directory to <comment>%s</comment>\n\n", $this->projectDir
+                "    * Change your current directory to <comment>%s</comment>\n", $this->projectDir
             ));
         }
 
+        $consoleDir = ($this->isSymfony3() ? 'bin' : 'app');
+
         $this->output->writeln(sprintf(
             "    * Configure your application in <comment>app/config/parameters.yml</comment> file.\n\n".
             "    * Run your application:\n".
-            "        1. Execute the <comment>php app/console server:run</comment> command.\n".
+            "        1. Execute the <comment>php %s/console server:run</comment> command.\n".
             "        2. Browse to the <comment>http://localhost:8000</comment> URL.\n\n".
-            "    * Read the documentation at <comment>http://symfony.com/doc</comment>\n"
+            "    * Read the documentation at <comment>http://symfony.com/doc</comment>\n",
+            $consoleDir
         ));
 
         return $this;

tests/Symfony/Installer/Tests/IntegrationTest.php

@@ -125,6 +125,12 @@ public function provideSymfonyInstallationData()
                 '/.*Symfony 2\.7\.0\-BETA1 was successfully installed.*/',
                 '/Symfony version 2\.7\.0\-BETA1 - app\/dev\/debug/',
             ),
+
+            array(
+                '3.0.0-BETA1',
+                '/.*Symfony 3\.0\.0\-BETA1 was successfully installed.*/',
+                '/Symfony version 3\.0\.0\-BETA1 - app\/dev\/debug/',
+            ),
         );
     }
 }