diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-02-19 12:23:35 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-02-19 12:23:44 +0100 |
commit | 04dc1076f13567549602802bbf8e931879174353 (patch) | |
tree | 490cab68e0d887e422246cd0351b309c3d9cdefa /vendor/composer | |
parent | 4b6e528a5f0472624644bd812c19af55fea52080 (diff) |
fix #734 and set a CSP on master
Diffstat (limited to 'vendor/composer')
-rw-r--r-- | vendor/composer/ClassLoader.php | 26 | ||||
-rw-r--r-- | vendor/composer/autoload_real.php | 10 | ||||
-rw-r--r-- | vendor/composer/installed.json | 83 |
3 files changed, 75 insertions, 44 deletions
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 70d78bc3f..5e1469e83 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -54,6 +54,8 @@ class ClassLoader private $useIncludePath = false; private $classMap = array(); + private $classMapAuthoritative = false; + public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -249,6 +251,27 @@ class ClassLoader } /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** * Registers this instance as an autoloader. * * @param bool $prepend Whether to prepend the autoloader or not @@ -299,6 +322,9 @@ class ClassLoader if (isset($this->classMap[$class])) { return $this->classMap[$class]; } + if ($this->classMapAuthoritative) { + return false; + } $file = $this->findFileWithExtension($class, '.php'); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index d933a9ab8..4b6457987 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitd76dfeebb5ddb82dad6b87cf02d1b308 +class ComposerAutoloaderInit373583df083e6f26edc2b67c5b6380e9 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitd76dfeebb5ddb82dad6b87cf02d1b308 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitd76dfeebb5ddb82dad6b87cf02d1b308', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit373583df083e6f26edc2b67c5b6380e9', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitd76dfeebb5ddb82dad6b87cf02d1b308', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit373583df083e6f26edc2b67c5b6380e9', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; array_push($includePaths, get_include_path()); @@ -46,14 +46,14 @@ class ComposerAutoloaderInitd76dfeebb5ddb82dad6b87cf02d1b308 $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequired76dfeebb5ddb82dad6b87cf02d1b308($file); + composerRequire373583df083e6f26edc2b67c5b6380e9($file); } return $loader; } } -function composerRequired76dfeebb5ddb82dad6b87cf02d1b308($file) +function composerRequire373583df083e6f26edc2b67c5b6380e9($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f15987f72..7d781e642 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -47,45 +47,6 @@ ] }, { - "name": "fguillot/picofeed", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/fguillot/picoFeed.git", - "reference": "0a1d0d3950f7f047dc8fb1d80aa6296e15f306d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/0a1d0d3950f7f047dc8fb1d80aa6296e15f306d0", - "reference": "0a1d0d3950f7f047dc8fb1d80aa6296e15f306d0", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "time": "2015-01-27 01:56:40", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "PicoFeed": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Unlicense" - ], - "authors": [ - { - "name": "Frédéric Guillot", - "homepage": "http://fredericguillot.com" - } - ], - "description": "Modern library to write or read feeds (RSS/Atom)", - "homepage": "http://fguillot.github.io/picoFeed" - }, - { "name": "pear/net_url2", "version": "v2.1.1", "version_normalized": "2.1.1.0", @@ -150,5 +111,49 @@ "uri", "url" ] + }, + { + "name": "fguillot/picofeed", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/fguillot/picoFeed.git", + "reference": "6f0ac9238dcb0899c8322933e7f4598890ecf744" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/6f0ac9238dcb0899c8322933e7f4598890ecf744", + "reference": "6f0ac9238dcb0899c8322933e7f4598890ecf744", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-iconv": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "php": ">=5.3.0" + }, + "time": "2015-02-18 02:47:12", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "PicoFeed": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Unlicense" + ], + "authors": [ + { + "name": "Frédéric Guillot", + "homepage": "http://fredericguillot.com" + } + ], + "description": "Modern library to write or read feeds (RSS/Atom)", + "homepage": "http://fguillot.github.io/picoFeed" } ] |