switched to composer for dependency management

FriendsOfPHP · May 15, 2012 · 1cda47e · 1cda47e
1 parent 6fec6ef
commit 1cda47e
Show file tree

Hide file tree

Showing 19 changed files with 131 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 phpunit.xml
+vendor
+
diff --git a/.gitmodules b/.gitmodules
diff --git a/autoload.php b/autoload.php
diff --git a/compile b/compile
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once __DIR__.'/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use Goutte\Compiler;
 

diff --git a/composer.json b/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "fabpot/goutte",
+    "type": "application",
+    "description": "A simple PHP Web Scraper",
+    "keywords": ["scraper"],
+    "homepage": "https://github.com/fabpot/Goutte",
+    "version": "1.0.0",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "symfony/browser-kit": "2.1.*",
+        "symfony/css-selector": "2.1.*",
+        "symfony/dom-crawler": "2.1.*",
+        "symfony/finder": "2.1.*",
+        "symfony/process": "2.1.*",
+        "guzzle/guzzle": "v2.5.0"
+    },
+    "autoload": {
+        "psr-0": { "Goutte": "src" }
+    },
+    "bin": ["goutte.phar"]
+}
diff --git a/composer.lock b/composer.lock
diff --git a/goutte.phar b/goutte.phar
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="./tests/bootstrap.php">
+         bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Goutte Test Suite">
             <directory>./tests/Goutte/Tests</directory>

diff --git a/src/Goutte/Compiler.php b/src/Goutte/Compiler.php
@@ -54,7 +54,7 @@ public function compile($pharFile = 'goutte.phar')
 
   protected function getCliStub()
   {
-    return "<?php ".$this->getLicense()." require_once __DIR__.'/autoload.php'; __HALT_COMPILER();";
+    return "<?php ".$this->getLicense()." require_once __DIR__.'/vendor/autoload.php'; __HALT_COMPILER();";
   }
 
   protected function getWebStub()
@@ -79,17 +79,18 @@ protected function getFiles()
   {
     $files = array(
       'LICENSE',
-      'autoload.php',
-      'vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php'
+      'vendor/autoload.php',
     );
 
     $dirs = array(
+      'vendor/composer',
       'src/Goutte',
-      'vendor/Symfony/Component/BrowserKit',
-      'vendor/Symfony/Component/DomCrawler',
-      'vendor/Symfony/Component/CssSelector',
-      'vendor/Symfony/Component/Process',
-      'vendor/Guzzle/src/Guzzle'
+      'vendor/symfony/browser-kit',
+      'vendor/symfony/dom-crawler',
+      'vendor/symfony/css-selector',
+      'vendor/symfony/process',
+      'vendor/symfony/event-dispatcher',
+      'vendor/guzzle/guzzle/src/Guzzle'
     );
 
     $finder = new Finder();

diff --git a/tests/Goutte/Tests/ClientTest.php b/tests/Goutte/Tests/ClientTest.php
@@ -16,7 +16,7 @@
 
 use Guzzle\Http\Message\Response as GuzzleResponse;
 use Guzzle\Service\Client as GuzzleClient;
-use Guzzle\Service\Plugin\MockPlugin;
+use Guzzle\Http\Plugin\MockPlugin;
 use Guzzle\Http\Plugin\HistoryPlugin;
 use Guzzle\Http\Message\Response;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/update_vendors.sh b/update_vendors.sh
diff --git a/vendor/Guzzle b/vendor/Guzzle
diff --git a/vendor/Symfony/Component/BrowserKit b/vendor/Symfony/Component/BrowserKit
diff --git a/vendor/Symfony/Component/ClassLoader b/vendor/Symfony/Component/ClassLoader
diff --git a/vendor/Symfony/Component/CssSelector b/vendor/Symfony/Component/CssSelector
diff --git a/vendor/Symfony/Component/DomCrawler b/vendor/Symfony/Component/DomCrawler
diff --git a/vendor/Symfony/Component/Finder b/vendor/Symfony/Component/Finder
diff --git a/vendor/Symfony/Component/Process b/vendor/Symfony/Component/Process