From 6f244fc65903656dd05d6706c67799104dd82f26 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 30 Jan 2012 21:52:29 -0500 Subject: [PATCH] Vendor spec Manually overrode Guzzle in composer to not fetch Guzzle's reps as they're not needed for what's used in Ratchet Removed SplClassLoader in favour of Composer's CladdLoader --- composer.json | 21 +++++- composer.lock | 18 +---- tests/SplClassLoader.php | 139 --------------------------------------- 3 files changed, 23 insertions(+), 155 deletions(-) delete mode 100644 tests/SplClassLoader.php diff --git a/composer.json b/composer.json index b5fdc13..33bdac6 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,27 @@ , "Ratchet": "lib" } } + , "repositories": { + "guzzle": { + "package": { + "name": "guzzle" + , "type": "library" + , "version": "2.0.2" + , "autoload": { + "psr-0": { + "Guzzle": "src" + } + } + , "source": { + "url": "https://github.com/guzzle/guzzle.git" + , "type": "git" + , "reference": "ac64abc2c05b921efc4623379c1674a282475ae5" + } + } + } + } , "require": { "php": ">=5.3.2" - , "guzzle/guzzle": ">=2.0.5" + , "guzzle": "2.0.2" } } \ No newline at end of file diff --git a/composer.lock b/composer.lock index 35761a5..7b8b66e 100644 --- a/composer.lock +++ b/composer.lock @@ -1,21 +1,9 @@ { - "hash": "f237c18d57c8cda8acb08f4d1e917930", + "hash": "75f85f47f6365abbeeabb065601c6ec2", "packages": [ { - "package": "doctrine\/common", - "version": "master-dev" - }, - { - "package": "symfony\/validator", - "version": "2.1.0-dev" - }, - { - "package": "symfony\/event-dispatcher", - "version": "2.1.0-dev" - }, - { - "package": "guzzle\/guzzle", - "version": "master-dev" + "package": "guzzle", + "version": "2.0.2" } ] } \ No newline at end of file diff --git a/tests/SplClassLoader.php b/tests/SplClassLoader.php deleted file mode 100644 index 4cba7a3..0000000 --- a/tests/SplClassLoader.php +++ /dev/null @@ -1,139 +0,0 @@ -register(); - * - * @author Jonathan H. Wage - * @author Roman S. Borschel - * @author Matthew Weier O'Phinney - * @author Kris Wallsmith - * @author Fabien Potencier - */ -class SplClassLoader -{ - private $_fileExtension = '.php'; - private $_namespace; - private $_includePath; - private $_namespaceSeparator = '\\'; - - /** - * Creates a new SplClassLoader that loads classes of the - * specified namespace. - * - * @param string $ns The namespace to use. - */ - public function __construct($ns = null, $includePath = null) - { - $this->_namespace = $ns; - $this->_includePath = $includePath; - } - - /** - * Sets the namespace separator used by classes in the namespace of this class loader. - * - * @param string $sep The separator to use. - */ - public function setNamespaceSeparator($sep) - { - $this->_namespaceSeparator = $sep; - } - - /** - * Gets the namespace seperator used by classes in the namespace of this class loader. - * - * @return void - */ - public function getNamespaceSeparator() - { - return $this->_namespaceSeparator; - } - - /** - * Sets the base include path for all class files in the namespace of this class loader. - * - * @param string $includePath - */ - public function setIncludePath($includePath) - { - $this->_includePath = $includePath; - } - - /** - * Gets the base include path for all class files in the namespace of this class loader. - * - * @return string $includePath - */ - public function getIncludePath() - { - return $this->_includePath; - } - - /** - * Sets the file extension of class files in the namespace of this class loader. - * - * @param string $fileExtension - */ - public function setFileExtension($fileExtension) - { - $this->_fileExtension = $fileExtension; - } - - /** - * Gets the file extension of class files in the namespace of this class loader. - * - * @return string $fileExtension - */ - public function getFileExtension() - { - return $this->_fileExtension; - } - - /** - * Installs this class loader on the SPL autoload stack. - */ - public function register() - { - spl_autoload_register(array($this, 'loadClass')); - } - - /** - * Uninstalls this class loader from the SPL autoloader stack. - */ - public function unregister() - { - spl_autoload_unregister(array($this, 'loadClass')); - } - - /** - * Loads the given class or interface. - * - * @param string $className The name of the class to load. - * @return void - */ - public function loadClass($className) - { - if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) { - $fileName = ''; - $namespace = ''; - if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) { - $namespace = substr($className, 0, $lastNsPos); - $className = substr($className, $lastNsPos + 1); - $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR; - } - $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension; - $filePath = ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName; - - if (is_file($filePath)) { - require $filePath; - } - } - } -} \ No newline at end of file