switched to use Composer for managing dependencies

.gitignore

 phpunit.xml
 silex.phar
+vendor

.gitmodules

-[submodule "vendor/Symfony/Component/Finder"]
-	path = vendor/Symfony/Component/Finder
-	url = https://github.com/symfony/Finder
-[submodule "vendor/Symfony/Component/ClassLoader"]
-	path = vendor/Symfony/Component/ClassLoader
-	url = https://github.com/symfony/ClassLoader
-[submodule "vendor/Symfony/Component/HttpFoundation"]
-	path = vendor/Symfony/Component/HttpFoundation
-	url = https://github.com/symfony/HttpFoundation
-[submodule "vendor/Symfony/Component/HttpKernel"]
-	path = vendor/Symfony/Component/HttpKernel
-	url = https://github.com/symfony/HttpKernel
-[submodule "vendor/Symfony/Component/Routing"]
-	path = vendor/Symfony/Component/Routing
-	url = https://github.com/symfony/Routing
-[submodule "vendor/Symfony/Component/EventDispatcher"]
-	path = vendor/Symfony/Component/EventDispatcher
-	url = https://github.com/symfony/EventDispatcher
-[submodule "vendor/Symfony/Component/BrowserKit"]
-	path = vendor/Symfony/Component/BrowserKit
-	url = https://github.com/symfony/BrowserKit
-[submodule "vendor/Symfony/Component/DomCrawler"]
-	path = vendor/Symfony/Component/DomCrawler
-	url = https://github.com/symfony/DomCrawler
-[submodule "vendor/Symfony/Component/CssSelector"]
-	path = vendor/Symfony/Component/CssSelector
-	url = https://github.com/symfony/CssSelector
-[submodule "vendor/pimple"]
-	path = vendor/pimple
-	url = https://github.com/fabpot/Pimple
-[submodule "vendor/twig"]
-	path = vendor/twig
-	url = https://github.com/fabpot/Twig
-[submodule "vendor/monolog"]
-	path = vendor/monolog
-	url = https://github.com/Seldaek/monolog.git
-[submodule "vendor/Symfony/Component/Process"]
-	path = vendor/Symfony/Component/Process
-	url = https://github.com/symfony/Process
-[submodule "vendor/doctrine-common"]
-	path = vendor/doctrine-common
-	url = https://github.com/doctrine/common
-[submodule "vendor/doctrine-dbal"]
-	path = vendor/doctrine-dbal
-	url = https://github.com/doctrine/dbal
-[submodule "vendor/Symfony/Component/Validator"]
-	path = vendor/Symfony/Component/Validator
-	url = https://github.com/symfony/Validator.git

autoload.php

-<?php
-
-if (false === class_exists('Symfony\Component\ClassLoader\UniversalClassLoader', false)) {
-    require_once __DIR__.'/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-}
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
-    'Symfony' => __DIR__.'/vendor',
-    'Silex'   => __DIR__.'/src',
-));
-$loader->registerPrefixes(array(
-    'Pimple' => __DIR__.'/vendor/pimple/lib',
-));
-$loader->register();

compile

 #!/usr/bin/env php
 <?php
 
-require_once __DIR__.'/autoload.php';
+require_once __DIR__.'/vendor/.composer/autoload.php';
 
 use Silex\Compiler;
 

composer.json

@@ -24,7 +24,9 @@
         "symfony/event-dispatcher": "2.1.*",
         "symfony/http-foundation": "2.1.*",
         "symfony/http-kernel": "2.1.*",
-        "symfony/routing": "2.1.*"
+        "symfony/routing": "2.1.*",
+        "symfony/process": "2.1.*",
+        "symfony/finder": "2.1.*"
     },
     "suggest": {
         "symfony/form": "2.1.*",

composer.lock

+{
+    "hash": "fe5aa65692e9cdbe9bbc18a5a3ec82fa",
+    "packages": [
+        {
+            "package": "pimple/pimple",
+            "version": "dev-master",
+            "source-reference": "321db91e49b6cf8cbeed58d8db662d40de96d2c3"
+        },
+        {
+            "package": "symfony/browser-kit",
+            "version": "dev-master",
+            "source-reference": "afa16de6b91833b5a72ca89dc942ffb424737687",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/class-loader",
+            "version": "dev-master",
+            "source-reference": "8bceaa2f1fed52f6285b2cea39e7ae37fbea1c9b",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/css-selector",
+            "version": "dev-master",
+            "source-reference": "dcce8174c551814c7aadcf13a2f8d73f3a6b4347",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/dom-crawler",
+            "version": "dev-master",
+            "source-reference": "d35d208382d6e23a39a9e3c09357801b911eead6",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/event-dispatcher",
+            "version": "dev-master",
+            "source-reference": "f6b7f60b0c29ab8167de7d7c9ba78fc9cc283c64",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/finder",
+            "version": "dev-master",
+            "source-reference": "b3adc8d5c29593db93c0abc4711a1e25fd3a6fa0",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/http-foundation",
+            "version": "dev-master",
+            "source-reference": "2abe7f1b8e0f808dad0cc001b9d69371b604d719",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/http-kernel",
+            "version": "dev-master",
+            "source-reference": "cf2bb8655a13fcb516b1d0b95ddf0c51db25b2a8",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/process",
+            "version": "dev-master",
+            "source-reference": "6aceac404d8574cf7da57e7e29b00a665b7bd559",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/routing",
+            "version": "dev-master",
+            "source-reference": "d3d9c02357b2db6503539d11f6c379ccd86f9cc4",
+            "alias": "2.1.9999999.9999999-dev"
+        }
+    ],
+    "aliases": []
+}

doc/changelog.rst

@@ -3,6 +3,8 @@ Changelog
 
 This changelog references all backward incompatibilities as we introduce them:
 
+* **2012-03-02**: Switched to use Composer for dependency management
+
 * **2012-02-27**: Updated to Symfony 2.1 session handling.
 
 * **2012-01-02**: Introduced support for streaming responses.

phpunit.xml.dist

@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/.composer/autoload.php"
 >
     <testsuites>
         <testsuite name="Silex Test Suite">

src/Silex/Compiler.php

@@ -52,15 +52,15 @@ class Compiler
             ->name('*.php')
             ->notName('Compiler.php')
             ->in(__DIR__.'/..')
-            ->in(__DIR__.'/../../vendor/pimple/lib')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/ClassLoader')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/EventDispatcher')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/HttpFoundation')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/HttpKernel')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/Routing')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/BrowserKit')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/CssSelector')
-            ->in(__DIR__.'/../../vendor/Symfony/Component/DomCrawler')
+            ->in(__DIR__.'/../../vendor/pimple/pimple/lib')
+            ->in(__DIR__.'/../../vendor/symfony/class-loader/Symfony/Component/ClassLoader')
+            ->in(__DIR__.'/../../vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher')
+            ->in(__DIR__.'/../../vendor/symfony/http-foundation/Symfony/Component/HttpFoundation')
+            ->in(__DIR__.'/../../vendor/symfony/http-kernel/Symfony/Component/HttpKernel')
+            ->in(__DIR__.'/../../vendor/symfony/routing/Symfony/Component/Routing')
+            ->in(__DIR__.'/../../vendor/symfony/browser-kit/Symfony/Component/BrowserKit')
+            ->in(__DIR__.'/../../vendor/symfony/css-selector/Symfony/Component/CssSelector')
+            ->in(__DIR__.'/../../vendor/symfony/dom-crawler/Symfony/Component/DomCrawler')
         ;
 
         foreach ($finder as $file) {
@@ -68,7 +68,9 @@ class Compiler
         }
 
         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../LICENSE'), false);
