update to symfony v2.0.6

bin/vendors

@@ -24,13 +24,13 @@ Specify a command to run:
 
  install: install vendors as specified in deps or deps.lock (recommended)
  update:  update vendors to their latest versions (as specified in deps)
- lock:  lock vendors to their current versions
+
 
 EOF
     );
 }
 
-if (!in_array($command = array_shift($argv), array('install', 'update', 'lock'))) {
+if (!in_array($command = array_shift($argv), array('install', 'update'))) {
     exit(sprintf("Command \"%s\" does not exist.\n", $command));
 }
 
@@ -73,40 +73,38 @@ if (false === $deps) {
 foreach ($deps as $name => $dep) {
     $dep = array_map('trim', $dep);
 
+    // revision
+    if (isset($versions[$name])) {
+        $rev = $versions[$name];
+    } else {
+        $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD';
+    }
+
     // install dir
     $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name;
     if (in_array('--reinstall', $argv)) {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+        if (PHP_OS == 'WINNT') {
             system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir))));
         } else {
             system(sprintf('rm -rf %s', escapeshellarg($installDir)));
         }
     }
 
-    if ('install' === $command || 'update' === $command) {
-        echo "> Installing/Updating $name\n";
-
-        // url
-        if (!isset($dep['git'])) {
-            exit(sprintf('The "git" value for the "%s" dependency must be set.', $name));
-        }
-        $url = $dep['git'];
-
-        if (!is_dir($installDir)) {
-            system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir)));
-        }
+    echo "> Installing/Updating $name\n";
 
-        // revision
-        if (isset($versions[$name])) {
-            $rev = $versions[$name];
-        } else {
-            $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD';
-        }
+    // url
+    if (!isset($dep['git'])) {
+        exit(sprintf('The "git" value for the "%s" dependency must be set.', $name));
+    }
+    $url = $dep['git'];
 
-        system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev)));
+    if (!is_dir($installDir)) {
+        system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir)));
     }
 
-    if ('update' === $command || 'lock' === $command) {
+    system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev)));
+
+    if ('update' === $command) {
         ob_start();
         system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir)));
         $newversions[] = trim($name.' '.ob_get_clean());
@@ -114,14 +112,12 @@ foreach ($deps as $name => $dep) {
 }
 
 // update?
-if ('update' === $command || 'lock' === $command) {
-    echo "> Updating deps.lock\n";
-
+if ('update' === $command) {
     file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions));
 }
 
 // php on windows can't use the shebang line from system()
-$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : '';
+$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : '';
 
 // Update the bootstrap files
 system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir)));
@@ -130,4 +126,4 @@ system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundle
 system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')));
 
 // Remove the cache
-system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')));
+system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')));

deps

@@ -1,6 +1,6 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=origin/2.0
+    version=v2.0.6
 
 [twig]
     git=http://github.com/fabpot/Twig.git
@@ -12,15 +12,15 @@
 
 [doctrine-common]
     git=http://github.com/doctrine/common.git
-    version=origin/2.1.x
+    version=2.1.2
 
 [doctrine-dbal]
     git=http://github.com/doctrine/dbal.git
-    version=origin/2.1.x
+    version=2.1.3
 
 [doctrine]
     git=http://github.com/doctrine/doctrine2.git
-    version=origin/2.1.x
+    version=2.1.2
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
@@ -53,6 +53,7 @@
 [SensioDistributionBundle]
     git=http://github.com/sensio/SensioDistributionBundle.git
     target=/bundles/Sensio/Bundle/DistributionBundle
+    version=origin/1.0
 
 [SensioGeneratorBundle]
     git=http://github.com/sensio/SensioGeneratorBundle.git

deps.lock

@@ -1,19 +1,19 @@
-symfony 7f21a5e9792f892166a550bb55791d80248243fc
+symfony b55a43813e8fbcf4facd19ce1da0cd7acc67ce9b
 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
 monolog b704c49a3051536f67f2d39f13568f74615b9922
-doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81
-doctrine-dbal f80444b8a476e5e6748239b68246528afc14f3f0
-doctrine d9328ea5e70d0d0f9d5578c47dfe152778d4b9ae
+doctrine-common b385ca770888248241bd3086a40d5b3bd082a706
+doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1
+doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553
 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6
 assetic f829ad23d23c87480151a21faad49fefe7c09e5d
-twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54
+twig-extensions d5851b96f06442e74590e5540a4209e9e3946243
 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
-composer 066a0db7521f39cd15c30bc328526a584e85e4da
+composer 1d5a03eedca24e3fe8f8f9ebc1fae68a92262e96
 SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c
 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538
-SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe
-SensioGeneratorBundle 2016dd4752ec52990b3fb304d68422eab3b1e8e0
+SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
+SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc
 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16
 FOSUserBundle 67300def4b2628512197c1fe05cd25727c309e20
-WhiteOctoberPagerfanta ae948d491a4b7461095d014398db10ecd998f4d8
-WhiteOctoberPagerfantaBundle b1fe46d6a1fca89153560f8c463ad535566ba45e
+WhiteOctoberPagerfanta bbbf256d830a6036a6a7671d6b1dc3038e38294a
+WhiteOctoberPagerfantaBundle 60db33325971201cfacb3cbe90d8e25c8c89fd66