Merge pull request #167 from owncloud/another-try-guzzle

Add guzzle
owncloud-archive · Mar 26, 2015 · 0f862d4 · 0f862d4
2 parents 244f75d + e4f3410
commit 0f862d4
Show file tree

Hide file tree

Showing 133 changed files with 14,994 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,3 +95,37 @@ swiftmailer/swiftmailer/LICENSE
 swiftmailer/swiftmailer/composer.json
 
 **/.travis.yml
+
+guzzlehttp/guzzle/build/
+guzzlehttp/guzzle/docs/
+guzzlehttp/guzzle/tests/
+guzzlehttp/guzzle/.gitignore
+guzzlehttp/guzzle/CHANGELOG.md
+guzzlehttp/guzzle/composer.json
+guzzlehttp/guzzle/MAKEFILE
+guzzlehttp/guzzle/phpunit.xml.dist
+guzzlehttp/guzzle/README.md
+guzzlehttp/guzzle/UPGRADING.md
+guzzlehttp/ringphp/docs/
+guzzlehttp/ringphp/tests/
+guzzlehttp/ringphp/.gitignore
+guzzlehttp/ringphp/CHANGELOG.md
+guzzlehttp/ringphp/Makefile
+guzzlehttp/ringphp/README.rst
+guzzlehttp/ringphp/composer.json
+guzzlehttp/ringphp/phpunit.xml.dist
+guzzlehttp/streams/tests/
+guzzlehttp/streams/.gitignore
+guzzlehttp/streams/.travis.yml
+guzzlehttp/streams/CHANGELOG.rst
+guzzlehttp/streams/Makefile
+guzzlehttp/streams/README.rst
+guzzlehttp/streams/composer.json
+guzzlehttp/streams/phpunit.xml.dist
+
+react/tests/
+react/.gitignore
+react/CHANGELOG.md
+react/composer.json
+react/phpunit.xml.dist
+react/README.md
diff --git a/composer.json b/composer.json
@@ -45,6 +45,7 @@
 		"ircmaxell/password-compat": "1.0.*",
 		"nikic/php-parser": "~1.1",
 		"icewind/Streams": "0.2.0",
-		"swiftmailer/swiftmailer": "@stable"
+		"swiftmailer/swiftmailer": "@stable",
+		"guzzlehttp/guzzle": "~5.0"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
@@ -6,6 +6,7 @@
 $baseDir = $vendorDir;
 
 return array(
+    $vendorDir . '/react/promise/src/functions_include.php',
     $vendorDir . '/nikic/php-parser/lib/bootstrap.php',
     $vendorDir . '/kriswallsmith/assetic/src/functions.php',
     $vendorDir . '/ircmaxell/password-compat/lib/password.php',

diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
@@ -15,7 +15,11 @@
     'Sabre\\DAVACL\\' => array($vendorDir . '/sabre/dav/lib/DAVACL'),
     'Sabre\\CardDAV\\' => array($vendorDir . '/sabre/dav/lib/CardDAV'),
     'Sabre\\CalDAV\\' => array($vendorDir . '/sabre/dav/lib/CalDAV'),
+    'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
     'Punic\\' => array($vendorDir . '/punic/punic/code'),
     'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
     'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
+    'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
+    'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
+    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
 );