-        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../autoload.php'));
+        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload.php'));
+        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/ClassLoader.php'));
+        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload_namespaces.php'));
 
         // Stubs
         $phar->setStub($this->getStub());
@@ -108,7 +110,7 @@ class Compiler
 
 Phar::mapPhar('silex.phar');
 
-require_once 'phar://silex.phar/autoload.php';
+require_once 'phar://silex.phar/vendor/.composer/autoload.php';
 
 if ('cli' === php_sapi_name() && basename(__FILE__) === basename($_SERVER['argv'][0]) && isset($_SERVER['argv'][1])) {
     switch ($_SERVER['argv'][1]) {

tests/bootstrap.php

-<?php
-
-/*
- * This file is part of the Silex framework.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (file_exists($file = __DIR__.'/../autoload.php')) {
-    require_once $file;
-} elseif (file_exists($file = __DIR__.'/../autoload.php.dist')) {
-    require_once $file;
-}

update_vendors.sh

-#!/bin/sh
-
-COMPONENTS='BrowserKit CssSelector EventDispatcher HttpFoundation Process ClassLoader DomCrawler Finder HttpKernel Routing Validator'
-
-cd vendor/Symfony/Component
-for COMPONENT in $COMPONENTS
-do
-    cd $COMPONENT && git fetch origin && git reset --hard origin/master && cd ..
-done
-cd ../../..
-
-cd vendor/doctrine-common
-git fetch origin && git reset --hard origin/2.1.x
-cd ../..
-
-cd vendor/doctrine-dbal
-git fetch origin && git reset --hard origin/2.1.x
-cd ../..
-
-cd vendor/monolog
-git fetch origin && git reset --hard 1.0.2
-cd ../..
-
-cd vendor/pimple
-git fetch origin && git reset --hard origin/master
-cd ../..
-
-cd vendor/twig
-git fetch origin && git reset --hard origin/master
-cd ../..

BrowserKit @ afa16de6

-Subproject commit afa16de6b91833b5a72ca89dc942ffb424737687

ClassLoader @ 8bceaa2f

-Subproject commit 8bceaa2f1fed52f6285b2cea39e7ae37fbea1c9b

CssSelector @ dcce8174

-Subproject commit dcce8174c551814c7aadcf13a2f8d73f3a6b4347

DomCrawler @ d35d2083

-Subproject commit d35d208382d6e23a39a9e3c09357801b911eead6

EventDispatcher @ f6b7f60b

-Subproject commit f6b7f60b0c29ab8167de7d7c9ba78fc9cc283c64

Finder @ b3adc8d5

-Subproject commit b3adc8d5c29593db93c0abc4711a1e25fd3a6fa0

HttpFoundation @ 2abe7f1b

-Subproject commit 2abe7f1b8e0f808dad0cc001b9d69371b604d719

HttpKernel @ cf2bb865

-Subproject commit cf2bb8655a13fcb516b1d0b95ddf0c51db25b2a8

Process @ 6aceac40

-Subproject commit 6aceac404d8574cf7da57e7e29b00a665b7bd559

Routing @ d3d9c023

-Subproject commit d3d9c02357b2db6503539d11f6c379ccd86f9cc4

Validator @ 2c507eb8

-Subproject commit 2c507eb8587d472d98f7c4df3c32a123800121ce

doctrine-common @ f78df116

-Subproject commit f78df1166ce28ceb38df4b43cb967137ae538cf4

doctrine-dbal @ 148a049d

-Subproject commit 148a049df448af9772259e69a034e51c0c080805

monolog @ b704c49a

-Subproject commit b704c49a3051536f67f2d39f13568f74615b9922

twig @ 01f733f4

-Subproject commit 01f733f4b5407a7a2cc97f2b6dc269c8432da022