diff --git a/.gitignore b/.gitignore index 58c6220..0bc7cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vendor/ -/node_modules/ \ No newline at end of file +/src/vendor/ +/node_modules/ diff --git a/composer.json b/composer.json index 67c00a0..4d91cf8 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "squizlabs/php_codesniffer": "^3.5", "wp-coding-standards/wpcs": "^2.2", "wp-phpunit/wp-phpunit": "^5.8", - "yoast/phpunit-polyfills": "^1.0" + "yoast/phpunit-polyfills": "^1.0", + "humbug/php-scoper": "^0.17.5" }, "require": { "composer/installers": "~1.0" @@ -25,7 +26,11 @@ "scripts": { "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source", "lint": "phpcs --standard=phpcs.xml.dist", - "test": "phpunit -c phpunit.xml.dist --verbose" + "test": "phpunit -c phpunit.xml.dist --verbose", + "scope": [ + "@php ./vendor/bin/php-scoper add-prefix -d src/vendor -o ../vendor_prefixed -c ../../scoper.inc.php --force", + "composer dump-autoload --working-dir src/vendor_prefixed --classmap-authoritative" + ] }, "config": { "allow-plugins": { diff --git a/composer.lock b/composer.lock index 4d21ee2..9c21cec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "743c2c08966238c02c6cce866fdd5d40", + "content-hash": "04754b8ed0b2ddcc6594e257e485e70b", "packages": [ { "name": "composer/installers", @@ -159,6 +159,79 @@ } ], "packages-dev": [ + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.5", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-17T14:14:24+00:00" + }, { "name": "dealerdirect/phpcodesniffer-composer-installer", "version": "v0.7.2", @@ -304,6 +377,219 @@ ], "time": "2022-12-30T00:15:36+00:00" }, + { + "name": "fidry/console", + "version": "0.5.5", + "source": { + "type": "git", + "url": "https://github.com/theofidry/console.git", + "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/console/zipball/bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7", + "reference": "bc1fe03f600c63f12ec0a39c6b746c1a1fb77bf7", + "shasum": "" + }, + "require": { + "php": "^7.4.0 || ^8.0.0", + "symfony/console": "^4.4 || ^5.4 || ^6.1", + "symfony/event-dispatcher-contracts": "^1.0 || ^2.5 || ^3.0", + "symfony/service-contracts": "^1.0 || ^2.5 || ^3.0", + "thecodingmachine/safe": "^1.3 || ^2.0", + "webmozart/assert": "^1.11" + }, + "conflict": { + "symfony/dependency-injection": "<5.3.0", + "symfony/framework-bundle": "<5.3.0", + "symfony/http-kernel": "<5.3.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4", + "composer/semver": "^3.3", + "ergebnis/composer-normalize": "^2.28", + "infection/infection": "^0.26", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4.3", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.1", + "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.1", + "symfony/http-kernel": "^4.4 || ^5.4 || ^6.1", + "symfony/phpunit-bridge": "^4.4.47 || ^5.4 || ^6.0", + "symfony/yaml": "^4.4 || ^5.4 || ^6.1", + "webmozarts/strict-phpunit": "^7.3" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false, + "forward-command": false + }, + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Fidry\\Console\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Library to create CLI applications", + "keywords": [ + "cli", + "console", + "symfony" + ], + "support": { + "issues": "https://github.com/theofidry/console/issues", + "source": "https://github.com/theofidry/console/tree/0.5.5" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2022-12-18T10:49:34+00:00" + }, + { + "name": "humbug/php-scoper", + "version": "0.17.5", + "source": { + "type": "git", + "url": "https://github.com/humbug/php-scoper.git", + "reference": "f67ae1e5360259911d6c4be871e4aeb4e6661541" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/humbug/php-scoper/zipball/f67ae1e5360259911d6c4be871e4aeb4e6661541", + "reference": "f67ae1e5360259911d6c4be871e4aeb4e6661541", + "shasum": "" + }, + "require": { + "composer/package-versions-deprecated": "^1.8", + "fidry/console": "^0.5.0", + "jetbrains/phpstorm-stubs": "^v2022.1", + "nikic/php-parser": "^4.12", + "php": "^7.4 || ^8.0", + "symfony/console": "^5.2 || ^6.0", + "symfony/filesystem": "^5.2 || ^6.0", + "symfony/finder": "^5.2 || ^6.0", + "symfony/polyfill-php80": "^1.23", + "symfony/polyfill-php81": "^1.24", + "thecodingmachine/safe": "^1.3 || ^2.0" + }, + "replace": { + "symfony/polyfill-php73": "*" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.1", + "humbug/box": "^3.16.0 || ^4.0", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0" + }, + "bin": [ + "bin/php-scoper" + ], + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": false + }, + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Humbug\\PhpScoper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + }, + { + "name": "Théo Fidry", + "email": "theo.fidry@gmail.com" + }, + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com" + } + ], + "description": "Prefixes all PHP namespaces in a file or directory.", + "support": { + "issues": "https://github.com/humbug/php-scoper/issues", + "source": "https://github.com/humbug/php-scoper/tree/0.17.5" + }, + "time": "2022-06-26T22:25:11+00:00" + }, + { + "name": "jetbrains/phpstorm-stubs", + "version": "v2022.3", + "source": { + "type": "git", + "url": "https://github.com/JetBrains/phpstorm-stubs.git", + "reference": "6b568c153cea002dc6fad96285c3063d07cab18d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/6b568c153cea002dc6fad96285c3063d07cab18d", + "reference": "6b568c153cea002dc6fad96285c3063d07cab18d", + "shasum": "" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "@stable", + "nikic/php-parser": "@stable", + "php": "^8.0", + "phpdocumentor/reflection-docblock": "@stable", + "phpunit/phpunit": "@stable" + }, + "type": "library", + "autoload": { + "files": [ + "PhpStormStubsMap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "PHP runtime & extensions header files for PhpStorm", + "homepage": "https://www.jetbrains.com/phpstorm", + "keywords": [ + "autocomplete", + "code", + "inference", + "inspection", + "jetbrains", + "phpstorm", + "stubs", + "type" + ], + "support": { + "source": "https://github.com/JetBrains/phpstorm-stubs/tree/v2022.3" + }, + "time": "2022-10-17T09:21:37+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -363,6 +649,62 @@ ], "time": "2023-03-08T13:26:56+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.17.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + }, + "time": "2023-08-13T19:53:39+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -931,93 +1273,191 @@ "time": "2023-02-27T13:04:50+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "psr/container", + "version": "1.1.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" + "php": ">=7.4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Psr\\Container\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { - "name": "sebastian/comparator", - "version": "3.0.5", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" + "php": ">=7.2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] - }, + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" + }, + { + "name": "sebastian/comparator", + "version": "3.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -1717,54 +2157,1284 @@ "time": "2023-02-22T23:07:41+00:00" }, { - "name": "theseer/tokenizer", - "version": "1.2.1", + "name": "symfony/console", + "version": "v5.4.26", "source": { "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "url": "https://github.com/symfony/console.git", + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/symfony/console/zipball/b504a3d266ad2bb632f196c0936ef2af5ff6e273", + "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" + }, + "conflict": { + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" + }, + "require-dev": { + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/symfony/console/tree/v5.4.26" }, "funding": [ { - "url": "https://github.com/theseer", + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-07-19T20:11:33+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" + }, + "suggest": { + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v5.4.25", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-31T13:04:02+00:00" + }, + { + "name": "symfony/finder", + "version": "v5.4.27", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v5.4.27" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-07-31T08:02:31+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-30T19:17:29+00:00" + }, + { + "name": "symfony/string", + "version": "v5.4.26", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "1181fe9270e373537475e826873b5867b863883c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", + "reference": "1181fe9270e373537475e826873b5867b863883c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.4.26" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-06-28T12:46:07+00:00" + }, + { + "name": "thecodingmachine/safe", + "version": "v1.3.3", + "source": { + "type": "git", + "url": "https://github.com/thecodingmachine/safe.git", + "reference": "a8ab0876305a4cdaef31b2350fcb9811b5608dbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/a8ab0876305a4cdaef31b2350fcb9811b5608dbc", + "reference": "a8ab0876305a4cdaef31b2350fcb9811b5608dbc", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "require-dev": { + "phpstan/phpstan": "^0.12", + "squizlabs/php_codesniffer": "^3.2", + "thecodingmachine/phpstan-strict-rules": "^0.12" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "files": [ + "deprecated/apc.php", + "deprecated/libevent.php", + "deprecated/mssql.php", + "deprecated/stats.php", + "lib/special_cases.php", + "generated/apache.php", + "generated/apcu.php", + "generated/array.php", + "generated/bzip2.php", + "generated/calendar.php", + "generated/classobj.php", + "generated/com.php", + "generated/cubrid.php", + "generated/curl.php", + "generated/datetime.php", + "generated/dir.php", + "generated/eio.php", + "generated/errorfunc.php", + "generated/exec.php", + "generated/fileinfo.php", + "generated/filesystem.php", + "generated/filter.php", + "generated/fpm.php", + "generated/ftp.php", + "generated/funchand.php", + "generated/gmp.php", + "generated/gnupg.php", + "generated/hash.php", + "generated/ibase.php", + "generated/ibmDb2.php", + "generated/iconv.php", + "generated/image.php", + "generated/imap.php", + "generated/info.php", + "generated/ingres-ii.php", + "generated/inotify.php", + "generated/json.php", + "generated/ldap.php", + "generated/libxml.php", + "generated/lzf.php", + "generated/mailparse.php", + "generated/mbstring.php", + "generated/misc.php", + "generated/msql.php", + "generated/mysql.php", + "generated/mysqli.php", + "generated/mysqlndMs.php", + "generated/mysqlndQc.php", + "generated/network.php", + "generated/oci8.php", + "generated/opcache.php", + "generated/openssl.php", + "generated/outcontrol.php", + "generated/password.php", + "generated/pcntl.php", + "generated/pcre.php", + "generated/pdf.php", + "generated/pgsql.php", + "generated/posix.php", + "generated/ps.php", + "generated/pspell.php", + "generated/readline.php", + "generated/rpminfo.php", + "generated/rrd.php", + "generated/sem.php", + "generated/session.php", + "generated/shmop.php", + "generated/simplexml.php", + "generated/sockets.php", + "generated/sodium.php", + "generated/solr.php", + "generated/spl.php", + "generated/sqlsrv.php", + "generated/ssdeep.php", + "generated/ssh2.php", + "generated/stream.php", + "generated/strings.php", + "generated/swoole.php", + "generated/uodbc.php", + "generated/uopz.php", + "generated/url.php", + "generated/var.php", + "generated/xdiff.php", + "generated/xml.php", + "generated/xmlrpc.php", + "generated/yaml.php", + "generated/yaz.php", + "generated/zip.php", + "generated/zlib.php" + ], + "psr-4": { + "Safe\\": [ + "lib/", + "deprecated/", + "generated/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP core functions that throw exceptions instead of returning FALSE on error", + "support": { + "issues": "https://github.com/thecodingmachine/safe/issues", + "source": "https://github.com/thecodingmachine/safe/tree/v1.3.3" + }, + "time": "2020-10-28T17:51:34+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2021-07-28T10:34:58+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "php": "^7.2 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<4.6.1 || 4.6.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.11.0" + }, + "time": "2022-06-03T18:03:27+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -1933,5 +3603,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/scoper.inc.php b/scoper.inc.php new file mode 100644 index 0000000..c17d5ba --- /dev/null +++ b/scoper.inc.php @@ -0,0 +1,102 @@ + 'WpToTwitter_Vendor', + + // By default when running php-scoper add-prefix, it will prefix all relevant code found in the current working + // directory. You can however define which files should be scoped by defining a collection of Finders in the + // following configuration key. + // + // This configuration entry is completely ignored when using Box. + // + // For more see: https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#finders-and-paths + 'finders' => [ + Finder::create() + ->files() + ->ignoreVCS(true) + ->notName('/LICENSE|.*\\.md|.*\\.dist|Makefile|composer\\.json|composer\\.lock/') + ->exclude([ + 'doc', + 'test', + 'test_old', + 'tests', + 'Tests', + 'vendor-bin', + ]) + ->in(__DIR__ . '/src/vendor'), + Finder::create()->append([ + '../composer.json', + ]), + ], + + // List of excluded files, i.e. files for which the content will be left untouched. + // Paths are relative to the configuration file unless if they are already absolute + // + // For more see: https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#patchers + 'exclude-files' => [ + ], + + // When scoping PHP files, there will be scenarios where some of the code being scoped indirectly references the + // original namespace. These will include, for example, strings or string manipulations. PHP-Scoper has limited + // support for prefixing such strings. To circumvent that, you can define patchers to manipulate the file to your + // heart contents. + // + // For more see: https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#patchers + 'patchers' => [ + static function (string $filePath, string $prefix, string $contents): string { + // Change the contents here. + + return $contents; + }, + ], + + // List of symbols to consider internal i.e. to leave untouched. + // + // For more information see: https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#excluded-symbols + 'exclude-namespaces' => [ + // 'Acme\Foo' // The Acme\Foo namespace (and sub-namespaces) + // '~^PHPUnit\\\\Framework$~', // The whole namespace PHPUnit\Framework (but not sub-namespaces) + // '~^$~', // The root namespace only + // '', // Any namespace + ], + 'exclude-classes' => [ + // 'ReflectionClassConstant', + ], + 'exclude-functions' => [ + // 'mb_str_split', + ], + 'exclude-constants' => [ + // 'STDIN', + ], + + // List of symbols to expose. + // + // For more information see: https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#exposed-symbols + 'expose-global-constants' => true, + 'expose-global-classes' => true, + 'expose-global-functions' => true, + 'expose-namespaces' => [ + // 'Acme\Foo' // The Acme\Foo namespace (and sub-namespaces) + // '~^PHPUnit\\\\Framework$~', // The whole namespace PHPUnit\Framework (but not sub-namespaces) + // '~^$~', // The root namespace only + // '', // Any namespace + ], + 'expose-classes' => [], + 'expose-functions' => [], + 'expose-constants' => [], +]; diff --git a/src/composer.json b/src/composer.json index 5bcaa6a..4a2029a 100644 --- a/src/composer.json +++ b/src/composer.json @@ -1,6 +1,12 @@ { "require": { - "noweh/twitter-api-v2-php": "^3.2", - "symfony/deprecation-contracts": "2.5.2" + "php": ">=7.4", + "noweh/twitter-api-v2-php": "^3.2" + }, + "config": { + "process-timeout": 1800, + "platform": { + "php": "7.4.30" + } } } diff --git a/src/composer.lock b/src/composer.lock index 1c4dc83..7834058 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6779440adefcd3cfdc69c7f6749da170", + "content-hash": "2983230359cd4862d17c9de8f4b577e1", "packages": [ { "name": "guzzlehttp/guzzle", @@ -727,7 +727,12 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=7.4" + }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "platform-overrides": { + "php": "7.4.30" + }, + "plugin-api-version": "2.3.0" } diff --git a/src/vendor/autoload.php b/src/vendor/autoload.php deleted file mode 100644 index e7d7d77..0000000 --- a/src/vendor/autoload.php +++ /dev/null @@ -1,7 +0,0 @@ - $vendorDir . '/composer/InstalledVersions.php', -); diff --git a/src/vendor/composer/autoload_psr4.php b/src/vendor/composer/autoload_psr4.php deleted file mode 100644 index 101ebbf..0000000 --- a/src/vendor/composer/autoload_psr4.php +++ /dev/null @@ -1,16 +0,0 @@ - array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'), - 'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'), - 'Noweh\\TwitterApi\\' => array($vendorDir . '/noweh/twitter-api-v2-php/src'), - 'GuzzleHttp\\Subscriber\\Oauth\\' => array($vendorDir . '/guzzlehttp/oauth-subscriber/src'), - 'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'), - 'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'), - 'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'), -); diff --git a/src/vendor/composer/autoload_real.php b/src/vendor/composer/autoload_real.php deleted file mode 100644 index 84553d3..0000000 --- a/src/vendor/composer/autoload_real.php +++ /dev/null @@ -1,80 +0,0 @@ -= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); - if ($useStaticLoader) { - require __DIR__ . '/autoload_static.php'; - - call_user_func(\Composer\Autoload\ComposerStaticInitada8147b337c3386b075d402be387a18::getInitializer($loader)); - } else { - $map = require __DIR__ . '/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - } - - $loader->register(true); - - if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitada8147b337c3386b075d402be387a18::$files; - } else { - $includeFiles = require __DIR__ . '/autoload_files.php'; - } - foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireada8147b337c3386b075d402be387a18($fileIdentifier, $file); - } - - return $loader; - } -} - -/** - * @param string $fileIdentifier - * @param string $file - * @return void - */ -function composerRequireada8147b337c3386b075d402be387a18($fileIdentifier, $file) -{ - if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; - - require $file; - } -} diff --git a/src/vendor/composer/autoload_static.php b/src/vendor/composer/autoload_static.php deleted file mode 100644 index 3ac5b23..0000000 --- a/src/vendor/composer/autoload_static.php +++ /dev/null @@ -1,79 +0,0 @@ - __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', - '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', - '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', - ); - - public static $prefixLengthsPsr4 = array ( - 'P' => - array ( - 'Psr\\Http\\Message\\' => 17, - 'Psr\\Http\\Client\\' => 16, - ), - 'N' => - array ( - 'Noweh\\TwitterApi\\' => 17, - ), - 'G' => - array ( - 'GuzzleHttp\\Subscriber\\Oauth\\' => 28, - 'GuzzleHttp\\Psr7\\' => 16, - 'GuzzleHttp\\Promise\\' => 19, - 'GuzzleHttp\\' => 11, - ), - ); - - public static $prefixDirsPsr4 = array ( - 'Psr\\Http\\Message\\' => - array ( - 0 => __DIR__ . '/..' . '/psr/http-factory/src', - 1 => __DIR__ . '/..' . '/psr/http-message/src', - ), - 'Psr\\Http\\Client\\' => - array ( - 0 => __DIR__ . '/..' . '/psr/http-client/src', - ), - 'Noweh\\TwitterApi\\' => - array ( - 0 => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src', - ), - 'GuzzleHttp\\Subscriber\\Oauth\\' => - array ( - 0 => __DIR__ . '/..' . '/guzzlehttp/oauth-subscriber/src', - ), - 'GuzzleHttp\\Psr7\\' => - array ( - 0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src', - ), - 'GuzzleHttp\\Promise\\' => - array ( - 0 => __DIR__ . '/..' . '/guzzlehttp/promises/src', - ), - 'GuzzleHttp\\' => - array ( - 0 => __DIR__ . '/..' . '/guzzlehttp/guzzle/src', - ), - ); - - public static $classMap = array ( - 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', - ); - - public static function getInitializer(ClassLoader $loader) - { - return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitada8147b337c3386b075d402be387a18::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitada8147b337c3386b075d402be387a18::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitada8147b337c3386b075d402be387a18::$classMap; - - }, null, ClassLoader::class); - } -} diff --git a/src/vendor/composer/installed.php b/src/vendor/composer/installed.php deleted file mode 100644 index 4742812..0000000 --- a/src/vendor/composer/installed.php +++ /dev/null @@ -1,131 +0,0 @@ - array( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'type' => 'library', - 'install_path' => __DIR__ . '/../../', - 'aliases' => array(), - 'reference' => '66091ab8f31985d8cd53d455206981c38effc2f4', - 'name' => '__root__', - 'dev' => true, - ), - 'versions' => array( - '__root__' => array( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'type' => 'library', - 'install_path' => __DIR__ . '/../../', - 'aliases' => array(), - 'reference' => '66091ab8f31985d8cd53d455206981c38effc2f4', - 'dev_requirement' => false, - ), - 'guzzlehttp/guzzle' => array( - 'pretty_version' => '7.7.0', - 'version' => '7.7.0.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../guzzlehttp/guzzle', - 'aliases' => array(), - 'reference' => 'fb7566caccf22d74d1ab270de3551f72a58399f5', - 'dev_requirement' => false, - ), - 'guzzlehttp/oauth-subscriber' => array( - 'pretty_version' => '0.6.0', - 'version' => '0.6.0.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../guzzlehttp/oauth-subscriber', - 'aliases' => array(), - 'reference' => '8d6cab29f8397e5712d00a383eeead36108a3c1f', - 'dev_requirement' => false, - ), - 'guzzlehttp/promises' => array( - 'pretty_version' => '2.0.1', - 'version' => '2.0.1.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../guzzlehttp/promises', - 'aliases' => array(), - 'reference' => '111166291a0f8130081195ac4556a5587d7f1b5d', - 'dev_requirement' => false, - ), - 'guzzlehttp/psr7' => array( - 'pretty_version' => '2.6.0', - 'version' => '2.6.0.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../guzzlehttp/psr7', - 'aliases' => array(), - 'reference' => '8bd7c33a0734ae1c5d074360512beb716bef3f77', - 'dev_requirement' => false, - ), - 'noweh/twitter-api-v2-php' => array( - 'pretty_version' => '3.4.0', - 'version' => '3.4.0.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../noweh/twitter-api-v2-php', - 'aliases' => array(), - 'reference' => '0831051dbfae16e6083180c69ad42673e9139d21', - 'dev_requirement' => false, - ), - 'psr/http-client' => array( - 'pretty_version' => '1.0.2', - 'version' => '1.0.2.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../psr/http-client', - 'aliases' => array(), - 'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31', - 'dev_requirement' => false, - ), - 'psr/http-client-implementation' => array( - 'dev_requirement' => false, - 'provided' => array( - 0 => '1.0', - ), - ), - 'psr/http-factory' => array( - 'pretty_version' => '1.0.2', - 'version' => '1.0.2.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../psr/http-factory', - 'aliases' => array(), - 'reference' => 'e616d01114759c4c489f93b099585439f795fe35', - 'dev_requirement' => false, - ), - 'psr/http-factory-implementation' => array( - 'dev_requirement' => false, - 'provided' => array( - 0 => '1.0', - ), - ), - 'psr/http-message' => array( - 'pretty_version' => '2.0', - 'version' => '2.0.0.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../psr/http-message', - 'aliases' => array(), - 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71', - 'dev_requirement' => false, - ), - 'psr/http-message-implementation' => array( - 'dev_requirement' => false, - 'provided' => array( - 0 => '1.0', - ), - ), - 'ralouphie/getallheaders' => array( - 'pretty_version' => '3.0.3', - 'version' => '3.0.3.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../ralouphie/getallheaders', - 'aliases' => array(), - 'reference' => '120b605dfeb996808c31b6477290a714d356e822', - 'dev_requirement' => false, - ), - 'symfony/deprecation-contracts' => array( - 'pretty_version' => 'v2.5.2', - 'version' => '2.5.2.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../symfony/deprecation-contracts', - 'aliases' => array(), - 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66', - 'dev_requirement' => false, - ), - ), -); diff --git a/src/vendor/guzzlehttp/guzzle/CHANGELOG.md b/src/vendor/guzzlehttp/guzzle/CHANGELOG.md deleted file mode 100644 index 1144eb7..0000000 --- a/src/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ /dev/null @@ -1,1609 +0,0 @@ -# Change Log - -Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version. - - -## 7.7.0 - 2023-05-21 - -### Added - -- Support `guzzlehttp/promises` v2 - - -## 7.6.1 - 2023-05-15 - -### Fixed - -- Fix `SetCookie::fromString` MaxAge deprecation warning and skip invalid MaxAge values - - -## 7.6.0 - 2023-05-14 - -### Added - -- Support for setting the minimum TLS version in a unified way -- Apply on request the version set in options parameters - - -## 7.5.2 - 2023-05-14 - -### Fixed - -- Fixed set cookie constructor validation -- Fixed handling of files with `'0'` body - -### Changed - -- Corrected docs and default connect timeout value to 300 seconds - - -## 7.5.1 - 2023-04-17 - -### Fixed - -- Fixed `NO_PROXY` settings so that setting the `proxy` option to `no` overrides the env variable - -### Changed - -- Adjusted `guzzlehttp/psr7` version constraint to `^1.9.1 || ^2.4.5` - - -## 7.5.0 - 2022-08-28 - -### Added - -- Support PHP 8.2 -- Add request to delay closure params - - -## 7.4.5 - 2022-06-20 - -### Fixed - -* Fix change in port should be considered a change in origin -* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin - - -## 7.4.4 - 2022-06-09 - -### Fixed - -* Fix failure to strip Authorization header on HTTP downgrade -* Fix failure to strip the Cookie header on change in host or HTTP downgrade - - -## 7.4.3 - 2022-05-25 - -### Fixed - -* Fix cross-domain cookie leakage - - -## 7.4.2 - 2022-03-20 - -### Fixed - -- Remove curl auth on cross-domain redirects to align with the Authorization HTTP header -- Reject non-HTTP schemes in StreamHandler -- Set a default ssl.peer_name context in StreamHandler to allow `force_ip_resolve` - - -## 7.4.1 - 2021-12-06 - -### Changed - -- Replaced implicit URI to string coercion [#2946](https://github.com/guzzle/guzzle/pull/2946) -- Allow `symfony/deprecation-contracts` version 3 [#2961](https://github.com/guzzle/guzzle/pull/2961) - -### Fixed - -- Only close curl handle if it's done [#2950](https://github.com/guzzle/guzzle/pull/2950) - - -## 7.4.0 - 2021-10-18 - -### Added - -- Support PHP 8.1 [#2929](https://github.com/guzzle/guzzle/pull/2929), [#2939](https://github.com/guzzle/guzzle/pull/2939) -- Support `psr/log` version 2 and 3 [#2943](https://github.com/guzzle/guzzle/pull/2943) - -### Fixed - -- Make sure we always call `restore_error_handler()` [#2915](https://github.com/guzzle/guzzle/pull/2915) -- Fix progress parameter type compatibility between the cURL and stream handlers [#2936](https://github.com/guzzle/guzzle/pull/2936) -- Throw `InvalidArgumentException` when an incorrect `headers` array is provided [#2916](https://github.com/guzzle/guzzle/pull/2916), [#2942](https://github.com/guzzle/guzzle/pull/2942) - -### Changed - -- Be more strict with types [#2914](https://github.com/guzzle/guzzle/pull/2914), [#2917](https://github.com/guzzle/guzzle/pull/2917), [#2919](https://github.com/guzzle/guzzle/pull/2919), [#2945](https://github.com/guzzle/guzzle/pull/2945) - - -## 7.3.0 - 2021-03-23 - -### Added - -- Support for DER and P12 certificates [#2413](https://github.com/guzzle/guzzle/pull/2413) -- Support the cURL (http://) scheme for StreamHandler proxies [#2850](https://github.com/guzzle/guzzle/pull/2850) -- Support for `guzzlehttp/psr7:^2.0` [#2878](https://github.com/guzzle/guzzle/pull/2878) - -### Fixed - -- Handle exceptions on invalid header consistently between PHP versions and handlers [#2872](https://github.com/guzzle/guzzle/pull/2872) - - -## 7.2.0 - 2020-10-10 - -### Added - -- Support for PHP 8 [#2712](https://github.com/guzzle/guzzle/pull/2712), [#2715](https://github.com/guzzle/guzzle/pull/2715), [#2789](https://github.com/guzzle/guzzle/pull/2789) -- Support passing a body summarizer to the http errors middleware [#2795](https://github.com/guzzle/guzzle/pull/2795) - -### Fixed - -- Handle exceptions during response creation [#2591](https://github.com/guzzle/guzzle/pull/2591) -- Fix CURLOPT_ENCODING not to be overwritten [#2595](https://github.com/guzzle/guzzle/pull/2595) -- Make sure the Request always has a body object [#2804](https://github.com/guzzle/guzzle/pull/2804) - -### Changed - -- The `TooManyRedirectsException` has a response [#2660](https://github.com/guzzle/guzzle/pull/2660) -- Avoid "functions" from dependencies [#2712](https://github.com/guzzle/guzzle/pull/2712) - -### Deprecated - -- Using environment variable GUZZLE_CURL_SELECT_TIMEOUT [#2786](https://github.com/guzzle/guzzle/pull/2786) - - -## 7.1.1 - 2020-09-30 - -### Fixed - -- Incorrect EOF detection for response body streams on Windows. - -### Changed - -- We dont connect curl `sink` on HEAD requests. -- Removed some PHP 5 workarounds - - -## 7.1.0 - 2020-09-22 - -### Added - -- `GuzzleHttp\MessageFormatterInterface` - -### Fixed - -- Fixed issue that caused cookies with no value not to be stored. -- On redirects, we allow all safe methods like GET, HEAD and OPTIONS. -- Fixed logging on empty responses. -- Make sure MessageFormatter::format returns string - -### Deprecated - -- All functions in `GuzzleHttp` has been deprecated. Use static methods on `Utils` instead. -- `ClientInterface::getConfig()` -- `Client::getConfig()` -- `Client::__call()` -- `Utils::defaultCaBundle()` -- `CurlFactory::LOW_CURL_VERSION_NUMBER` - - -## 7.0.1 - 2020-06-27 - -* Fix multiply defined functions fatal error [#2699](https://github.com/guzzle/guzzle/pull/2699) - - -## 7.0.0 - 2020-06-27 - -No changes since 7.0.0-rc1. - - -## 7.0.0-rc1 - 2020-06-15 - -### Changed - -* Use error level for logging errors in Middleware [#2629](https://github.com/guzzle/guzzle/pull/2629) -* Disabled IDN support by default and require ext-intl to use it [#2675](https://github.com/guzzle/guzzle/pull/2675) - - -## 7.0.0-beta2 - 2020-05-25 - -### Added - -* Using `Utils` class instead of functions in the `GuzzleHttp` namespace. [#2546](https://github.com/guzzle/guzzle/pull/2546) -* `ClientInterface::MAJOR_VERSION` [#2583](https://github.com/guzzle/guzzle/pull/2583) - -### Changed - -* Avoid the `getenv` function when unsafe [#2531](https://github.com/guzzle/guzzle/pull/2531) -* Added real client methods [#2529](https://github.com/guzzle/guzzle/pull/2529) -* Avoid functions due to global install conflicts [#2546](https://github.com/guzzle/guzzle/pull/2546) -* Use Symfony intl-idn polyfill [#2550](https://github.com/guzzle/guzzle/pull/2550) -* Adding methods for HTTP verbs like `Client::get()`, `Client::head()`, `Client::patch()` etc [#2529](https://github.com/guzzle/guzzle/pull/2529) -* `ConnectException` extends `TransferException` [#2541](https://github.com/guzzle/guzzle/pull/2541) -* Updated the default User Agent to "GuzzleHttp/7" [#2654](https://github.com/guzzle/guzzle/pull/2654) - -### Fixed - -* Various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626) - -### Removed - -* Pool option `pool_size` [#2528](https://github.com/guzzle/guzzle/pull/2528) - - -## 7.0.0-beta1 - 2019-12-30 - -The diff might look very big but 95% of Guzzle users will be able to upgrade without modification. -Please see [the upgrade document](UPGRADING.md) that describes all BC breaking changes. - -### Added - -* Implement PSR-18 and dropped PHP 5 support [#2421](https://github.com/guzzle/guzzle/pull/2421) [#2474](https://github.com/guzzle/guzzle/pull/2474) -* PHP 7 types [#2442](https://github.com/guzzle/guzzle/pull/2442) [#2449](https://github.com/guzzle/guzzle/pull/2449) [#2466](https://github.com/guzzle/guzzle/pull/2466) [#2497](https://github.com/guzzle/guzzle/pull/2497) [#2499](https://github.com/guzzle/guzzle/pull/2499) -* IDN support for redirects [2424](https://github.com/guzzle/guzzle/pull/2424) - -### Changed - -* Dont allow passing null as third argument to `BadResponseException::__construct()` [#2427](https://github.com/guzzle/guzzle/pull/2427) -* Use SAPI constant instead of method call [#2450](https://github.com/guzzle/guzzle/pull/2450) -* Use native function invocation [#2444](https://github.com/guzzle/guzzle/pull/2444) -* Better defaults for PHP installations with old ICU lib [2454](https://github.com/guzzle/guzzle/pull/2454) -* Added visibility to all constants [#2462](https://github.com/guzzle/guzzle/pull/2462) -* Dont allow passing `null` as URI to `Client::request()` and `Client::requestAsync()` [#2461](https://github.com/guzzle/guzzle/pull/2461) -* Widen the exception argument to throwable [#2495](https://github.com/guzzle/guzzle/pull/2495) - -### Fixed - -* Logging when Promise rejected with a string [#2311](https://github.com/guzzle/guzzle/pull/2311) - -### Removed - -* Class `SeekException` [#2162](https://github.com/guzzle/guzzle/pull/2162) -* `RequestException::getResponseBodySummary()` [#2425](https://github.com/guzzle/guzzle/pull/2425) -* `CookieJar::getCookieValue()` [#2433](https://github.com/guzzle/guzzle/pull/2433) -* `uri_template()` and `UriTemplate` [#2440](https://github.com/guzzle/guzzle/pull/2440) -* Request options `save_to` and `exceptions` [#2464](https://github.com/guzzle/guzzle/pull/2464) - - -## 6.5.2 - 2019-12-23 - -* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489) - - -## 6.5.1 - 2019-12-21 - -* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454) -* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424) - - -## 6.5.0 - 2019-12-07 - -* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143) -* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287) -* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132) -* Fix: `RetryMiddleware` did not do exponential delay between retires due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132) -* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348) -* Deprecated `ClientInterface::VERSION` - - -## 6.4.1 - 2019-10-23 - -* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that -* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar` - - -## 6.4.0 - 2019-10-23 - -* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108) -* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081) -* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161) -* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163) -* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242) -* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284) -* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273) -* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335) -* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362) - - -## 6.3.3 - 2018-04-22 - -* Fix: Default headers when decode_content is specified - - -## 6.3.2 - 2018-03-26 - -* Fix: Release process - - -## 6.3.1 - 2018-03-26 - -* Bug fix: Parsing 0 epoch expiry times in cookies [#2014](https://github.com/guzzle/guzzle/pull/2014) -* Improvement: Better ConnectException detection [#2012](https://github.com/guzzle/guzzle/pull/2012) -* Bug fix: Malformed domain that contains a "/" [#1999](https://github.com/guzzle/guzzle/pull/1999) -* Bug fix: Undefined offset when a cookie has no first key-value pair [#1998](https://github.com/guzzle/guzzle/pull/1998) -* Improvement: Support PHPUnit 6 [#1953](https://github.com/guzzle/guzzle/pull/1953) -* Bug fix: Support empty headers [#1915](https://github.com/guzzle/guzzle/pull/1915) -* Bug fix: Ignore case during header modifications [#1916](https://github.com/guzzle/guzzle/pull/1916) - -+ Minor code cleanups, documentation fixes and clarifications. - - -## 6.3.0 - 2017-06-22 - -* Feature: force IP resolution (ipv4 or ipv6) [#1608](https://github.com/guzzle/guzzle/pull/1608), [#1659](https://github.com/guzzle/guzzle/pull/1659) -* Improvement: Don't include summary in exception message when body is empty [#1621](https://github.com/guzzle/guzzle/pull/1621) -* Improvement: Handle `on_headers` option in MockHandler [#1580](https://github.com/guzzle/guzzle/pull/1580) -* Improvement: Added SUSE Linux CA path [#1609](https://github.com/guzzle/guzzle/issues/1609) -* Improvement: Use class reference for getting the name of the class instead of using hardcoded strings [#1641](https://github.com/guzzle/guzzle/pull/1641) -* Feature: Added `read_timeout` option [#1611](https://github.com/guzzle/guzzle/pull/1611) -* Bug fix: PHP 7.x fixes [#1685](https://github.com/guzzle/guzzle/pull/1685), [#1686](https://github.com/guzzle/guzzle/pull/1686), [#1811](https://github.com/guzzle/guzzle/pull/1811) -* Deprecation: BadResponseException instantiation without a response [#1642](https://github.com/guzzle/guzzle/pull/1642) -* Feature: Added NTLM auth [#1569](https://github.com/guzzle/guzzle/pull/1569) -* Feature: Track redirect HTTP status codes [#1711](https://github.com/guzzle/guzzle/pull/1711) -* Improvement: Check handler type during construction [#1745](https://github.com/guzzle/guzzle/pull/1745) -* Improvement: Always include the Content-Length if there's a body [#1721](https://github.com/guzzle/guzzle/pull/1721) -* Feature: Added convenience method to access a cookie by name [#1318](https://github.com/guzzle/guzzle/pull/1318) -* Bug fix: Fill `CURLOPT_CAPATH` and `CURLOPT_CAINFO` properly [#1684](https://github.com/guzzle/guzzle/pull/1684) -* Improvement: Use `\GuzzleHttp\Promise\rejection_for` function instead of object init [#1827](https://github.com/guzzle/guzzle/pull/1827) - -+ Minor code cleanups, documentation fixes and clarifications. - - -## 6.2.3 - 2017-02-28 - -* Fix deprecations with guzzle/psr7 version 1.4 - - -## 6.2.2 - 2016-10-08 - -* Allow to pass nullable Response to delay callable -* Only add scheme when host is present -* Fix drain case where content-length is the literal string zero -* Obfuscate in-URL credentials in exceptions - - -## 6.2.1 - 2016-07-18 - -* Address HTTP_PROXY security vulnerability, CVE-2016-5385: - https://httpoxy.org/ -* Fixing timeout bug with StreamHandler: - https://github.com/guzzle/guzzle/pull/1488 -* Only read up to `Content-Length` in PHP StreamHandler to avoid timeouts when - a server does not honor `Connection: close`. -* Ignore URI fragment when sending requests. - - -## 6.2.0 - 2016-03-21 - -* Feature: added `GuzzleHttp\json_encode` and `GuzzleHttp\json_decode`. - https://github.com/guzzle/guzzle/pull/1389 -* Bug fix: Fix sleep calculation when waiting for delayed requests. - https://github.com/guzzle/guzzle/pull/1324 -* Feature: More flexible history containers. - https://github.com/guzzle/guzzle/pull/1373 -* Bug fix: defer sink stream opening in StreamHandler. - https://github.com/guzzle/guzzle/pull/1377 -* Bug fix: do not attempt to escape cookie values. - https://github.com/guzzle/guzzle/pull/1406 -* Feature: report original content encoding and length on decoded responses. - https://github.com/guzzle/guzzle/pull/1409 -* Bug fix: rewind seekable request bodies before dispatching to cURL. - https://github.com/guzzle/guzzle/pull/1422 -* Bug fix: provide an empty string to `http_build_query` for HHVM workaround. - https://github.com/guzzle/guzzle/pull/1367 - - -## 6.1.1 - 2015-11-22 - -* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler - https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4 -* Feature: HandlerStack is now more generic. - https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e -* Bug fix: setting verify to false in the StreamHandler now disables peer - verification. https://github.com/guzzle/guzzle/issues/1256 -* Feature: Middleware now uses an exception factory, including more error - context. https://github.com/guzzle/guzzle/pull/1282 -* Feature: better support for disabled functions. - https://github.com/guzzle/guzzle/pull/1287 -* Bug fix: fixed regression where MockHandler was not using `sink`. - https://github.com/guzzle/guzzle/pull/1292 - - -## 6.1.0 - 2015-09-08 - -* Feature: Added the `on_stats` request option to provide access to transfer - statistics for requests. https://github.com/guzzle/guzzle/pull/1202 -* Feature: Added the ability to persist session cookies in CookieJars. - https://github.com/guzzle/guzzle/pull/1195 -* Feature: Some compatibility updates for Google APP Engine - https://github.com/guzzle/guzzle/pull/1216 -* Feature: Added support for NO_PROXY to prevent the use of a proxy based on - a simple set of rules. https://github.com/guzzle/guzzle/pull/1197 -* Feature: Cookies can now contain square brackets. - https://github.com/guzzle/guzzle/pull/1237 -* Bug fix: Now correctly parsing `=` inside of quotes in Cookies. - https://github.com/guzzle/guzzle/pull/1232 -* Bug fix: Cusotm cURL options now correctly override curl options of the - same name. https://github.com/guzzle/guzzle/pull/1221 -* Bug fix: Content-Type header is now added when using an explicitly provided - multipart body. https://github.com/guzzle/guzzle/pull/1218 -* Bug fix: Now ignoring Set-Cookie headers that have no name. -* Bug fix: Reason phrase is no longer cast to an int in some cases in the - cURL handler. https://github.com/guzzle/guzzle/pull/1187 -* Bug fix: Remove the Authorization header when redirecting if the Host - header changes. https://github.com/guzzle/guzzle/pull/1207 -* Bug fix: Cookie path matching fixes - https://github.com/guzzle/guzzle/issues/1129 -* Bug fix: Fixing the cURL `body_as_string` setting - https://github.com/guzzle/guzzle/pull/1201 -* Bug fix: quotes are no longer stripped when parsing cookies. - https://github.com/guzzle/guzzle/issues/1172 -* Bug fix: `form_params` and `query` now always uses the `&` separator. - https://github.com/guzzle/guzzle/pull/1163 -* Bug fix: Adding a Content-Length to PHP stream wrapper requests if not set. - https://github.com/guzzle/guzzle/pull/1189 - - -## 6.0.2 - 2015-07-04 - -* Fixed a memory leak in the curl handlers in which references to callbacks - were not being removed by `curl_reset`. -* Cookies are now extracted properly before redirects. -* Cookies now allow more character ranges. -* Decoded Content-Encoding responses are now modified to correctly reflect - their state if the encoding was automatically removed by a handler. This - means that the `Content-Encoding` header may be removed an the - `Content-Length` modified to reflect the message size after removing the - encoding. -* Added a more explicit error message when trying to use `form_params` and - `multipart` in the same request. -* Several fixes for HHVM support. -* Functions are now conditionally required using an additional level of - indirection to help with global Composer installations. - - -## 6.0.1 - 2015-05-27 - -* Fixed a bug with serializing the `query` request option where the `&` - separator was missing. -* Added a better error message for when `body` is provided as an array. Please - use `form_params` or `multipart` instead. -* Various doc fixes. - - -## 6.0.0 - 2015-05-26 - -* See the UPGRADING.md document for more information. -* Added `multipart` and `form_params` request options. -* Added `synchronous` request option. -* Added the `on_headers` request option. -* Fixed `expect` handling. -* No longer adding default middlewares in the client ctor. These need to be - present on the provided handler in order to work. -* Requests are no longer initiated when sending async requests with the - CurlMultiHandler. This prevents unexpected recursion from requests completing - while ticking the cURL loop. -* Removed the semantics of setting `default` to `true`. This is no longer - required now that the cURL loop is not ticked for async requests. -* Added request and response logging middleware. -* No longer allowing self signed certificates when using the StreamHandler. -* Ensuring that `sink` is valid if saving to a file. -* Request exceptions now include a "handler context" which provides handler - specific contextual information. -* Added `GuzzleHttp\RequestOptions` to allow request options to be applied - using constants. -* `$maxHandles` has been removed from CurlMultiHandler. -* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package. - - -## 5.3.0 - 2015-05-19 - -* Mock now supports `save_to` -* Marked `AbstractRequestEvent::getTransaction()` as public. -* Fixed a bug in which multiple headers using different casing would overwrite - previous headers in the associative array. -* Added `Utils::getDefaultHandler()` -* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated. -* URL scheme is now always lowercased. - - -## 6.0.0-beta.1 - -* Requires PHP >= 5.5 -* Updated to use PSR-7 - * Requires immutable messages, which basically means an event based system - owned by a request instance is no longer possible. - * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7). - * Removed the dependency on `guzzlehttp/streams`. These stream abstractions - are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7` - namespace. -* Added middleware and handler system - * Replaced the Guzzle event and subscriber system with a middleware system. - * No longer depends on RingPHP, but rather places the HTTP handlers directly - in Guzzle, operating on PSR-7 messages. - * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which - means the `guzzlehttp/retry-subscriber` is now obsolete. - * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`. -* Asynchronous responses - * No longer supports the `future` request option to send an async request. - Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`, - `getAsync`, etc.). - * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid - recursion required by chaining and forwarding react promises. See - https://github.com/guzzle/promises - * Added `requestAsync` and `sendAsync` to send request asynchronously. - * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests - asynchronously. -* Request options - * POST and form updates - * Added the `form_fields` and `form_files` request options. - * Removed the `GuzzleHttp\Post` namespace. - * The `body` request option no longer accepts an array for POST requests. - * The `exceptions` request option has been deprecated in favor of the - `http_errors` request options. - * The `save_to` request option has been deprecated in favor of `sink` request - option. -* Clients no longer accept an array of URI template string and variables for - URI variables. You will need to expand URI templates before passing them - into a client constructor or request method. -* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are - now magic methods that will send synchronous requests. -* Replaced `Utils.php` with plain functions in `functions.php`. -* Removed `GuzzleHttp\Collection`. -* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as - an array. -* Removed `GuzzleHttp\Query`. Query string handling is now handled using an - associative array passed into the `query` request option. The query string - is serialized using PHP's `http_build_query`. If you need more control, you - can pass the query string in as a string. -* `GuzzleHttp\QueryParser` has been replaced with the - `GuzzleHttp\Psr7\parse_query`. - - -## 5.2.0 - 2015-01-27 - -* Added `AppliesHeadersInterface` to make applying headers to a request based - on the body more generic and not specific to `PostBodyInterface`. -* Reduced the number of stack frames needed to send requests. -* Nested futures are now resolved in the client rather than the RequestFsm -* Finishing state transitions is now handled in the RequestFsm rather than the - RingBridge. -* Added a guard in the Pool class to not use recursion for request retries. - - -## 5.1.0 - 2014-12-19 - -* Pool class no longer uses recursion when a request is intercepted. -* The size of a Pool can now be dynamically adjusted using a callback. - See https://github.com/guzzle/guzzle/pull/943. -* Setting a request option to `null` when creating a request with a client will - ensure that the option is not set. This allows you to overwrite default - request options on a per-request basis. - See https://github.com/guzzle/guzzle/pull/937. -* Added the ability to limit which protocols are allowed for redirects by - specifying a `protocols` array in the `allow_redirects` request option. -* Nested futures due to retries are now resolved when waiting for synchronous - responses. See https://github.com/guzzle/guzzle/pull/947. -* `"0"` is now an allowed URI path. See - https://github.com/guzzle/guzzle/pull/935. -* `Query` no longer typehints on the `$query` argument in the constructor, - allowing for strings and arrays. -* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle - specific exceptions if necessary. - - -## 5.0.3 - 2014-11-03 - -This change updates query strings so that they are treated as un-encoded values -by default where the value represents an un-encoded value to send over the -wire. A Query object then encodes the value before sending over the wire. This -means that even value query string values (e.g., ":") are url encoded. This -makes the Query class match PHP's http_build_query function. However, if you -want to send requests over the wire using valid query string characters that do -not need to be encoded, then you can provide a string to Url::setQuery() and -pass true as the second argument to specify that the query string is a raw -string that should not be parsed or encoded (unless a call to getQuery() is -subsequently made, forcing the query-string to be converted into a Query -object). - - -## 5.0.2 - 2014-10-30 - -* Added a trailing `\r\n` to multipart/form-data payloads. See - https://github.com/guzzle/guzzle/pull/871 -* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs. -* Status codes are now returned as integers. See - https://github.com/guzzle/guzzle/issues/881 -* No longer overwriting an existing `application/x-www-form-urlencoded` header - when sending POST requests, allowing for customized headers. See - https://github.com/guzzle/guzzle/issues/877 -* Improved path URL serialization. - - * No longer double percent-encoding characters in the path or query string if - they are already encoded. - * Now properly encoding the supplied path to a URL object, instead of only - encoding ' ' and '?'. - * Note: This has been changed in 5.0.3 to now encode query string values by - default unless the `rawString` argument is provided when setting the query - string on a URL: Now allowing many more characters to be present in the - query string without being percent encoded. See https://tools.ietf.org/html/rfc3986#appendix-A - - -## 5.0.1 - 2014-10-16 - -Bugfix release. - -* Fixed an issue where connection errors still returned response object in - error and end events event though the response is unusable. This has been - corrected so that a response is not returned in the `getResponse` method of - these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867 -* Fixed an issue where transfer statistics were not being populated in the - RingBridge. https://github.com/guzzle/guzzle/issues/866 - - -## 5.0.0 - 2014-10-12 - -Adding support for non-blocking responses and some minor API cleanup. - -### New Features - -* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`. -* Added a public API for creating a default HTTP adapter. -* Updated the redirect plugin to be non-blocking so that redirects are sent - concurrently. Other plugins like this can now be updated to be non-blocking. -* Added a "progress" event so that you can get upload and download progress - events. -* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers - requests concurrently using a capped pool size as efficiently as possible. -* Added `hasListeners()` to EmitterInterface. -* Removed `GuzzleHttp\ClientInterface::sendAll` and marked - `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the - recommended way). - -### Breaking changes - -The breaking changes in this release are relatively minor. The biggest thing to -look out for is that request and response objects no longer implement fluent -interfaces. - -* Removed the fluent interfaces (i.e., `return $this`) from requests, - responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`, - `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and - `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of - why I did this: https://ocramius.github.io/blog/fluent-interfaces-are-evil/. - This also makes the Guzzle message interfaces compatible with the current - PSR-7 message proposal. -* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except - for the HTTP request functions from function.php, these functions are now - implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode` - moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to - `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to - `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be - `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php - caused problems for many users: they aren't PSR-4 compliant, require an - explicit include, and needed an if-guard to ensure that the functions are not - declared multiple times. -* Rewrote adapter layer. - * Removing all classes from `GuzzleHttp\Adapter`, these are now - implemented as callables that are stored in `GuzzleHttp\Ring\Client`. - * Removed the concept of "parallel adapters". Sending requests serially or - concurrently is now handled using a single adapter. - * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The - Transaction object now exposes the request, response, and client as public - properties. The getters and setters have been removed. -* Removed the "headers" event. This event was only useful for changing the - body a response once the headers of the response were known. You can implement - a similar behavior in a number of ways. One example might be to use a - FnStream that has access to the transaction being sent. For example, when the - first byte is written, you could check if the response headers match your - expectations, and if so, change the actual stream body that is being - written to. -* Removed the `asArray` parameter from - `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header - value as an array, then use the newly added `getHeaderAsArray()` method of - `MessageInterface`. This change makes the Guzzle interfaces compatible with - the PSR-7 interfaces. -* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add - custom request options using double-dispatch (this was an implementation - detail). Instead, you should now provide an associative array to the - constructor which is a mapping of the request option name mapping to a - function that applies the option value to a request. -* Removed the concept of "throwImmediately" from exceptions and error events. - This control mechanism was used to stop a transfer of concurrent requests - from completing. This can now be handled by throwing the exception or by - cancelling a pool of requests or each outstanding future request individually. -* Updated to "GuzzleHttp\Streams" 3.0. - * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a - `maxLen` parameter. This update makes the Guzzle streams project - compatible with the current PSR-7 proposal. - * `GuzzleHttp\Stream\Stream::__construct`, - `GuzzleHttp\Stream\Stream::factory`, and - `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second - argument. They now accept an associative array of options, including the - "size" key and "metadata" key which can be used to provide custom metadata. - - -## 4.2.2 - 2014-09-08 - -* Fixed a memory leak in the CurlAdapter when reusing cURL handles. -* No longer using `request_fulluri` in stream adapter proxies. -* Relative redirects are now based on the last response, not the first response. - -## 4.2.1 - 2014-08-19 - -* Ensuring that the StreamAdapter does not always add a Content-Type header -* Adding automated github releases with a phar and zip - -## 4.2.0 - 2014-08-17 - -* Now merging in default options using a case-insensitive comparison. - Closes https://github.com/guzzle/guzzle/issues/767 -* Added the ability to automatically decode `Content-Encoding` response bodies - using the `decode_content` request option. This is set to `true` by default - to decode the response body if it comes over the wire with a - `Content-Encoding`. Set this value to `false` to disable decoding the - response content, and pass a string to provide a request `Accept-Encoding` - header and turn on automatic response decoding. This feature now allows you - to pass an `Accept-Encoding` header in the headers of a request but still - disable automatic response decoding. - Closes https://github.com/guzzle/guzzle/issues/764 -* Added the ability to throw an exception immediately when transferring - requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760 -* Updating guzzlehttp/streams dependency to ~2.1 -* No longer utilizing the now deprecated namespaced methods from the stream - package. - -## 4.1.8 - 2014-08-14 - -* Fixed an issue in the CurlFactory that caused setting the `stream=false` - request option to throw an exception. - See: https://github.com/guzzle/guzzle/issues/769 -* TransactionIterator now calls rewind on the inner iterator. - See: https://github.com/guzzle/guzzle/pull/765 -* You can now set the `Content-Type` header to `multipart/form-data` - when creating POST requests to force multipart bodies. - See https://github.com/guzzle/guzzle/issues/768 - -## 4.1.7 - 2014-08-07 - -* Fixed an error in the HistoryPlugin that caused the same request and response - to be logged multiple times when an HTTP protocol error occurs. -* Ensuring that cURL does not add a default Content-Type when no Content-Type - has been supplied by the user. This prevents the adapter layer from modifying - the request that is sent over the wire after any listeners may have already - put the request in a desired state (e.g., signed the request). -* Throwing an exception when you attempt to send requests that have the - "stream" set to true in parallel using the MultiAdapter. -* Only calling curl_multi_select when there are active cURL handles. This was - previously changed and caused performance problems on some systems due to PHP - always selecting until the maximum select timeout. -* Fixed a bug where multipart/form-data POST fields were not correctly - aggregated (e.g., values with "&"). - -## 4.1.6 - 2014-08-03 - -* Added helper methods to make it easier to represent messages as strings, - including getting the start line and getting headers as a string. - -## 4.1.5 - 2014-08-02 - -* Automatically retrying cURL "Connection died, retrying a fresh connect" - errors when possible. -* cURL implementation cleanup -* Allowing multiple event subscriber listeners to be registered per event by - passing an array of arrays of listener configuration. - -## 4.1.4 - 2014-07-22 - -* Fixed a bug that caused multi-part POST requests with more than one field to - serialize incorrectly. -* Paths can now be set to "0" -* `ResponseInterface::xml` now accepts a `libxml_options` option and added a - missing default argument that was required when parsing XML response bodies. -* A `save_to` stream is now created lazily, which means that files are not - created on disk unless a request succeeds. - -## 4.1.3 - 2014-07-15 - -* Various fixes to multipart/form-data POST uploads -* Wrapping function.php in an if-statement to ensure Guzzle can be used - globally and in a Composer install -* Fixed an issue with generating and merging in events to an event array -* POST headers are only applied before sending a request to allow you to change - the query aggregator used before uploading -* Added much more robust query string parsing -* Fixed various parsing and normalization issues with URLs -* Fixing an issue where multi-valued headers were not being utilized correctly - in the StreamAdapter - -## 4.1.2 - 2014-06-18 - -* Added support for sending payloads with GET requests - -## 4.1.1 - 2014-06-08 - -* Fixed an issue related to using custom message factory options in subclasses -* Fixed an issue with nested form fields in a multi-part POST -* Fixed an issue with using the `json` request option for POST requests -* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar` - -## 4.1.0 - 2014-05-27 - -* Added a `json` request option to easily serialize JSON payloads. -* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON. -* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`. -* Added the ability to provide an emitter to a client in the client constructor. -* Added the ability to persist a cookie session using $_SESSION. -* Added a trait that can be used to add event listeners to an iterator. -* Removed request method constants from RequestInterface. -* Fixed warning when invalid request start-lines are received. -* Updated MessageFactory to work with custom request option methods. -* Updated cacert bundle to latest build. - -4.0.2 (2014-04-16) ------------------- - -* Proxy requests using the StreamAdapter now properly use request_fulluri (#632) -* Added the ability to set scalars as POST fields (#628) - -## 4.0.1 - 2014-04-04 - -* The HTTP status code of a response is now set as the exception code of - RequestException objects. -* 303 redirects will now correctly switch from POST to GET requests. -* The default parallel adapter of a client now correctly uses the MultiAdapter. -* HasDataTrait now initializes the internal data array as an empty array so - that the toArray() method always returns an array. - -## 4.0.0 - 2014-03-29 - -* For information on changes and upgrading, see: - https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40 -* Added `GuzzleHttp\batch()` as a convenience function for sending requests in - parallel without needing to write asynchronous code. -* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`. - You can now pass a callable or an array of associative arrays where each - associative array contains the "fn", "priority", and "once" keys. - -## 4.0.0.rc-2 - 2014-03-25 - -* Removed `getConfig()` and `setConfig()` from clients to avoid confusion - around whether things like base_url, message_factory, etc. should be able to - be retrieved or modified. -* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface -* functions.php functions were renamed using snake_case to match PHP idioms -* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and - `GUZZLE_CURL_SELECT_TIMEOUT` environment variables -* Added the ability to specify custom `sendAll()` event priorities -* Added the ability to specify custom stream context options to the stream - adapter. -* Added a functions.php function for `get_path()` and `set_path()` -* CurlAdapter and MultiAdapter now use a callable to generate curl resources -* MockAdapter now properly reads a body and emits a `headers` event -* Updated Url class to check if a scheme and host are set before adding ":" - and "//". This allows empty Url (e.g., "") to be serialized as "". -* Parsing invalid XML no longer emits warnings -* Curl classes now properly throw AdapterExceptions -* Various performance optimizations -* Streams are created with the faster `Stream\create()` function -* Marked deprecation_proxy() as internal -* Test server is now a collection of static methods on a class - -## 4.0.0-rc.1 - 2014-03-15 - -* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40 - -## 3.8.1 - 2014-01-28 - -* Bug: Always using GET requests when redirecting from a 303 response -* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in - `Guzzle\Http\ClientInterface::setSslVerification()` -* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL -* Bug: The body of a request can now be set to `"0"` -* Sending PHP stream requests no longer forces `HTTP/1.0` -* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of - each sub-exception -* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than - clobbering everything). -* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators) -* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`. - For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`. -* Now properly escaping the regular expression delimiter when matching Cookie domains. -* Network access is now disabled when loading XML documents - -## 3.8.0 - 2013-12-05 - -* Added the ability to define a POST name for a file -* JSON response parsing now properly walks additionalProperties -* cURL error code 18 is now retried automatically in the BackoffPlugin -* Fixed a cURL error when URLs contain fragments -* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were - CurlExceptions -* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e) -* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS` -* Fixed a bug that was encountered when parsing empty header parameters -* UriTemplate now has a `setRegex()` method to match the docs -* The `debug` request parameter now checks if it is truthy rather than if it exists -* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin -* Added the ability to combine URLs using strict RFC 3986 compliance -* Command objects can now return the validation errors encountered by the command -* Various fixes to cache revalidation (#437 and 29797e5) -* Various fixes to the AsyncPlugin -* Cleaned up build scripts - -## 3.7.4 - 2013-10-02 - -* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430) -* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp - (see https://github.com/aws/aws-sdk-php/issues/147) -* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots -* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420) -* Updated the bundled cacert.pem (#419) -* OauthPlugin now supports adding authentication to headers or query string (#425) - -## 3.7.3 - 2013-09-08 - -* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and - `CommandTransferException`. -* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description -* Schemas are only injected into response models when explicitly configured. -* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of - an EntityBody. -* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator. -* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`. -* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody() -* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin -* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests -* Bug fix: Properly parsing headers that contain commas contained in quotes -* Bug fix: mimetype guessing based on a filename is now case-insensitive - -## 3.7.2 - 2013-08-02 - -* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander - See https://github.com/guzzle/guzzle/issues/371 -* Bug fix: Cookie domains are now matched correctly according to RFC 6265 - See https://github.com/guzzle/guzzle/issues/377 -* Bug fix: GET parameters are now used when calculating an OAuth signature -* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted -* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched -* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input. - See https://github.com/guzzle/guzzle/issues/379 -* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See - https://github.com/guzzle/guzzle/pull/380 -* cURL multi cleanup and optimizations - -## 3.7.1 - 2013-07-05 - -* Bug fix: Setting default options on a client now works -* Bug fix: Setting options on HEAD requests now works. See #352 -* Bug fix: Moving stream factory before send event to before building the stream. See #353 -* Bug fix: Cookies no longer match on IP addresses per RFC 6265 -* Bug fix: Correctly parsing header parameters that are in `<>` and quotes -* Added `cert` and `ssl_key` as request options -* `Host` header can now diverge from the host part of a URL if the header is set manually -* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter -* OAuth parameters are only added via the plugin if they aren't already set -* Exceptions are now thrown when a URL cannot be parsed -* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails -* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin - -## 3.7.0 - 2013-06-10 - -* See UPGRADING.md for more information on how to upgrade. -* Requests now support the ability to specify an array of $options when creating a request to more easily modify a - request. You can pass a 'request.options' configuration setting to a client to apply default request options to - every request created by a client (e.g. default query string variables, headers, curl options, etc.). -* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`. - See `Guzzle\Http\StaticClient::mount`. -* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests - created by a command (e.g. custom headers, query string variables, timeout settings, etc.). -* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the - headers of a response -* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key - (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`) -* ServiceBuilders now support storing and retrieving arbitrary data -* CachePlugin can now purge all resources for a given URI -* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource -* CachePlugin now uses the Vary header to determine if a resource is a cache hit -* `Guzzle\Http\Message\Response` now implements `\Serializable` -* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters -* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable -* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()` -* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size -* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message -* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older - Symfony users can still use the old version of Monolog. -* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`. - Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`. -* Several performance improvements to `Guzzle\Common\Collection` -* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`: - createRequest, head, delete, put, patch, post, options, prepareRequest -* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()` -* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface` -* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to - `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a - resource, string, or EntityBody into the $options parameter to specify the download location of the response. -* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a - default `array()` -* Added `Guzzle\Stream\StreamInterface::isRepeatable` -* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use - $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or - $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`. -* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`. -* Removed `Guzzle\Http\ClientInterface::expandTemplate()` -* Removed `Guzzle\Http\ClientInterface::setRequestFactory()` -* Removed `Guzzle\Http\ClientInterface::getCurlMulti()` -* Removed `Guzzle\Http\Message\RequestInterface::canCache` -* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect` -* Removed `Guzzle\Http\Message\RequestInterface::isRedirect` -* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods. -* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting - `Guzzle\Common\Version::$emitWarnings` to true. -* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use - `$request->getResponseBody()->isRepeatable()` instead. -* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use - `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead. -* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use - `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead. -* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead. -* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead. -* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated -* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand. - These will work through Guzzle 4.0 -* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params]. -* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client. -* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`. -* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. -* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8. -* Marked `Guzzle\Common\Collection::inject()` as deprecated. -* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');` -* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a - CacheStorageInterface. These two objects and interface will be removed in a future version. -* Always setting X-cache headers on cached responses -* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin -* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface - $request, Response $response);` -* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);` -* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);` -* Added `CacheStorageInterface::purge($url)` -* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin - $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache, - CanCacheStrategyInterface $canCache = null)` -* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)` - -## 3.6.0 - 2013-05-29 - -* ServiceDescription now implements ToArrayInterface -* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters -* Guzzle can now correctly parse incomplete URLs -* Mixed casing of headers are now forced to be a single consistent casing across all values for that header. -* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution -* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader(). -* Specific header implementations can be created for complex headers. When a message creates a header, it uses a - HeaderFactory which can map specific headers to specific header classes. There is now a Link header and - CacheControl header implementation. -* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate -* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti() -* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in - Guzzle\Http\Curl\RequestMediator -* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string. -* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface -* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders() -* Removed Guzzle\Parser\ParserRegister::get(). Use getParser() -* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser(). -* All response header helper functions return a string rather than mixing Header objects and strings inconsistently -* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle - directly via interfaces -* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist - but are a no-op until removed. -* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a - `Guzzle\Service\Command\ArrayCommandInterface`. -* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response - on a request while the request is still being transferred -* The ability to case-insensitively search for header values -* Guzzle\Http\Message\Header::hasExactHeader -* Guzzle\Http\Message\Header::raw. Use getAll() -* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object - instead. -* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess -* Added the ability to cast Model objects to a string to view debug information. - -## 3.5.0 - 2013-05-13 - -* Bug: Fixed a regression so that request responses are parsed only once per oncomplete event rather than multiple times -* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove - itself from the EventDispatcher) -* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values -* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too -* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a - non-existent key -* Bug: All __call() method arguments are now required (helps with mocking frameworks) -* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference - to help with refcount based garbage collection of resources created by sending a request -* Deprecating ZF1 cache and log adapters. These will be removed in the next major version. -* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it's deprecated). Use the - HistoryPlugin for a history. -* Added a `responseBody` alias for the `response_body` location -* Refactored internals to no longer rely on Response::getRequest() -* HistoryPlugin can now be cast to a string -* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests - and responses that are sent over the wire -* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects - -## 3.4.3 - 2013-04-30 - -* Bug fix: Fixing bug introduced in 3.4.2 where redirect responses are duplicated on the final redirected response -* Added a check to re-extract the temp cacert bundle from the phar before sending each request - -## 3.4.2 - 2013-04-29 - -* Bug fix: Stream objects now work correctly with "a" and "a+" modes -* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present -* Bug fix: AsyncPlugin no longer forces HEAD requests -* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter -* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails -* Setting a response on a request will write to the custom request body from the response body if one is specified -* LogPlugin now writes to php://output when STDERR is undefined -* Added the ability to set multiple POST files for the same key in a single call -* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default -* Added the ability to queue CurlExceptions to the MockPlugin -* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send) -* Configuration loading now allows remote files - -## 3.4.1 - 2013-04-16 - -* Large refactoring to how CurlMulti handles work. There is now a proxy that sits in front of a pool of CurlMulti - handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost. -* Exceptions are now properly grouped when sending requests in parallel -* Redirects are now properly aggregated when a multi transaction fails -* Redirects now set the response on the original object even in the event of a failure -* Bug fix: Model names are now properly set even when using $refs -* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax -* Added support for oauth_callback in OAuth signatures -* Added support for oauth_verifier in OAuth signatures -* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection - -## 3.4.0 - 2013-04-11 - -* Bug fix: URLs are now resolved correctly based on https://tools.ietf.org/html/rfc3986#section-5.2. #289 -* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289 -* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263 -* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264. -* Bug fix: Added `number` type to service descriptions. -* Bug fix: empty parameters are removed from an OAuth signature -* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header -* Bug fix: Fixed "array to string" error when validating a union of types in a service description -* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream -* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin. -* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs. -* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections. -* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if - the Content-Type can be determined based on the entity body or the path of the request. -* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder. -* Added support for a PSR-3 LogAdapter. -* Added a `command.after_prepare` event -* Added `oauth_callback` parameter to the OauthPlugin -* Added the ability to create a custom stream class when using a stream factory -* Added a CachingEntityBody decorator -* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized. -* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar. -* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies -* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This - means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use - POST fields or files (the latter is only used when emulating a form POST in the browser). -* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest - -## 3.3.1 - 2013-03-10 - -* Added the ability to create PHP streaming responses from HTTP requests -* Bug fix: Running any filters when parsing response headers with service descriptions -* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing -* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across - response location visitors. -* Bug fix: Removed the possibility of creating configuration files with circular dependencies -* RequestFactory::create() now uses the key of a POST file when setting the POST file name -* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set - -## 3.3.0 - 2013-03-03 - -* A large number of performance optimizations have been made -* Bug fix: Added 'wb' as a valid write mode for streams -* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned -* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()` -* BC: Removed `Guzzle\Http\Utils` class -* BC: Setting a service description on a client will no longer modify the client's command factories. -* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using - the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io' -* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to - lowercase -* Operation parameter objects are now lazy loaded internally -* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses -* Added support for instantiating responseType=class responseClass classes. Classes must implement - `Guzzle\Service\Command\ResponseClassInterface` -* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These - additional properties also support locations and can be used to parse JSON responses where the outermost part of the - JSON is an array -* Added support for nested renaming of JSON models (rename sentAs to name) -* CachePlugin - * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error - * Debug headers can now added to cached response in the CachePlugin - -## 3.2.0 - 2013-02-14 - -* CurlMulti is no longer reused globally. A new multi object is created per-client. This helps to isolate clients. -* URLs with no path no longer contain a "/" by default -* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url. -* BadResponseException no longer includes the full request and response message -* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface -* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface -* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription -* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list -* xmlEncoding can now be customized for the XML declaration of a XML service description operation -* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value - aggregation and no longer uses callbacks -* The URL encoding implementation of Guzzle\Http\QueryString can now be customized -* Bug fix: Filters were not always invoked for array service description parameters -* Bug fix: Redirects now use a target response body rather than a temporary response body -* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded -* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives - -## 3.1.2 - 2013-01-27 - -* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the - response body. For example, the XmlVisitor now parses the XML response into an array in the before() method. -* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent -* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444) -* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse() -* Setting default headers on a client after setting the user-agent will not erase the user-agent setting - -## 3.1.1 - 2013-01-20 - -* Adding wildcard support to Guzzle\Common\Collection::getPath() -* Adding alias support to ServiceBuilder configs -* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface - -## 3.1.0 - 2013-01-12 - -* BC: CurlException now extends from RequestException rather than BadResponseException -* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse() -* Added getData to ServiceDescriptionInterface -* Added context array to RequestInterface::setState() -* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http -* Bug: Adding required content-type when JSON request visitor adds JSON to a command -* Bug: Fixing the serialization of a service description with custom data -* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing - an array of successful and failed responses -* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection -* Added Guzzle\Http\IoEmittingEntityBody -* Moved command filtration from validators to location visitors -* Added `extends` attributes to service description parameters -* Added getModels to ServiceDescriptionInterface - -## 3.0.7 - 2012-12-19 - -* Fixing phar detection when forcing a cacert to system if null or true -* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()` -* Cleaning up `Guzzle\Common\Collection::inject` method -* Adding a response_body location to service descriptions - -## 3.0.6 - 2012-12-09 - -* CurlMulti performance improvements -* Adding setErrorResponses() to Operation -* composer.json tweaks - -## 3.0.5 - 2012-11-18 - -* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin -* Bug: Response body can now be a string containing "0" -* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert -* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs -* Added support for XML attributes in service description responses -* DefaultRequestSerializer now supports array URI parameter values for URI template expansion -* Added better mimetype guessing to requests and post files - -## 3.0.4 - 2012-11-11 - -* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value -* Bug: Cookies can now be added that have a name, domain, or value set to "0" -* Bug: Using the system cacert bundle when using the Phar -* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures -* Enhanced cookie jar de-duplication -* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added -* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies -* Added the ability to create any sort of hash for a stream rather than just an MD5 hash - -## 3.0.3 - 2012-11-04 - -* Implementing redirects in PHP rather than cURL -* Added PECL URI template extension and using as default parser if available -* Bug: Fixed Content-Length parsing of Response factory -* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams. -* Adding ToArrayInterface throughout library -* Fixing OauthPlugin to create unique nonce values per request - -## 3.0.2 - 2012-10-25 - -* Magic methods are enabled by default on clients -* Magic methods return the result of a command -* Service clients no longer require a base_url option in the factory -* Bug: Fixed an issue with URI templates where null template variables were being expanded - -## 3.0.1 - 2012-10-22 - -* Models can now be used like regular collection objects by calling filter, map, etc. -* Models no longer require a Parameter structure or initial data in the constructor -* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator` - -## 3.0.0 - 2012-10-15 - -* Rewrote service description format to be based on Swagger - * Now based on JSON schema - * Added nested input structures and nested response models - * Support for JSON and XML input and output models - * Renamed `commands` to `operations` - * Removed dot class notation - * Removed custom types -* Broke the project into smaller top-level namespaces to be more component friendly -* Removed support for XML configs and descriptions. Use arrays or JSON files. -* Removed the Validation component and Inspector -* Moved all cookie code to Guzzle\Plugin\Cookie -* Magic methods on a Guzzle\Service\Client now return the command un-executed. -* Calling getResult() or getResponse() on a command will lazily execute the command if needed. -* Now shipping with cURL's CA certs and using it by default -* Added previousResponse() method to response objects -* No longer sending Accept and Accept-Encoding headers on every request -* Only sending an Expect header by default when a payload is greater than 1MB -* Added/moved client options: - * curl.blacklist to curl.option.blacklist - * Added ssl.certificate_authority -* Added a Guzzle\Iterator component -* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin -* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin) -* Added a more robust caching plugin -* Added setBody to response objects -* Updating LogPlugin to use a more flexible MessageFormatter -* Added a completely revamped build process -* Cleaning up Collection class and removing default values from the get method -* Fixed ZF2 cache adapters - -## 2.8.8 - 2012-10-15 - -* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did - -## 2.8.7 - 2012-09-30 - -* Bug: Fixed config file aliases for JSON includes -* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests -* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload -* Bug: Hardening request and response parsing to account for missing parts -* Bug: Fixed PEAR packaging -* Bug: Fixed Request::getInfo -* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail -* Adding the ability for the namespace Iterator factory to look in multiple directories -* Added more getters/setters/removers from service descriptions -* Added the ability to remove POST fields from OAuth signatures -* OAuth plugin now supports 2-legged OAuth - -## 2.8.6 - 2012-09-05 - -* Added the ability to modify and build service descriptions -* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command -* Added a `json` parameter location -* Now allowing dot notation for classes in the CacheAdapterFactory -* Using the union of two arrays rather than an array_merge when extending service builder services and service params -* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references - in service builder config files. -* Services defined in two different config files that include one another will by default replace the previously - defined service, but you can now create services that extend themselves and merge their settings over the previous -* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like - '_default' with a default JSON configuration file. - -## 2.8.5 - 2012-08-29 - -* Bug: Suppressed empty arrays from URI templates -* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching -* Added support for HTTP responses that do not contain a reason phrase in the start-line -* AbstractCommand commands are now invokable -* Added a way to get the data used when signing an Oauth request before a request is sent - -## 2.8.4 - 2012-08-15 - -* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin -* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable. -* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream -* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream -* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5()) -* Added additional response status codes -* Removed SSL information from the default User-Agent header -* DELETE requests can now send an entity body -* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries -* Added the ability of the MockPlugin to consume mocked request bodies -* LogPlugin now exposes request and response objects in the extras array - -## 2.8.3 - 2012-07-30 - -* Bug: Fixed a case where empty POST requests were sent as GET requests -* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body -* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new -* Added multiple inheritance to service description commands -* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()` -* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything -* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles - -## 2.8.2 - 2012-07-24 - -* Bug: Query string values set to 0 are no longer dropped from the query string -* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()` -* Bug: `+` is now treated as an encoded space when parsing query strings -* QueryString and Collection performance improvements -* Allowing dot notation for class paths in filters attribute of a service descriptions - -## 2.8.1 - 2012-07-16 - -* Loosening Event Dispatcher dependency -* POST redirects can now be customized using CURLOPT_POSTREDIR - -## 2.8.0 - 2012-07-15 - -* BC: Guzzle\Http\Query - * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl) - * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding() - * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool) - * Changed the aggregation functions of QueryString to be static methods - * Can now use fromString() with querystrings that have a leading ? -* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters -* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body -* Cookies are no longer URL decoded by default -* Bug: URI template variables set to null are no longer expanded - -## 2.7.2 - 2012-07-02 - -* BC: Moving things to get ready for subtree splits. Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser. -* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty() -* CachePlugin now allows for a custom request parameter function to check if a request can be cached -* Bug fix: CachePlugin now only caches GET and HEAD requests by default -* Bug fix: Using header glue when transferring headers over the wire -* Allowing deeply nested arrays for composite variables in URI templates -* Batch divisors can now return iterators or arrays - -## 2.7.1 - 2012-06-26 - -* Minor patch to update version number in UA string -* Updating build process - -## 2.7.0 - 2012-06-25 - -* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes. -* BC: Removed magic setX methods from commands -* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method -* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable. -* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity) -* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace -* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin -* Added the ability to set POST fields and files in a service description -* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method -* Adding a command.before_prepare event to clients -* Added BatchClosureTransfer and BatchClosureDivisor -* BatchTransferException now includes references to the batch divisor and transfer strategies -* Fixed some tests so that they pass more reliably -* Added Guzzle\Common\Log\ArrayLogAdapter - -## 2.6.6 - 2012-06-10 - -* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin -* BC: Removing Guzzle\Service\Command\CommandSet -* Adding generic batching system (replaces the batch queue plugin and command set) -* Updating ZF cache and log adapters and now using ZF's composer repository -* Bug: Setting the name of each ApiParam when creating through an ApiCommand -* Adding result_type, result_doc, deprecated, and doc_url to service descriptions -* Bug: Changed the default cookie header casing back to 'Cookie' - -## 2.6.5 - 2012-06-03 - -* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource() -* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from -* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data -* BC: Renaming methods in the CookieJarInterface -* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations -* Making the default glue for HTTP headers ';' instead of ',' -* Adding a removeValue to Guzzle\Http\Message\Header -* Adding getCookies() to request interface. -* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber() - -## 2.6.4 - 2012-05-30 - -* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class. -* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand -* Bug: Fixing magic method command calls on clients -* Bug: Email constraint only validates strings -* Bug: Aggregate POST fields when POST files are present in curl handle -* Bug: Fixing default User-Agent header -* Bug: Only appending or prepending parameters in commands if they are specified -* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes -* Allowing the use of dot notation for class namespaces when using instance_of constraint -* Added any_match validation constraint -* Added an AsyncPlugin -* Passing request object to the calculateWait method of the ExponentialBackoffPlugin -* Allowing the result of a command object to be changed -* Parsing location and type sub values when instantiating a service description rather than over and over at runtime - -## 2.6.3 - 2012-05-23 - -* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options. -* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields. -* You can now use an array of data when creating PUT request bodies in the request factory. -* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable. -* [Http] Adding support for Content-Type in multipart POST uploads per upload -* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1]) -* Adding more POST data operations for easier manipulation of POST data. -* You can now set empty POST fields. -* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files. -* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate. -* CS updates - -## 2.6.2 - 2012-05-19 - -* [Http] Better handling of nested scope requests in CurlMulti. Requests are now always prepares in the send() method rather than the addRequest() method. - -## 2.6.1 - 2012-05-19 - -* [BC] Removing 'path' support in service descriptions. Use 'uri'. -* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache. -* [BC] Removing Guzzle\Common\NullObject. Use https://github.com/mtdowling/NullObject if you need it. -* [BC] Removing Guzzle\Common\XmlElement. -* All commands, both dynamic and concrete, have ApiCommand objects. -* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits. -* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored. -* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible. - -## 2.6.0 - 2012-05-15 - -* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder -* [BC] Executing a Command returns the result of the command rather than the command -* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed. -* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args. -* [BC] Moving ResourceIterator* to Guzzle\Service\Resource -* [BC] Completely refactored ResourceIterators to iterate over a cloned command object -* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate -* [BC] Guzzle\Guzzle is now deprecated -* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject -* Adding Guzzle\Version class to give version information about Guzzle -* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate() -* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data -* ServiceDescription and ServiceBuilder are now cacheable using similar configs -* Changing the format of XML and JSON service builder configs. Backwards compatible. -* Cleaned up Cookie parsing -* Trimming the default Guzzle User-Agent header -* Adding a setOnComplete() method to Commands that is called when a command completes -* Keeping track of requests that were mocked in the MockPlugin -* Fixed a caching bug in the CacheAdapterFactory -* Inspector objects can be injected into a Command object -* Refactoring a lot of code and tests to be case insensitive when dealing with headers -* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL -* Adding the ability to set global option overrides to service builder configs -* Adding the ability to include other service builder config files from within XML and JSON files -* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method. - -## 2.5.0 - 2012-05-08 - -* Major performance improvements -* [BC] Simplifying Guzzle\Common\Collection. Please check to see if you are using features that are now deprecated. -* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component. -* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates. Use "{}" -* Added the ability to passed parameters to all requests created by a client -* Added callback functionality to the ExponentialBackoffPlugin -* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies. -* Rewinding request stream bodies when retrying requests -* Exception is thrown when JSON response body cannot be decoded -* Added configurable magic method calls to clients and commands. This is off by default. -* Fixed a defect that added a hash to every parsed URL part -* Fixed duplicate none generation for OauthPlugin. -* Emitting an event each time a client is generated by a ServiceBuilder -* Using an ApiParams object instead of a Collection for parameters of an ApiCommand -* cache.* request parameters should be renamed to params.cache.* -* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle. -* Added the ability to disable type validation of service descriptions -* ServiceDescriptions and ServiceBuilders are now Serializable diff --git a/src/vendor/guzzlehttp/guzzle/LICENSE b/src/vendor/guzzlehttp/guzzle/LICENSE deleted file mode 100644 index fd2375d..0000000 --- a/src/vendor/guzzlehttp/guzzle/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2011 Michael Dowling -Copyright (c) 2012 Jeremy Lindblom -Copyright (c) 2014 Graham Campbell -Copyright (c) 2015 Márk Sági-Kazár -Copyright (c) 2015 Tobias Schultze -Copyright (c) 2016 Tobias Nyholm -Copyright (c) 2016 George Mponos - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/guzzlehttp/guzzle/README.md b/src/vendor/guzzlehttp/guzzle/README.md deleted file mode 100644 index 0786462..0000000 --- a/src/vendor/guzzlehttp/guzzle/README.md +++ /dev/null @@ -1,94 +0,0 @@ -![Guzzle](.github/logo.png?raw=true) - -# Guzzle, PHP HTTP client - -[![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases) -[![Build Status](https://img.shields.io/github/workflow/status/guzzle/guzzle/CI?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI) -[![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle) - -Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and -trivial to integrate with web services. - -- Simple interface for building query strings, POST requests, streaming large - uploads, streaming large downloads, using HTTP cookies, uploading JSON data, - etc... -- Can send both synchronous and asynchronous requests using the same interface. -- Uses PSR-7 interfaces for requests, responses, and streams. This allows you - to utilize other PSR-7 compatible libraries with Guzzle. -- Supports PSR-18 allowing interoperability between other PSR-18 HTTP Clients. -- Abstracts away the underlying HTTP transport, allowing you to write - environment and transport agnostic code; i.e., no hard dependency on cURL, - PHP streams, sockets, or non-blocking event loops. -- Middleware system allows you to augment and compose client behavior. - -```php -$client = new \GuzzleHttp\Client(); -$response = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle'); - -echo $response->getStatusCode(); // 200 -echo $response->getHeaderLine('content-type'); // 'application/json; charset=utf8' -echo $response->getBody(); // '{"id": 1420053, "name": "guzzle", ...}' - -// Send an asynchronous request. -$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org'); -$promise = $client->sendAsync($request)->then(function ($response) { - echo 'I completed! ' . $response->getBody(); -}); - -$promise->wait(); -``` - -## Help and docs - -We use GitHub issues only to discuss bugs and new features. For support please refer to: - -- [Documentation](https://docs.guzzlephp.org) -- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle) -- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/) -- [Gitter](https://gitter.im/guzzle/guzzle) - - -## Installing Guzzle - -The recommended way to install Guzzle is through -[Composer](https://getcomposer.org/). - -```bash -composer require guzzlehttp/guzzle -``` - - -## Version Guidance - -| Version | Status | Packagist | Namespace | Repo | Docs | PSR-7 | PHP Version | -|---------|---------------------|---------------------|--------------|---------------------|---------------------|-------|--------------| -| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >=5.3.3,<7.0 | -| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >=5.4,<7.0 | -| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >=5.4,<7.4 | -| 6.x | Security fixes only | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >=5.5,<8.0 | -| 7.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes | >=7.2.5,<8.3 | - -[guzzle-3-repo]: https://github.com/guzzle/guzzle3 -[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x -[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3 -[guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5 -[guzzle-7-repo]: https://github.com/guzzle/guzzle -[guzzle-3-docs]: https://guzzle3.readthedocs.io/ -[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/ -[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/ -[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/ - - -## Security - -If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/guzzle/security/policy) for more information. - -## License - -Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information. - -## For Enterprise - -Available as part of the Tidelift Subscription - -The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-guzzle?utm_source=packagist-guzzlehttp-guzzle&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff --git a/src/vendor/guzzlehttp/guzzle/UPGRADING.md b/src/vendor/guzzlehttp/guzzle/UPGRADING.md deleted file mode 100644 index 45417a7..0000000 --- a/src/vendor/guzzlehttp/guzzle/UPGRADING.md +++ /dev/null @@ -1,1253 +0,0 @@ -Guzzle Upgrade Guide -==================== - -6.0 to 7.0 ----------- - -In order to take advantage of the new features of PHP, Guzzle dropped the support -of PHP 5. The minimum supported PHP version is now PHP 7.2. Type hints and return -types for functions and methods have been added wherever possible. - -Please make sure: -- You are calling a function or a method with the correct type. -- If you extend a class of Guzzle; update all signatures on methods you override. - -#### Other backwards compatibility breaking changes - -- Class `GuzzleHttp\UriTemplate` is removed. -- Class `GuzzleHttp\Exception\SeekException` is removed. -- Classes `GuzzleHttp\Exception\BadResponseException`, `GuzzleHttp\Exception\ClientException`, - `GuzzleHttp\Exception\ServerException` can no longer be initialized with an empty - Response as argument. -- Class `GuzzleHttp\Exception\ConnectException` now extends `GuzzleHttp\Exception\TransferException` - instead of `GuzzleHttp\Exception\RequestException`. -- Function `GuzzleHttp\Exception\ConnectException::getResponse()` is removed. -- Function `GuzzleHttp\Exception\ConnectException::hasResponse()` is removed. -- Constant `GuzzleHttp\ClientInterface::VERSION` is removed. Added `GuzzleHttp\ClientInterface::MAJOR_VERSION` instead. -- Function `GuzzleHttp\Exception\RequestException::getResponseBodySummary` is removed. - Use `\GuzzleHttp\Psr7\get_message_body_summary` as an alternative. -- Function `GuzzleHttp\Cookie\CookieJar::getCookieValue` is removed. -- Request option `exception` is removed. Please use `http_errors`. -- Request option `save_to` is removed. Please use `sink`. -- Pool option `pool_size` is removed. Please use `concurrency`. -- We now look for environment variables in the `$_SERVER` super global, due to thread safety issues with `getenv`. We continue to fallback to `getenv` in CLI environments, for maximum compatibility. -- The `get`, `head`, `put`, `post`, `patch`, `delete`, `getAsync`, `headAsync`, `putAsync`, `postAsync`, `patchAsync`, and `deleteAsync` methods are now implemented as genuine methods on `GuzzleHttp\Client`, with strong typing. The original `__call` implementation remains unchanged for now, for maximum backwards compatibility, but won't be invoked under normal operation. -- The `log` middleware will log the errors with level `error` instead of `notice` -- Support for international domain names (IDN) is now disabled by default, and enabling it requires installing ext-intl, linked against a modern version of the C library (ICU 4.6 or higher). - -#### Native functions calls - -All internal native functions calls of Guzzle are now prefixed with a slash. This -change makes it impossible for method overloading by other libraries or applications. -Example: - -```php -// Before: -curl_version(); - -// After: -\curl_version(); -``` - -For the full diff you can check [here](https://github.com/guzzle/guzzle/compare/6.5.4..master). - -5.0 to 6.0 ----------- - -Guzzle now uses [PSR-7](https://www.php-fig.org/psr/psr-7/) for HTTP messages. -Due to the fact that these messages are immutable, this prompted a refactoring -of Guzzle to use a middleware based system rather than an event system. Any -HTTP message interaction (e.g., `GuzzleHttp\Message\Request`) need to be -updated to work with the new immutable PSR-7 request and response objects. Any -event listeners or subscribers need to be updated to become middleware -functions that wrap handlers (or are injected into a -`GuzzleHttp\HandlerStack`). - -- Removed `GuzzleHttp\BatchResults` -- Removed `GuzzleHttp\Collection` -- Removed `GuzzleHttp\HasDataTrait` -- Removed `GuzzleHttp\ToArrayInterface` -- The `guzzlehttp/streams` dependency has been removed. Stream functionality - is now present in the `GuzzleHttp\Psr7` namespace provided by the - `guzzlehttp/psr7` package. -- Guzzle no longer uses ReactPHP promises and now uses the - `guzzlehttp/promises` library. We use a custom promise library for three - significant reasons: - 1. React promises (at the time of writing this) are recursive. Promise - chaining and promise resolution will eventually blow the stack. Guzzle - promises are not recursive as they use a sort of trampolining technique. - Note: there has been movement in the React project to modify promises to - no longer utilize recursion. - 2. Guzzle needs to have the ability to synchronously block on a promise to - wait for a result. Guzzle promises allows this functionality (and does - not require the use of recursion). - 3. Because we need to be able to wait on a result, doing so using React - promises requires wrapping react promises with RingPHP futures. This - overhead is no longer needed, reducing stack sizes, reducing complexity, - and improving performance. -- `GuzzleHttp\Mimetypes` has been moved to a function in - `GuzzleHttp\Psr7\mimetype_from_extension` and - `GuzzleHttp\Psr7\mimetype_from_filename`. -- `GuzzleHttp\Query` and `GuzzleHttp\QueryParser` have been removed. Query - strings must now be passed into request objects as strings, or provided to - the `query` request option when creating requests with clients. The `query` - option uses PHP's `http_build_query` to convert an array to a string. If you - need a different serialization technique, you will need to pass the query - string in as a string. There are a couple helper functions that will make - working with query strings easier: `GuzzleHttp\Psr7\parse_query` and - `GuzzleHttp\Psr7\build_query`. -- Guzzle no longer has a dependency on RingPHP. Due to the use of a middleware - system based on PSR-7, using RingPHP and it's middleware system as well adds - more complexity than the benefits it provides. All HTTP handlers that were - present in RingPHP have been modified to work directly with PSR-7 messages - and placed in the `GuzzleHttp\Handler` namespace. This significantly reduces - complexity in Guzzle, removes a dependency, and improves performance. RingPHP - will be maintained for Guzzle 5 support, but will no longer be a part of - Guzzle 6. -- As Guzzle now uses a middleware based systems the event system and RingPHP - integration has been removed. Note: while the event system has been removed, - it is possible to add your own type of event system that is powered by the - middleware system. - - Removed the `Event` namespace. - - Removed the `Subscriber` namespace. - - Removed `Transaction` class - - Removed `RequestFsm` - - Removed `RingBridge` - - `GuzzleHttp\Subscriber\Cookie` is now provided by - `GuzzleHttp\Middleware::cookies` - - `GuzzleHttp\Subscriber\HttpError` is now provided by - `GuzzleHttp\Middleware::httpError` - - `GuzzleHttp\Subscriber\History` is now provided by - `GuzzleHttp\Middleware::history` - - `GuzzleHttp\Subscriber\Mock` is now provided by - `GuzzleHttp\Handler\MockHandler` - - `GuzzleHttp\Subscriber\Prepare` is now provided by - `GuzzleHttp\PrepareBodyMiddleware` - - `GuzzleHttp\Subscriber\Redirect` is now provided by - `GuzzleHttp\RedirectMiddleware` -- Guzzle now uses `Psr\Http\Message\UriInterface` (implements in - `GuzzleHttp\Psr7\Uri`) for URI support. `GuzzleHttp\Url` is now gone. -- Static functions in `GuzzleHttp\Utils` have been moved to namespaced - functions under the `GuzzleHttp` namespace. This requires either a Composer - based autoloader or you to include functions.php. -- `GuzzleHttp\ClientInterface::getDefaultOption` has been renamed to - `GuzzleHttp\ClientInterface::getConfig`. -- `GuzzleHttp\ClientInterface::setDefaultOption` has been removed. -- The `json` and `xml` methods of response objects has been removed. With the - migration to strictly adhering to PSR-7 as the interface for Guzzle messages, - adding methods to message interfaces would actually require Guzzle messages - to extend from PSR-7 messages rather then work with them directly. - -## Migrating to middleware - -The change to PSR-7 unfortunately required significant refactoring to Guzzle -due to the fact that PSR-7 messages are immutable. Guzzle 5 relied on an event -system from plugins. The event system relied on mutability of HTTP messages and -side effects in order to work. With immutable messages, you have to change your -workflow to become more about either returning a value (e.g., functional -middlewares) or setting a value on an object. Guzzle v6 has chosen the -functional middleware approach. - -Instead of using the event system to listen for things like the `before` event, -you now create a stack based middleware function that intercepts a request on -the way in and the promise of the response on the way out. This is a much -simpler and more predictable approach than the event system and works nicely -with PSR-7 middleware. Due to the use of promises, the middleware system is -also asynchronous. - -v5: - -```php -use GuzzleHttp\Event\BeforeEvent; -$client = new GuzzleHttp\Client(); -// Get the emitter and listen to the before event. -$client->getEmitter()->on('before', function (BeforeEvent $e) { - // Guzzle v5 events relied on mutation - $e->getRequest()->setHeader('X-Foo', 'Bar'); -}); -``` - -v6: - -In v6, you can modify the request before it is sent using the `mapRequest` -middleware. The idiomatic way in v6 to modify the request/response lifecycle is -to setup a handler middleware stack up front and inject the handler into a -client. - -```php -use GuzzleHttp\Middleware; -// Create a handler stack that has all of the default middlewares attached -$handler = GuzzleHttp\HandlerStack::create(); -// Push the handler onto the handler stack -$handler->push(Middleware::mapRequest(function (RequestInterface $request) { - // Notice that we have to return a request object - return $request->withHeader('X-Foo', 'Bar'); -})); -// Inject the handler into the client -$client = new GuzzleHttp\Client(['handler' => $handler]); -``` - -## POST Requests - -This version added the [`form_params`](http://guzzle.readthedocs.org/en/latest/request-options.html#form_params) -and `multipart` request options. `form_params` is an associative array of -strings or array of strings and is used to serialize an -`application/x-www-form-urlencoded` POST request. The -[`multipart`](http://guzzle.readthedocs.org/en/latest/request-options.html#multipart) -option is now used to send a multipart/form-data POST request. - -`GuzzleHttp\Post\PostFile` has been removed. Use the `multipart` option to add -POST files to a multipart/form-data request. - -The `body` option no longer accepts an array to send POST requests. Please use -`multipart` or `form_params` instead. - -The `base_url` option has been renamed to `base_uri`. - -4.x to 5.0 ----------- - -## Rewritten Adapter Layer - -Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send -HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor -is still supported, but it has now been renamed to `handler`. Instead of -passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP -`callable` that follows the RingPHP specification. - -## Removed Fluent Interfaces - -[Fluent interfaces were removed](https://ocramius.github.io/blog/fluent-interfaces-are-evil/) -from the following classes: - -- `GuzzleHttp\Collection` -- `GuzzleHttp\Url` -- `GuzzleHttp\Query` -- `GuzzleHttp\Post\PostBody` -- `GuzzleHttp\Cookie\SetCookie` - -## Removed functions.php - -Removed "functions.php", so that Guzzle is truly PSR-4 compliant. The following -functions can be used as replacements. - -- `GuzzleHttp\json_decode` -> `GuzzleHttp\Utils::jsonDecode` -- `GuzzleHttp\get_path` -> `GuzzleHttp\Utils::getPath` -- `GuzzleHttp\Utils::setPath` -> `GuzzleHttp\set_path` -- `GuzzleHttp\Pool::batch` -> `GuzzleHttp\batch`. This function is, however, - deprecated in favor of using `GuzzleHttp\Pool::batch()`. - -The "procedural" global client has been removed with no replacement (e.g., -`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttp\Client` -object as a replacement. - -## `throwImmediately` has been removed - -The concept of "throwImmediately" has been removed from exceptions and error -events. This control mechanism was used to stop a transfer of concurrent -requests from completing. This can now be handled by throwing the exception or -by cancelling a pool of requests or each outstanding future request -individually. - -## headers event has been removed - -Removed the "headers" event. This event was only useful for changing the -body a response once the headers of the response were known. You can implement -a similar behavior in a number of ways. One example might be to use a -FnStream that has access to the transaction being sent. For example, when the -first byte is written, you could check if the response headers match your -expectations, and if so, change the actual stream body that is being -written to. - -## Updates to HTTP Messages - -Removed the `asArray` parameter from -`GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header -value as an array, then use the newly added `getHeaderAsArray()` method of -`MessageInterface`. This change makes the Guzzle interfaces compatible with -the PSR-7 interfaces. - -3.x to 4.0 ----------- - -## Overarching changes: - -- Now requires PHP 5.4 or greater. -- No longer requires cURL to send requests. -- Guzzle no longer wraps every exception it throws. Only exceptions that are - recoverable are now wrapped by Guzzle. -- Various namespaces have been removed or renamed. -- No longer requiring the Symfony EventDispatcher. A custom event dispatcher - based on the Symfony EventDispatcher is - now utilized in `GuzzleHttp\Event\EmitterInterface` (resulting in significant - speed and functionality improvements). - -Changes per Guzzle 3.x namespace are described below. - -## Batch - -The `Guzzle\Batch` namespace has been removed. This is best left to -third-parties to implement on top of Guzzle's core HTTP library. - -## Cache - -The `Guzzle\Cache` namespace has been removed. (Todo: No suitable replacement -has been implemented yet, but hoping to utilize a PSR cache interface). - -## Common - -- Removed all of the wrapped exceptions. It's better to use the standard PHP - library for unrecoverable exceptions. -- `FromConfigInterface` has been removed. -- `Guzzle\Common\Version` has been removed. The VERSION constant can be found - at `GuzzleHttp\ClientInterface::VERSION`. - -### Collection - -- `getAll` has been removed. Use `toArray` to convert a collection to an array. -- `inject` has been removed. -- `keySearch` has been removed. -- `getPath` no longer supports wildcard expressions. Use something better like - JMESPath for this. -- `setPath` now supports appending to an existing array via the `[]` notation. - -### Events - -Guzzle no longer requires Symfony's EventDispatcher component. Guzzle now uses -`GuzzleHttp\Event\Emitter`. - -- `Symfony\Component\EventDispatcher\EventDispatcherInterface` is replaced by - `GuzzleHttp\Event\EmitterInterface`. -- `Symfony\Component\EventDispatcher\EventDispatcher` is replaced by - `GuzzleHttp\Event\Emitter`. -- `Symfony\Component\EventDispatcher\Event` is replaced by - `GuzzleHttp\Event\Event`, and Guzzle now has an EventInterface in - `GuzzleHttp\Event\EventInterface`. -- `AbstractHasDispatcher` has moved to a trait, `HasEmitterTrait`, and - `HasDispatcherInterface` has moved to `HasEmitterInterface`. Retrieving the - event emitter of a request, client, etc. now uses the `getEmitter` method - rather than the `getDispatcher` method. - -#### Emitter - -- Use the `once()` method to add a listener that automatically removes itself - the first time it is invoked. -- Use the `listeners()` method to retrieve a list of event listeners rather than - the `getListeners()` method. -- Use `emit()` instead of `dispatch()` to emit an event from an emitter. -- Use `attach()` instead of `addSubscriber()` and `detach()` instead of - `removeSubscriber()`. - -```php -$mock = new Mock(); -// 3.x -$request->getEventDispatcher()->addSubscriber($mock); -$request->getEventDispatcher()->removeSubscriber($mock); -// 4.x -$request->getEmitter()->attach($mock); -$request->getEmitter()->detach($mock); -``` - -Use the `on()` method to add a listener rather than the `addListener()` method. - -```php -// 3.x -$request->getEventDispatcher()->addListener('foo', function (Event $event) { /* ... */ } ); -// 4.x -$request->getEmitter()->on('foo', function (Event $event, $name) { /* ... */ } ); -``` - -## Http - -### General changes - -- The cacert.pem certificate has been moved to `src/cacert.pem`. -- Added the concept of adapters that are used to transfer requests over the - wire. -- Simplified the event system. -- Sending requests in parallel is still possible, but batching is no longer a - concept of the HTTP layer. Instead, you must use the `complete` and `error` - events to asynchronously manage parallel request transfers. -- `Guzzle\Http\Url` has moved to `GuzzleHttp\Url`. -- `Guzzle\Http\QueryString` has moved to `GuzzleHttp\Query`. -- QueryAggregators have been rewritten so that they are simply callable - functions. -- `GuzzleHttp\StaticClient` has been removed. Use the functions provided in - `functions.php` for an easy to use static client instance. -- Exceptions in `GuzzleHttp\Exception` have been updated to all extend from - `GuzzleHttp\Exception\TransferException`. - -### Client - -Calling methods like `get()`, `post()`, `head()`, etc. no longer create and -return a request, but rather creates a request, sends the request, and returns -the response. - -```php -// 3.0 -$request = $client->get('/'); -$response = $request->send(); - -// 4.0 -$response = $client->get('/'); - -// or, to mirror the previous behavior -$request = $client->createRequest('GET', '/'); -$response = $client->send($request); -``` - -`GuzzleHttp\ClientInterface` has changed. - -- The `send` method no longer accepts more than one request. Use `sendAll` to - send multiple requests in parallel. -- `setUserAgent()` has been removed. Use a default request option instead. You - could, for example, do something like: - `$client->setConfig('defaults/headers/User-Agent', 'Foo/Bar ' . $client::getDefaultUserAgent())`. -- `setSslVerification()` has been removed. Use default request options instead, - like `$client->setConfig('defaults/verify', true)`. - -`GuzzleHttp\Client` has changed. - -- The constructor now accepts only an associative array. You can include a - `base_url` string or array to use a URI template as the base URL of a client. - You can also specify a `defaults` key that is an associative array of default - request options. You can pass an `adapter` to use a custom adapter, - `batch_adapter` to use a custom adapter for sending requests in parallel, or - a `message_factory` to change the factory used to create HTTP requests and - responses. -- The client no longer emits a `client.create_request` event. -- Creating requests with a client no longer automatically utilize a URI - template. You must pass an array into a creational method (e.g., - `createRequest`, `get`, `put`, etc.) in order to expand a URI template. - -### Messages - -Messages no longer have references to their counterparts (i.e., a request no -longer has a reference to it's response, and a response no loger has a -reference to its request). This association is now managed through a -`GuzzleHttp\Adapter\TransactionInterface` object. You can get references to -these transaction objects using request events that are emitted over the -lifecycle of a request. - -#### Requests with a body - -- `GuzzleHttp\Message\EntityEnclosingRequest` and - `GuzzleHttp\Message\EntityEnclosingRequestInterface` have been removed. The - separation between requests that contain a body and requests that do not - contain a body has been removed, and now `GuzzleHttp\Message\RequestInterface` - handles both use cases. -- Any method that previously accepts a `GuzzleHttp\Response` object now accept a - `GuzzleHttp\Message\ResponseInterface`. -- `GuzzleHttp\Message\RequestFactoryInterface` has been renamed to - `GuzzleHttp\Message\MessageFactoryInterface`. This interface is used to create - both requests and responses and is implemented in - `GuzzleHttp\Message\MessageFactory`. -- POST field and file methods have been removed from the request object. You - must now use the methods made available to `GuzzleHttp\Post\PostBodyInterface` - to control the format of a POST body. Requests that are created using a - standard `GuzzleHttp\Message\MessageFactoryInterface` will automatically use - a `GuzzleHttp\Post\PostBody` body if the body was passed as an array or if - the method is POST and no body is provided. - -```php -$request = $client->createRequest('POST', '/'); -$request->getBody()->setField('foo', 'bar'); -$request->getBody()->addFile(new PostFile('file_key', fopen('/path/to/content', 'r'))); -``` - -#### Headers - -- `GuzzleHttp\Message\Header` has been removed. Header values are now simply - represented by an array of values or as a string. Header values are returned - as a string by default when retrieving a header value from a message. You can - pass an optional argument of `true` to retrieve a header value as an array - of strings instead of a single concatenated string. -- `GuzzleHttp\PostFile` and `GuzzleHttp\PostFileInterface` have been moved to - `GuzzleHttp\Post`. This interface has been simplified and now allows the - addition of arbitrary headers. -- Custom headers like `GuzzleHttp\Message\Header\Link` have been removed. Most - of the custom headers are now handled separately in specific - subscribers/plugins, and `GuzzleHttp\Message\HeaderValues::parseParams()` has - been updated to properly handle headers that contain parameters (like the - `Link` header). - -#### Responses - -- `GuzzleHttp\Message\Response::getInfo()` and - `GuzzleHttp\Message\Response::setInfo()` have been removed. Use the event - system to retrieve this type of information. -- `GuzzleHttp\Message\Response::getRawHeaders()` has been removed. -- `GuzzleHttp\Message\Response::getMessage()` has been removed. -- `GuzzleHttp\Message\Response::calculateAge()` and other cache specific - methods have moved to the CacheSubscriber. -- Header specific helper functions like `getContentMd5()` have been removed. - Just use `getHeader('Content-MD5')` instead. -- `GuzzleHttp\Message\Response::setRequest()` and - `GuzzleHttp\Message\Response::getRequest()` have been removed. Use the event - system to work with request and response objects as a transaction. -- `GuzzleHttp\Message\Response::getRedirectCount()` has been removed. Use the - Redirect subscriber instead. -- `GuzzleHttp\Message\Response::isSuccessful()` and other related methods have - been removed. Use `getStatusCode()` instead. - -#### Streaming responses - -Streaming requests can now be created by a client directly, returning a -`GuzzleHttp\Message\ResponseInterface` object that contains a body stream -referencing an open PHP HTTP stream. - -```php -// 3.0 -use Guzzle\Stream\PhpStreamRequestFactory; -$request = $client->get('/'); -$factory = new PhpStreamRequestFactory(); -$stream = $factory->fromRequest($request); -$data = $stream->read(1024); - -// 4.0 -$response = $client->get('/', ['stream' => true]); -// Read some data off of the stream in the response body -$data = $response->getBody()->read(1024); -``` - -#### Redirects - -The `configureRedirects()` method has been removed in favor of a -`allow_redirects` request option. - -```php -// Standard redirects with a default of a max of 5 redirects -$request = $client->createRequest('GET', '/', ['allow_redirects' => true]); - -// Strict redirects with a custom number of redirects -$request = $client->createRequest('GET', '/', [ - 'allow_redirects' => ['max' => 5, 'strict' => true] -]); -``` - -#### EntityBody - -EntityBody interfaces and classes have been removed or moved to -`GuzzleHttp\Stream`. All classes and interfaces that once required -`GuzzleHttp\EntityBodyInterface` now require -`GuzzleHttp\Stream\StreamInterface`. Creating a new body for a request no -longer uses `GuzzleHttp\EntityBody::factory` but now uses -`GuzzleHttp\Stream\Stream::factory` or even better: -`GuzzleHttp\Stream\create()`. - -- `Guzzle\Http\EntityBodyInterface` is now `GuzzleHttp\Stream\StreamInterface` -- `Guzzle\Http\EntityBody` is now `GuzzleHttp\Stream\Stream` -- `Guzzle\Http\CachingEntityBody` is now `GuzzleHttp\Stream\CachingStream` -- `Guzzle\Http\ReadLimitEntityBody` is now `GuzzleHttp\Stream\LimitStream` -- `Guzzle\Http\IoEmittyinEntityBody` has been removed. - -#### Request lifecycle events - -Requests previously submitted a large number of requests. The number of events -emitted over the lifecycle of a request has been significantly reduced to make -it easier to understand how to extend the behavior of a request. All events -emitted during the lifecycle of a request now emit a custom -`GuzzleHttp\Event\EventInterface` object that contains context providing -methods and a way in which to modify the transaction at that specific point in -time (e.g., intercept the request and set a response on the transaction). - -- `request.before_send` has been renamed to `before` and now emits a - `GuzzleHttp\Event\BeforeEvent` -- `request.complete` has been renamed to `complete` and now emits a - `GuzzleHttp\Event\CompleteEvent`. -- `request.sent` has been removed. Use `complete`. -- `request.success` has been removed. Use `complete`. -- `error` is now an event that emits a `GuzzleHttp\Event\ErrorEvent`. -- `request.exception` has been removed. Use `error`. -- `request.receive.status_line` has been removed. -- `curl.callback.progress` has been removed. Use a custom `StreamInterface` to - maintain a status update. -- `curl.callback.write` has been removed. Use a custom `StreamInterface` to - intercept writes. -- `curl.callback.read` has been removed. Use a custom `StreamInterface` to - intercept reads. - -`headers` is a new event that is emitted after the response headers of a -request have been received before the body of the response is downloaded. This -event emits a `GuzzleHttp\Event\HeadersEvent`. - -You can intercept a request and inject a response using the `intercept()` event -of a `GuzzleHttp\Event\BeforeEvent`, `GuzzleHttp\Event\CompleteEvent`, and -`GuzzleHttp\Event\ErrorEvent` event. - -See: http://docs.guzzlephp.org/en/latest/events.html - -## Inflection - -The `Guzzle\Inflection` namespace has been removed. This is not a core concern -of Guzzle. - -## Iterator - -The `Guzzle\Iterator` namespace has been removed. - -- `Guzzle\Iterator\AppendIterator`, `Guzzle\Iterator\ChunkedIterator`, and - `Guzzle\Iterator\MethodProxyIterator` are nice, but not a core requirement of - Guzzle itself. -- `Guzzle\Iterator\FilterIterator` is no longer needed because an equivalent - class is shipped with PHP 5.4. -- `Guzzle\Iterator\MapIterator` is not really needed when using PHP 5.5 because - it's easier to just wrap an iterator in a generator that maps values. - -For a replacement of these iterators, see https://github.com/nikic/iter - -## Log - -The LogPlugin has moved to https://github.com/guzzle/log-subscriber. The -`Guzzle\Log` namespace has been removed. Guzzle now relies on -`Psr\Log\LoggerInterface` for all logging. The MessageFormatter class has been -moved to `GuzzleHttp\Subscriber\Log\Formatter`. - -## Parser - -The `Guzzle\Parser` namespace has been removed. This was previously used to -make it possible to plug in custom parsers for cookies, messages, URI -templates, and URLs; however, this level of complexity is not needed in Guzzle -so it has been removed. - -- Cookie: Cookie parsing logic has been moved to - `GuzzleHttp\Cookie\SetCookie::fromString`. -- Message: Message parsing logic for both requests and responses has been moved - to `GuzzleHttp\Message\MessageFactory::fromMessage`. Message parsing is only - used in debugging or deserializing messages, so it doesn't make sense for - Guzzle as a library to add this level of complexity to parsing messages. -- UriTemplate: URI template parsing has been moved to - `GuzzleHttp\UriTemplate`. The Guzzle library will automatically use the PECL - URI template library if it is installed. -- Url: URL parsing is now performed in `GuzzleHttp\Url::fromString` (previously - it was `Guzzle\Http\Url::factory()`). If custom URL parsing is necessary, - then developers are free to subclass `GuzzleHttp\Url`. - -## Plugin - -The `Guzzle\Plugin` namespace has been renamed to `GuzzleHttp\Subscriber`. -Several plugins are shipping with the core Guzzle library under this namespace. - -- `GuzzleHttp\Subscriber\Cookie`: Replaces the old CookiePlugin. Cookie jar - code has moved to `GuzzleHttp\Cookie`. -- `GuzzleHttp\Subscriber\History`: Replaces the old HistoryPlugin. -- `GuzzleHttp\Subscriber\HttpError`: Throws errors when a bad HTTP response is - received. -- `GuzzleHttp\Subscriber\Mock`: Replaces the old MockPlugin. -- `GuzzleHttp\Subscriber\Prepare`: Prepares the body of a request just before - sending. This subscriber is attached to all requests by default. -- `GuzzleHttp\Subscriber\Redirect`: Replaces the RedirectPlugin. - -The following plugins have been removed (third-parties are free to re-implement -these if needed): - -- `GuzzleHttp\Plugin\Async` has been removed. -- `GuzzleHttp\Plugin\CurlAuth` has been removed. -- `GuzzleHttp\Plugin\ErrorResponse\ErrorResponsePlugin` has been removed. This - functionality should instead be implemented with event listeners that occur - after normal response parsing occurs in the guzzle/command package. - -The following plugins are not part of the core Guzzle package, but are provided -in separate repositories: - -- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be much simpler - to build custom retry policies using simple functions rather than various - chained classes. See: https://github.com/guzzle/retry-subscriber -- `Guzzle\Http\Plugin\Cache\CachePlugin` has moved to - https://github.com/guzzle/cache-subscriber -- `Guzzle\Http\Plugin\Log\LogPlugin` has moved to - https://github.com/guzzle/log-subscriber -- `Guzzle\Http\Plugin\Md5\Md5Plugin` has moved to - https://github.com/guzzle/message-integrity-subscriber -- `Guzzle\Http\Plugin\Mock\MockPlugin` has moved to - `GuzzleHttp\Subscriber\MockSubscriber`. -- `Guzzle\Http\Plugin\Oauth\OauthPlugin` has moved to - https://github.com/guzzle/oauth-subscriber - -## Service - -The service description layer of Guzzle has moved into two separate packages: - -- http://github.com/guzzle/command Provides a high level abstraction over web - services by representing web service operations using commands. -- http://github.com/guzzle/guzzle-services Provides an implementation of - guzzle/command that provides request serialization and response parsing using - Guzzle service descriptions. - -## Stream - -Stream have moved to a separate package available at -https://github.com/guzzle/streams. - -`Guzzle\Stream\StreamInterface` has been given a large update to cleanly take -on the responsibilities of `Guzzle\Http\EntityBody` and -`Guzzle\Http\EntityBodyInterface` now that they have been removed. The number -of methods implemented by the `StreamInterface` has been drastically reduced to -allow developers to more easily extend and decorate stream behavior. - -## Removed methods from StreamInterface - -- `getStream` and `setStream` have been removed to better encapsulate streams. -- `getMetadata` and `setMetadata` have been removed in favor of - `GuzzleHttp\Stream\MetadataStreamInterface`. -- `getWrapper`, `getWrapperData`, `getStreamType`, and `getUri` have all been - removed. This data is accessible when - using streams that implement `GuzzleHttp\Stream\MetadataStreamInterface`. -- `rewind` has been removed. Use `seek(0)` for a similar behavior. - -## Renamed methods - -- `detachStream` has been renamed to `detach`. -- `feof` has been renamed to `eof`. -- `ftell` has been renamed to `tell`. -- `readLine` has moved from an instance method to a static class method of - `GuzzleHttp\Stream\Stream`. - -## Metadata streams - -`GuzzleHttp\Stream\MetadataStreamInterface` has been added to denote streams -that contain additional metadata accessible via `getMetadata()`. -`GuzzleHttp\Stream\StreamInterface::getMetadata` and -`GuzzleHttp\Stream\StreamInterface::setMetadata` have been removed. - -## StreamRequestFactory - -The entire concept of the StreamRequestFactory has been removed. The way this -was used in Guzzle 3 broke the actual interface of sending streaming requests -(instead of getting back a Response, you got a StreamInterface). Streaming -PHP requests are now implemented through the `GuzzleHttp\Adapter\StreamAdapter`. - -3.6 to 3.7 ----------- - -### Deprecations - -- You can now enable E_USER_DEPRECATED warnings to see if you are using any deprecated methods.: - -```php -\Guzzle\Common\Version::$emitWarnings = true; -``` - -The following APIs and options have been marked as deprecated: - -- Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use `$request->getResponseBody()->isRepeatable()` instead. -- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead. -- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead. -- Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead. -- Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead. -- Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated -- Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client. -- Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8. -- Marked `Guzzle\Common\Collection::inject()` as deprecated. -- Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use - `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));` or - `$client->setDefaultOption('auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));` - -3.7 introduces `request.options` as a parameter for a client configuration and as an optional argument to all creational -request methods. When paired with a client's configuration settings, these options allow you to specify default settings -for various aspects of a request. Because these options make other previous configuration options redundant, several -configuration options and methods of a client and AbstractCommand have been deprecated. - -- Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use `$client->getDefaultOption('headers')`. -- Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use `$client->setDefaultOption('headers/{header_name}', 'value')`. -- Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use `$client->setDefaultOption('params/{param_name}', 'value')` -- Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand. These will work through Guzzle 4.0 - - $command = $client->getCommand('foo', array( - 'command.headers' => array('Test' => '123'), - 'command.response_body' => '/path/to/file' - )); - - // Should be changed to: - - $command = $client->getCommand('foo', array( - 'command.request_options' => array( - 'headers' => array('Test' => '123'), - 'save_as' => '/path/to/file' - ) - )); - -### Interface changes - -Additions and changes (you will need to update any implementations or subclasses you may have created): - -- Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`: - createRequest, head, delete, put, patch, post, options, prepareRequest -- Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()` -- Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface` -- Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to - `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a - resource, string, or EntityBody into the $options parameter to specify the download location of the response. -- Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a - default `array()` -- Added `Guzzle\Stream\StreamInterface::isRepeatable` -- Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods. - -The following methods were removed from interfaces. All of these methods are still available in the concrete classes -that implement them, but you should update your code to use alternative methods: - -- Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use - `$client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or - `$client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))` or - `$client->setDefaultOption('headers/{header_name}', 'value')`. or - `$client->setDefaultOption('headers', array('header_name' => 'value'))`. -- Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use `$client->getConfig()->getPath('request.options/headers')`. -- Removed `Guzzle\Http\ClientInterface::expandTemplate()`. This is an implementation detail. -- Removed `Guzzle\Http\ClientInterface::setRequestFactory()`. This is an implementation detail. -- Removed `Guzzle\Http\ClientInterface::getCurlMulti()`. This is a very specific implementation detail. -- Removed `Guzzle\Http\Message\RequestInterface::canCache`. Use the CachePlugin. -- Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`. Use the HistoryPlugin. -- Removed `Guzzle\Http\Message\RequestInterface::isRedirect`. Use the HistoryPlugin. - -### Cache plugin breaking changes - -- CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a - CacheStorageInterface. These two objects and interface will be removed in a future version. -- Always setting X-cache headers on cached responses -- Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin -- `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface - $request, Response $response);` -- `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);` -- `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);` -- Added `CacheStorageInterface::purge($url)` -- `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin - $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache, - CanCacheStrategyInterface $canCache = null)` -- Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)` - -3.5 to 3.6 ----------- - -* Mixed casing of headers are now forced to be a single consistent casing across all values for that header. -* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution -* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader(). - For example, setHeader() first removes the header using unset on a HeaderCollection and then calls addHeader(). - Keeping the Host header and URL host in sync is now handled by overriding the addHeader method in Request. -* Specific header implementations can be created for complex headers. When a message creates a header, it uses a - HeaderFactory which can map specific headers to specific header classes. There is now a Link header and - CacheControl header implementation. -* Moved getLinks() from Response to just be used on a Link header object. - -If you previously relied on Guzzle\Http\Message\Header::raw(), then you will need to update your code to use the -HeaderInterface (e.g. toArray(), getAll(), etc.). - -### Interface changes - -* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate -* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti() -* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in - Guzzle\Http\Curl\RequestMediator -* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string. -* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface -* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders() - -### Removed deprecated functions - -* Removed Guzzle\Parser\ParserRegister::get(). Use getParser() -* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser(). - -### Deprecations - -* The ability to case-insensitively search for header values -* Guzzle\Http\Message\Header::hasExactHeader -* Guzzle\Http\Message\Header::raw. Use getAll() -* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object - instead. - -### Other changes - -* All response header helper functions return a string rather than mixing Header objects and strings inconsistently -* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle - directly via interfaces -* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist - but are a no-op until removed. -* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a - `Guzzle\Service\Command\ArrayCommandInterface`. -* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response - on a request while the request is still being transferred -* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess - -3.3 to 3.4 ----------- - -Base URLs of a client now follow the rules of https://tools.ietf.org/html/rfc3986#section-5.2.2 when merging URLs. - -3.2 to 3.3 ----------- - -### Response::getEtag() quote stripping removed - -`Guzzle\Http\Message\Response::getEtag()` no longer strips quotes around the ETag response header - -### Removed `Guzzle\Http\Utils` - -The `Guzzle\Http\Utils` class was removed. This class was only used for testing. - -### Stream wrapper and type - -`Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getStreamType()` are no longer converted to lowercase. - -### curl.emit_io became emit_io - -Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using the -'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io' - -3.1 to 3.2 ----------- - -### CurlMulti is no longer reused globally - -Before 3.2, the same CurlMulti object was reused globally for each client. This can cause issue where plugins added -to a single client can pollute requests dispatched from other clients. - -If you still wish to reuse the same CurlMulti object with each client, then you can add a listener to the -ServiceBuilder's `service_builder.create_client` event to inject a custom CurlMulti object into each client as it is -created. - -```php -$multi = new Guzzle\Http\Curl\CurlMulti(); -$builder = Guzzle\Service\Builder\ServiceBuilder::factory('/path/to/config.json'); -$builder->addListener('service_builder.create_client', function ($event) use ($multi) { - $event['client']->setCurlMulti($multi); -} -}); -``` - -### No default path - -URLs no longer have a default path value of '/' if no path was specified. - -Before: - -```php -$request = $client->get('http://www.foo.com'); -echo $request->getUrl(); -// >> http://www.foo.com/ -``` - -After: - -```php -$request = $client->get('http://www.foo.com'); -echo $request->getUrl(); -// >> http://www.foo.com -``` - -### Less verbose BadResponseException - -The exception message for `Guzzle\Http\Exception\BadResponseException` no longer contains the full HTTP request and -response information. You can, however, get access to the request and response object by calling `getRequest()` or -`getResponse()` on the exception object. - -### Query parameter aggregation - -Multi-valued query parameters are no longer aggregated using a callback function. `Guzzle\Http\Query` now has a -setAggregator() method that accepts a `Guzzle\Http\QueryAggregator\QueryAggregatorInterface` object. This object is -responsible for handling the aggregation of multi-valued query string variables into a flattened hash. - -2.8 to 3.x ----------- - -### Guzzle\Service\Inspector - -Change `\Guzzle\Service\Inspector::fromConfig` to `\Guzzle\Common\Collection::fromConfig` - -**Before** - -```php -use Guzzle\Service\Inspector; - -class YourClient extends \Guzzle\Service\Client -{ - public static function factory($config = array()) - { - $default = array(); - $required = array('base_url', 'username', 'api_key'); - $config = Inspector::fromConfig($config, $default, $required); - - $client = new self( - $config->get('base_url'), - $config->get('username'), - $config->get('api_key') - ); - $client->setConfig($config); - - $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json')); - - return $client; - } -``` - -**After** - -```php -use Guzzle\Common\Collection; - -class YourClient extends \Guzzle\Service\Client -{ - public static function factory($config = array()) - { - $default = array(); - $required = array('base_url', 'username', 'api_key'); - $config = Collection::fromConfig($config, $default, $required); - - $client = new self( - $config->get('base_url'), - $config->get('username'), - $config->get('api_key') - ); - $client->setConfig($config); - - $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json')); - - return $client; - } -``` - -### Convert XML Service Descriptions to JSON - -**Before** - -```xml - - - - - - Get a list of groups - - - Uses a search query to get a list of groups - - - - Create a group - - - - - Delete a group by ID - - - - - - - Update a group - - - - - - -``` - -**After** - -```json -{ - "name": "Zendesk REST API v2", - "apiVersion": "2012-12-31", - "description":"Provides access to Zendesk views, groups, tickets, ticket fields, and users", - "operations": { - "list_groups": { - "httpMethod":"GET", - "uri": "groups.json", - "summary": "Get a list of groups" - }, - "search_groups":{ - "httpMethod":"GET", - "uri": "search.json?query=\"{query} type:group\"", - "summary": "Uses a search query to get a list of groups", - "parameters":{ - "query":{ - "location": "uri", - "description":"Zendesk Search Query", - "type": "string", - "required": true - } - } - }, - "create_group": { - "httpMethod":"POST", - "uri": "groups.json", - "summary": "Create a group", - "parameters":{ - "data": { - "type": "array", - "location": "body", - "description":"Group JSON", - "filters": "json_encode", - "required": true - }, - "Content-Type":{ - "type": "string", - "location":"header", - "static": "application/json" - } - } - }, - "delete_group": { - "httpMethod":"DELETE", - "uri": "groups/{id}.json", - "summary": "Delete a group", - "parameters":{ - "id":{ - "location": "uri", - "description":"Group to delete by ID", - "type": "integer", - "required": true - } - } - }, - "get_group": { - "httpMethod":"GET", - "uri": "groups/{id}.json", - "summary": "Get a ticket", - "parameters":{ - "id":{ - "location": "uri", - "description":"Group to get by ID", - "type": "integer", - "required": true - } - } - }, - "update_group": { - "httpMethod":"PUT", - "uri": "groups/{id}.json", - "summary": "Update a group", - "parameters":{ - "id": { - "location": "uri", - "description":"Group to update by ID", - "type": "integer", - "required": true - }, - "data": { - "type": "array", - "location": "body", - "description":"Group JSON", - "filters": "json_encode", - "required": true - }, - "Content-Type":{ - "type": "string", - "location":"header", - "static": "application/json" - } - } - } -} -``` - -### Guzzle\Service\Description\ServiceDescription - -Commands are now called Operations - -**Before** - -```php -use Guzzle\Service\Description\ServiceDescription; - -$sd = new ServiceDescription(); -$sd->getCommands(); // @returns ApiCommandInterface[] -$sd->hasCommand($name); -$sd->getCommand($name); // @returns ApiCommandInterface|null -$sd->addCommand($command); // @param ApiCommandInterface $command -``` - -**After** - -```php -use Guzzle\Service\Description\ServiceDescription; - -$sd = new ServiceDescription(); -$sd->getOperations(); // @returns OperationInterface[] -$sd->hasOperation($name); -$sd->getOperation($name); // @returns OperationInterface|null -$sd->addOperation($operation); // @param OperationInterface $operation -``` - -### Guzzle\Common\Inflection\Inflector - -Namespace is now `Guzzle\Inflection\Inflector` - -### Guzzle\Http\Plugin - -Namespace is now `Guzzle\Plugin`. Many other changes occur within this namespace and are detailed in their own sections below. - -### Guzzle\Http\Plugin\LogPlugin and Guzzle\Common\Log - -Now `Guzzle\Plugin\Log\LogPlugin` and `Guzzle\Log` respectively. - -**Before** - -```php -use Guzzle\Common\Log\ClosureLogAdapter; -use Guzzle\Http\Plugin\LogPlugin; - -/** @var \Guzzle\Http\Client */ -$client; - -// $verbosity is an integer indicating desired message verbosity level -$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $verbosity = LogPlugin::LOG_VERBOSE); -``` - -**After** - -```php -use Guzzle\Log\ClosureLogAdapter; -use Guzzle\Log\MessageFormatter; -use Guzzle\Plugin\Log\LogPlugin; - -/** @var \Guzzle\Http\Client */ -$client; - -// $format is a string indicating desired message format -- @see MessageFormatter -$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $format = MessageFormatter::DEBUG_FORMAT); -``` - -### Guzzle\Http\Plugin\CurlAuthPlugin - -Now `Guzzle\Plugin\CurlAuth\CurlAuthPlugin`. - -### Guzzle\Http\Plugin\ExponentialBackoffPlugin - -Now `Guzzle\Plugin\Backoff\BackoffPlugin`, and other changes. - -**Before** - -```php -use Guzzle\Http\Plugin\ExponentialBackoffPlugin; - -$backoffPlugin = new ExponentialBackoffPlugin($maxRetries, array_merge( - ExponentialBackoffPlugin::getDefaultFailureCodes(), array(429) - )); - -$client->addSubscriber($backoffPlugin); -``` - -**After** - -```php -use Guzzle\Plugin\Backoff\BackoffPlugin; -use Guzzle\Plugin\Backoff\HttpBackoffStrategy; - -// Use convenient factory method instead -- see implementation for ideas of what -// you can do with chaining backoff strategies -$backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, array_merge( - HttpBackoffStrategy::getDefaultFailureCodes(), array(429) - )); -$client->addSubscriber($backoffPlugin); -``` - -### Known Issues - -#### [BUG] Accept-Encoding header behavior changed unintentionally. - -(See #217) (Fixed in 09daeb8c666fb44499a0646d655a8ae36456575e) - -In version 2.8 setting the `Accept-Encoding` header would set the CURLOPT_ENCODING option, which permitted cURL to -properly handle gzip/deflate compressed responses from the server. In versions affected by this bug this does not happen. -See issue #217 for a workaround, or use a version containing the fix. diff --git a/src/vendor/guzzlehttp/guzzle/composer.json b/src/vendor/guzzlehttp/guzzle/composer.json deleted file mode 100644 index 3207f8c..0000000 --- a/src/vendor/guzzlehttp/guzzle/composer.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "name": "guzzlehttp/guzzle", - "description": "Guzzle is a PHP HTTP client library", - "keywords": [ - "framework", - "http", - "rest", - "web service", - "curl", - "client", - "HTTP client", - "PSR-7", - "PSR-18" - ], - "license": "MIT", - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "require": { - "php": "^7.2.5 || ^8.0", - "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" - }, - "provide": { - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "ext-curl": "*", - "bamarni/composer-bin-plugin": "^1.8.1", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", - "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", - "psr/log": "^1.1 || ^2.0 || ^3.0" - }, - "suggest": { - "ext-curl": "Required for CURL handler support", - "ext-intl": "Required for Internationalized Domain Name (IDN) support", - "psr/log": "Required for using the Log middleware" - }, - "config": { - "allow-plugins": { - "bamarni/composer-bin-plugin": true - }, - "preferred-install": "dist", - "sort-packages": true - }, - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "autoload-dev": { - "psr-4": { - "GuzzleHttp\\Tests\\": "tests/" - } - } -} diff --git a/src/vendor/guzzlehttp/guzzle/src/BodySummarizer.php b/src/vendor/guzzlehttp/guzzle/src/BodySummarizer.php deleted file mode 100644 index 6eca94e..0000000 --- a/src/vendor/guzzlehttp/guzzle/src/BodySummarizer.php +++ /dev/null @@ -1,28 +0,0 @@ -truncateAt = $truncateAt; - } - - /** - * Returns a summarized message body. - */ - public function summarize(MessageInterface $message): ?string - { - return $this->truncateAt === null - ? \GuzzleHttp\Psr7\Message::bodySummary($message) - : \GuzzleHttp\Psr7\Message::bodySummary($message, $this->truncateAt); - } -} diff --git a/src/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php b/src/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php deleted file mode 100644 index 3e02e03..0000000 --- a/src/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php +++ /dev/null @@ -1,13 +0,0 @@ ->>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}"; - public const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}'; - - /** - * @var string Template used to format log messages - */ - private $template; - - /** - * @param string $template Log message template - */ - public function __construct(?string $template = self::CLF) - { - $this->template = $template ?: self::CLF; - } - - /** - * Returns a formatted message string. - * - * @param RequestInterface $request Request that was sent - * @param ResponseInterface|null $response Response that was received - * @param \Throwable|null $error Exception that was received - */ - public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null): string - { - $cache = []; - - /** @var string */ - return \preg_replace_callback( - '/{\s*([A-Za-z_\-\.0-9]+)\s*}/', - function (array $matches) use ($request, $response, $error, &$cache) { - if (isset($cache[$matches[1]])) { - return $cache[$matches[1]]; - } - - $result = ''; - switch ($matches[1]) { - case 'request': - $result = Psr7\Message::toString($request); - break; - case 'response': - $result = $response ? Psr7\Message::toString($response) : ''; - break; - case 'req_headers': - $result = \trim($request->getMethod() - .' '.$request->getRequestTarget()) - .' HTTP/'.$request->getProtocolVersion()."\r\n" - .$this->headers($request); - break; - case 'res_headers': - $result = $response ? - \sprintf( - 'HTTP/%s %d %s', - $response->getProtocolVersion(), - $response->getStatusCode(), - $response->getReasonPhrase() - )."\r\n".$this->headers($response) - : 'NULL'; - break; - case 'req_body': - $result = $request->getBody()->__toString(); - break; - case 'res_body': - if (!$response instanceof ResponseInterface) { - $result = 'NULL'; - break; - } - - $body = $response->getBody(); - - if (!$body->isSeekable()) { - $result = 'RESPONSE_NOT_LOGGEABLE'; - break; - } - - $result = $response->getBody()->__toString(); - break; - case 'ts': - case 'date_iso_8601': - $result = \gmdate('c'); - break; - case 'date_common_log': - $result = \date('d/M/Y:H:i:s O'); - break; - case 'method': - $result = $request->getMethod(); - break; - case 'version': - $result = $request->getProtocolVersion(); - break; - case 'uri': - case 'url': - $result = $request->getUri()->__toString(); - break; - case 'target': - $result = $request->getRequestTarget(); - break; - case 'req_version': - $result = $request->getProtocolVersion(); - break; - case 'res_version': - $result = $response - ? $response->getProtocolVersion() - : 'NULL'; - break; - case 'host': - $result = $request->getHeaderLine('Host'); - break; - case 'hostname': - $result = \gethostname(); - break; - case 'code': - $result = $response ? $response->getStatusCode() : 'NULL'; - break; - case 'phrase': - $result = $response ? $response->getReasonPhrase() : 'NULL'; - break; - case 'error': - $result = $error ? $error->getMessage() : 'NULL'; - break; - default: - // handle prefixed dynamic headers - if (\strpos($matches[1], 'req_header_') === 0) { - $result = $request->getHeaderLine(\substr($matches[1], 11)); - } elseif (\strpos($matches[1], 'res_header_') === 0) { - $result = $response - ? $response->getHeaderLine(\substr($matches[1], 11)) - : 'NULL'; - } - } - - $cache[$matches[1]] = $result; - - return $result; - }, - $this->template - ); - } - - /** - * Get headers from message as string - */ - private function headers(MessageInterface $message): string - { - $result = ''; - foreach ($message->getHeaders() as $name => $values) { - $result .= $name.': '.\implode(', ', $values)."\r\n"; - } - - return \trim($result); - } -} diff --git a/src/vendor/guzzlehttp/guzzle/src/functions_include.php b/src/vendor/guzzlehttp/guzzle/src/functions_include.php deleted file mode 100644 index 394f953..0000000 --- a/src/vendor/guzzlehttp/guzzle/src/functions_include.php +++ /dev/null @@ -1,6 +0,0 @@ - - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/guzzlehttp/oauth-subscriber/composer.json b/src/vendor/guzzlehttp/oauth-subscriber/composer.json deleted file mode 100644 index 18b00c4..0000000 --- a/src/vendor/guzzlehttp/oauth-subscriber/composer.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "guzzlehttp/oauth-subscriber", - "description": "Guzzle OAuth 1.0 subscriber", - "homepage": "http://guzzlephp.org/", - "keywords": ["oauth", "guzzle"], - "license": "MIT", - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "require": { - "php": ">=5.5.0", - "guzzlehttp/guzzle": "^6.5|^7.2", - "guzzlehttp/psr7": "^1.7|^2.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|^9.3.3" - }, - "autoload": { - "psr-4": { "GuzzleHttp\\Subscriber\\Oauth\\": "src" } - }, - "extra": { - "branch-alias": { - "dev-master": "0.6-dev" - } - }, - "suggest": { - "ext-openssl": "Required to sign using RSA-SHA1" - } -} diff --git a/src/vendor/guzzlehttp/promises/CHANGELOG.md b/src/vendor/guzzlehttp/promises/CHANGELOG.md deleted file mode 100644 index eaf2af4..0000000 --- a/src/vendor/guzzlehttp/promises/CHANGELOG.md +++ /dev/null @@ -1,145 +0,0 @@ -# CHANGELOG - - -## 2.0.1 - 2023-08-03 - -### Changed - -- PHP 8.3 support - - -## 2.0.0 - 2023-05-21 - -### Added - -- Added PHP 7 type hints - -### Changed - -- All previously non-final non-exception classes have been marked as soft-final - -### Removed - -- Dropped PHP < 7.2 support -- All functions in the `GuzzleHttp\Promise` namespace - - -## 1.5.3 - 2023-05-21 - -### Changed - -- Removed remaining usage of deprecated functions - - -## 1.5.2 - 2022-08-07 - -### Changed - -- Officially support PHP 8.2 - - -## 1.5.1 - 2021-10-22 - -### Fixed - -- Revert "Call handler when waiting on fulfilled/rejected Promise" -- Fix pool memory leak when empty array of promises provided - - -## 1.5.0 - 2021-10-07 - -### Changed - -- Call handler when waiting on fulfilled/rejected Promise -- Officially support PHP 8.1 - -### Fixed - -- Fix manually settle promises generated with `Utils::task` - - -## 1.4.1 - 2021-02-18 - -### Fixed - -- Fixed `each_limit` skipping promises and failing - - -## 1.4.0 - 2020-09-30 - -### Added - -- Support for PHP 8 -- Optional `$recursive` flag to `all` -- Replaced functions by static methods - -### Fixed - -- Fix empty `each` processing -- Fix promise handling for Iterators of non-unique keys -- Fixed `method_exists` crashes on PHP 8 -- Memory leak on exceptions - - -## 1.3.1 - 2016-12-20 - -### Fixed - -- `wait()` foreign promise compatibility - - -## 1.3.0 - 2016-11-18 - -### Added - -- Adds support for custom task queues. - -### Fixed - -- Fixed coroutine promise memory leak. - - -## 1.2.0 - 2016-05-18 - -### Changed - -- Update to now catch `\Throwable` on PHP 7+ - - -## 1.1.0 - 2016-03-07 - -### Changed - -- Update EachPromise to prevent recurring on a iterator when advancing, as this - could trigger fatal generator errors. -- Update Promise to allow recursive waiting without unwrapping exceptions. - - -## 1.0.3 - 2015-10-15 - -### Changed - -- Update EachPromise to immediately resolve when the underlying promise iterator - is empty. Previously, such a promise would throw an exception when its `wait` - function was called. - - -## 1.0.2 - 2015-05-15 - -### Changed - -- Conditionally require functions.php. - - -## 1.0.1 - 2015-06-24 - -### Changed - -- Updating EachPromise to call next on the underlying promise iterator as late - as possible to ensure that generators that generate new requests based on - callbacks are not iterated until after callbacks are invoked. - - -## 1.0.0 - 2015-05-12 - -- Initial release diff --git a/src/vendor/guzzlehttp/promises/LICENSE b/src/vendor/guzzlehttp/promises/LICENSE deleted file mode 100644 index 9f0f943..0000000 --- a/src/vendor/guzzlehttp/promises/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Michael Dowling -Copyright (c) 2015 Graham Campbell -Copyright (c) 2017 Tobias Schultze -Copyright (c) 2020 Tobias Nyholm - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/guzzlehttp/promises/README.md b/src/vendor/guzzlehttp/promises/README.md deleted file mode 100644 index a32d3d2..0000000 --- a/src/vendor/guzzlehttp/promises/README.md +++ /dev/null @@ -1,559 +0,0 @@ -# Guzzle Promises - -[Promises/A+](https://promisesaplus.com/) implementation that handles promise -chaining and resolution iteratively, allowing for "infinite" promise chaining -while keeping the stack size constant. Read [this blog post](https://blog.domenic.me/youre-missing-the-point-of-promises/) -for a general introduction to promises. - -- [Features](#features) -- [Quick start](#quick-start) -- [Synchronous wait](#synchronous-wait) -- [Cancellation](#cancellation) -- [API](#api) - - [Promise](#promise) - - [FulfilledPromise](#fulfilledpromise) - - [RejectedPromise](#rejectedpromise) -- [Promise interop](#promise-interop) -- [Implementation notes](#implementation-notes) - - -## Features - -- [Promises/A+](https://promisesaplus.com/) implementation. -- Promise resolution and chaining is handled iteratively, allowing for - "infinite" promise chaining. -- Promises have a synchronous `wait` method. -- Promises can be cancelled. -- Works with any object that has a `then` function. -- C# style async/await coroutine promises using - `GuzzleHttp\Promise\Coroutine::of()`. - - -## Installation - -```shell -composer require guzzlehttp/promises -``` - - -## Version Guidance - -| Version | Status | PHP Version | -|---------|------------------------|--------------| -| 1.x | Bug and security fixes | >=5.5,<8.3 | -| 2.x | Latest | >=7.2.5,<8.4 | - - -## Quick Start - -A *promise* represents the eventual result of an asynchronous operation. The -primary way of interacting with a promise is through its `then` method, which -registers callbacks to receive either a promise's eventual value or the reason -why the promise cannot be fulfilled. - -### Callbacks - -Callbacks are registered with the `then` method by providing an optional -`$onFulfilled` followed by an optional `$onRejected` function. - - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$promise->then( - // $onFulfilled - function ($value) { - echo 'The promise was fulfilled.'; - }, - // $onRejected - function ($reason) { - echo 'The promise was rejected.'; - } -); -``` - -*Resolving* a promise means that you either fulfill a promise with a *value* or -reject a promise with a *reason*. Resolving a promise triggers callbacks -registered with the promise's `then` method. These callbacks are triggered -only once and in the order in which they were added. - -### Resolving a Promise - -Promises are fulfilled using the `resolve($value)` method. Resolving a promise -with any value other than a `GuzzleHttp\Promise\RejectedPromise` will trigger -all of the onFulfilled callbacks (resolving a promise with a rejected promise -will reject the promise and trigger the `$onRejected` callbacks). - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$promise - ->then(function ($value) { - // Return a value and don't break the chain - return "Hello, " . $value; - }) - // This then is executed after the first then and receives the value - // returned from the first then. - ->then(function ($value) { - echo $value; - }); - -// Resolving the promise triggers the $onFulfilled callbacks and outputs -// "Hello, reader." -$promise->resolve('reader.'); -``` - -### Promise Forwarding - -Promises can be chained one after the other. Each then in the chain is a new -promise. The return value of a promise is what's forwarded to the next -promise in the chain. Returning a promise in a `then` callback will cause the -subsequent promises in the chain to only be fulfilled when the returned promise -has been fulfilled. The next promise in the chain will be invoked with the -resolved value of the promise. - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$nextPromise = new Promise(); - -$promise - ->then(function ($value) use ($nextPromise) { - echo $value; - return $nextPromise; - }) - ->then(function ($value) { - echo $value; - }); - -// Triggers the first callback and outputs "A" -$promise->resolve('A'); -// Triggers the second callback and outputs "B" -$nextPromise->resolve('B'); -``` - -### Promise Rejection - -When a promise is rejected, the `$onRejected` callbacks are invoked with the -rejection reason. - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$promise->then(null, function ($reason) { - echo $reason; -}); - -$promise->reject('Error!'); -// Outputs "Error!" -``` - -### Rejection Forwarding - -If an exception is thrown in an `$onRejected` callback, subsequent -`$onRejected` callbacks are invoked with the thrown exception as the reason. - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$promise->then(null, function ($reason) { - throw new Exception($reason); -})->then(null, function ($reason) { - assert($reason->getMessage() === 'Error!'); -}); - -$promise->reject('Error!'); -``` - -You can also forward a rejection down the promise chain by returning a -`GuzzleHttp\Promise\RejectedPromise` in either an `$onFulfilled` or -`$onRejected` callback. - -```php -use GuzzleHttp\Promise\Promise; -use GuzzleHttp\Promise\RejectedPromise; - -$promise = new Promise(); -$promise->then(null, function ($reason) { - return new RejectedPromise($reason); -})->then(null, function ($reason) { - assert($reason === 'Error!'); -}); - -$promise->reject('Error!'); -``` - -If an exception is not thrown in a `$onRejected` callback and the callback -does not return a rejected promise, downstream `$onFulfilled` callbacks are -invoked using the value returned from the `$onRejected` callback. - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise(); -$promise - ->then(null, function ($reason) { - return "It's ok"; - }) - ->then(function ($value) { - assert($value === "It's ok"); - }); - -$promise->reject('Error!'); -``` - - -## Synchronous Wait - -You can synchronously force promises to complete using a promise's `wait` -method. When creating a promise, you can provide a wait function that is used -to synchronously force a promise to complete. When a wait function is invoked -it is expected to deliver a value to the promise or reject the promise. If the -wait function does not deliver a value, then an exception is thrown. The wait -function provided to a promise constructor is invoked when the `wait` function -of the promise is called. - -```php -$promise = new Promise(function () use (&$promise) { - $promise->resolve('foo'); -}); - -// Calling wait will return the value of the promise. -echo $promise->wait(); // outputs "foo" -``` - -If an exception is encountered while invoking the wait function of a promise, -the promise is rejected with the exception and the exception is thrown. - -```php -$promise = new Promise(function () use (&$promise) { - throw new Exception('foo'); -}); - -$promise->wait(); // throws the exception. -``` - -Calling `wait` on a promise that has been fulfilled will not trigger the wait -function. It will simply return the previously resolved value. - -```php -$promise = new Promise(function () { die('this is not called!'); }); -$promise->resolve('foo'); -echo $promise->wait(); // outputs "foo" -``` - -Calling `wait` on a promise that has been rejected will throw an exception. If -the rejection reason is an instance of `\Exception` the reason is thrown. -Otherwise, a `GuzzleHttp\Promise\RejectionException` is thrown and the reason -can be obtained by calling the `getReason` method of the exception. - -```php -$promise = new Promise(); -$promise->reject('foo'); -$promise->wait(); -``` - -> PHP Fatal error: Uncaught exception 'GuzzleHttp\Promise\RejectionException' with message 'The promise was rejected with value: foo' - -### Unwrapping a Promise - -When synchronously waiting on a promise, you are joining the state of the -promise into the current state of execution (i.e., return the value of the -promise if it was fulfilled or throw an exception if it was rejected). This is -called "unwrapping" the promise. Waiting on a promise will by default unwrap -the promise state. - -You can force a promise to resolve and *not* unwrap the state of the promise -by passing `false` to the first argument of the `wait` function: - -```php -$promise = new Promise(); -$promise->reject('foo'); -// This will not throw an exception. It simply ensures the promise has -// been resolved. -$promise->wait(false); -``` - -When unwrapping a promise, the resolved value of the promise will be waited -upon until the unwrapped value is not a promise. This means that if you resolve -promise A with a promise B and unwrap promise A, the value returned by the -wait function will be the value delivered to promise B. - -**Note**: when you do not unwrap the promise, no value is returned. - - -## Cancellation - -You can cancel a promise that has not yet been fulfilled using the `cancel()` -method of a promise. When creating a promise you can provide an optional -cancel function that when invoked cancels the action of computing a resolution -of the promise. - - -## API - -### Promise - -When creating a promise object, you can provide an optional `$waitFn` and -`$cancelFn`. `$waitFn` is a function that is invoked with no arguments and is -expected to resolve the promise. `$cancelFn` is a function with no arguments -that is expected to cancel the computation of a promise. It is invoked when the -`cancel()` method of a promise is called. - -```php -use GuzzleHttp\Promise\Promise; - -$promise = new Promise( - function () use (&$promise) { - $promise->resolve('waited'); - }, - function () { - // do something that will cancel the promise computation (e.g., close - // a socket, cancel a database query, etc...) - } -); - -assert('waited' === $promise->wait()); -``` - -A promise has the following methods: - -- `then(callable $onFulfilled, callable $onRejected) : PromiseInterface` - - Appends fulfillment and rejection handlers to the promise, and returns a new promise resolving to the return value of the called handler. - -- `otherwise(callable $onRejected) : PromiseInterface` - - Appends a rejection handler callback to the promise, and returns a new promise resolving to the return value of the callback if it is called, or to its original fulfillment value if the promise is instead fulfilled. - -- `wait($unwrap = true) : mixed` - - Synchronously waits on the promise to complete. - - `$unwrap` controls whether or not the value of the promise is returned for a - fulfilled promise or if an exception is thrown if the promise is rejected. - This is set to `true` by default. - -- `cancel()` - - Attempts to cancel the promise if possible. The promise being cancelled and - the parent most ancestor that has not yet been resolved will also be - cancelled. Any promises waiting on the cancelled promise to resolve will also - be cancelled. - -- `getState() : string` - - Returns the state of the promise. One of `pending`, `fulfilled`, or - `rejected`. - -- `resolve($value)` - - Fulfills the promise with the given `$value`. - -- `reject($reason)` - - Rejects the promise with the given `$reason`. - - -### FulfilledPromise - -A fulfilled promise can be created to represent a promise that has been -fulfilled. - -```php -use GuzzleHttp\Promise\FulfilledPromise; - -$promise = new FulfilledPromise('value'); - -// Fulfilled callbacks are immediately invoked. -$promise->then(function ($value) { - echo $value; -}); -``` - - -### RejectedPromise - -A rejected promise can be created to represent a promise that has been -rejected. - -```php -use GuzzleHttp\Promise\RejectedPromise; - -$promise = new RejectedPromise('Error'); - -// Rejected callbacks are immediately invoked. -$promise->then(null, function ($reason) { - echo $reason; -}); -``` - - -## Promise Interoperability - -This library works with foreign promises that have a `then` method. This means -you can use Guzzle promises with [React promises](https://github.com/reactphp/promise) -for example. When a foreign promise is returned inside of a then method -callback, promise resolution will occur recursively. - -```php -// Create a React promise -$deferred = new React\Promise\Deferred(); -$reactPromise = $deferred->promise(); - -// Create a Guzzle promise that is fulfilled with a React promise. -$guzzlePromise = new GuzzleHttp\Promise\Promise(); -$guzzlePromise->then(function ($value) use ($reactPromise) { - // Do something something with the value... - // Return the React promise - return $reactPromise; -}); -``` - -Please note that wait and cancel chaining is no longer possible when forwarding -a foreign promise. You will need to wrap a third-party promise with a Guzzle -promise in order to utilize wait and cancel functions with foreign promises. - - -### Event Loop Integration - -In order to keep the stack size constant, Guzzle promises are resolved -asynchronously using a task queue. When waiting on promises synchronously, the -task queue will be automatically run to ensure that the blocking promise and -any forwarded promises are resolved. When using promises asynchronously in an -event loop, you will need to run the task queue on each tick of the loop. If -you do not run the task queue, then promises will not be resolved. - -You can run the task queue using the `run()` method of the global task queue -instance. - -```php -// Get the global task queue -$queue = GuzzleHttp\Promise\Utils::queue(); -$queue->run(); -``` - -For example, you could use Guzzle promises with React using a periodic timer: - -```php -$loop = React\EventLoop\Factory::create(); -$loop->addPeriodicTimer(0, [$queue, 'run']); -``` - - -## Implementation Notes - -### Promise Resolution and Chaining is Handled Iteratively - -By shuffling pending handlers from one owner to another, promises are -resolved iteratively, allowing for "infinite" then chaining. - -```php -then(function ($v) { - // The stack size remains constant (a good thing) - echo xdebug_get_stack_depth() . ', '; - return $v + 1; - }); -} - -$parent->resolve(0); -var_dump($p->wait()); // int(1000) - -``` - -When a promise is fulfilled or rejected with a non-promise value, the promise -then takes ownership of the handlers of each child promise and delivers values -down the chain without using recursion. - -When a promise is resolved with another promise, the original promise transfers -all of its pending handlers to the new promise. When the new promise is -eventually resolved, all of the pending handlers are delivered the forwarded -value. - -### A Promise is the Deferred - -Some promise libraries implement promises using a deferred object to represent -a computation and a promise object to represent the delivery of the result of -the computation. This is a nice separation of computation and delivery because -consumers of the promise cannot modify the value that will be eventually -delivered. - -One side effect of being able to implement promise resolution and chaining -iteratively is that you need to be able for one promise to reach into the state -of another promise to shuffle around ownership of handlers. In order to achieve -this without making the handlers of a promise publicly mutable, a promise is -also the deferred value, allowing promises of the same parent class to reach -into and modify the private properties of promises of the same type. While this -does allow consumers of the value to modify the resolution or rejection of the -deferred, it is a small price to pay for keeping the stack size constant. - -```php -$promise = new Promise(); -$promise->then(function ($value) { echo $value; }); -// The promise is the deferred value, so you can deliver a value to it. -$promise->resolve('foo'); -// prints "foo" -``` - - -## Upgrading from Function API - -A static API was first introduced in 1.4.0, in order to mitigate problems with -functions conflicting between global and local copies of the package. The -function API was removed in 2.0.0. A migration table has been provided here for -your convenience: - -| Original Function | Replacement Method | -|----------------|----------------| -| `queue` | `Utils::queue` | -| `task` | `Utils::task` | -| `promise_for` | `Create::promiseFor` | -| `rejection_for` | `Create::rejectionFor` | -| `exception_for` | `Create::exceptionFor` | -| `iter_for` | `Create::iterFor` | -| `inspect` | `Utils::inspect` | -| `inspect_all` | `Utils::inspectAll` | -| `unwrap` | `Utils::unwrap` | -| `all` | `Utils::all` | -| `some` | `Utils::some` | -| `any` | `Utils::any` | -| `settle` | `Utils::settle` | -| `each` | `Each::of` | -| `each_limit` | `Each::ofLimit` | -| `each_limit_all` | `Each::ofLimitAll` | -| `!is_fulfilled` | `Is::pending` | -| `is_fulfilled` | `Is::fulfilled` | -| `is_rejected` | `Is::rejected` | -| `is_settled` | `Is::settled` | -| `coroutine` | `Coroutine::of` | - - -## Security - -If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/promises/security/policy) for more information. - - -## License - -Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information. - - -## For Enterprise - -Available as part of the Tidelift Subscription - -The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-promises?utm_source=packagist-guzzlehttp-promises&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff --git a/src/vendor/guzzlehttp/promises/composer.json b/src/vendor/guzzlehttp/promises/composer.json deleted file mode 100644 index fc1989e..0000000 --- a/src/vendor/guzzlehttp/promises/composer.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "guzzlehttp/promises", - "description": "Guzzle promises library", - "keywords": ["promise"], - "license": "MIT", - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "require": { - "php": "^7.2.5 || ^8.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "GuzzleHttp\\Promise\\Tests\\": "tests/" - } - }, - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "config": { - "allow-plugins": { - "bamarni/composer-bin-plugin": true - }, - "preferred-install": "dist", - "sort-packages": true - } -} diff --git a/src/vendor/guzzlehttp/psr7/CHANGELOG.md b/src/vendor/guzzlehttp/psr7/CHANGELOG.md deleted file mode 100644 index e841f67..0000000 --- a/src/vendor/guzzlehttp/psr7/CHANGELOG.md +++ /dev/null @@ -1,431 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## 2.6.0 - 2023-08-03 - -### Changed - -- Updated the mime type map to add some new entries, fix a couple of invalid entries, and remove an invalid entry -- Fallback to `application/octet-stream` if we are unable to guess the content type for a multipart file upload - -## 2.5.1 - 2023-08-03 - -### Fixed - -- Corrected mime type for `.acc` files to `audio/aac` - -### Changed - -- PHP 8.3 support - -## 2.5.0 - 2023-04-17 - -### Changed - -- Adjusted `psr/http-message` version constraint to `^1.1 || ^2.0` - -## 2.4.5 - 2023-04-17 - -### Fixed - -- Prevent possible warnings on unset variables in `ServerRequest::normalizeNestedFileSpec` -- Fixed `Message::bodySummary` when `preg_match` fails -- Fixed header validation issue - -## 2.4.4 - 2023-03-09 - -### Changed - -- Removed the need for `AllowDynamicProperties` in `LazyOpenStream` - -## 2.4.3 - 2022-10-26 - -### Changed - -- Replaced `sha1(uniqid())` by `bin2hex(random_bytes(20))` - -## 2.4.2 - 2022-10-25 - -### Fixed - -- Fixed erroneous behaviour when combining host and relative path - -## 2.4.1 - 2022-08-28 - -### Fixed - -- Rewind body before reading in `Message::bodySummary` - -## 2.4.0 - 2022-06-20 - -### Added - -- Added provisional PHP 8.2 support -- Added `UriComparator::isCrossOrigin` method - -## 2.3.0 - 2022-06-09 - -### Fixed - -- Added `Header::splitList` method -- Added `Utils::tryGetContents` method -- Improved `Stream::getContents` method -- Updated mimetype mappings - -## 2.2.2 - 2022-06-08 - -### Fixed - -- Fix `Message::parseRequestUri` for numeric headers -- Re-wrap exceptions thrown in `fread` into runtime exceptions -- Throw an exception when multipart options is misformatted - -## 2.2.1 - 2022-03-20 - -### Fixed - -- Correct header value validation - -## 2.2.0 - 2022-03-20 - -### Added - -- A more compressive list of mime types -- Add JsonSerializable to Uri -- Missing return types - -### Fixed - -- Bug MultipartStream no `uri` metadata -- Bug MultipartStream with filename for `data://` streams -- Fixed new line handling in MultipartStream -- Reduced RAM usage when copying streams -- Updated parsing in `Header::normalize()` - -## 2.1.1 - 2022-03-20 - -### Fixed - -- Validate header values properly - -## 2.1.0 - 2021-10-06 - -### Changed - -- Attempting to create a `Uri` object from a malformed URI will no longer throw a generic - `InvalidArgumentException`, but rather a `MalformedUriException`, which inherits from the former - for backwards compatibility. Callers relying on the exception being thrown to detect invalid - URIs should catch the new exception. - -### Fixed - -- Return `null` in caching stream size if remote size is `null` - -## 2.0.0 - 2021-06-30 - -Identical to the RC release. - -## 2.0.0@RC-1 - 2021-04-29 - -### Fixed - -- Handle possibly unset `url` in `stream_get_meta_data` - -## 2.0.0@beta-1 - 2021-03-21 - -### Added - -- PSR-17 factories -- Made classes final -- PHP7 type hints - -### Changed - -- When building a query string, booleans are represented as 1 and 0. - -### Removed - -- PHP < 7.2 support -- All functions in the `GuzzleHttp\Psr7` namespace - -## 1.8.1 - 2021-03-21 - -### Fixed - -- Issue parsing IPv6 URLs -- Issue modifying ServerRequest lost all its attributes - -## 1.8.0 - 2021-03-21 - -### Added - -- Locale independent URL parsing -- Most classes got a `@final` annotation to prepare for 2.0 - -### Fixed - -- Issue when creating stream from `php://input` and curl-ext is not installed -- Broken `Utils::tryFopen()` on PHP 8 - -## 1.7.0 - 2020-09-30 - -### Added - -- Replaced functions by static methods - -### Fixed - -- Converting a non-seekable stream to a string -- Handle multiple Set-Cookie correctly -- Ignore array keys in header values when merging -- Allow multibyte characters to be parsed in `Message:bodySummary()` - -### Changed - -- Restored partial HHVM 3 support - - -## [1.6.1] - 2019-07-02 - -### Fixed - -- Accept null and bool header values again - - -## [1.6.0] - 2019-06-30 - -### Added - -- Allowed version `^3.0` of `ralouphie/getallheaders` dependency (#244) -- Added MIME type for WEBP image format (#246) -- Added more validation of values according to PSR-7 and RFC standards, e.g. status code range (#250, #272) - -### Changed - -- Tests don't pass with HHVM 4.0, so HHVM support got dropped. Other libraries like composer have done the same. (#262) -- Accept port number 0 to be valid (#270) - -### Fixed - -- Fixed subsequent reads from `php://input` in ServerRequest (#247) -- Fixed readable/writable detection for certain stream modes (#248) -- Fixed encoding of special characters in the `userInfo` component of an URI (#253) - - -## [1.5.2] - 2018-12-04 - -### Fixed - -- Check body size when getting the message summary - - -## [1.5.1] - 2018-12-04 - -### Fixed - -- Get the summary of a body only if it is readable - - -## [1.5.0] - 2018-12-03 - -### Added - -- Response first-line to response string exception (fixes #145) -- A test for #129 behavior -- `get_message_body_summary` function in order to get the message summary -- `3gp` and `mkv` mime types - -### Changed - -- Clarify exception message when stream is detached - -### Deprecated - -- Deprecated parsing folded header lines as per RFC 7230 - -### Fixed - -- Fix `AppendStream::detach` to not close streams -- `InflateStream` preserves `isSeekable` attribute of the underlying stream -- `ServerRequest::getUriFromGlobals` to support URLs in query parameters - - -Several other fixes and improvements. - - -## [1.4.2] - 2017-03-20 - -### Fixed - -- Reverted BC break to `Uri::resolve` and `Uri::removeDotSegments` by removing - calls to `trigger_error` when deprecated methods are invoked. - - -## [1.4.1] - 2017-02-27 - -### Added - -- Rriggering of silenced deprecation warnings. - -### Fixed - -- Reverted BC break by reintroducing behavior to automagically fix a URI with a - relative path and an authority by adding a leading slash to the path. It's only - deprecated now. - - -## [1.4.0] - 2017-02-21 - -### Added - -- Added common URI utility methods based on RFC 3986 (see documentation in the readme): - - `Uri::isDefaultPort` - - `Uri::isAbsolute` - - `Uri::isNetworkPathReference` - - `Uri::isAbsolutePathReference` - - `Uri::isRelativePathReference` - - `Uri::isSameDocumentReference` - - `Uri::composeComponents` - - `UriNormalizer::normalize` - - `UriNormalizer::isEquivalent` - - `UriResolver::relativize` - -### Changed - -- Ensure `ServerRequest::getUriFromGlobals` returns a URI in absolute form. -- Allow `parse_response` to parse a response without delimiting space and reason. -- Ensure each URI modification results in a valid URI according to PSR-7 discussions. - Invalid modifications will throw an exception instead of returning a wrong URI or - doing some magic. - - `(new Uri)->withPath('foo')->withHost('example.com')` will throw an exception - because the path of a URI with an authority must start with a slash "/" or be empty - - `(new Uri())->withScheme('http')` will return `'http://localhost'` - -### Deprecated - -- `Uri::resolve` in favor of `UriResolver::resolve` -- `Uri::removeDotSegments` in favor of `UriResolver::removeDotSegments` - -### Fixed - -- `Stream::read` when length parameter <= 0. -- `copy_to_stream` reads bytes in chunks instead of `maxLen` into memory. -- `ServerRequest::getUriFromGlobals` when `Host` header contains port. -- Compatibility of URIs with `file` scheme and empty host. - - -## [1.3.1] - 2016-06-25 - -### Fixed - -- `Uri::__toString` for network path references, e.g. `//example.org`. -- Missing lowercase normalization for host. -- Handling of URI components in case they are `'0'` in a lot of places, - e.g. as a user info password. -- `Uri::withAddedHeader` to correctly merge headers with different case. -- Trimming of header values in `Uri::withAddedHeader`. Header values may - be surrounded by whitespace which should be ignored according to RFC 7230 - Section 3.2.4. This does not apply to header names. -- `Uri::withAddedHeader` with an array of header values. -- `Uri::resolve` when base path has no slash and handling of fragment. -- Handling of encoding in `Uri::with(out)QueryValue` so one can pass the - key/value both in encoded as well as decoded form to those methods. This is - consistent with withPath, withQuery etc. -- `ServerRequest::withoutAttribute` when attribute value is null. - - -## [1.3.0] - 2016-04-13 - -### Added - -- Remaining interfaces needed for full PSR7 compatibility - (ServerRequestInterface, UploadedFileInterface, etc.). -- Support for stream_for from scalars. - -### Changed - -- Can now extend Uri. - -### Fixed -- A bug in validating request methods by making it more permissive. - - -## [1.2.3] - 2016-02-18 - -### Fixed - -- Support in `GuzzleHttp\Psr7\CachingStream` for seeking forward on remote - streams, which can sometimes return fewer bytes than requested with `fread`. -- Handling of gzipped responses with FNAME headers. - - -## [1.2.2] - 2016-01-22 - -### Added - -- Support for URIs without any authority. -- Support for HTTP 451 'Unavailable For Legal Reasons.' -- Support for using '0' as a filename. -- Support for including non-standard ports in Host headers. - - -## [1.2.1] - 2015-11-02 - -### Changes - -- Now supporting negative offsets when seeking to SEEK_END. - - -## [1.2.0] - 2015-08-15 - -### Changed - -- Body as `"0"` is now properly added to a response. -- Now allowing forward seeking in CachingStream. -- Now properly parsing HTTP requests that contain proxy targets in - `parse_request`. -- functions.php is now conditionally required. -- user-info is no longer dropped when resolving URIs. - - -## [1.1.0] - 2015-06-24 - -### Changed - -- URIs can now be relative. -- `multipart/form-data` headers are now overridden case-insensitively. -- URI paths no longer encode the following characters because they are allowed - in URIs: "(", ")", "*", "!", "'" -- A port is no longer added to a URI when the scheme is missing and no port is - present. - - -## 1.0.0 - 2015-05-19 - -Initial release. - -Currently unsupported: - -- `Psr\Http\Message\ServerRequestInterface` -- `Psr\Http\Message\UploadedFileInterface` - - - -[1.6.0]: https://github.com/guzzle/psr7/compare/1.5.2...1.6.0 -[1.5.2]: https://github.com/guzzle/psr7/compare/1.5.1...1.5.2 -[1.5.1]: https://github.com/guzzle/psr7/compare/1.5.0...1.5.1 -[1.5.0]: https://github.com/guzzle/psr7/compare/1.4.2...1.5.0 -[1.4.2]: https://github.com/guzzle/psr7/compare/1.4.1...1.4.2 -[1.4.1]: https://github.com/guzzle/psr7/compare/1.4.0...1.4.1 -[1.4.0]: https://github.com/guzzle/psr7/compare/1.3.1...1.4.0 -[1.3.1]: https://github.com/guzzle/psr7/compare/1.3.0...1.3.1 -[1.3.0]: https://github.com/guzzle/psr7/compare/1.2.3...1.3.0 -[1.2.3]: https://github.com/guzzle/psr7/compare/1.2.2...1.2.3 -[1.2.2]: https://github.com/guzzle/psr7/compare/1.2.1...1.2.2 -[1.2.1]: https://github.com/guzzle/psr7/compare/1.2.0...1.2.1 -[1.2.0]: https://github.com/guzzle/psr7/compare/1.1.0...1.2.0 -[1.1.0]: https://github.com/guzzle/psr7/compare/1.0.0...1.1.0 diff --git a/src/vendor/guzzlehttp/psr7/LICENSE b/src/vendor/guzzlehttp/psr7/LICENSE deleted file mode 100644 index 51c7ec8..0000000 --- a/src/vendor/guzzlehttp/psr7/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Michael Dowling -Copyright (c) 2015 Márk Sági-Kazár -Copyright (c) 2015 Graham Campbell -Copyright (c) 2016 Tobias Schultze -Copyright (c) 2016 George Mponos -Copyright (c) 2018 Tobias Nyholm - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/guzzlehttp/psr7/README.md b/src/vendor/guzzlehttp/psr7/README.md deleted file mode 100644 index a64ec90..0000000 --- a/src/vendor/guzzlehttp/psr7/README.md +++ /dev/null @@ -1,880 +0,0 @@ -# PSR-7 Message Implementation - -This repository contains a full [PSR-7](https://www.php-fig.org/psr/psr-7/) -message implementation, several stream decorators, and some helpful -functionality like query string parsing. - -![CI](https://github.com/guzzle/psr7/workflows/CI/badge.svg) -![Static analysis](https://github.com/guzzle/psr7/workflows/Static%20analysis/badge.svg) - - -## Features - -This package comes with a number of stream implementations and stream -decorators. - - -## Installation - -```shell -composer require guzzlehttp/psr7 -``` - -## Version Guidance - -| Version | Status | PHP Version | -|---------|---------------------|--------------| -| 1.x | Security fixes only | >=5.4,<8.1 | -| 2.x | Latest | >=7.2.5,<8.4 | - - -## AppendStream - -`GuzzleHttp\Psr7\AppendStream` - -Reads from multiple streams, one after the other. - -```php -use GuzzleHttp\Psr7; - -$a = Psr7\Utils::streamFor('abc, '); -$b = Psr7\Utils::streamFor('123.'); -$composed = new Psr7\AppendStream([$a, $b]); - -$composed->addStream(Psr7\Utils::streamFor(' Above all listen to me')); - -echo $composed; // abc, 123. Above all listen to me. -``` - - -## BufferStream - -`GuzzleHttp\Psr7\BufferStream` - -Provides a buffer stream that can be written to fill a buffer, and read -from to remove bytes from the buffer. - -This stream returns a "hwm" metadata value that tells upstream consumers -what the configured high water mark of the stream is, or the maximum -preferred size of the buffer. - -```php -use GuzzleHttp\Psr7; - -// When more than 1024 bytes are in the buffer, it will begin returning -// false to writes. This is an indication that writers should slow down. -$buffer = new Psr7\BufferStream(1024); -``` - - -## CachingStream - -The CachingStream is used to allow seeking over previously read bytes on -non-seekable streams. This can be useful when transferring a non-seekable -entity body fails due to needing to rewind the stream (for example, resulting -from a redirect). Data that is read from the remote stream will be buffered in -a PHP temp stream so that previously read bytes are cached first in memory, -then on disk. - -```php -use GuzzleHttp\Psr7; - -$original = Psr7\Utils::streamFor(fopen('http://www.google.com', 'r')); -$stream = new Psr7\CachingStream($original); - -$stream->read(1024); -echo $stream->tell(); -// 1024 - -$stream->seek(0); -echo $stream->tell(); -// 0 -``` - - -## DroppingStream - -`GuzzleHttp\Psr7\DroppingStream` - -Stream decorator that begins dropping data once the size of the underlying -stream becomes too full. - -```php -use GuzzleHttp\Psr7; - -// Create an empty stream -$stream = Psr7\Utils::streamFor(); - -// Start dropping data when the stream has more than 10 bytes -$dropping = new Psr7\DroppingStream($stream, 10); - -$dropping->write('01234567890123456789'); -echo $stream; // 0123456789 -``` - - -## FnStream - -`GuzzleHttp\Psr7\FnStream` - -Compose stream implementations based on a hash of functions. - -Allows for easy testing and extension of a provided stream without needing -to create a concrete class for a simple extension point. - -```php - -use GuzzleHttp\Psr7; - -$stream = Psr7\Utils::streamFor('hi'); -$fnStream = Psr7\FnStream::decorate($stream, [ - 'rewind' => function () use ($stream) { - echo 'About to rewind - '; - $stream->rewind(); - echo 'rewound!'; - } -]); - -$fnStream->rewind(); -// Outputs: About to rewind - rewound! -``` - - -## InflateStream - -`GuzzleHttp\Psr7\InflateStream` - -Uses PHP's zlib.inflate filter to inflate zlib (HTTP deflate, RFC1950) or gzipped (RFC1952) content. - -This stream decorator converts the provided stream to a PHP stream resource, -then appends the zlib.inflate filter. The stream is then converted back -to a Guzzle stream resource to be used as a Guzzle stream. - - -## LazyOpenStream - -`GuzzleHttp\Psr7\LazyOpenStream` - -Lazily reads or writes to a file that is opened only after an IO operation -take place on the stream. - -```php -use GuzzleHttp\Psr7; - -$stream = new Psr7\LazyOpenStream('/path/to/file', 'r'); -// The file has not yet been opened... - -echo $stream->read(10); -// The file is opened and read from only when needed. -``` - - -## LimitStream - -`GuzzleHttp\Psr7\LimitStream` - -LimitStream can be used to read a subset or slice of an existing stream object. -This can be useful for breaking a large file into smaller pieces to be sent in -chunks (e.g. Amazon S3's multipart upload API). - -```php -use GuzzleHttp\Psr7; - -$original = Psr7\Utils::streamFor(fopen('/tmp/test.txt', 'r+')); -echo $original->getSize(); -// >>> 1048576 - -// Limit the size of the body to 1024 bytes and start reading from byte 2048 -$stream = new Psr7\LimitStream($original, 1024, 2048); -echo $stream->getSize(); -// >>> 1024 -echo $stream->tell(); -// >>> 0 -``` - - -## MultipartStream - -`GuzzleHttp\Psr7\MultipartStream` - -Stream that when read returns bytes for a streaming multipart or -multipart/form-data stream. - - -## NoSeekStream - -`GuzzleHttp\Psr7\NoSeekStream` - -NoSeekStream wraps a stream and does not allow seeking. - -```php -use GuzzleHttp\Psr7; - -$original = Psr7\Utils::streamFor('foo'); -$noSeek = new Psr7\NoSeekStream($original); - -echo $noSeek->read(3); -// foo -var_export($noSeek->isSeekable()); -// false -$noSeek->seek(0); -var_export($noSeek->read(3)); -// NULL -``` - - -## PumpStream - -`GuzzleHttp\Psr7\PumpStream` - -Provides a read only stream that pumps data from a PHP callable. - -When invoking the provided callable, the PumpStream will pass the amount of -data requested to read to the callable. The callable can choose to ignore -this value and return fewer or more bytes than requested. Any extra data -returned by the provided callable is buffered internally until drained using -the read() function of the PumpStream. The provided callable MUST return -false when there is no more data to read. - - -## Implementing stream decorators - -Creating a stream decorator is very easy thanks to the -`GuzzleHttp\Psr7\StreamDecoratorTrait`. This trait provides methods that -implement `Psr\Http\Message\StreamInterface` by proxying to an underlying -stream. Just `use` the `StreamDecoratorTrait` and implement your custom -methods. - -For example, let's say we wanted to call a specific function each time the last -byte is read from a stream. This could be implemented by overriding the -`read()` method. - -```php -use Psr\Http\Message\StreamInterface; -use GuzzleHttp\Psr7\StreamDecoratorTrait; - -class EofCallbackStream implements StreamInterface -{ - use StreamDecoratorTrait; - - private $callback; - - private $stream; - - public function __construct(StreamInterface $stream, callable $cb) - { - $this->stream = $stream; - $this->callback = $cb; - } - - public function read($length) - { - $result = $this->stream->read($length); - - // Invoke the callback when EOF is hit. - if ($this->eof()) { - call_user_func($this->callback); - } - - return $result; - } -} -``` - -This decorator could be added to any existing stream and used like so: - -```php -use GuzzleHttp\Psr7; - -$original = Psr7\Utils::streamFor('foo'); - -$eofStream = new EofCallbackStream($original, function () { - echo 'EOF!'; -}); - -$eofStream->read(2); -$eofStream->read(1); -// echoes "EOF!" -$eofStream->seek(0); -$eofStream->read(3); -// echoes "EOF!" -``` - - -## PHP StreamWrapper - -You can use the `GuzzleHttp\Psr7\StreamWrapper` class if you need to use a -PSR-7 stream as a PHP stream resource. - -Use the `GuzzleHttp\Psr7\StreamWrapper::getResource()` method to create a PHP -stream from a PSR-7 stream. - -```php -use GuzzleHttp\Psr7\StreamWrapper; - -$stream = GuzzleHttp\Psr7\Utils::streamFor('hello!'); -$resource = StreamWrapper::getResource($stream); -echo fread($resource, 6); // outputs hello! -``` - - -# Static API - -There are various static methods available under the `GuzzleHttp\Psr7` namespace. - - -## `GuzzleHttp\Psr7\Message::toString` - -`public static function toString(MessageInterface $message): string` - -Returns the string representation of an HTTP message. - -```php -$request = new GuzzleHttp\Psr7\Request('GET', 'http://example.com'); -echo GuzzleHttp\Psr7\Message::toString($request); -``` - - -## `GuzzleHttp\Psr7\Message::bodySummary` - -`public static function bodySummary(MessageInterface $message, int $truncateAt = 120): string|null` - -Get a short summary of the message body. - -Will return `null` if the response is not printable. - - -## `GuzzleHttp\Psr7\Message::rewindBody` - -`public static function rewindBody(MessageInterface $message): void` - -Attempts to rewind a message body and throws an exception on failure. - -The body of the message will only be rewound if a call to `tell()` -returns a value other than `0`. - - -## `GuzzleHttp\Psr7\Message::parseMessage` - -`public static function parseMessage(string $message): array` - -Parses an HTTP message into an associative array. - -The array contains the "start-line" key containing the start line of -the message, "headers" key containing an associative array of header -array values, and a "body" key containing the body of the message. - - -## `GuzzleHttp\Psr7\Message::parseRequestUri` - -`public static function parseRequestUri(string $path, array $headers): string` - -Constructs a URI for an HTTP request message. - - -## `GuzzleHttp\Psr7\Message::parseRequest` - -`public static function parseRequest(string $message): Request` - -Parses a request message string into a request object. - - -## `GuzzleHttp\Psr7\Message::parseResponse` - -`public static function parseResponse(string $message): Response` - -Parses a response message string into a response object. - - -## `GuzzleHttp\Psr7\Header::parse` - -`public static function parse(string|array $header): array` - -Parse an array of header values containing ";" separated data into an -array of associative arrays representing the header key value pair data -of the header. When a parameter does not contain a value, but just -contains a key, this function will inject a key with a '' string value. - - -## `GuzzleHttp\Psr7\Header::splitList` - -`public static function splitList(string|string[] $header): string[]` - -Splits a HTTP header defined to contain a comma-separated list into -each individual value: - -``` -$knownEtags = Header::splitList($request->getHeader('if-none-match')); -``` - -Example headers include `accept`, `cache-control` and `if-none-match`. - - -## `GuzzleHttp\Psr7\Header::normalize` (deprecated) - -`public static function normalize(string|array $header): array` - -`Header::normalize()` is deprecated in favor of [`Header::splitList()`](README.md#guzzlehttppsr7headersplitlist) -which performs the same operation with a cleaned up API and improved -documentation. - -Converts an array of header values that may contain comma separated -headers into an array of headers with no comma separated values. - - -## `GuzzleHttp\Psr7\Query::parse` - -`public static function parse(string $str, int|bool $urlEncoding = true): array` - -Parse a query string into an associative array. - -If multiple values are found for the same key, the value of that key -value pair will become an array. This function does not parse nested -PHP style arrays into an associative array (e.g., `foo[a]=1&foo[b]=2` -will be parsed into `['foo[a]' => '1', 'foo[b]' => '2'])`. - - -## `GuzzleHttp\Psr7\Query::build` - -`public static function build(array $params, int|false $encoding = PHP_QUERY_RFC3986): string` - -Build a query string from an array of key value pairs. - -This function can use the return value of `parse()` to build a query -string. This function does not modify the provided keys when an array is -encountered (like `http_build_query()` would). - - -## `GuzzleHttp\Psr7\Utils::caselessRemove` - -`public static function caselessRemove(iterable $keys, $keys, array $data): array` - -Remove the items given by the keys, case insensitively from the data. - - -## `GuzzleHttp\Psr7\Utils::copyToStream` - -`public static function copyToStream(StreamInterface $source, StreamInterface $dest, int $maxLen = -1): void` - -Copy the contents of a stream into another stream until the given number -of bytes have been read. - - -## `GuzzleHttp\Psr7\Utils::copyToString` - -`public static function copyToString(StreamInterface $stream, int $maxLen = -1): string` - -Copy the contents of a stream into a string until the given number of -bytes have been read. - - -## `GuzzleHttp\Psr7\Utils::hash` - -`public static function hash(StreamInterface $stream, string $algo, bool $rawOutput = false): string` - -Calculate a hash of a stream. - -This method reads the entire stream to calculate a rolling hash, based on -PHP's `hash_init` functions. - - -## `GuzzleHttp\Psr7\Utils::modifyRequest` - -`public static function modifyRequest(RequestInterface $request, array $changes): RequestInterface` - -Clone and modify a request with the given changes. - -This method is useful for reducing the number of clones needed to mutate -a message. - -- method: (string) Changes the HTTP method. -- set_headers: (array) Sets the given headers. -- remove_headers: (array) Remove the given headers. -- body: (mixed) Sets the given body. -- uri: (UriInterface) Set the URI. -- query: (string) Set the query string value of the URI. -- version: (string) Set the protocol version. - - -## `GuzzleHttp\Psr7\Utils::readLine` - -`public static function readLine(StreamInterface $stream, int $maxLength = null): string` - -Read a line from the stream up to the maximum allowed buffer length. - - -## `GuzzleHttp\Psr7\Utils::streamFor` - -`public static function streamFor(resource|string|null|int|float|bool|StreamInterface|callable|\Iterator $resource = '', array $options = []): StreamInterface` - -Create a new stream based on the input type. - -Options is an associative array that can contain the following keys: - -- metadata: Array of custom metadata. -- size: Size of the stream. - -This method accepts the following `$resource` types: - -- `Psr\Http\Message\StreamInterface`: Returns the value as-is. -- `string`: Creates a stream object that uses the given string as the contents. -- `resource`: Creates a stream object that wraps the given PHP stream resource. -- `Iterator`: If the provided value implements `Iterator`, then a read-only - stream object will be created that wraps the given iterable. Each time the - stream is read from, data from the iterator will fill a buffer and will be - continuously called until the buffer is equal to the requested read size. - Subsequent read calls will first read from the buffer and then call `next` - on the underlying iterator until it is exhausted. -- `object` with `__toString()`: If the object has the `__toString()` method, - the object will be cast to a string and then a stream will be returned that - uses the string value. -- `NULL`: When `null` is passed, an empty stream object is returned. -- `callable` When a callable is passed, a read-only stream object will be - created that invokes the given callable. The callable is invoked with the - number of suggested bytes to read. The callable can return any number of - bytes, but MUST return `false` when there is no more data to return. The - stream object that wraps the callable will invoke the callable until the - number of requested bytes are available. Any additional bytes will be - buffered and used in subsequent reads. - -```php -$stream = GuzzleHttp\Psr7\Utils::streamFor('foo'); -$stream = GuzzleHttp\Psr7\Utils::streamFor(fopen('/path/to/file', 'r')); - -$generator = function ($bytes) { - for ($i = 0; $i < $bytes; $i++) { - yield ' '; - } -} - -$stream = GuzzleHttp\Psr7\Utils::streamFor($generator(100)); -``` - - -## `GuzzleHttp\Psr7\Utils::tryFopen` - -`public static function tryFopen(string $filename, string $mode): resource` - -Safely opens a PHP stream resource using a filename. - -When fopen fails, PHP normally raises a warning. This function adds an -error handler that checks for errors and throws an exception instead. - - -## `GuzzleHttp\Psr7\Utils::tryGetContents` - -`public static function tryGetContents(resource $stream): string` - -Safely gets the contents of a given stream. - -When stream_get_contents fails, PHP normally raises a warning. This -function adds an error handler that checks for errors and throws an -exception instead. - - -## `GuzzleHttp\Psr7\Utils::uriFor` - -`public static function uriFor(string|UriInterface $uri): UriInterface` - -Returns a UriInterface for the given value. - -This function accepts a string or UriInterface and returns a -UriInterface for the given value. If the value is already a -UriInterface, it is returned as-is. - - -## `GuzzleHttp\Psr7\MimeType::fromFilename` - -`public static function fromFilename(string $filename): string|null` - -Determines the mimetype of a file by looking at its extension. - - -## `GuzzleHttp\Psr7\MimeType::fromExtension` - -`public static function fromExtension(string $extension): string|null` - -Maps a file extensions to a mimetype. - - -## Upgrading from Function API - -The static API was first introduced in 1.7.0, in order to mitigate problems with functions conflicting between global and local copies of the package. The function API was removed in 2.0.0. A migration table has been provided here for your convenience: - -| Original Function | Replacement Method | -|----------------|----------------| -| `str` | `Message::toString` | -| `uri_for` | `Utils::uriFor` | -| `stream_for` | `Utils::streamFor` | -| `parse_header` | `Header::parse` | -| `normalize_header` | `Header::normalize` | -| `modify_request` | `Utils::modifyRequest` | -| `rewind_body` | `Message::rewindBody` | -| `try_fopen` | `Utils::tryFopen` | -| `copy_to_string` | `Utils::copyToString` | -| `copy_to_stream` | `Utils::copyToStream` | -| `hash` | `Utils::hash` | -| `readline` | `Utils::readLine` | -| `parse_request` | `Message::parseRequest` | -| `parse_response` | `Message::parseResponse` | -| `parse_query` | `Query::parse` | -| `build_query` | `Query::build` | -| `mimetype_from_filename` | `MimeType::fromFilename` | -| `mimetype_from_extension` | `MimeType::fromExtension` | -| `_parse_message` | `Message::parseMessage` | -| `_parse_request_uri` | `Message::parseRequestUri` | -| `get_message_body_summary` | `Message::bodySummary` | -| `_caseless_remove` | `Utils::caselessRemove` | - - -# Additional URI Methods - -Aside from the standard `Psr\Http\Message\UriInterface` implementation in form of the `GuzzleHttp\Psr7\Uri` class, -this library also provides additional functionality when working with URIs as static methods. - -## URI Types - -An instance of `Psr\Http\Message\UriInterface` can either be an absolute URI or a relative reference. -An absolute URI has a scheme. A relative reference is used to express a URI relative to another URI, -the base URI. Relative references can be divided into several forms according to -[RFC 3986 Section 4.2](https://tools.ietf.org/html/rfc3986#section-4.2): - -- network-path references, e.g. `//example.com/path` -- absolute-path references, e.g. `/path` -- relative-path references, e.g. `subpath` - -The following methods can be used to identify the type of the URI. - -### `GuzzleHttp\Psr7\Uri::isAbsolute` - -`public static function isAbsolute(UriInterface $uri): bool` - -Whether the URI is absolute, i.e. it has a scheme. - -### `GuzzleHttp\Psr7\Uri::isNetworkPathReference` - -`public static function isNetworkPathReference(UriInterface $uri): bool` - -Whether the URI is a network-path reference. A relative reference that begins with two slash characters is -termed an network-path reference. - -### `GuzzleHttp\Psr7\Uri::isAbsolutePathReference` - -`public static function isAbsolutePathReference(UriInterface $uri): bool` - -Whether the URI is a absolute-path reference. A relative reference that begins with a single slash character is -termed an absolute-path reference. - -### `GuzzleHttp\Psr7\Uri::isRelativePathReference` - -`public static function isRelativePathReference(UriInterface $uri): bool` - -Whether the URI is a relative-path reference. A relative reference that does not begin with a slash character is -termed a relative-path reference. - -### `GuzzleHttp\Psr7\Uri::isSameDocumentReference` - -`public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool` - -Whether the URI is a same-document reference. A same-document reference refers to a URI that is, aside from its -fragment component, identical to the base URI. When no base URI is given, only an empty URI reference -(apart from its fragment) is considered a same-document reference. - -## URI Components - -Additional methods to work with URI components. - -### `GuzzleHttp\Psr7\Uri::isDefaultPort` - -`public static function isDefaultPort(UriInterface $uri): bool` - -Whether the URI has the default port of the current scheme. `Psr\Http\Message\UriInterface::getPort` may return null -or the standard port. This method can be used independently of the implementation. - -### `GuzzleHttp\Psr7\Uri::composeComponents` - -`public static function composeComponents($scheme, $authority, $path, $query, $fragment): string` - -Composes a URI reference string from its various components according to -[RFC 3986 Section 5.3](https://tools.ietf.org/html/rfc3986#section-5.3). Usually this method does not need to be called -manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__toString`. - -### `GuzzleHttp\Psr7\Uri::fromParts` - -`public static function fromParts(array $parts): UriInterface` - -Creates a URI from a hash of [`parse_url`](https://www.php.net/manual/en/function.parse-url.php) components. - - -### `GuzzleHttp\Psr7\Uri::withQueryValue` - -`public static function withQueryValue(UriInterface $uri, $key, $value): UriInterface` - -Creates a new URI with a specific query string value. Any existing query string values that exactly match the -provided key are removed and replaced with the given key value pair. A value of null will set the query string -key without a value, e.g. "key" instead of "key=value". - -### `GuzzleHttp\Psr7\Uri::withQueryValues` - -`public static function withQueryValues(UriInterface $uri, array $keyValueArray): UriInterface` - -Creates a new URI with multiple query string values. It has the same behavior as `withQueryValue()` but for an -associative array of key => value. - -### `GuzzleHttp\Psr7\Uri::withoutQueryValue` - -`public static function withoutQueryValue(UriInterface $uri, $key): UriInterface` - -Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the -provided key are removed. - -## Cross-Origin Detection - -`GuzzleHttp\Psr7\UriComparator` provides methods to determine if a modified URL should be considered cross-origin. - -### `GuzzleHttp\Psr7\UriComparator::isCrossOrigin` - -`public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool` - -Determines if a modified URL should be considered cross-origin with respect to an original URL. - -## Reference Resolution - -`GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according -to [RFC 3986 Section 5](https://tools.ietf.org/html/rfc3986#section-5). This is for example also what web browsers -do when resolving a link in a website based on the current request URI. - -### `GuzzleHttp\Psr7\UriResolver::resolve` - -`public static function resolve(UriInterface $base, UriInterface $rel): UriInterface` - -Converts the relative URI into a new URI that is resolved against the base URI. - -### `GuzzleHttp\Psr7\UriResolver::removeDotSegments` - -`public static function removeDotSegments(string $path): string` - -Removes dot segments from a path and returns the new path according to -[RFC 3986 Section 5.2.4](https://tools.ietf.org/html/rfc3986#section-5.2.4). - -### `GuzzleHttp\Psr7\UriResolver::relativize` - -`public static function relativize(UriInterface $base, UriInterface $target): UriInterface` - -Returns the target URI as a relative reference from the base URI. This method is the counterpart to resolve(): - -```php -(string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target)) -``` - -One use-case is to use the current request URI as base URI and then generate relative links in your documents -to reduce the document size or offer self-contained downloadable document archives. - -```php -$base = new Uri('http://example.com/a/b/'); -echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c')); // prints 'c'. -echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y')); // prints '../x/y'. -echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'. -echo UriResolver::relativize($base, new Uri('http://example.org/a/b/')); // prints '//example.org/a/b/'. -``` - -## Normalization and Comparison - -`GuzzleHttp\Psr7\UriNormalizer` provides methods to normalize and compare URIs according to -[RFC 3986 Section 6](https://tools.ietf.org/html/rfc3986#section-6). - -### `GuzzleHttp\Psr7\UriNormalizer::normalize` - -`public static function normalize(UriInterface $uri, $flags = self::PRESERVING_NORMALIZATIONS): UriInterface` - -Returns a normalized URI. The scheme and host component are already normalized to lowercase per PSR-7 UriInterface. -This methods adds additional normalizations that can be configured with the `$flags` parameter which is a bitmask -of normalizations to apply. The following normalizations are available: - -- `UriNormalizer::PRESERVING_NORMALIZATIONS` - - Default normalizations which only include the ones that preserve semantics. - -- `UriNormalizer::CAPITALIZE_PERCENT_ENCODING` - - All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized. - - Example: `http://example.org/a%c2%b1b` → `http://example.org/a%C2%B1b` - -- `UriNormalizer::DECODE_UNRESERVED_CHARACTERS` - - Decodes percent-encoded octets of unreserved characters. For consistency, percent-encoded octets in the ranges of - ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39), hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should - not be created by URI producers and, when found in a URI, should be decoded to their corresponding unreserved - characters by URI normalizers. - - Example: `http://example.org/%7Eusern%61me/` → `http://example.org/~username/` - -- `UriNormalizer::CONVERT_EMPTY_PATH` - - Converts the empty path to "/" for http and https URIs. - - Example: `http://example.org` → `http://example.org/` - -- `UriNormalizer::REMOVE_DEFAULT_HOST` - - Removes the default host of the given URI scheme from the URI. Only the "file" scheme defines the default host - "localhost". All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile` are equivalent according to - RFC 3986. - - Example: `file://localhost/myfile` → `file:///myfile` - -- `UriNormalizer::REMOVE_DEFAULT_PORT` - - Removes the default port of the given URI scheme from the URI. - - Example: `http://example.org:80/` → `http://example.org/` - -- `UriNormalizer::REMOVE_DOT_SEGMENTS` - - Removes unnecessary dot-segments. Dot-segments in relative-path references are not removed as it would - change the semantics of the URI reference. - - Example: `http://example.org/../a/b/../c/./d.html` → `http://example.org/a/c/d.html` - -- `UriNormalizer::REMOVE_DUPLICATE_SLASHES` - - Paths which include two or more adjacent slashes are converted to one. Webservers usually ignore duplicate slashes - and treat those URIs equivalent. But in theory those URIs do not need to be equivalent. So this normalization - may change the semantics. Encoded slashes (%2F) are not removed. - - Example: `http://example.org//foo///bar.html` → `http://example.org/foo/bar.html` - -- `UriNormalizer::SORT_QUERY_PARAMETERS` - - Sort query parameters with their values in alphabetical order. However, the order of parameters in a URI may be - significant (this is not defined by the standard). So this normalization is not safe and may change the semantics - of the URI. - - Example: `?lang=en&article=fred` → `?article=fred&lang=en` - -### `GuzzleHttp\Psr7\UriNormalizer::isEquivalent` - -`public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, $normalizations = self::PRESERVING_NORMALIZATIONS): bool` - -Whether two URIs can be considered equivalent. Both URIs are normalized automatically before comparison with the given -`$normalizations` bitmask. The method also accepts relative URI references and returns true when they are equivalent. -This of course assumes they will be resolved against the same base URI. If this is not the case, determination of -equivalence or difference of relative references does not mean anything. - - -## Security - -If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information. - - -## License - -Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information. - - -## For Enterprise - -Available as part of the Tidelift Subscription - -The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-psr7?utm_source=packagist-guzzlehttp-psr7&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff --git a/src/vendor/guzzlehttp/psr7/composer.json b/src/vendor/guzzlehttp/psr7/composer.json deleted file mode 100644 index d51dd62..0000000 --- a/src/vendor/guzzlehttp/psr7/composer.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "name": "guzzlehttp/psr7", - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "request", - "response", - "message", - "stream", - "http", - "uri", - "url", - "psr-7" - ], - "license": "MIT", - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" - } - ], - "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 || ^2.0", - "ralouphie/getallheaders": "^3.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "GuzzleHttp\\Tests\\Psr7\\": "tests/" - } - }, - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "config": { - "allow-plugins": { - "bamarni/composer-bin-plugin": true - }, - "preferred-install": "dist", - "sort-packages": true - } -} diff --git a/src/vendor/guzzlehttp/psr7/src/MimeType.php b/src/vendor/guzzlehttp/psr7/src/MimeType.php deleted file mode 100644 index b131bdb..0000000 --- a/src/vendor/guzzlehttp/psr7/src/MimeType.php +++ /dev/null @@ -1,1259 +0,0 @@ - 'application/vnd.1000minds.decision-model+xml', - '3dml' => 'text/vnd.in3d.3dml', - '3ds' => 'image/x-3ds', - '3g2' => 'video/3gpp2', - '3gp' => 'video/3gp', - '3gpp' => 'video/3gpp', - '3mf' => 'model/3mf', - '7z' => 'application/x-7z-compressed', - '7zip' => 'application/x-7z-compressed', - '123' => 'application/vnd.lotus-1-2-3', - 'aab' => 'application/x-authorware-bin', - 'aac' => 'audio/aac', - 'aam' => 'application/x-authorware-map', - 'aas' => 'application/x-authorware-seg', - 'abw' => 'application/x-abiword', - 'ac' => 'application/vnd.nokia.n-gage.ac+xml', - 'ac3' => 'audio/ac3', - 'acc' => 'application/vnd.americandynamics.acc', - 'ace' => 'application/x-ace-compressed', - 'acu' => 'application/vnd.acucobol', - 'acutc' => 'application/vnd.acucorp', - 'adp' => 'audio/adpcm', - 'adts' => 'audio/aac', - 'aep' => 'application/vnd.audiograph', - 'afm' => 'application/x-font-type1', - 'afp' => 'application/vnd.ibm.modcap', - 'age' => 'application/vnd.age', - 'ahead' => 'application/vnd.ahead.space', - 'ai' => 'application/pdf', - 'aif' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'air' => 'application/vnd.adobe.air-application-installer-package+zip', - 'ait' => 'application/vnd.dvb.ait', - 'ami' => 'application/vnd.amiga.ami', - 'aml' => 'application/automationml-aml+xml', - 'amlx' => 'application/automationml-amlx+zip', - 'amr' => 'audio/amr', - 'apk' => 'application/vnd.android.package-archive', - 'apng' => 'image/apng', - 'appcache' => 'text/cache-manifest', - 'appinstaller' => 'application/appinstaller', - 'application' => 'application/x-ms-application', - 'appx' => 'application/appx', - 'appxbundle' => 'application/appxbundle', - 'apr' => 'application/vnd.lotus-approach', - 'arc' => 'application/x-freearc', - 'arj' => 'application/x-arj', - 'asc' => 'application/pgp-signature', - 'asf' => 'video/x-ms-asf', - 'asm' => 'text/x-asm', - 'aso' => 'application/vnd.accpac.simply.aso', - 'asx' => 'video/x-ms-asf', - 'atc' => 'application/vnd.acucorp', - 'atom' => 'application/atom+xml', - 'atomcat' => 'application/atomcat+xml', - 'atomdeleted' => 'application/atomdeleted+xml', - 'atomsvc' => 'application/atomsvc+xml', - 'atx' => 'application/vnd.antix.game-component', - 'au' => 'audio/x-au', - 'avci' => 'image/avci', - 'avcs' => 'image/avcs', - 'avi' => 'video/x-msvideo', - 'avif' => 'image/avif', - 'aw' => 'application/applixware', - 'azf' => 'application/vnd.airzip.filesecure.azf', - 'azs' => 'application/vnd.airzip.filesecure.azs', - 'azv' => 'image/vnd.airzip.accelerator.azv', - 'azw' => 'application/vnd.amazon.ebook', - 'b16' => 'image/vnd.pco.b16', - 'bat' => 'application/x-msdownload', - 'bcpio' => 'application/x-bcpio', - 'bdf' => 'application/x-font-bdf', - 'bdm' => 'application/vnd.syncml.dm+wbxml', - 'bdoc' => 'application/x-bdoc', - 'bed' => 'application/vnd.realvnc.bed', - 'bh2' => 'application/vnd.fujitsu.oasysprs', - 'bin' => 'application/octet-stream', - 'blb' => 'application/x-blorb', - 'blorb' => 'application/x-blorb', - 'bmi' => 'application/vnd.bmi', - 'bmml' => 'application/vnd.balsamiq.bmml+xml', - 'bmp' => 'image/bmp', - 'book' => 'application/vnd.framemaker', - 'box' => 'application/vnd.previewsystems.box', - 'boz' => 'application/x-bzip2', - 'bpk' => 'application/octet-stream', - 'bpmn' => 'application/octet-stream', - 'bsp' => 'model/vnd.valve.source.compiled-map', - 'btf' => 'image/prs.btif', - 'btif' => 'image/prs.btif', - 'buffer' => 'application/octet-stream', - 'bz' => 'application/x-bzip', - 'bz2' => 'application/x-bzip2', - 'c' => 'text/x-c', - 'c4d' => 'application/vnd.clonk.c4group', - 'c4f' => 'application/vnd.clonk.c4group', - 'c4g' => 'application/vnd.clonk.c4group', - 'c4p' => 'application/vnd.clonk.c4group', - 'c4u' => 'application/vnd.clonk.c4group', - 'c11amc' => 'application/vnd.cluetrust.cartomobile-config', - 'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg', - 'cab' => 'application/vnd.ms-cab-compressed', - 'caf' => 'audio/x-caf', - 'cap' => 'application/vnd.tcpdump.pcap', - 'car' => 'application/vnd.curl.car', - 'cat' => 'application/vnd.ms-pki.seccat', - 'cb7' => 'application/x-cbr', - 'cba' => 'application/x-cbr', - 'cbr' => 'application/x-cbr', - 'cbt' => 'application/x-cbr', - 'cbz' => 'application/x-cbr', - 'cc' => 'text/x-c', - 'cco' => 'application/x-cocoa', - 'cct' => 'application/x-director', - 'ccxml' => 'application/ccxml+xml', - 'cdbcmsg' => 'application/vnd.contact.cmsg', - 'cdf' => 'application/x-netcdf', - 'cdfx' => 'application/cdfx+xml', - 'cdkey' => 'application/vnd.mediastation.cdkey', - 'cdmia' => 'application/cdmi-capability', - 'cdmic' => 'application/cdmi-container', - 'cdmid' => 'application/cdmi-domain', - 'cdmio' => 'application/cdmi-object', - 'cdmiq' => 'application/cdmi-queue', - 'cdr' => 'application/cdr', - 'cdx' => 'chemical/x-cdx', - 'cdxml' => 'application/vnd.chemdraw+xml', - 'cdy' => 'application/vnd.cinderella', - 'cer' => 'application/pkix-cert', - 'cfs' => 'application/x-cfs-compressed', - 'cgm' => 'image/cgm', - 'chat' => 'application/x-chat', - 'chm' => 'application/vnd.ms-htmlhelp', - 'chrt' => 'application/vnd.kde.kchart', - 'cif' => 'chemical/x-cif', - 'cii' => 'application/vnd.anser-web-certificate-issue-initiation', - 'cil' => 'application/vnd.ms-artgalry', - 'cjs' => 'application/node', - 'cla' => 'application/vnd.claymore', - 'class' => 'application/octet-stream', - 'cld' => 'model/vnd.cld', - 'clkk' => 'application/vnd.crick.clicker.keyboard', - 'clkp' => 'application/vnd.crick.clicker.palette', - 'clkt' => 'application/vnd.crick.clicker.template', - 'clkw' => 'application/vnd.crick.clicker.wordbank', - 'clkx' => 'application/vnd.crick.clicker', - 'clp' => 'application/x-msclip', - 'cmc' => 'application/vnd.cosmocaller', - 'cmdf' => 'chemical/x-cmdf', - 'cml' => 'chemical/x-cml', - 'cmp' => 'application/vnd.yellowriver-custom-menu', - 'cmx' => 'image/x-cmx', - 'cod' => 'application/vnd.rim.cod', - 'coffee' => 'text/coffeescript', - 'com' => 'application/x-msdownload', - 'conf' => 'text/plain', - 'cpio' => 'application/x-cpio', - 'cpl' => 'application/cpl+xml', - 'cpp' => 'text/x-c', - 'cpt' => 'application/mac-compactpro', - 'crd' => 'application/x-mscardfile', - 'crl' => 'application/pkix-crl', - 'crt' => 'application/x-x509-ca-cert', - 'crx' => 'application/x-chrome-extension', - 'cryptonote' => 'application/vnd.rig.cryptonote', - 'csh' => 'application/x-csh', - 'csl' => 'application/vnd.citationstyles.style+xml', - 'csml' => 'chemical/x-csml', - 'csp' => 'application/vnd.commonspace', - 'csr' => 'application/octet-stream', - 'css' => 'text/css', - 'cst' => 'application/x-director', - 'csv' => 'text/csv', - 'cu' => 'application/cu-seeme', - 'curl' => 'text/vnd.curl', - 'cwl' => 'application/cwl', - 'cww' => 'application/prs.cww', - 'cxt' => 'application/x-director', - 'cxx' => 'text/x-c', - 'dae' => 'model/vnd.collada+xml', - 'daf' => 'application/vnd.mobius.daf', - 'dart' => 'application/vnd.dart', - 'dataless' => 'application/vnd.fdsn.seed', - 'davmount' => 'application/davmount+xml', - 'dbf' => 'application/vnd.dbf', - 'dbk' => 'application/docbook+xml', - 'dcr' => 'application/x-director', - 'dcurl' => 'text/vnd.curl.dcurl', - 'dd2' => 'application/vnd.oma.dd2+xml', - 'ddd' => 'application/vnd.fujixerox.ddd', - 'ddf' => 'application/vnd.syncml.dmddf+xml', - 'dds' => 'image/vnd.ms-dds', - 'deb' => 'application/x-debian-package', - 'def' => 'text/plain', - 'deploy' => 'application/octet-stream', - 'der' => 'application/x-x509-ca-cert', - 'dfac' => 'application/vnd.dreamfactory', - 'dgc' => 'application/x-dgc-compressed', - 'dib' => 'image/bmp', - 'dic' => 'text/x-c', - 'dir' => 'application/x-director', - 'dis' => 'application/vnd.mobius.dis', - 'disposition-notification' => 'message/disposition-notification', - 'dist' => 'application/octet-stream', - 'distz' => 'application/octet-stream', - 'djv' => 'image/vnd.djvu', - 'djvu' => 'image/vnd.djvu', - 'dll' => 'application/octet-stream', - 'dmg' => 'application/x-apple-diskimage', - 'dmn' => 'application/octet-stream', - 'dmp' => 'application/vnd.tcpdump.pcap', - 'dms' => 'application/octet-stream', - 'dna' => 'application/vnd.dna', - 'doc' => 'application/msword', - 'docm' => 'application/vnd.ms-word.template.macroEnabled.12', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'dot' => 'application/msword', - 'dotm' => 'application/vnd.ms-word.template.macroEnabled.12', - 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - 'dp' => 'application/vnd.osgi.dp', - 'dpg' => 'application/vnd.dpgraph', - 'dpx' => 'image/dpx', - 'dra' => 'audio/vnd.dra', - 'drle' => 'image/dicom-rle', - 'dsc' => 'text/prs.lines.tag', - 'dssc' => 'application/dssc+der', - 'dtb' => 'application/x-dtbook+xml', - 'dtd' => 'application/xml-dtd', - 'dts' => 'audio/vnd.dts', - 'dtshd' => 'audio/vnd.dts.hd', - 'dump' => 'application/octet-stream', - 'dvb' => 'video/vnd.dvb.file', - 'dvi' => 'application/x-dvi', - 'dwd' => 'application/atsc-dwd+xml', - 'dwf' => 'model/vnd.dwf', - 'dwg' => 'image/vnd.dwg', - 'dxf' => 'image/vnd.dxf', - 'dxp' => 'application/vnd.spotfire.dxp', - 'dxr' => 'application/x-director', - 'ear' => 'application/java-archive', - 'ecelp4800' => 'audio/vnd.nuera.ecelp4800', - 'ecelp7470' => 'audio/vnd.nuera.ecelp7470', - 'ecelp9600' => 'audio/vnd.nuera.ecelp9600', - 'ecma' => 'application/ecmascript', - 'edm' => 'application/vnd.novadigm.edm', - 'edx' => 'application/vnd.novadigm.edx', - 'efif' => 'application/vnd.picsel', - 'ei6' => 'application/vnd.pg.osasli', - 'elc' => 'application/octet-stream', - 'emf' => 'image/emf', - 'eml' => 'message/rfc822', - 'emma' => 'application/emma+xml', - 'emotionml' => 'application/emotionml+xml', - 'emz' => 'application/x-msmetafile', - 'eol' => 'audio/vnd.digital-winds', - 'eot' => 'application/vnd.ms-fontobject', - 'eps' => 'application/postscript', - 'epub' => 'application/epub+zip', - 'es3' => 'application/vnd.eszigno3+xml', - 'esa' => 'application/vnd.osgi.subsystem', - 'esf' => 'application/vnd.epson.esf', - 'et3' => 'application/vnd.eszigno3+xml', - 'etx' => 'text/x-setext', - 'eva' => 'application/x-eva', - 'evy' => 'application/x-envoy', - 'exe' => 'application/octet-stream', - 'exi' => 'application/exi', - 'exp' => 'application/express', - 'exr' => 'image/aces', - 'ext' => 'application/vnd.novadigm.ext', - 'ez' => 'application/andrew-inset', - 'ez2' => 'application/vnd.ezpix-album', - 'ez3' => 'application/vnd.ezpix-package', - 'f' => 'text/x-fortran', - 'f4v' => 'video/mp4', - 'f77' => 'text/x-fortran', - 'f90' => 'text/x-fortran', - 'fbs' => 'image/vnd.fastbidsheet', - 'fcdt' => 'application/vnd.adobe.formscentral.fcdt', - 'fcs' => 'application/vnd.isac.fcs', - 'fdf' => 'application/vnd.fdf', - 'fdt' => 'application/fdt+xml', - 'fe_launch' => 'application/vnd.denovo.fcselayout-link', - 'fg5' => 'application/vnd.fujitsu.oasysgp', - 'fgd' => 'application/x-director', - 'fh' => 'image/x-freehand', - 'fh4' => 'image/x-freehand', - 'fh5' => 'image/x-freehand', - 'fh7' => 'image/x-freehand', - 'fhc' => 'image/x-freehand', - 'fig' => 'application/x-xfig', - 'fits' => 'image/fits', - 'flac' => 'audio/x-flac', - 'fli' => 'video/x-fli', - 'flo' => 'application/vnd.micrografx.flo', - 'flv' => 'video/x-flv', - 'flw' => 'application/vnd.kde.kivio', - 'flx' => 'text/vnd.fmi.flexstor', - 'fly' => 'text/vnd.fly', - 'fm' => 'application/vnd.framemaker', - 'fnc' => 'application/vnd.frogans.fnc', - 'fo' => 'application/vnd.software602.filler.form+xml', - 'for' => 'text/x-fortran', - 'fpx' => 'image/vnd.fpx', - 'frame' => 'application/vnd.framemaker', - 'fsc' => 'application/vnd.fsc.weblaunch', - 'fst' => 'image/vnd.fst', - 'ftc' => 'application/vnd.fluxtime.clip', - 'fti' => 'application/vnd.anser-web-funds-transfer-initiation', - 'fvt' => 'video/vnd.fvt', - 'fxp' => 'application/vnd.adobe.fxp', - 'fxpl' => 'application/vnd.adobe.fxp', - 'fzs' => 'application/vnd.fuzzysheet', - 'g2w' => 'application/vnd.geoplan', - 'g3' => 'image/g3fax', - 'g3w' => 'application/vnd.geospace', - 'gac' => 'application/vnd.groove-account', - 'gam' => 'application/x-tads', - 'gbr' => 'application/rpki-ghostbusters', - 'gca' => 'application/x-gca-compressed', - 'gdl' => 'model/vnd.gdl', - 'gdoc' => 'application/vnd.google-apps.document', - 'ged' => 'text/vnd.familysearch.gedcom', - 'geo' => 'application/vnd.dynageo', - 'geojson' => 'application/geo+json', - 'gex' => 'application/vnd.geometry-explorer', - 'ggb' => 'application/vnd.geogebra.file', - 'ggt' => 'application/vnd.geogebra.tool', - 'ghf' => 'application/vnd.groove-help', - 'gif' => 'image/gif', - 'gim' => 'application/vnd.groove-identity-message', - 'glb' => 'model/gltf-binary', - 'gltf' => 'model/gltf+json', - 'gml' => 'application/gml+xml', - 'gmx' => 'application/vnd.gmx', - 'gnumeric' => 'application/x-gnumeric', - 'gpg' => 'application/gpg-keys', - 'gph' => 'application/vnd.flographit', - 'gpx' => 'application/gpx+xml', - 'gqf' => 'application/vnd.grafeq', - 'gqs' => 'application/vnd.grafeq', - 'gram' => 'application/srgs', - 'gramps' => 'application/x-gramps-xml', - 'gre' => 'application/vnd.geometry-explorer', - 'grv' => 'application/vnd.groove-injector', - 'grxml' => 'application/srgs+xml', - 'gsf' => 'application/x-font-ghostscript', - 'gsheet' => 'application/vnd.google-apps.spreadsheet', - 'gslides' => 'application/vnd.google-apps.presentation', - 'gtar' => 'application/x-gtar', - 'gtm' => 'application/vnd.groove-tool-message', - 'gtw' => 'model/vnd.gtw', - 'gv' => 'text/vnd.graphviz', - 'gxf' => 'application/gxf', - 'gxt' => 'application/vnd.geonext', - 'gz' => 'application/gzip', - 'gzip' => 'application/gzip', - 'h' => 'text/x-c', - 'h261' => 'video/h261', - 'h263' => 'video/h263', - 'h264' => 'video/h264', - 'hal' => 'application/vnd.hal+xml', - 'hbci' => 'application/vnd.hbci', - 'hbs' => 'text/x-handlebars-template', - 'hdd' => 'application/x-virtualbox-hdd', - 'hdf' => 'application/x-hdf', - 'heic' => 'image/heic', - 'heics' => 'image/heic-sequence', - 'heif' => 'image/heif', - 'heifs' => 'image/heif-sequence', - 'hej2' => 'image/hej2k', - 'held' => 'application/atsc-held+xml', - 'hh' => 'text/x-c', - 'hjson' => 'application/hjson', - 'hlp' => 'application/winhlp', - 'hpgl' => 'application/vnd.hp-hpgl', - 'hpid' => 'application/vnd.hp-hpid', - 'hps' => 'application/vnd.hp-hps', - 'hqx' => 'application/mac-binhex40', - 'hsj2' => 'image/hsj2', - 'htc' => 'text/x-component', - 'htke' => 'application/vnd.kenameaapp', - 'htm' => 'text/html', - 'html' => 'text/html', - 'hvd' => 'application/vnd.yamaha.hv-dic', - 'hvp' => 'application/vnd.yamaha.hv-voice', - 'hvs' => 'application/vnd.yamaha.hv-script', - 'i2g' => 'application/vnd.intergeo', - 'icc' => 'application/vnd.iccprofile', - 'ice' => 'x-conference/x-cooltalk', - 'icm' => 'application/vnd.iccprofile', - 'ico' => 'image/x-icon', - 'ics' => 'text/calendar', - 'ief' => 'image/ief', - 'ifb' => 'text/calendar', - 'ifm' => 'application/vnd.shana.informed.formdata', - 'iges' => 'model/iges', - 'igl' => 'application/vnd.igloader', - 'igm' => 'application/vnd.insors.igm', - 'igs' => 'model/iges', - 'igx' => 'application/vnd.micrografx.igx', - 'iif' => 'application/vnd.shana.informed.interchange', - 'img' => 'application/octet-stream', - 'imp' => 'application/vnd.accpac.simply.imp', - 'ims' => 'application/vnd.ms-ims', - 'in' => 'text/plain', - 'ini' => 'text/plain', - 'ink' => 'application/inkml+xml', - 'inkml' => 'application/inkml+xml', - 'install' => 'application/x-install-instructions', - 'iota' => 'application/vnd.astraea-software.iota', - 'ipfix' => 'application/ipfix', - 'ipk' => 'application/vnd.shana.informed.package', - 'irm' => 'application/vnd.ibm.rights-management', - 'irp' => 'application/vnd.irepository.package+xml', - 'iso' => 'application/x-iso9660-image', - 'itp' => 'application/vnd.shana.informed.formtemplate', - 'its' => 'application/its+xml', - 'ivp' => 'application/vnd.immervision-ivp', - 'ivu' => 'application/vnd.immervision-ivu', - 'jad' => 'text/vnd.sun.j2me.app-descriptor', - 'jade' => 'text/jade', - 'jam' => 'application/vnd.jam', - 'jar' => 'application/java-archive', - 'jardiff' => 'application/x-java-archive-diff', - 'java' => 'text/x-java-source', - 'jhc' => 'image/jphc', - 'jisp' => 'application/vnd.jisp', - 'jls' => 'image/jls', - 'jlt' => 'application/vnd.hp-jlyt', - 'jng' => 'image/x-jng', - 'jnlp' => 'application/x-java-jnlp-file', - 'joda' => 'application/vnd.joost.joda-archive', - 'jp2' => 'image/jp2', - 'jpe' => 'image/jpeg', - 'jpeg' => 'image/jpeg', - 'jpf' => 'image/jpx', - 'jpg' => 'image/jpeg', - 'jpg2' => 'image/jp2', - 'jpgm' => 'video/jpm', - 'jpgv' => 'video/jpeg', - 'jph' => 'image/jph', - 'jpm' => 'video/jpm', - 'jpx' => 'image/jpx', - 'js' => 'application/javascript', - 'json' => 'application/json', - 'json5' => 'application/json5', - 'jsonld' => 'application/ld+json', - 'jsonml' => 'application/jsonml+json', - 'jsx' => 'text/jsx', - 'jt' => 'model/jt', - 'jxr' => 'image/jxr', - 'jxra' => 'image/jxra', - 'jxrs' => 'image/jxrs', - 'jxs' => 'image/jxs', - 'jxsc' => 'image/jxsc', - 'jxsi' => 'image/jxsi', - 'jxss' => 'image/jxss', - 'kar' => 'audio/midi', - 'karbon' => 'application/vnd.kde.karbon', - 'kdb' => 'application/octet-stream', - 'kdbx' => 'application/x-keepass2', - 'key' => 'application/x-iwork-keynote-sffkey', - 'kfo' => 'application/vnd.kde.kformula', - 'kia' => 'application/vnd.kidspiration', - 'kml' => 'application/vnd.google-earth.kml+xml', - 'kmz' => 'application/vnd.google-earth.kmz', - 'kne' => 'application/vnd.kinar', - 'knp' => 'application/vnd.kinar', - 'kon' => 'application/vnd.kde.kontour', - 'kpr' => 'application/vnd.kde.kpresenter', - 'kpt' => 'application/vnd.kde.kpresenter', - 'kpxx' => 'application/vnd.ds-keypoint', - 'ksp' => 'application/vnd.kde.kspread', - 'ktr' => 'application/vnd.kahootz', - 'ktx' => 'image/ktx', - 'ktx2' => 'image/ktx2', - 'ktz' => 'application/vnd.kahootz', - 'kwd' => 'application/vnd.kde.kword', - 'kwt' => 'application/vnd.kde.kword', - 'lasxml' => 'application/vnd.las.las+xml', - 'latex' => 'application/x-latex', - 'lbd' => 'application/vnd.llamagraphics.life-balance.desktop', - 'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml', - 'les' => 'application/vnd.hhe.lesson-player', - 'less' => 'text/less', - 'lgr' => 'application/lgr+xml', - 'lha' => 'application/octet-stream', - 'link66' => 'application/vnd.route66.link66+xml', - 'list' => 'text/plain', - 'list3820' => 'application/vnd.ibm.modcap', - 'listafp' => 'application/vnd.ibm.modcap', - 'litcoffee' => 'text/coffeescript', - 'lnk' => 'application/x-ms-shortcut', - 'log' => 'text/plain', - 'lostxml' => 'application/lost+xml', - 'lrf' => 'application/octet-stream', - 'lrm' => 'application/vnd.ms-lrm', - 'ltf' => 'application/vnd.frogans.ltf', - 'lua' => 'text/x-lua', - 'luac' => 'application/x-lua-bytecode', - 'lvp' => 'audio/vnd.lucent.voice', - 'lwp' => 'application/vnd.lotus-wordpro', - 'lzh' => 'application/octet-stream', - 'm1v' => 'video/mpeg', - 'm2a' => 'audio/mpeg', - 'm2v' => 'video/mpeg', - 'm3a' => 'audio/mpeg', - 'm3u' => 'text/plain', - 'm3u8' => 'application/vnd.apple.mpegurl', - 'm4a' => 'audio/x-m4a', - 'm4p' => 'application/mp4', - 'm4s' => 'video/iso.segment', - 'm4u' => 'application/vnd.mpegurl', - 'm4v' => 'video/x-m4v', - 'm13' => 'application/x-msmediaview', - 'm14' => 'application/x-msmediaview', - 'm21' => 'application/mp21', - 'ma' => 'application/mathematica', - 'mads' => 'application/mads+xml', - 'maei' => 'application/mmt-aei+xml', - 'mag' => 'application/vnd.ecowin.chart', - 'maker' => 'application/vnd.framemaker', - 'man' => 'text/troff', - 'manifest' => 'text/cache-manifest', - 'map' => 'application/json', - 'mar' => 'application/octet-stream', - 'markdown' => 'text/markdown', - 'mathml' => 'application/mathml+xml', - 'mb' => 'application/mathematica', - 'mbk' => 'application/vnd.mobius.mbk', - 'mbox' => 'application/mbox', - 'mc1' => 'application/vnd.medcalcdata', - 'mcd' => 'application/vnd.mcd', - 'mcurl' => 'text/vnd.curl.mcurl', - 'md' => 'text/markdown', - 'mdb' => 'application/x-msaccess', - 'mdi' => 'image/vnd.ms-modi', - 'mdx' => 'text/mdx', - 'me' => 'text/troff', - 'mesh' => 'model/mesh', - 'meta4' => 'application/metalink4+xml', - 'metalink' => 'application/metalink+xml', - 'mets' => 'application/mets+xml', - 'mfm' => 'application/vnd.mfmp', - 'mft' => 'application/rpki-manifest', - 'mgp' => 'application/vnd.osgeo.mapguide.package', - 'mgz' => 'application/vnd.proteus.magazine', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mie' => 'application/x-mie', - 'mif' => 'application/vnd.mif', - 'mime' => 'message/rfc822', - 'mj2' => 'video/mj2', - 'mjp2' => 'video/mj2', - 'mjs' => 'text/javascript', - 'mk3d' => 'video/x-matroska', - 'mka' => 'audio/x-matroska', - 'mkd' => 'text/x-markdown', - 'mks' => 'video/x-matroska', - 'mkv' => 'video/x-matroska', - 'mlp' => 'application/vnd.dolby.mlp', - 'mmd' => 'application/vnd.chipnuts.karaoke-mmd', - 'mmf' => 'application/vnd.smaf', - 'mml' => 'text/mathml', - 'mmr' => 'image/vnd.fujixerox.edmics-mmr', - 'mng' => 'video/x-mng', - 'mny' => 'application/x-msmoney', - 'mobi' => 'application/x-mobipocket-ebook', - 'mods' => 'application/mods+xml', - 'mov' => 'video/quicktime', - 'movie' => 'video/x-sgi-movie', - 'mp2' => 'audio/mpeg', - 'mp2a' => 'audio/mpeg', - 'mp3' => 'audio/mpeg', - 'mp4' => 'video/mp4', - 'mp4a' => 'audio/mp4', - 'mp4s' => 'application/mp4', - 'mp4v' => 'video/mp4', - 'mp21' => 'application/mp21', - 'mpc' => 'application/vnd.mophun.certificate', - 'mpd' => 'application/dash+xml', - 'mpe' => 'video/mpeg', - 'mpeg' => 'video/mpeg', - 'mpf' => 'application/media-policy-dataset+xml', - 'mpg' => 'video/mpeg', - 'mpg4' => 'video/mp4', - 'mpga' => 'audio/mpeg', - 'mpkg' => 'application/vnd.apple.installer+xml', - 'mpm' => 'application/vnd.blueice.multipass', - 'mpn' => 'application/vnd.mophun.application', - 'mpp' => 'application/vnd.ms-project', - 'mpt' => 'application/vnd.ms-project', - 'mpy' => 'application/vnd.ibm.minipay', - 'mqy' => 'application/vnd.mobius.mqy', - 'mrc' => 'application/marc', - 'mrcx' => 'application/marcxml+xml', - 'ms' => 'text/troff', - 'mscml' => 'application/mediaservercontrol+xml', - 'mseed' => 'application/vnd.fdsn.mseed', - 'mseq' => 'application/vnd.mseq', - 'msf' => 'application/vnd.epson.msf', - 'msg' => 'application/vnd.ms-outlook', - 'msh' => 'model/mesh', - 'msi' => 'application/x-msdownload', - 'msix' => 'application/msix', - 'msixbundle' => 'application/msixbundle', - 'msl' => 'application/vnd.mobius.msl', - 'msm' => 'application/octet-stream', - 'msp' => 'application/octet-stream', - 'msty' => 'application/vnd.muvee.style', - 'mtl' => 'model/mtl', - 'mts' => 'model/vnd.mts', - 'mus' => 'application/vnd.musician', - 'musd' => 'application/mmt-usd+xml', - 'musicxml' => 'application/vnd.recordare.musicxml+xml', - 'mvb' => 'application/x-msmediaview', - 'mvt' => 'application/vnd.mapbox-vector-tile', - 'mwf' => 'application/vnd.mfer', - 'mxf' => 'application/mxf', - 'mxl' => 'application/vnd.recordare.musicxml', - 'mxmf' => 'audio/mobile-xmf', - 'mxml' => 'application/xv+xml', - 'mxs' => 'application/vnd.triscape.mxs', - 'mxu' => 'video/vnd.mpegurl', - 'n-gage' => 'application/vnd.nokia.n-gage.symbian.install', - 'n3' => 'text/n3', - 'nb' => 'application/mathematica', - 'nbp' => 'application/vnd.wolfram.player', - 'nc' => 'application/x-netcdf', - 'ncx' => 'application/x-dtbncx+xml', - 'nfo' => 'text/x-nfo', - 'ngdat' => 'application/vnd.nokia.n-gage.data', - 'nitf' => 'application/vnd.nitf', - 'nlu' => 'application/vnd.neurolanguage.nlu', - 'nml' => 'application/vnd.enliven', - 'nnd' => 'application/vnd.noblenet-directory', - 'nns' => 'application/vnd.noblenet-sealer', - 'nnw' => 'application/vnd.noblenet-web', - 'npx' => 'image/vnd.net-fpx', - 'nq' => 'application/n-quads', - 'nsc' => 'application/x-conference', - 'nsf' => 'application/vnd.lotus-notes', - 'nt' => 'application/n-triples', - 'ntf' => 'application/vnd.nitf', - 'numbers' => 'application/x-iwork-numbers-sffnumbers', - 'nzb' => 'application/x-nzb', - 'oa2' => 'application/vnd.fujitsu.oasys2', - 'oa3' => 'application/vnd.fujitsu.oasys3', - 'oas' => 'application/vnd.fujitsu.oasys', - 'obd' => 'application/x-msbinder', - 'obgx' => 'application/vnd.openblox.game+xml', - 'obj' => 'model/obj', - 'oda' => 'application/oda', - 'odb' => 'application/vnd.oasis.opendocument.database', - 'odc' => 'application/vnd.oasis.opendocument.chart', - 'odf' => 'application/vnd.oasis.opendocument.formula', - 'odft' => 'application/vnd.oasis.opendocument.formula-template', - 'odg' => 'application/vnd.oasis.opendocument.graphics', - 'odi' => 'application/vnd.oasis.opendocument.image', - 'odm' => 'application/vnd.oasis.opendocument.text-master', - 'odp' => 'application/vnd.oasis.opendocument.presentation', - 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', - 'odt' => 'application/vnd.oasis.opendocument.text', - 'oga' => 'audio/ogg', - 'ogex' => 'model/vnd.opengex', - 'ogg' => 'audio/ogg', - 'ogv' => 'video/ogg', - 'ogx' => 'application/ogg', - 'omdoc' => 'application/omdoc+xml', - 'onepkg' => 'application/onenote', - 'onetmp' => 'application/onenote', - 'onetoc' => 'application/onenote', - 'onetoc2' => 'application/onenote', - 'opf' => 'application/oebps-package+xml', - 'opml' => 'text/x-opml', - 'oprc' => 'application/vnd.palm', - 'opus' => 'audio/ogg', - 'org' => 'text/x-org', - 'osf' => 'application/vnd.yamaha.openscoreformat', - 'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml', - 'osm' => 'application/vnd.openstreetmap.data+xml', - 'otc' => 'application/vnd.oasis.opendocument.chart-template', - 'otf' => 'font/otf', - 'otg' => 'application/vnd.oasis.opendocument.graphics-template', - 'oth' => 'application/vnd.oasis.opendocument.text-web', - 'oti' => 'application/vnd.oasis.opendocument.image-template', - 'otp' => 'application/vnd.oasis.opendocument.presentation-template', - 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', - 'ott' => 'application/vnd.oasis.opendocument.text-template', - 'ova' => 'application/x-virtualbox-ova', - 'ovf' => 'application/x-virtualbox-ovf', - 'owl' => 'application/rdf+xml', - 'oxps' => 'application/oxps', - 'oxt' => 'application/vnd.openofficeorg.extension', - 'p' => 'text/x-pascal', - 'p7a' => 'application/x-pkcs7-signature', - 'p7b' => 'application/x-pkcs7-certificates', - 'p7c' => 'application/pkcs7-mime', - 'p7m' => 'application/pkcs7-mime', - 'p7r' => 'application/x-pkcs7-certreqresp', - 'p7s' => 'application/pkcs7-signature', - 'p8' => 'application/pkcs8', - 'p10' => 'application/x-pkcs10', - 'p12' => 'application/x-pkcs12', - 'pac' => 'application/x-ns-proxy-autoconfig', - 'pages' => 'application/x-iwork-pages-sffpages', - 'pas' => 'text/x-pascal', - 'paw' => 'application/vnd.pawaafile', - 'pbd' => 'application/vnd.powerbuilder6', - 'pbm' => 'image/x-portable-bitmap', - 'pcap' => 'application/vnd.tcpdump.pcap', - 'pcf' => 'application/x-font-pcf', - 'pcl' => 'application/vnd.hp-pcl', - 'pclxl' => 'application/vnd.hp-pclxl', - 'pct' => 'image/x-pict', - 'pcurl' => 'application/vnd.curl.pcurl', - 'pcx' => 'image/x-pcx', - 'pdb' => 'application/x-pilot', - 'pde' => 'text/x-processing', - 'pdf' => 'application/pdf', - 'pem' => 'application/x-x509-user-cert', - 'pfa' => 'application/x-font-type1', - 'pfb' => 'application/x-font-type1', - 'pfm' => 'application/x-font-type1', - 'pfr' => 'application/font-tdpfr', - 'pfx' => 'application/x-pkcs12', - 'pgm' => 'image/x-portable-graymap', - 'pgn' => 'application/x-chess-pgn', - 'pgp' => 'application/pgp', - 'phar' => 'application/octet-stream', - 'php' => 'application/x-httpd-php', - 'php3' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'phtml' => 'application/x-httpd-php', - 'pic' => 'image/x-pict', - 'pkg' => 'application/octet-stream', - 'pki' => 'application/pkixcmp', - 'pkipath' => 'application/pkix-pkipath', - 'pkpass' => 'application/vnd.apple.pkpass', - 'pl' => 'application/x-perl', - 'plb' => 'application/vnd.3gpp.pic-bw-large', - 'plc' => 'application/vnd.mobius.plc', - 'plf' => 'application/vnd.pocketlearn', - 'pls' => 'application/pls+xml', - 'pm' => 'application/x-perl', - 'pml' => 'application/vnd.ctc-posml', - 'png' => 'image/png', - 'pnm' => 'image/x-portable-anymap', - 'portpkg' => 'application/vnd.macports.portpkg', - 'pot' => 'application/vnd.ms-powerpoint', - 'potm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', - 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template', - 'ppa' => 'application/vnd.ms-powerpoint', - 'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12', - 'ppd' => 'application/vnd.cups-ppd', - 'ppm' => 'image/x-portable-pixmap', - 'pps' => 'application/vnd.ms-powerpoint', - 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', - 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', - 'ppt' => 'application/powerpoint', - 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', - 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', - 'pqa' => 'application/vnd.palm', - 'prc' => 'model/prc', - 'pre' => 'application/vnd.lotus-freelance', - 'prf' => 'application/pics-rules', - 'provx' => 'application/provenance+xml', - 'ps' => 'application/postscript', - 'psb' => 'application/vnd.3gpp.pic-bw-small', - 'psd' => 'application/x-photoshop', - 'psf' => 'application/x-font-linux-psf', - 'pskcxml' => 'application/pskc+xml', - 'pti' => 'image/prs.pti', - 'ptid' => 'application/vnd.pvi.ptid1', - 'pub' => 'application/x-mspublisher', - 'pvb' => 'application/vnd.3gpp.pic-bw-var', - 'pwn' => 'application/vnd.3m.post-it-notes', - 'pya' => 'audio/vnd.ms-playready.media.pya', - 'pyo' => 'model/vnd.pytha.pyox', - 'pyox' => 'model/vnd.pytha.pyox', - 'pyv' => 'video/vnd.ms-playready.media.pyv', - 'qam' => 'application/vnd.epson.quickanime', - 'qbo' => 'application/vnd.intu.qbo', - 'qfx' => 'application/vnd.intu.qfx', - 'qps' => 'application/vnd.publishare-delta-tree', - 'qt' => 'video/quicktime', - 'qwd' => 'application/vnd.quark.quarkxpress', - 'qwt' => 'application/vnd.quark.quarkxpress', - 'qxb' => 'application/vnd.quark.quarkxpress', - 'qxd' => 'application/vnd.quark.quarkxpress', - 'qxl' => 'application/vnd.quark.quarkxpress', - 'qxt' => 'application/vnd.quark.quarkxpress', - 'ra' => 'audio/x-realaudio', - 'ram' => 'audio/x-pn-realaudio', - 'raml' => 'application/raml+yaml', - 'rapd' => 'application/route-apd+xml', - 'rar' => 'application/x-rar', - 'ras' => 'image/x-cmu-raster', - 'rcprofile' => 'application/vnd.ipunplugged.rcprofile', - 'rdf' => 'application/rdf+xml', - 'rdz' => 'application/vnd.data-vision.rdz', - 'relo' => 'application/p2p-overlay+xml', - 'rep' => 'application/vnd.businessobjects', - 'res' => 'application/x-dtbresource+xml', - 'rgb' => 'image/x-rgb', - 'rif' => 'application/reginfo+xml', - 'rip' => 'audio/vnd.rip', - 'ris' => 'application/x-research-info-systems', - 'rl' => 'application/resource-lists+xml', - 'rlc' => 'image/vnd.fujixerox.edmics-rlc', - 'rld' => 'application/resource-lists-diff+xml', - 'rm' => 'audio/x-pn-realaudio', - 'rmi' => 'audio/midi', - 'rmp' => 'audio/x-pn-realaudio-plugin', - 'rms' => 'application/vnd.jcp.javame.midlet-rms', - 'rmvb' => 'application/vnd.rn-realmedia-vbr', - 'rnc' => 'application/relax-ng-compact-syntax', - 'rng' => 'application/xml', - 'roa' => 'application/rpki-roa', - 'roff' => 'text/troff', - 'rp9' => 'application/vnd.cloanto.rp9', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'rpss' => 'application/vnd.nokia.radio-presets', - 'rpst' => 'application/vnd.nokia.radio-preset', - 'rq' => 'application/sparql-query', - 'rs' => 'application/rls-services+xml', - 'rsa' => 'application/x-pkcs7', - 'rsat' => 'application/atsc-rsat+xml', - 'rsd' => 'application/rsd+xml', - 'rsheet' => 'application/urc-ressheet+xml', - 'rss' => 'application/rss+xml', - 'rtf' => 'text/rtf', - 'rtx' => 'text/richtext', - 'run' => 'application/x-makeself', - 'rusd' => 'application/route-usd+xml', - 'rv' => 'video/vnd.rn-realvideo', - 's' => 'text/x-asm', - 's3m' => 'audio/s3m', - 'saf' => 'application/vnd.yamaha.smaf-audio', - 'sass' => 'text/x-sass', - 'sbml' => 'application/sbml+xml', - 'sc' => 'application/vnd.ibm.secure-container', - 'scd' => 'application/x-msschedule', - 'scm' => 'application/vnd.lotus-screencam', - 'scq' => 'application/scvp-cv-request', - 'scs' => 'application/scvp-cv-response', - 'scss' => 'text/x-scss', - 'scurl' => 'text/vnd.curl.scurl', - 'sda' => 'application/vnd.stardivision.draw', - 'sdc' => 'application/vnd.stardivision.calc', - 'sdd' => 'application/vnd.stardivision.impress', - 'sdkd' => 'application/vnd.solent.sdkm+xml', - 'sdkm' => 'application/vnd.solent.sdkm+xml', - 'sdp' => 'application/sdp', - 'sdw' => 'application/vnd.stardivision.writer', - 'sea' => 'application/octet-stream', - 'see' => 'application/vnd.seemail', - 'seed' => 'application/vnd.fdsn.seed', - 'sema' => 'application/vnd.sema', - 'semd' => 'application/vnd.semd', - 'semf' => 'application/vnd.semf', - 'senmlx' => 'application/senml+xml', - 'sensmlx' => 'application/sensml+xml', - 'ser' => 'application/java-serialized-object', - 'setpay' => 'application/set-payment-initiation', - 'setreg' => 'application/set-registration-initiation', - 'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data', - 'sfs' => 'application/vnd.spotfire.sfs', - 'sfv' => 'text/x-sfv', - 'sgi' => 'image/sgi', - 'sgl' => 'application/vnd.stardivision.writer-global', - 'sgm' => 'text/sgml', - 'sgml' => 'text/sgml', - 'sh' => 'application/x-sh', - 'shar' => 'application/x-shar', - 'shex' => 'text/shex', - 'shf' => 'application/shf+xml', - 'shtml' => 'text/html', - 'sid' => 'image/x-mrsid-image', - 'sieve' => 'application/sieve', - 'sig' => 'application/pgp-signature', - 'sil' => 'audio/silk', - 'silo' => 'model/mesh', - 'sis' => 'application/vnd.symbian.install', - 'sisx' => 'application/vnd.symbian.install', - 'sit' => 'application/x-stuffit', - 'sitx' => 'application/x-stuffitx', - 'siv' => 'application/sieve', - 'skd' => 'application/vnd.koan', - 'skm' => 'application/vnd.koan', - 'skp' => 'application/vnd.koan', - 'skt' => 'application/vnd.koan', - 'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12', - 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide', - 'slim' => 'text/slim', - 'slm' => 'text/slim', - 'sls' => 'application/route-s-tsid+xml', - 'slt' => 'application/vnd.epson.salt', - 'sm' => 'application/vnd.stepmania.stepchart', - 'smf' => 'application/vnd.stardivision.math', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'smv' => 'video/x-smv', - 'smzip' => 'application/vnd.stepmania.package', - 'snd' => 'audio/basic', - 'snf' => 'application/x-font-snf', - 'so' => 'application/octet-stream', - 'spc' => 'application/x-pkcs7-certificates', - 'spdx' => 'text/spdx', - 'spf' => 'application/vnd.yamaha.smaf-phrase', - 'spl' => 'application/x-futuresplash', - 'spot' => 'text/vnd.in3d.spot', - 'spp' => 'application/scvp-vp-response', - 'spq' => 'application/scvp-vp-request', - 'spx' => 'audio/ogg', - 'sql' => 'application/x-sql', - 'src' => 'application/x-wais-source', - 'srt' => 'application/x-subrip', - 'sru' => 'application/sru+xml', - 'srx' => 'application/sparql-results+xml', - 'ssdl' => 'application/ssdl+xml', - 'sse' => 'application/vnd.kodak-descriptor', - 'ssf' => 'application/vnd.epson.ssf', - 'ssml' => 'application/ssml+xml', - 'sst' => 'application/octet-stream', - 'st' => 'application/vnd.sailingtracker.track', - 'stc' => 'application/vnd.sun.xml.calc.template', - 'std' => 'application/vnd.sun.xml.draw.template', - 'step' => 'application/STEP', - 'stf' => 'application/vnd.wt.stf', - 'sti' => 'application/vnd.sun.xml.impress.template', - 'stk' => 'application/hyperstudio', - 'stl' => 'model/stl', - 'stp' => 'application/STEP', - 'stpx' => 'model/step+xml', - 'stpxz' => 'model/step-xml+zip', - 'stpz' => 'model/step+zip', - 'str' => 'application/vnd.pg.format', - 'stw' => 'application/vnd.sun.xml.writer.template', - 'styl' => 'text/stylus', - 'stylus' => 'text/stylus', - 'sub' => 'text/vnd.dvb.subtitle', - 'sus' => 'application/vnd.sus-calendar', - 'susp' => 'application/vnd.sus-calendar', - 'sv4cpio' => 'application/x-sv4cpio', - 'sv4crc' => 'application/x-sv4crc', - 'svc' => 'application/vnd.dvb.service', - 'svd' => 'application/vnd.svd', - 'svg' => 'image/svg+xml', - 'svgz' => 'image/svg+xml', - 'swa' => 'application/x-director', - 'swf' => 'application/x-shockwave-flash', - 'swi' => 'application/vnd.aristanetworks.swi', - 'swidtag' => 'application/swid+xml', - 'sxc' => 'application/vnd.sun.xml.calc', - 'sxd' => 'application/vnd.sun.xml.draw', - 'sxg' => 'application/vnd.sun.xml.writer.global', - 'sxi' => 'application/vnd.sun.xml.impress', - 'sxm' => 'application/vnd.sun.xml.math', - 'sxw' => 'application/vnd.sun.xml.writer', - 't' => 'text/troff', - 't3' => 'application/x-t3vm-image', - 't38' => 'image/t38', - 'taglet' => 'application/vnd.mynfc', - 'tao' => 'application/vnd.tao.intent-module-archive', - 'tap' => 'image/vnd.tencent.tap', - 'tar' => 'application/x-tar', - 'tcap' => 'application/vnd.3gpp2.tcap', - 'tcl' => 'application/x-tcl', - 'td' => 'application/urc-targetdesc+xml', - 'teacher' => 'application/vnd.smart.teacher', - 'tei' => 'application/tei+xml', - 'teicorpus' => 'application/tei+xml', - 'tex' => 'application/x-tex', - 'texi' => 'application/x-texinfo', - 'texinfo' => 'application/x-texinfo', - 'text' => 'text/plain', - 'tfi' => 'application/thraud+xml', - 'tfm' => 'application/x-tex-tfm', - 'tfx' => 'image/tiff-fx', - 'tga' => 'image/x-tga', - 'tgz' => 'application/x-tar', - 'thmx' => 'application/vnd.ms-officetheme', - 'tif' => 'image/tiff', - 'tiff' => 'image/tiff', - 'tk' => 'application/x-tcl', - 'tmo' => 'application/vnd.tmobile-livetv', - 'toml' => 'application/toml', - 'torrent' => 'application/x-bittorrent', - 'tpl' => 'application/vnd.groove-tool-template', - 'tpt' => 'application/vnd.trid.tpt', - 'tr' => 'text/troff', - 'tra' => 'application/vnd.trueapp', - 'trig' => 'application/trig', - 'trm' => 'application/x-msterminal', - 'ts' => 'video/mp2t', - 'tsd' => 'application/timestamped-data', - 'tsv' => 'text/tab-separated-values', - 'ttc' => 'font/collection', - 'ttf' => 'font/ttf', - 'ttl' => 'text/turtle', - 'ttml' => 'application/ttml+xml', - 'twd' => 'application/vnd.simtech-mindmapper', - 'twds' => 'application/vnd.simtech-mindmapper', - 'txd' => 'application/vnd.genomatix.tuxedo', - 'txf' => 'application/vnd.mobius.txf', - 'txt' => 'text/plain', - 'u3d' => 'model/u3d', - 'u8dsn' => 'message/global-delivery-status', - 'u8hdr' => 'message/global-headers', - 'u8mdn' => 'message/global-disposition-notification', - 'u8msg' => 'message/global', - 'u32' => 'application/x-authorware-bin', - 'ubj' => 'application/ubjson', - 'udeb' => 'application/x-debian-package', - 'ufd' => 'application/vnd.ufdl', - 'ufdl' => 'application/vnd.ufdl', - 'ulx' => 'application/x-glulx', - 'umj' => 'application/vnd.umajin', - 'unityweb' => 'application/vnd.unity', - 'uo' => 'application/vnd.uoml+xml', - 'uoml' => 'application/vnd.uoml+xml', - 'uri' => 'text/uri-list', - 'uris' => 'text/uri-list', - 'urls' => 'text/uri-list', - 'usda' => 'model/vnd.usda', - 'usdz' => 'model/vnd.usdz+zip', - 'ustar' => 'application/x-ustar', - 'utz' => 'application/vnd.uiq.theme', - 'uu' => 'text/x-uuencode', - 'uva' => 'audio/vnd.dece.audio', - 'uvd' => 'application/vnd.dece.data', - 'uvf' => 'application/vnd.dece.data', - 'uvg' => 'image/vnd.dece.graphic', - 'uvh' => 'video/vnd.dece.hd', - 'uvi' => 'image/vnd.dece.graphic', - 'uvm' => 'video/vnd.dece.mobile', - 'uvp' => 'video/vnd.dece.pd', - 'uvs' => 'video/vnd.dece.sd', - 'uvt' => 'application/vnd.dece.ttml+xml', - 'uvu' => 'video/vnd.uvvu.mp4', - 'uvv' => 'video/vnd.dece.video', - 'uvva' => 'audio/vnd.dece.audio', - 'uvvd' => 'application/vnd.dece.data', - 'uvvf' => 'application/vnd.dece.data', - 'uvvg' => 'image/vnd.dece.graphic', - 'uvvh' => 'video/vnd.dece.hd', - 'uvvi' => 'image/vnd.dece.graphic', - 'uvvm' => 'video/vnd.dece.mobile', - 'uvvp' => 'video/vnd.dece.pd', - 'uvvs' => 'video/vnd.dece.sd', - 'uvvt' => 'application/vnd.dece.ttml+xml', - 'uvvu' => 'video/vnd.uvvu.mp4', - 'uvvv' => 'video/vnd.dece.video', - 'uvvx' => 'application/vnd.dece.unspecified', - 'uvvz' => 'application/vnd.dece.zip', - 'uvx' => 'application/vnd.dece.unspecified', - 'uvz' => 'application/vnd.dece.zip', - 'vbox' => 'application/x-virtualbox-vbox', - 'vbox-extpack' => 'application/x-virtualbox-vbox-extpack', - 'vcard' => 'text/vcard', - 'vcd' => 'application/x-cdlink', - 'vcf' => 'text/x-vcard', - 'vcg' => 'application/vnd.groove-vcard', - 'vcs' => 'text/x-vcalendar', - 'vcx' => 'application/vnd.vcx', - 'vdi' => 'application/x-virtualbox-vdi', - 'vds' => 'model/vnd.sap.vds', - 'vhd' => 'application/x-virtualbox-vhd', - 'vis' => 'application/vnd.visionary', - 'viv' => 'video/vnd.vivo', - 'vlc' => 'application/videolan', - 'vmdk' => 'application/x-virtualbox-vmdk', - 'vob' => 'video/x-ms-vob', - 'vor' => 'application/vnd.stardivision.writer', - 'vox' => 'application/x-authorware-bin', - 'vrml' => 'model/vrml', - 'vsd' => 'application/vnd.visio', - 'vsf' => 'application/vnd.vsf', - 'vss' => 'application/vnd.visio', - 'vst' => 'application/vnd.visio', - 'vsw' => 'application/vnd.visio', - 'vtf' => 'image/vnd.valve.source.texture', - 'vtt' => 'text/vtt', - 'vtu' => 'model/vnd.vtu', - 'vxml' => 'application/voicexml+xml', - 'w3d' => 'application/x-director', - 'wad' => 'application/x-doom', - 'wadl' => 'application/vnd.sun.wadl+xml', - 'war' => 'application/java-archive', - 'wasm' => 'application/wasm', - 'wav' => 'audio/x-wav', - 'wax' => 'audio/x-ms-wax', - 'wbmp' => 'image/vnd.wap.wbmp', - 'wbs' => 'application/vnd.criticaltools.wbs+xml', - 'wbxml' => 'application/wbxml', - 'wcm' => 'application/vnd.ms-works', - 'wdb' => 'application/vnd.ms-works', - 'wdp' => 'image/vnd.ms-photo', - 'weba' => 'audio/webm', - 'webapp' => 'application/x-web-app-manifest+json', - 'webm' => 'video/webm', - 'webmanifest' => 'application/manifest+json', - 'webp' => 'image/webp', - 'wg' => 'application/vnd.pmi.widget', - 'wgsl' => 'text/wgsl', - 'wgt' => 'application/widget', - 'wif' => 'application/watcherinfo+xml', - 'wks' => 'application/vnd.ms-works', - 'wm' => 'video/x-ms-wm', - 'wma' => 'audio/x-ms-wma', - 'wmd' => 'application/x-ms-wmd', - 'wmf' => 'image/wmf', - 'wml' => 'text/vnd.wap.wml', - 'wmlc' => 'application/wmlc', - 'wmls' => 'text/vnd.wap.wmlscript', - 'wmlsc' => 'application/vnd.wap.wmlscriptc', - 'wmv' => 'video/x-ms-wmv', - 'wmx' => 'video/x-ms-wmx', - 'wmz' => 'application/x-msmetafile', - 'woff' => 'font/woff', - 'woff2' => 'font/woff2', - 'word' => 'application/msword', - 'wpd' => 'application/vnd.wordperfect', - 'wpl' => 'application/vnd.ms-wpl', - 'wps' => 'application/vnd.ms-works', - 'wqd' => 'application/vnd.wqd', - 'wri' => 'application/x-mswrite', - 'wrl' => 'model/vrml', - 'wsc' => 'message/vnd.wfa.wsc', - 'wsdl' => 'application/wsdl+xml', - 'wspolicy' => 'application/wspolicy+xml', - 'wtb' => 'application/vnd.webturbo', - 'wvx' => 'video/x-ms-wvx', - 'x3d' => 'model/x3d+xml', - 'x3db' => 'model/x3d+fastinfoset', - 'x3dbz' => 'model/x3d+binary', - 'x3dv' => 'model/x3d-vrml', - 'x3dvz' => 'model/x3d+vrml', - 'x3dz' => 'model/x3d+xml', - 'x32' => 'application/x-authorware-bin', - 'x_b' => 'model/vnd.parasolid.transmit.binary', - 'x_t' => 'model/vnd.parasolid.transmit.text', - 'xaml' => 'application/xaml+xml', - 'xap' => 'application/x-silverlight-app', - 'xar' => 'application/vnd.xara', - 'xav' => 'application/xcap-att+xml', - 'xbap' => 'application/x-ms-xbap', - 'xbd' => 'application/vnd.fujixerox.docuworks.binder', - 'xbm' => 'image/x-xbitmap', - 'xca' => 'application/xcap-caps+xml', - 'xcs' => 'application/calendar+xml', - 'xdf' => 'application/xcap-diff+xml', - 'xdm' => 'application/vnd.syncml.dm+xml', - 'xdp' => 'application/vnd.adobe.xdp+xml', - 'xdssc' => 'application/dssc+xml', - 'xdw' => 'application/vnd.fujixerox.docuworks', - 'xel' => 'application/xcap-el+xml', - 'xenc' => 'application/xenc+xml', - 'xer' => 'application/patch-ops-error+xml', - 'xfdf' => 'application/xfdf', - 'xfdl' => 'application/vnd.xfdl', - 'xht' => 'application/xhtml+xml', - 'xhtm' => 'application/vnd.pwg-xhtml-print+xml', - 'xhtml' => 'application/xhtml+xml', - 'xhvml' => 'application/xv+xml', - 'xif' => 'image/vnd.xiff', - 'xl' => 'application/excel', - 'xla' => 'application/vnd.ms-excel', - 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12', - 'xlc' => 'application/vnd.ms-excel', - 'xlf' => 'application/xliff+xml', - 'xlm' => 'application/vnd.ms-excel', - 'xls' => 'application/vnd.ms-excel', - 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', - 'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'xlt' => 'application/vnd.ms-excel', - 'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12', - 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', - 'xlw' => 'application/vnd.ms-excel', - 'xm' => 'audio/xm', - 'xml' => 'application/xml', - 'xns' => 'application/xcap-ns+xml', - 'xo' => 'application/vnd.olpc-sugar', - 'xop' => 'application/xop+xml', - 'xpi' => 'application/x-xpinstall', - 'xpl' => 'application/xproc+xml', - 'xpm' => 'image/x-xpixmap', - 'xpr' => 'application/vnd.is-xpr', - 'xps' => 'application/vnd.ms-xpsdocument', - 'xpw' => 'application/vnd.intercon.formnet', - 'xpx' => 'application/vnd.intercon.formnet', - 'xsd' => 'application/xml', - 'xsf' => 'application/prs.xsf+xml', - 'xsl' => 'application/xml', - 'xslt' => 'application/xslt+xml', - 'xsm' => 'application/vnd.syncml+xml', - 'xspf' => 'application/xspf+xml', - 'xul' => 'application/vnd.mozilla.xul+xml', - 'xvm' => 'application/xv+xml', - 'xvml' => 'application/xv+xml', - 'xwd' => 'image/x-xwindowdump', - 'xyz' => 'chemical/x-xyz', - 'xz' => 'application/x-xz', - 'yaml' => 'text/yaml', - 'yang' => 'application/yang', - 'yin' => 'application/yin+xml', - 'yml' => 'text/yaml', - 'ymp' => 'text/x-suse-ymp', - 'z' => 'application/x-compress', - 'z1' => 'application/x-zmachine', - 'z2' => 'application/x-zmachine', - 'z3' => 'application/x-zmachine', - 'z4' => 'application/x-zmachine', - 'z5' => 'application/x-zmachine', - 'z6' => 'application/x-zmachine', - 'z7' => 'application/x-zmachine', - 'z8' => 'application/x-zmachine', - 'zaz' => 'application/vnd.zzazz.deck+xml', - 'zip' => 'application/zip', - 'zir' => 'application/vnd.zul', - 'zirz' => 'application/vnd.zul', - 'zmm' => 'application/vnd.handheld-entertainment+xml', - 'zsh' => 'text/x-scriptzsh', - ]; - - /** - * Determines the mimetype of a file by looking at its extension. - * - * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json - */ - public static function fromFilename(string $filename): ?string - { - return self::fromExtension(pathinfo($filename, PATHINFO_EXTENSION)); - } - - /** - * Maps a file extensions to a mimetype. - * - * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json - */ - public static function fromExtension(string $extension): ?string - { - return self::MIME_TYPES[strtolower($extension)] ?? null; - } -} diff --git a/src/vendor/guzzlehttp/psr7/src/Response.php b/src/vendor/guzzlehttp/psr7/src/Response.php deleted file mode 100644 index 8fc1147..0000000 --- a/src/vendor/guzzlehttp/psr7/src/Response.php +++ /dev/null @@ -1,161 +0,0 @@ - 'Continue', - 101 => 'Switching Protocols', - 102 => 'Processing', - 200 => 'OK', - 201 => 'Created', - 202 => 'Accepted', - 203 => 'Non-Authoritative Information', - 204 => 'No Content', - 205 => 'Reset Content', - 206 => 'Partial Content', - 207 => 'Multi-status', - 208 => 'Already Reported', - 300 => 'Multiple Choices', - 301 => 'Moved Permanently', - 302 => 'Found', - 303 => 'See Other', - 304 => 'Not Modified', - 305 => 'Use Proxy', - 306 => 'Switch Proxy', - 307 => 'Temporary Redirect', - 308 => 'Permanent Redirect', - 400 => 'Bad Request', - 401 => 'Unauthorized', - 402 => 'Payment Required', - 403 => 'Forbidden', - 404 => 'Not Found', - 405 => 'Method Not Allowed', - 406 => 'Not Acceptable', - 407 => 'Proxy Authentication Required', - 408 => 'Request Time-out', - 409 => 'Conflict', - 410 => 'Gone', - 411 => 'Length Required', - 412 => 'Precondition Failed', - 413 => 'Request Entity Too Large', - 414 => 'Request-URI Too Large', - 415 => 'Unsupported Media Type', - 416 => 'Requested range not satisfiable', - 417 => 'Expectation Failed', - 418 => 'I\'m a teapot', - 422 => 'Unprocessable Entity', - 423 => 'Locked', - 424 => 'Failed Dependency', - 425 => 'Unordered Collection', - 426 => 'Upgrade Required', - 428 => 'Precondition Required', - 429 => 'Too Many Requests', - 431 => 'Request Header Fields Too Large', - 451 => 'Unavailable For Legal Reasons', - 500 => 'Internal Server Error', - 501 => 'Not Implemented', - 502 => 'Bad Gateway', - 503 => 'Service Unavailable', - 504 => 'Gateway Time-out', - 505 => 'HTTP Version not supported', - 506 => 'Variant Also Negotiates', - 507 => 'Insufficient Storage', - 508 => 'Loop Detected', - 510 => 'Not Extended', - 511 => 'Network Authentication Required', - ]; - - /** @var string */ - private $reasonPhrase; - - /** @var int */ - private $statusCode; - - /** - * @param int $status Status code - * @param array $headers Response headers - * @param string|resource|StreamInterface|null $body Response body - * @param string $version Protocol version - * @param string|null $reason Reason phrase (when empty a default will be used based on the status code) - */ - public function __construct( - int $status = 200, - array $headers = [], - $body = null, - string $version = '1.1', - string $reason = null - ) { - $this->assertStatusCodeRange($status); - - $this->statusCode = $status; - - if ($body !== '' && $body !== null) { - $this->stream = Utils::streamFor($body); - } - - $this->setHeaders($headers); - if ($reason == '' && isset(self::PHRASES[$this->statusCode])) { - $this->reasonPhrase = self::PHRASES[$this->statusCode]; - } else { - $this->reasonPhrase = (string) $reason; - } - - $this->protocol = $version; - } - - public function getStatusCode(): int - { - return $this->statusCode; - } - - public function getReasonPhrase(): string - { - return $this->reasonPhrase; - } - - public function withStatus($code, $reasonPhrase = ''): ResponseInterface - { - $this->assertStatusCodeIsInteger($code); - $code = (int) $code; - $this->assertStatusCodeRange($code); - - $new = clone $this; - $new->statusCode = $code; - if ($reasonPhrase == '' && isset(self::PHRASES[$new->statusCode])) { - $reasonPhrase = self::PHRASES[$new->statusCode]; - } - $new->reasonPhrase = (string) $reasonPhrase; - - return $new; - } - - /** - * @param mixed $statusCode - */ - private function assertStatusCodeIsInteger($statusCode): void - { - if (filter_var($statusCode, FILTER_VALIDATE_INT) === false) { - throw new \InvalidArgumentException('Status code must be an integer value.'); - } - } - - private function assertStatusCodeRange(int $statusCode): void - { - if ($statusCode < 100 || $statusCode >= 600) { - throw new \InvalidArgumentException('Status code must be an integer value between 1xx and 5xx.'); - } - } -} diff --git a/src/vendor/guzzlehttp/psr7/src/UploadedFile.php b/src/vendor/guzzlehttp/psr7/src/UploadedFile.php deleted file mode 100644 index b1521bc..0000000 --- a/src/vendor/guzzlehttp/psr7/src/UploadedFile.php +++ /dev/null @@ -1,211 +0,0 @@ -setError($errorStatus); - $this->size = $size; - $this->clientFilename = $clientFilename; - $this->clientMediaType = $clientMediaType; - - if ($this->isOk()) { - $this->setStreamOrFile($streamOrFile); - } - } - - /** - * Depending on the value set file or stream variable - * - * @param StreamInterface|string|resource $streamOrFile - * - * @throws InvalidArgumentException - */ - private function setStreamOrFile($streamOrFile): void - { - if (is_string($streamOrFile)) { - $this->file = $streamOrFile; - } elseif (is_resource($streamOrFile)) { - $this->stream = new Stream($streamOrFile); - } elseif ($streamOrFile instanceof StreamInterface) { - $this->stream = $streamOrFile; - } else { - throw new InvalidArgumentException( - 'Invalid stream or file provided for UploadedFile' - ); - } - } - - /** - * @throws InvalidArgumentException - */ - private function setError(int $error): void - { - if (false === in_array($error, UploadedFile::ERRORS, true)) { - throw new InvalidArgumentException( - 'Invalid error status for UploadedFile' - ); - } - - $this->error = $error; - } - - private function isStringNotEmpty($param): bool - { - return is_string($param) && false === empty($param); - } - - /** - * Return true if there is no upload error - */ - private function isOk(): bool - { - return $this->error === UPLOAD_ERR_OK; - } - - public function isMoved(): bool - { - return $this->moved; - } - - /** - * @throws RuntimeException if is moved or not ok - */ - private function validateActive(): void - { - if (false === $this->isOk()) { - throw new RuntimeException('Cannot retrieve stream due to upload error'); - } - - if ($this->isMoved()) { - throw new RuntimeException('Cannot retrieve stream after it has already been moved'); - } - } - - public function getStream(): StreamInterface - { - $this->validateActive(); - - if ($this->stream instanceof StreamInterface) { - return $this->stream; - } - - /** @var string $file */ - $file = $this->file; - - return new LazyOpenStream($file, 'r+'); - } - - public function moveTo($targetPath): void - { - $this->validateActive(); - - if (false === $this->isStringNotEmpty($targetPath)) { - throw new InvalidArgumentException( - 'Invalid path provided for move operation; must be a non-empty string' - ); - } - - if ($this->file) { - $this->moved = PHP_SAPI === 'cli' - ? rename($this->file, $targetPath) - : move_uploaded_file($this->file, $targetPath); - } else { - Utils::copyToStream( - $this->getStream(), - new LazyOpenStream($targetPath, 'w') - ); - - $this->moved = true; - } - - if (false === $this->moved) { - throw new RuntimeException( - sprintf('Uploaded file could not be moved to %s', $targetPath) - ); - } - } - - public function getSize(): ?int - { - return $this->size; - } - - public function getError(): int - { - return $this->error; - } - - public function getClientFilename(): ?string - { - return $this->clientFilename; - } - - public function getClientMediaType(): ?string - { - return $this->clientMediaType; - } -} diff --git a/src/vendor/noweh/twitter-api-v2-php/.github/workflows/run-tests.yml b/src/vendor/noweh/twitter-api-v2-php/.github/workflows/run-tests.yml deleted file mode 100644 index ede4879..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/.github/workflows/run-tests.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: "Run Tests" - -on: [push, pull_request] - -jobs: - tests: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [7.4] - dependency-version: [prefer-stable] - - steps: - - name: checkout code - uses: actions/checkout@v2 - - - name: setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer - - - name: Validate composer.json and composer.lock - run: composer validate - - - name: Get composer cache directory - id: composercache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composercache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Install dependencies - run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - - - name: Run PHPStan - run: vendor/bin/phpstan analyse . - - - name: Execute tests - env: - TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} - TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} - TWITTER_ACCOUNT_ID: ${{ secrets.TWITTER_ACCOUNT_ID }} - TWITTER_BEARER_TOKEN: ${{ secrets.TWITTER_BEARER_TOKEN }} - TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }} - TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }} - run: vendor/bin/phpunit diff --git a/src/vendor/noweh/twitter-api-v2-php/.gitignore b/src/vendor/noweh/twitter-api-v2-php/.gitignore deleted file mode 100644 index c71be2c..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/vendor -/composer.lock -/test/config/.env -# Others # -.idea/ -.project/ -.bundle/ -*.retry -.vscode/ -.phpunit.result.cache -/results/ -/.run/ diff --git a/src/vendor/noweh/twitter-api-v2-php/composer.json b/src/vendor/noweh/twitter-api-v2-php/composer.json deleted file mode 100644 index c07d67a..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/composer.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "noweh/twitter-api-v2-php", - "description": "This library provides methods for sending messages to Twitter and receiving statuses.", - "keywords": ["twitter", "PHP", "API"], - "minimum-stability": "stable", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Julien Schmitt", - "email": "jschmitt95@protonmail.com" - }, { - "name": "Martin Zeitler", - "homepage": "https://github.com/syslogic" - } - ], - "require": { - "ext-curl": "*", - "ext-json": "*", - "php": ">=7.4", - "guzzlehttp/guzzle": "^7.5.0", - "guzzlehttp/oauth-subscriber": "^0.6.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.6.3", - "phpunit/php-code-coverage": "^9.2.24", - "vlucas/phpdotenv": "^v5.5.0", - "phpstan/phpstan": "^1.9.14" - }, - "scripts": { - "test": "vendor/bin/phpunit --bootstrap vendor/autoload.php --configuration phpunit.xml --testsuite main", - "coverage_linux": "export XDEBUG_MODE=coverage && vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-html --configuration coverage.xml --testsuite main", - "coverage_windows": "setlocal xdebug.mode=coverage && %cd%/vendor/bin/phpunit --bootstrap vendor/autoload.php --configuration coverage.xml --testsuite main" - }, - "scripts-descriptions": { - "test": "Run PHPUnit tests", - "coverage_linux": "Run PHPUnit tests with code coverage on Linux", - "coverage_windows": "Run PHPUnit tests with code coverage on Windows" - }, - "autoload": { - "psr-4": { - "Noweh\\TwitterApi\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Noweh\\TwitterApi\\Test\\": "test/" - } - } -} diff --git a/src/vendor/noweh/twitter-api-v2-php/licence.md b/src/vendor/noweh/twitter-api-v2-php/licence.md deleted file mode 100644 index 634df03..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/licence.md +++ /dev/null @@ -1,7 +0,0 @@ -Copyright © Julien SCHMITT - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software \ No newline at end of file diff --git a/src/vendor/noweh/twitter-api-v2-php/phpstan.neon.dist b/src/vendor/noweh/twitter-api-v2-php/phpstan.neon.dist deleted file mode 100644 index 206f0f7..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/phpstan.neon.dist +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - level: 9 - - # Exclusions - excludePaths: - - vendor - - # Inclusions - paths: - - . \ No newline at end of file diff --git a/src/vendor/noweh/twitter-api-v2-php/readme.md b/src/vendor/noweh/twitter-api-v2-php/readme.md deleted file mode 100644 index d3878a3..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/readme.md +++ /dev/null @@ -1,401 +0,0 @@ -# Twitter API V2 for PHP - -![PHP](https://img.shields.io/badge/PHP-v7.4+-828cb7.svg?style=flat-square&logo=php) -[![Badge Twitter](https://img.shields.io/badge/Twitter%20API-v2-828cb7.svg?style=flat-square&logo=twitter&color=1DA1F2)](https://developer.twitter.com/en/docs/twitter-api) -[![Run Tests](https://github.com/noweh/twitter-api-v2-php/actions/workflows/run-tests.yml/badge.svg)](https://github.com/noweh/twitter-api-v2-php/actions/workflows/run-tests.yml) -[![MIT Licensed](https://img.shields.io/github/license/noweh/twitter-api-v2-php)](licence.md) -[![last version](https://img.shields.io/packagist/v/noweh/twitter-api-v2-php)](https://packagist.org/packages/noweh/twitter-api-v2-php) -[![Downloads](https://img.shields.io/packagist/dt/noweh/twitter-api-v2-php)](https://packagist.org/packages/noweh/twitter-api-v2-php) -[![twitter](https://img.shields.io/twitter/follow/Noweh95?style=social)](https://twitter.com/Noweh95) - -Twitter API V2 is a PHP package which provides an easy and fast access to Twitter REST API for Version 2 endpoints. - -## Documentation - -* [Installation](#installation) -* [Github Actions](#github-actions) -* [Usage](#usage) - - [Active your developer account](#active-your-developer-account) - - [Configuration setup](#configuration-setup) - - [API Functionality](#api-functionality) - - [Include the HTTP headers provided by Twitter in the response](#include-the-http-headers-provided-by-twitter-in-the-response) -* [Tweets endpoints](#tweet-endpoints) - - [Timeline endpoints](#timeline-endpoints) - - [Find Recent Mentioning for a User](#find-recent-mentioning-for-a-user) - - [Find Recent Tweets for a User](#find-recent-tweets-for-a-user) - - [Reverse Chronological Timeline by user ID](#reverse-chronological-timeline-by-user-id) - - [Tweet/Likes endpoints](#tweetlikes-endpoints) - - [Tweets liked by a user](#tweets-liked-by-a-user) - - [Users who liked a tweet](#users-who-liked-a-tweet) - - [Tweet/Lookup endpoints](#tweetlikes-endpoints) - - [Search specific tweets](#search-specific-tweets) - - [Find all replies from a Tweet](#find-all-replies-from-a-tweet) - - [Tweet endpoints](#tweetlikes-endpoints) - - [Fetch a tweet by Id](#fetch-a-tweet-by-id) - - [Create a new Tweet](#create-a-new-tweet) - - [Upload image to Twitter (and use in Tweets)](#upload-image-to-twitter-and-use-in-tweets) - - [Tweet/Quotes endpoints](#tweetquotes-endpoints) - - [Returns Quote Tweets for a Tweet specified by the requested Tweet ID](#returns-quote-tweets-for-a-tweet-specified-by-the-requested-tweet-id) - - [Retweet endpoints](#retweet-endpoints) - - [Retweet a Tweet](#retweet-a-tweet) - - [Tweet/Replies endpoints](#tweetreplies-endpoints) - - [Hide a reply to a Tweet](#hide-a-reply-to-a-tweet) - - [Unhide a reply to a Tweet](#unhide-a-reply-to-a-tweet) - - [Tweet/Bookmarks endpoints](#tweetbookmarks-endpoints) - - [Lookup a user's Bookmarks](#lookup-a-users-bookmarks) -* [Users endpoints](#users-endpoints) - - [User/Blocks endpoints](#userblocks-endpoints) - - [Retrieve the users which you've blocked](#retrieve-the-users-which-youve-blocked) - - [User/Follows endpoints](#userfollows-endpoints) - - [Retrieve the users which are following you](#retrieve-the-users-which-are-following-you) - - [Retrieve the users which you are following](#retrieve-the-users-which-you-are-following) - - [Follow a user](#follow-a-user) - - [Unfollow a user](#unfollow-a-user) - - [User/Lookup endpoints](#userlookup-endpoints) - - [Find Twitter Users](#find-twitter-users) - - [User/Mutes endpoints](#usermutes-endpoints) - - [Retrieve the users which you've muted](#retrieve-the-users-which-youve-muted) - - [Mute user by username or ID](#mute-user-by-username-or-id) - - [Unmute user by username or ID](#unmute-user-by-username-or-id) -* [Contributing](#contributing) - - [To run test](#to-run-tests) - - [To run code analyzer](#to-run-code-analyzer) - -## Installation -To begin, you'll need to add the component to your `composer.json` -```shell -composer require noweh/twitter-api-v2-php -``` -After adding the component, update your packages using `composer update` or install them using `composer install`. - -## Github Actions - -This repository uses [Github Actions](https://github.com/noweh/twitter-api-v2-php/actions) for each push/pull request, employing [PHPStan/PHPUnit](/.github/workflows/run-tests.yml). - -Consequently, with each valid push, a new Tweet is posted from the [Twitter test account](https://twitter.com/canWeDeploy/status/1538477133487644672). - -## Usage - -### Active your developer account -Before anything else, you must follow [this tutorial](https://developer.twitter.com/en/docs/tutorials/getting-started-with-r-and-v2-of-the-twitter-api). -- [Request approval for a developer account](https://developer.twitter.com/en/apply-for-access); -- Once your developer account is approved, you will need to [create a Project](https://developer.twitter.com/en/docs/projects/overview); -- Enable read/write access for your Twitter app; -- Generate Consumer Keys and Authentication Tokens; -- Retrieve your Keys and Tokens from the Twitter Developer portal. - -### Configuration setup -Expected settings are as follows: -```php -use Noweh\TwitterApi\Client; - -$settings['account_id'] -$settings['access_token'], -$settings['access_token_secret'], -$settings['consumer_key'], -$settings['consumer_secret'], -$settings['bearer_token'] - -$client = new Client($settings); -``` - -### API Functionality -All API calls are triggered when the `performRequest()` method is invoked. -Depending on the context, this method can either be empty or contain data that will be sent as PostData (refer to examples of each call below). - -#### Include the HTTP headers provided by Twitter in the response -The `performRequest()` method accepts a second parameter, `$withHeaders`, which is a boolean value. -Setting this parameter to `true` will include the headers information in the response. - -Here are some examples of information included in headers: -- `x-rate-limit-limit`: the rate limit ceiling for that given endpoint -- `x-rate-limit-remaining`: the number of requests left for the 15-minute window -- `x-rate-limit-reset`: the remaining window before the rate limit resets, in UTC epoch seconds - -Example: -```php -$response = $this->client->tweet()->create() - ->performRequest([ - 'text' => 'Test Tweet... ' - ], - withHeaders: true - ) -; - -/* -Output: -object(stdClass)#399 (2) { - ["data"]=> - object(stdClass)#398 (3) { - ["edit_history_tweet_ids"]=> - array(1) { - [0]=> - string(19) "1690304934837637121" - } - ["id"]=> - string(19) "1690304934837637121" - ["text"]=> - string(39) "Test Tweet..." - } - ["headers"]=> - ... - ["x-rate-limit-limit"]=> - array(1) { - [0]=> - string(5) "40000" - } - ["x-rate-limit-reset"]=> - array(1) { - [0]=> - string(10) "1691835953" - } - ["x-rate-limit-remaining"]=> - array(1) { - [0]=> - string(5) "39998" - } - ... - } -} -*/ -``` ---- -## Tweets endpoints - -## Timeline endpoints - -### Find Recent Mentioning for a User -Example: -```php -$return = $client->timeline()->getRecentMentions($accountId)->performRequest(); -``` - -### Find Recent Tweets for a User -Example: -```php -$return = $client->timeline()->getRecentTweets($accountId)->performRequest(); -``` - -### Reverse Chronological Timeline by user ID -Example: -```php -$return = $client->timeline()->getReverseChronological()->performRequest(); -``` - -## Tweet/Likes endpoints - -### Tweets liked by a user -Example: -```php -$return = $client->tweetLikes()->addMaxResults($pageSize)->getLikedTweets($accountId)->performRequest(); -``` - -### Users who liked a tweet -Example: -```php -$return = $client->tweetLikes()->addMaxResults($pageSize)->getUsersWhoLiked($tweetId)->performRequest(); -``` - -## Tweet/Lookup endpoints - -### Search specific tweets -Example: -```php -$return = $client->tweetLookup() - ->showMetrics() - ->onlyWithMedias() - ->addFilterOnUsernamesFrom([ - 'twitterdev', - 'Noweh95' - ], \Noweh\TwitterApi\TweetLookup::OPERATORS['OR']) - ->addFilterOnKeywordOrPhrase([ - 'Dune', - 'DenisVilleneuve' - ], \Noweh\TwitterApi\TweetLookup::OPERATORS['AND']) - ->addFilterOnLocales(['fr', 'en']) - ->showUserDetails() - ->performRequest() -; - -$client->tweetLookup() - ->addMaxResults($pageSize) - ->addFilterOnKeywordOrPhrase($keywordFilter) - ->addFilterOnLocales($localeFilter) - ->showUserDetails() - ->showMetrics() - ->performRequest() -; -``` - -### Find all replies from a Tweet -```php -->addFilterOnConversationId($tweetId); -``` - -## Tweet endpoints - -### Fetch a tweet by Id -Example: -```php -$return = $client->tweet()->->fetch(1622477565565739010)->performRequest(); -``` - -### Create a new Tweet -Example: -```php -$return = $client->tweet()->create()->performRequest(['text' => 'Test Tweet... ']); -``` - -### Upload image to Twitter (and use in Tweets) -Example: -```php -$file_data = base64_encode(file_get_contents($file)); -$media_info = $client->uploadMedia()->upload($file_data); -$return = $client->tweet()->create() - ->performRequest([ - 'text' => 'Test Tweet... ', - "media" => [ - "media_ids" => [ - (string)$media_info["media_id"] - ] - ] - ]) -; -``` - -## Tweet/Quotes endpoints - -### Returns Quote Tweets for a Tweet specified by the requested Tweet ID -Example: -```php -$return = $client->tweetQuotes()->getQuoteTweets($tweetId)->performRequest(); -``` - -## Retweet endpoints - -### Retweet a Tweet -Example: -```php -$return = $client->retweet()->performRequest(['tweet_id' => $tweet_id]); -``` - -## Tweet/Replies endpoints - -### Hide a reply to a Tweet -Example: -```php -$return = $client->->tweetReplies()->hideReply($tweetId)->performRequest(['hidden' => true]); -``` - -### Unhide a reply to a Tweet -Example: -```php -$return = $client->->tweetReplies()->hideReply($tweetId)->performRequest(['hidden' => false]); -``` - -## Tweet/Bookmarks endpoints - -### Lookup a user's Bookmarks -Example: -```php -$return = $client->tweetBookmarks()->lookup()->performRequest(); -``` - ---- - -## Users endpoints - -## User/Blocks endpoints - -### Retrieve the users which you've blocked -Example: -```php -$return = $client->userBlocks()->lookup()->performRequest(); -``` - -## User/Follows endpoints - -### Retrieve the users which are following you -Example: -```php -$return = $client->userFollows()->getFollowers()->performRequest(); -``` - -### Retrieve the users which you are following -Example: -```php -$return = $client->userFollows()->getFollowing()->performRequest(); -``` - -### Follow a user -Example: -```php -$return = $client->userFollows()->follow()->performRequest(['target_user_id' => $userId]); -``` - -### Unfollow a user -Example: -```php -$return = $client->userFollows()->unfollow($userId)->performRequest(['target_user_id' => self::$userId]); -``` - -## User/Lookup endpoints - -### Find Me -Example: -```php -$return = $client->userMeLookup()->performRequest(); -``` - -### Find Twitter Users -`findByIdOrUsername()` expects either an array, or a string. - -You can specify the search mode as a second parameter (`Client::MODES['USERNAME']` OR `Client::MODES['ID']`) - -Example: -```php -$return = $client->userLookup() - ->findByIdOrUsername('twitterdev', \Noweh\TwitterApi\UserLookup::MODES['USERNAME']) - ->performRequest() -; -``` - -## User/Mutes endpoints - -### Retrieve the users which you've muted -Example: -```php -$return = $client->userMutes()->lookup()->performRequest(); -``` - -### Mute user by username or ID -Example: -```php -$return = $client->userMutes()->mute()->performRequest(['target_user_id' => $userId]); -``` - -### Unmute user by username or ID -Example: -```php -$return = $client->userMutes()->unmute()->performRequest(['target_user_id' => $userId]); -``` - ---- - -## Contributing -Fork/download the code and run -```shell -composer install -``` - -copy `test/config/.env.example` to `test/config/.env` and add your credentials for testing. - -### To run tests -```shell -./vendor/bin/phpunit -``` - -### To run code analyzer -```shell -./vendor/bin/phpstan analyse . -``` \ No newline at end of file diff --git a/src/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php b/src/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php deleted file mode 100644 index 1a88e8d..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php +++ /dev/null @@ -1,39 +0,0 @@ -Users Lookup - * @author Julien Schmitt - */ - -class UserMeLookup extends AbstractController -{ - /** - * @param array $settings - * @throws \Exception - */ - public function __construct(array $settings) - { - parent::__construct($settings); - $this->setEndpoint('users/me'); - $this->setAuthMode(1); - } - /** - * Retrieve Endpoint value and rebuilt it with the expected parameters - * @return string the URL for the request. - * @throws \JsonException | \Exception - */ - protected function constructEndpoint(): string - { - return parent::constructEndpoint() . - '?user.fields=created_at,description,entities,id,location,name,' . - 'profile_image_url,protected,public_metrics,url,username,verified,verified_type,withheld' . - '&tweet.fields=attachments,author_id,context_annotations,conversation_id,created_at,edit_controls,' . - 'edit_history_tweet_ids,entities,geo,id,in_reply_to_user_id,lang,non_public_metrics,note_tweet,' . - 'organic_metrics,possibly_sensitive,public_metrics,referenced_tweets,reply_settings,source,text,withheld' . - '&expansions=pinned_tweet_id' - ; - } -} diff --git a/src/vendor/noweh/twitter-api-v2-php/test/BaseTestCase.php b/src/vendor/noweh/twitter-api-v2-php/test/BaseTestCase.php deleted file mode 100644 index 2a46fa5..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/test/BaseTestCase.php +++ /dev/null @@ -1,79 +0,0 @@ - $settings */ - protected static array $settings = []; - - /** @var int $pageSize */ - protected static int $pageSize = 10; - - /** - * Set up Test Case - * @throws Exception - */ - public function setUp(): void - { - // Error : Class "Dotenv\Dotenv" not found. - if (class_exists(Dotenv::class) && file_exists(__DIR__.'/config/.env')) { - $dotenv = Dotenv::createUnsafeImmutable(__DIR__.'/config', '.env'); - $dotenv->safeLoad(); - } - - // Initialize from environmental variables. - foreach (getenv() as $key => $value) { - if (str_starts_with($key, 'TWITTER_')) { - $name = str_replace('twitter_', '', mb_strtolower($key)); - self::$settings[$name] = $value; - } - } - - $this->client = new Client(self::$settings); - } - - /** - * Log tweet nodes to console - * @param array<\stdClass> | \stdClass $data - */ - protected static function logTweets($data): void - { - if (is_object($data)) { - // Tweet - $tweet_id = str_pad($data->id, 20, " ",STR_PAD_LEFT); - echo "$tweet_id \"".str_replace("\n", " ", $data->text)."\"\n"; - } else { - foreach ($data as $item) { - $tweet_id = str_pad($item->id, 20, " ",STR_PAD_LEFT); - if (property_exists($item, 'author_id')) { - $user_id = str_pad($item->author_id, 20, " ",STR_PAD_LEFT); - echo $user_id." $tweet_id \"".str_replace("\n", " ", $item->text)."\"\n"; - } else { - // Mentions - echo "$tweet_id \"".str_replace("\n", " ", $item->text)."\"\n"; - } - } - } - } - - /** - * Log user nodes to console - * @param array<\stdClass> $data - */ - protected static function logUsers(array $data): void - { - foreach ($data as $item) { - $user_id = str_pad($item->id, 20, " ",STR_PAD_LEFT); - echo $user_id." $item->username \"".str_replace("\n", " ", $item->name)."\"\n"; - } - } -} diff --git a/src/vendor/noweh/twitter-api-v2-php/test/TweetsTest.php b/src/vendor/noweh/twitter-api-v2-php/test/TweetsTest.php deleted file mode 100644 index 26d0c9b..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/test/TweetsTest.php +++ /dev/null @@ -1,250 +0,0 @@ - $keywordFilter parameter for TweetLookup. */ - private static array $keywordFilter = ['php']; - - /** @var array $localeFilter parameter for TweetLookup. */ - private static array $localeFilter = ['en', 'fr', 'de']; - - /** @var int $replyTweetId */ - private static int $replyTweetId = 1622641314255761409; - - /** @var int $quotedTweetId */ - private static int $quotedTweetId = 1622586244680261639; - - /** - * Timeline: Find recent mentions by user ID. - * @throws GuzzleException | Exception - */ - public function testTimelineRecentMentions(): void - { - $response = $this->client->timeline() - ->getRecentMentions(self::$settings['account_id']) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } - - /** - * Timeline: Find recent tweets by user ID. - * @throws GuzzleException | Exception - */ - public function testTimelineRecentTweets(): void - { - $response = $this->client->timeline() - ->getRecentTweets(self::$settings['account_id']) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } - - /** - * Timeline: Reverse Chronological Timeline by user ID. - * @throws GuzzleException | Exception - */ - public function testTimelineReverseChronological(): void - { - $response = $this->client->timeline() - ->getReverseChronological() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } - - /** - * Likes: Tweets liked by a user. - * @throws GuzzleException | Exception - */ - public function testLikedTweets(): void - { - $response = $this->client->tweetLikes() - ->addMaxResults(self::$pageSize) - ->getLikedTweets(self::$settings['account_id']) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } - - /** - * Likes: Tweets liked by a user. - * @throws GuzzleException | Exception - */ - public function testUsersWhoLiked(): void - { - $tweet_id = "1093540451678851072"; - $response = $this->client->tweetLikes() - ->addMaxResults(self::$pageSize) - ->getUsersWhoLiked($tweet_id) - ->performRequest(); - assertTrue(is_object($response)); - if (property_exists($response, 'meta') && $response->meta->result_count > 0) { - assertTrue( property_exists($response, 'data')); - self::logUsers($response->data); - } else { - echo "Nobody ever liked this tweet."; - } - } - - /** - * Lookup Tweets by Keyword. - * @throws GuzzleException | Exception - */ - public function testTweetLookup(): void - { - $response = $this->client->tweetLookup() - ->addFilterOnKeywordOrPhrase(self::$keywordFilter) - ->addFilterOnLocales(self::$localeFilter) - ->addMaxResults(self::$pageSize) - ->showUserDetails() - ->showMetrics() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logTweets($response->data); - } - - /** - * Retrieve Tweet by tweet ID. - * @throws GuzzleException | Exception - */ - public function testFetchTweet(): void - { - $response = $this->client->tweet()->fetch(1622477565565739010) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } - - /** - * Returns Quote Tweets for a Tweet specified by the requested Tweet ID. - * @throws GuzzleException | Exception - */ - public function testTweetQuotes(): void - { - $response = $this->client->tweetQuotes() - ->getQuoteTweets(self::$quotedTweetId) - ->performRequest(); - - assertTrue(is_object($response)); - if (property_exists($response, 'meta') && $response->meta->result_count > 0) { - assertTrue( property_exists($response, 'data')); - self::logTweets($response->data); - } else { - echo "Nobody ever quoted this tweet (" . self::$quotedTweetId . ")."; - } - } - - /** - * Share Tweet - * @throws GuzzleException | Exception - */ - public function testTweet(): void - { - $date = new \DateTime('NOW'); - try { - $response = $this->client->tweet()->create() - ->performRequest([ - 'text' => 'Test Tweet... ' . $date->format(\DateTimeInterface::ATOM) - ] - ); - assertTrue(is_object($response) && property_exists($response, 'data')); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - - /** - * Retweet a random Tweet. - * @throws GuzzleException | Exception - */ - public function testRetweet(): void - { - $response = $this->client->tweetLookup() - ->addMaxResults(self::$pageSize) - ->addFilterOnKeywordOrPhrase(self::$keywordFilter) - ->addFilterOnLocales(self::$localeFilter) - ->showUserDetails() - ->showMetrics() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logTweets($response->data); - - // Retweet by random index - $tweet_id = $response->data[rand(0, self::$pageSize-1)]->id; - try { - $response2 = $this->client->retweet() - ->performRequest(['tweet_id' => $tweet_id]); - assertTrue(is_object($response2) && property_exists($response2, 'data')); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - - /** - * Replies: Hides a reply to a Tweet. - * @throws GuzzleException | Exception - */ - public function testTweetReplyHide(): void - { - try { - $response = $this->client->tweetReplies() - ->hideReply(self::$replyTweetId) - ->performRequest(['hidden' => true]); - assertTrue(is_object($response) && property_exists($response, 'data')); - assertTrue(property_exists($response->data, 'hidden')); - assertTrue($response->data->hidden); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - - /** - * - * Replies: Unhides a reply to a Tweet. - * @throws GuzzleException | Exception - */ - public function testTweetReplyUnhide(): void - { - try { - $response = $this->client->tweetReplies() - ->hideReply(self::$replyTweetId) - ->performRequest(['hidden' => false]); - assertTrue(is_object($response) && property_exists($response, 'data')); - assertTrue(property_exists($response->data, 'hidden')); - assertTrue(! $response->data->hidden); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - - /** - * Bookmarks: Lookup a user's Bookmarks (will fail). - * @throws GuzzleException | Exception - */ - public function testBookmarksLookup(): void - { - try { - $response = $this->client->tweetBookmarks() - ->lookup() - ->performRequest(); - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logTweets($response->data); - } catch (\Exception $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } -} diff --git a/src/vendor/noweh/twitter-api-v2-php/test/UsersTest.php b/src/vendor/noweh/twitter-api-v2-php/test/UsersTest.php deleted file mode 100644 index a95802f..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/test/UsersTest.php +++ /dev/null @@ -1,170 +0,0 @@ - $idsToLookup */ - private static array $idsToLookup = [93711247, 2244994945]; - - /** @var string $nameToLookup */ - private static string $nameToLookup = 'twitterdev'; - - /** @var array $namesToLookup */ - private static array $namesToLookup = ['androiddev', 'twitterdev']; - - /** int $userToMute mute/unmute user ID */ - //private static int $userToMute = 2244994945; - - /** - * Retrieve the users which you've blocked. - * @throws GuzzleException | Exception - */ - public function testUserBlocks(): void - { - $response = $this->client->userBlocks()->lookup() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logUsers($response->data); - } - - /** - * Retrieve the users which are following you. - * @throws GuzzleException | Exception - */ - public function testUserFollowers(): void - { - $response = $this->client->userFollows()->getFollowers() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logUsers($response->data); - } - - /** - * Retrieve the users which you are following. - * @throws GuzzleException | Exception - */ - public function testUserFollowing(): void - { - $response = $this->client->userFollows()->getFollowing() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logUsers($response->data); - } - - /** - * Lookup a User by username - * @throws GuzzleException | Exception - */ - public function testLookupByName(): void - { - $response = $this->client->userLookup() - ->findByIdOrUsername(self::$nameToLookup) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logUsers([$response->data]); - } - - /** - * Lookup an User by username - * @throws GuzzleException | Exception - */ - public function testLookupByNames(): void - { - $response = $this->client->userLookup() - ->findByIdOrUsername(self::$namesToLookup) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logUsers($response->data); - } - - /** - * Lookup an User by username - * @throws GuzzleException | Exception - */ - public function testLookupById(): void - { - $response = $this->client->userLookup() - ->findByIdOrUsername(self::$idToLookup) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logUsers([$response->data]); - } - - /** - * Lookup a User by username - * @throws GuzzleException | Exception - */ - public function testLookupByIds(): void - { - $response = $this->client->userLookup() - ->findByIdOrUsername(self::$idsToLookup) - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data')); - self::logUsers($response->data); - } - - /** - * Retrieve the users which you've muted. - * @throws GuzzleException | Exception - */ - public function testUserMutes(): void - { - $response = $this->client->userMutes()->lookup() - ->performRequest(); - - assertTrue(is_object($response) && property_exists($response, 'data') && property_exists($response, 'meta')); - self::logUsers($response->data); - } - - /** - * Follow a user. - * @throws GuzzleException | Exception - */ - public function testUserFollow(): void - { - try { - $response = $this->client->userFollows()->follow() - ->performRequest(['target_user_id' => self::$userToFollow]); - assertTrue(is_object($response) && property_exists($response, 'data')); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - - /** - * Unfollow a user. - * @throws GuzzleException | Exception - */ - public function testUserUnfollow(): void - { - try { - $response = $this->client->userFollows()->unfollow(self::$userToFollow) - ->performRequest(['target_user_id' => self::$userToFollow]); - assertTrue(is_object($response) && property_exists($response, 'data')); - } catch (\GuzzleHttp\Exception\ClientException $e) { - $this->markTestSkipped('Test skipped: ' . $e->getMessage()); - } - } - -} diff --git a/src/vendor/noweh/twitter-api-v2-php/test/config/.env.example b/src/vendor/noweh/twitter-api-v2-php/test/config/.env.example deleted file mode 100644 index acca1ba..0000000 --- a/src/vendor/noweh/twitter-api-v2-php/test/config/.env.example +++ /dev/null @@ -1,6 +0,0 @@ -TWITTER_ACCOUNT_ID=1234567 -TWITTER_CONSUMER_KEY=CONSUMER_KEY -TWITTER_CONSUMER_SECRET=CONSUMER_SECRET -TWITTER_BEARER_TOKEN=BEARER_TOKEN -TWITTER_ACCESS_TOKEN=ACCESS_TOKEN -TWITTER_ACCESS_TOKEN_SECRET=ACCESS_TOKEN \ No newline at end of file diff --git a/src/vendor/psr/http-client/CHANGELOG.md b/src/vendor/psr/http-client/CHANGELOG.md deleted file mode 100644 index e2dc25f..0000000 --- a/src/vendor/psr/http-client/CHANGELOG.md +++ /dev/null @@ -1,23 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file, in reverse chronological order by release. - -## 1.0.1 - -Allow installation with PHP 8. No code changes. - -## 1.0.0 - -First stable release. No changes since 0.3.0. - -## 0.3.0 - -Added Interface suffix on exceptions - -## 0.2.0 - -All exceptions are in `Psr\Http\Client` namespace - -## 0.1.0 - -First release diff --git a/src/vendor/psr/http-client/LICENSE b/src/vendor/psr/http-client/LICENSE deleted file mode 100644 index cd5e002..0000000 --- a/src/vendor/psr/http-client/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2017 PHP Framework Interoperability Group - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/psr/http-client/README.md b/src/vendor/psr/http-client/README.md deleted file mode 100644 index 84af5c5..0000000 --- a/src/vendor/psr/http-client/README.md +++ /dev/null @@ -1,12 +0,0 @@ -HTTP Client -=========== - -This repository holds all the common code related to [PSR-18 (HTTP Client)][psr-url]. - -Note that this is not a HTTP Client implementation of its own. It is merely abstractions that describe the components of a HTTP Client. - -The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. - -[psr-url]: https://www.php-fig.org/psr/psr-18 -[package-url]: https://packagist.org/packages/psr/http-client -[implementation-url]: https://packagist.org/providers/psr/http-client-implementation diff --git a/src/vendor/psr/http-client/composer.json b/src/vendor/psr/http-client/composer.json deleted file mode 100644 index e4cab2f..0000000 --- a/src/vendor/psr/http-client/composer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "psr/http-client", - "description": "Common interface for HTTP clients", - "keywords": ["psr", "psr-18", "http", "http-client"], - "homepage": "https://github.com/php-fig/http-client", - "license": "MIT", - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Client\\": "src/" - } - }, - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - } -} diff --git a/src/vendor/psr/http-factory/LICENSE b/src/vendor/psr/http-factory/LICENSE deleted file mode 100644 index 3f1559b..0000000 --- a/src/vendor/psr/http-factory/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 PHP-FIG - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/vendor/psr/http-factory/README.md b/src/vendor/psr/http-factory/README.md deleted file mode 100644 index bf8913b..0000000 --- a/src/vendor/psr/http-factory/README.md +++ /dev/null @@ -1,12 +0,0 @@ -HTTP Factories -============== - -This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url]. - -Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory. - -The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. - -[psr-url]: https://www.php-fig.org/psr/psr-17/ -[package-url]: https://packagist.org/packages/psr/http-factory -[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation diff --git a/src/vendor/psr/http-factory/composer.json b/src/vendor/psr/http-factory/composer.json deleted file mode 100644 index d1bbdde..0000000 --- a/src/vendor/psr/http-factory/composer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "psr/http-factory", - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "psr", - "psr-7", - "psr-17", - "http", - "factory", - "message", - "request", - "response" - ], - "license": "MIT", - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - } -} diff --git a/src/vendor/psr/http-message/CHANGELOG.md b/src/vendor/psr/http-message/CHANGELOG.md deleted file mode 100644 index 74b1ef9..0000000 --- a/src/vendor/psr/http-message/CHANGELOG.md +++ /dev/null @@ -1,36 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file, in reverse chronological order by release. - -## 1.0.1 - 2016-08-06 - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Updated all `@return self` annotation references in interfaces to use - `@return static`, which more closelly follows the semantics of the - specification. -- Updated the `MessageInterface::getHeaders()` return annotation to use the - value `string[][]`, indicating the format is a nested array of strings. -- Updated the `@link` annotation for `RequestInterface::withRequestTarget()` - to point to the correct section of RFC 7230. -- Updated the `ServerRequestInterface::withUploadedFiles()` parameter annotation - to add the parameter name (`$uploadedFiles`). -- Updated a `@throws` annotation for the `UploadedFileInterface::moveTo()` - method to correctly reference the method parameter (it was referencing an - incorrect parameter name previously). - -## 1.0.0 - 2016-05-18 - -Initial stable release; reflects accepted PSR-7 specification. diff --git a/src/vendor/psr/http-message/LICENSE b/src/vendor/psr/http-message/LICENSE deleted file mode 100644 index c2d8e45..0000000 --- a/src/vendor/psr/http-message/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2014 PHP Framework Interoperability Group - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/psr/http-message/README.md b/src/vendor/psr/http-message/README.md deleted file mode 100644 index 2668be6..0000000 --- a/src/vendor/psr/http-message/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PSR Http Message -================ - -This repository holds all interfaces/classes/traits related to -[PSR-7](http://www.php-fig.org/psr/psr-7/). - -Note that this is not a HTTP message implementation of its own. It is merely an -interface that describes a HTTP message. See the specification for more details. - -Usage ------ - -Before reading the usage guide we recommend reading the PSR-7 interfaces method list: - -* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md) -* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md) \ No newline at end of file diff --git a/src/vendor/psr/http-message/composer.json b/src/vendor/psr/http-message/composer.json deleted file mode 100644 index c66e5ab..0000000 --- a/src/vendor/psr/http-message/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "psr/http-message", - "description": "Common interface for HTTP messages", - "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"], - "homepage": "https://github.com/php-fig/http-message", - "license": "MIT", - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "require": { - "php": "^7.2 || ^8.0" - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - } -} diff --git a/src/vendor/psr/http-message/docs/PSR7-Interfaces.md b/src/vendor/psr/http-message/docs/PSR7-Interfaces.md deleted file mode 100644 index 3a7e7dd..0000000 --- a/src/vendor/psr/http-message/docs/PSR7-Interfaces.md +++ /dev/null @@ -1,130 +0,0 @@ -# Interfaces - -The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces. - -The interfaces defined in PSR-7 are the following: - -| Class Name | Description | -|---|---| -| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message | -| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. | -| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | -| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. | -| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream | -| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. | -| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. | - -## `Psr\Http\Message\MessageInterface` Methods - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getProtocolVersion()` | Retrieve HTTP protocol version | 1.0 or 1.1 | -| `withProtocolVersion($version)` | Returns new message instance with given HTTP protocol version | | -| `getHeaders()` | Retrieve all HTTP Headers | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields) | -| `hasHeader($name)` | Checks if HTTP Header with given name exists | | -| `getHeader($name)` | Retrieves a array with the values for a single header | | -| `getHeaderLine($name)` | Retrieves a comma-separated string of the values for a single header | | -| `withHeader($name, $value)` | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. | -| `withAddedHeader($name, $value)` | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created | -| `withoutHeader($name)` | Removes HTTP Header with given name| | -| `getBody()` | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`| -| `withBody(StreamInterface $body)` | Returns new message instance with given HTTP Message Body | | - - -## `Psr\Http\Message\RequestInterface` Methods - -Same methods as `Psr\Http\Message\MessageInterface` + the following methods: - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getRequestTarget()` | Retrieves the message's request target | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) | -| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target | | -| `getMethod()` | Retrieves the HTTP method of the request. | GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) | -| `withMethod($method)` | Returns a new message instance with the provided HTTP method | | -| `getUri()` | Retrieves the URI instance | | -| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI | | - - -## `Psr\Http\Message\ServerRequestInterface` Methods - -Same methods as `Psr\Http\Message\RequestInterface` + the following methods: - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getServerParams() ` | Retrieve server parameters | Typically derived from `$_SERVER` | -| `getCookieParams()` | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` | -| `withCookieParams(array $cookies)` | Returns a new request instance with the specified cookies | | -| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments | | -| `getUploadedFiles()` | Retrieve normalized file upload data | | -| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files | | -| `getParsedBody()` | Retrieve any parameters provided in the request body | | -| `withParsedBody($data)` | Returns a new request instance with the specified body parameters | | -| `getAttributes()` | Retrieve attributes derived from the request | | -| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute | | -| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute | | -| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute | | - -## `Psr\Http\Message\ResponseInterface` Methods: - -Same methods as `Psr\Http\Message\MessageInterface` + the following methods: - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getStatusCode()` | Gets the response status code. | | -| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | | -| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | | - -## `Psr\Http\Message\StreamInterface` Methods - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | | -| `close()` | Closes the stream and any underlying resources. | | -| `detach()` | Separates any underlying resources from the stream. | | -| `getSize()` | Get the size of the stream if known. | | -| `eof()` | Returns true if the stream is at the end of the stream.| | -| `isSeekable()` | Returns whether or not the stream is seekable. | | -| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | | -| `rewind()` | Seek to the beginning of the stream. | | -| `isWritable()` | Returns whether or not the stream is writable. | | -| `write($string)` | Write data to the stream. | | -| `isReadable()` | Returns whether or not the stream is readable. | | -| `read($length)` | Read data from the stream. | | -| `getContents()` | Returns the remaining contents in a string | | -| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | | - -## `Psr\Http\Message\UriInterface` Methods - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getScheme()` | Retrieve the scheme component of the URI. | | -| `getAuthority()` | Retrieve the authority component of the URI. | | -| `getUserInfo()` | Retrieve the user information component of the URI. | | -| `getHost()` | Retrieve the host component of the URI. | | -| `getPort()` | Retrieve the port component of the URI. | | -| `getPath()` | Retrieve the path component of the URI. | | -| `getQuery()` | Retrieve the query string of the URI. | | -| `getFragment()` | Retrieve the fragment component of the URI. | | -| `withScheme($scheme)` | Return an instance with the specified scheme. | | -| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | | -| `withHost($host)` | Return an instance with the specified host. | | -| `withPort($port)` | Return an instance with the specified port. | | -| `withPath($path)` | Return an instance with the specified path. | | -| `withQuery($query)` | Return an instance with the specified query string. | | -| `withFragment($fragment)` | Return an instance with the specified URI fragment. | | -| `__toString()` | Return the string representation as a URI reference. | | - -## `Psr\Http\Message\UploadedFileInterface` Methods - -| Method Name | Description | Notes | -|------------------------------------| ----------- | ----- | -| `getStream()` | Retrieve a stream representing the uploaded file. | | -| `moveTo($targetPath)` | Move the uploaded file to a new location. | | -| `getSize()` | Retrieve the file size. | | -| `getError()` | Retrieve the error associated with the uploaded file. | | -| `getClientFilename()` | Retrieve the filename sent by the client. | | -| `getClientMediaType()` | Retrieve the media type sent by the client. | | - -> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface` because the `Request` and the `Response` are `HTTP Messages`. -> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered. - diff --git a/src/vendor/psr/http-message/docs/PSR7-Usage.md b/src/vendor/psr/http-message/docs/PSR7-Usage.md deleted file mode 100644 index b6d048a..0000000 --- a/src/vendor/psr/http-message/docs/PSR7-Usage.md +++ /dev/null @@ -1,159 +0,0 @@ -### PSR-7 Usage - -All PSR-7 applications comply with these interfaces -They were created to establish a standard between middleware implementations. - -> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface` because the `Request` and the `Response` are `HTTP Messages`. -> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered. - - -The following examples will illustrate how basic operations are done in PSR-7. - -##### Examples - - -For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc) -All PSR-7 implementations should have the same behaviour. - -The following will be assumed: -`$request` is an object of `Psr\Http\Message\RequestInterface` and - -`$response` is an object implementing `Psr\Http\Message\RequestInterface` - - -### Working with HTTP Headers - -#### Adding headers to response: - -```php -$response->withHeader('My-Custom-Header', 'My Custom Message'); -``` - -#### Appending values to headers - -```php -$response->withAddedHeader('My-Custom-Header', 'The second message'); -``` - -#### Checking if header exists: - -```php -$request->hasHeader('My-Custom-Header'); // will return false -$response->hasHeader('My-Custom-Header'); // will return true -``` - -> Note: My-Custom-Header was only added in the Response - -#### Getting comma-separated values from a header (also applies to request) - -```php -// getting value from request headers -$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8" -// getting value from response headers -$response->getHeaderLine('My-Custom-Header'); // will return: "My Custom Message; The second message" -``` - -#### Getting array of value from a header (also applies to request) -```php -// getting value from request headers -$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"] -// getting value from response headers -$response->getHeader('My-Custom-Header'); // will return: ["My Custom Message", "The second message"] -``` - -#### Removing headers from HTTP Messages -```php -// removing a header from Request, removing deprecated "Content-MD5" header -$request->withoutHeader('Content-MD5'); - -// removing a header from Response -// effect: the browser won't know the size of the stream -// the browser will download the stream till it ends -$response->withoutHeader('Content-Length'); -``` - -### Working with HTTP Message Body - -When working with the PSR-7 there are two methods of implementation: -#### 1. Getting the body separately - -> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented. - -```php -$body = $response->getBody(); -// operations on body, eg. read, write, seek -// ... -// replacing the old body -$response->withBody($body); -// this last statement is optional as we working with objects -// in this case the "new" body is same with the "old" one -// the $body variable has the same value as the one in $request, only the reference is passed -``` - -#### 2. Working directly on response - -> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required - -```php -$response->getBody()->write('hello'); -``` - -### Getting the body contents - -The following snippet gets the contents of a stream contents. -> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream. -```php -$body = $response->getBody(); -$body->rewind(); // or $body->seek(0); -$bodyText = $body->getContents(); -``` -> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended. - -### Append to body - -```php -$response->getBody()->write('Hello'); // writing directly -$body = $request->getBody(); // which is a `StreamInterface` -$body->write('xxxxx'); -``` - -### Prepend to body -Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended. -The following example will explain the behaviour of streams. - -```php -// assuming our response is initially empty -$body = $repsonse->getBody(); -// writing the string "abcd" -$body->write('abcd'); - -// seeking to start of stream -$body->seek(0); -// writing 'ef' -$body->write('ef'); // at this point the stream contains "efcd" -``` - -#### Prepending by rewriting separately - -```php -// assuming our response body stream only contains: "abcd" -$body = $response->getBody(); -$body->rewind(); -$contents = $body->getContents(); // abcd -// seeking the stream to beginning -$body->rewind(); -$body->write('ef'); // stream contains "efcd" -$body->write($contents); // stream contains "efabcd" -``` - -> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`. - -#### Prepending by using contents as a string -```php -$body = $response->getBody(); -$body->rewind(); -$contents = $body->getContents(); // efabcd -$contents = 'ef'.$contents; -$body->rewind(); -$body->write($contents); -``` diff --git a/src/vendor/ralouphie/getallheaders/LICENSE b/src/vendor/ralouphie/getallheaders/LICENSE deleted file mode 100644 index be5540c..0000000 --- a/src/vendor/ralouphie/getallheaders/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Ralph Khattar - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/vendor/ralouphie/getallheaders/README.md b/src/vendor/ralouphie/getallheaders/README.md deleted file mode 100644 index 9430d76..0000000 --- a/src/vendor/ralouphie/getallheaders/README.md +++ /dev/null @@ -1,27 +0,0 @@ -getallheaders -============= - -PHP `getallheaders()` polyfill. Compatible with PHP >= 5.3. - -[![Build Status](https://travis-ci.org/ralouphie/getallheaders.svg?branch=master)](https://travis-ci.org/ralouphie/getallheaders) -[![Coverage Status](https://coveralls.io/repos/ralouphie/getallheaders/badge.png?branch=master)](https://coveralls.io/r/ralouphie/getallheaders?branch=master) -[![Latest Stable Version](https://poser.pugx.org/ralouphie/getallheaders/v/stable.png)](https://packagist.org/packages/ralouphie/getallheaders) -[![Latest Unstable Version](https://poser.pugx.org/ralouphie/getallheaders/v/unstable.png)](https://packagist.org/packages/ralouphie/getallheaders) -[![License](https://poser.pugx.org/ralouphie/getallheaders/license.png)](https://packagist.org/packages/ralouphie/getallheaders) - - -This is a simple polyfill for [`getallheaders()`](http://www.php.net/manual/en/function.getallheaders.php). - -## Install - -For PHP version **`>= 5.6`**: - -``` -composer require ralouphie/getallheaders -``` - -For PHP version **`< 5.6`**: - -``` -composer require ralouphie/getallheaders "^2" -``` diff --git a/src/vendor/ralouphie/getallheaders/composer.json b/src/vendor/ralouphie/getallheaders/composer.json deleted file mode 100644 index de8ce62..0000000 --- a/src/vendor/ralouphie/getallheaders/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "ralouphie/getallheaders", - "description": "A polyfill for getallheaders.", - "license": "MIT", - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^5 || ^6.5", - "php-coveralls/php-coveralls": "^2.1" - }, - "autoload": { - "files": ["src/getallheaders.php"] - }, - "autoload-dev": { - "psr-4": { - "getallheaders\\Tests\\": "tests/" - } - } -} diff --git a/src/vendor/symfony/deprecation-contracts/.gitignore b/src/vendor/symfony/deprecation-contracts/.gitignore deleted file mode 100644 index c49a5d8..0000000 --- a/src/vendor/symfony/deprecation-contracts/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -vendor/ -composer.lock -phpunit.xml diff --git a/src/vendor/symfony/deprecation-contracts/CHANGELOG.md b/src/vendor/symfony/deprecation-contracts/CHANGELOG.md deleted file mode 100644 index 7932e26..0000000 --- a/src/vendor/symfony/deprecation-contracts/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -CHANGELOG -========= - -The changelog is maintained for all Symfony contracts at the following URL: -https://github.com/symfony/contracts/blob/main/CHANGELOG.md diff --git a/src/vendor/symfony/deprecation-contracts/LICENSE b/src/vendor/symfony/deprecation-contracts/LICENSE deleted file mode 100644 index 406242f..0000000 --- a/src/vendor/symfony/deprecation-contracts/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2020-2022 Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/vendor/symfony/deprecation-contracts/README.md b/src/vendor/symfony/deprecation-contracts/README.md deleted file mode 100644 index 4957933..0000000 --- a/src/vendor/symfony/deprecation-contracts/README.md +++ /dev/null @@ -1,26 +0,0 @@ -Symfony Deprecation Contracts -============================= - -A generic function and convention to trigger deprecation notices. - -This package provides a single global function named `trigger_deprecation()` that triggers silenced deprecation notices. - -By using a custom PHP error handler such as the one provided by the Symfony ErrorHandler component, -the triggered deprecations can be caught and logged for later discovery, both on dev and prod environments. - -The function requires at least 3 arguments: - - the name of the Composer package that is triggering the deprecation - - the version of the package that introduced the deprecation - - the message of the deprecation - - more arguments can be provided: they will be inserted in the message using `printf()` formatting - -Example: -```php -trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use "%s" instead.', 'bitcoin', 'fabcoin'); -``` - -This will generate the following message: -`Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.` - -While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty -`function trigger_deprecation() {}` in your application. diff --git a/src/vendor/symfony/deprecation-contracts/composer.json b/src/vendor/symfony/deprecation-contracts/composer.json deleted file mode 100644 index cc7cc12..0000000 --- a/src/vendor/symfony/deprecation-contracts/composer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "symfony/deprecation-contracts", - "type": "library", - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=7.1" - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - } -} diff --git a/src/vendor_prefixed/composer.json b/src/vendor_prefixed/composer.json new file mode 100644 index 0000000..2f4900b --- /dev/null +++ b/src/vendor_prefixed/composer.json @@ -0,0 +1,12 @@ +{ + "require": { + "php": ">=7.4", + "noweh\/twitter-api-v2-php": "^3.2" + }, + "config": { + "process-timeout": 1800, + "platform": { + "php": "7.4.30" + } + } +} \ No newline at end of file diff --git a/src/vendor_prefixed/vendor/autoload.php b/src/vendor_prefixed/vendor/autoload.php new file mode 100644 index 0000000..80c3e47 --- /dev/null +++ b/src/vendor_prefixed/vendor/autoload.php @@ -0,0 +1,25 @@ +vendorDir = $vendorDir; + self::initializeIncludeClosure(); } /** @@ -425,7 +429,8 @@ public function unregister() public function loadClass($class) { if ($file = $this->findFile($class)) { - includeFile($file); + $includeFile = self::$includeFile; + $includeFile($file); return true; } @@ -555,18 +560,26 @@ private function findFileWithExtension($class, $ext) return false; } -} -/** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - * - * @param string $file - * @return void - * @private - */ -function includeFile($file) -{ - include $file; + /** + * @return void + */ + private static function initializeIncludeClosure() + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = \Closure::bind(static function($file) { + include $file; + }, null, null); + } } diff --git a/src/vendor/composer/InstalledVersions.php b/src/vendor_prefixed/vendor/composer/InstalledVersions.php similarity index 64% rename from src/vendor/composer/InstalledVersions.php rename to src/vendor_prefixed/vendor/composer/InstalledVersions.php index d50e0c9..d1bf61f 100644 --- a/src/vendor/composer/InstalledVersions.php +++ b/src/vendor_prefixed/vendor/composer/InstalledVersions.php @@ -9,38 +9,35 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ +namespace WpToTwitter_Vendor\Composer; -namespace Composer; - -use Composer\Autoload\ClassLoader; -use Composer\Semver\VersionParser; - +use WpToTwitter_Vendor\Composer\Autoload\ClassLoader; +use WpToTwitter_Vendor\Composer\Semver\VersionParser; /** * This class is copied in every Composer installed project and available to all * * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final */ class InstalledVersions { /** * @var mixed[]|null - * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null + * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null */ private static $installed; - /** * @var bool|null */ private static $canGetVendors; - /** * @var array[] - * @psalm-var array}> + * @psalm-var array}> */ private static $installedByVendor = array(); - /** * Returns a list of all package names which are present, either by being installed, replaced or provided * @@ -51,16 +48,13 @@ public static function getInstalledPackages() { $packages = array(); foreach (self::getInstalled() as $installed) { - $packages[] = array_keys($installed['versions']); + $packages[] = \array_keys($installed['versions']); } - if (1 === \count($packages)) { return $packages[0]; } - - return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + return \array_keys(\array_flip(\call_user_func_array('array_merge', $packages))); } - /** * Returns a list of all package names with a specific type e.g. 'library' * @@ -71,7 +65,6 @@ public static function getInstalledPackages() public static function getInstalledPackagesByType($type) { $packagesByType = array(); - foreach (self::getInstalled() as $installed) { foreach ($installed['versions'] as $name => $package) { if (isset($package['type']) && $package['type'] === $type) { @@ -79,10 +72,8 @@ public static function getInstalledPackagesByType($type) } } } - return $packagesByType; } - /** * Checks whether the given package is installed * @@ -92,17 +83,15 @@ public static function getInstalledPackagesByType($type) * @param bool $includeDevRequirements * @return bool */ - public static function isInstalled($packageName, $includeDevRequirements = true) + public static function isInstalled($packageName, $includeDevRequirements = \true) { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === \false; } } - - return false; + return \false; } - /** * Checks whether the given package satisfies a version constraint * @@ -117,12 +106,10 @@ public static function isInstalled($packageName, $includeDevRequirements = true) */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints($constraint); + $constraint = $parser->parseConstraints((string) $constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); - return $provided->matches($constraint); } - /** * Returns a version constraint representing all the range(s) which are installed for a given package * @@ -138,27 +125,23 @@ public static function getVersionRanges($packageName) if (!isset($installed['versions'][$packageName])) { continue; } - $ranges = array(); if (isset($installed['versions'][$packageName]['pretty_version'])) { $ranges[] = $installed['versions'][$packageName]['pretty_version']; } - if (array_key_exists('aliases', $installed['versions'][$packageName])) { - $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + if (\array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = \array_merge($ranges, $installed['versions'][$packageName]['aliases']); } - if (array_key_exists('replaced', $installed['versions'][$packageName])) { - $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + if (\array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = \array_merge($ranges, $installed['versions'][$packageName]['replaced']); } - if (array_key_exists('provided', $installed['versions'][$packageName])) { - $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + if (\array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = \array_merge($ranges, $installed['versions'][$packageName]['provided']); } - - return implode(' || ', $ranges); + return \implode(' || ', $ranges); } - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } - /** * @param string $packageName * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present @@ -169,17 +152,13 @@ public static function getVersion($packageName) if (!isset($installed['versions'][$packageName])) { continue; } - if (!isset($installed['versions'][$packageName]['version'])) { return null; } - return $installed['versions'][$packageName]['version']; } - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } - /** * @param string $packageName * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present @@ -190,17 +169,13 @@ public static function getPrettyVersion($packageName) if (!isset($installed['versions'][$packageName])) { continue; } - if (!isset($installed['versions'][$packageName]['pretty_version'])) { return null; } - return $installed['versions'][$packageName]['pretty_version']; } - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } - /** * @param string $packageName * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference @@ -211,17 +186,13 @@ public static function getReference($packageName) if (!isset($installed['versions'][$packageName])) { continue; } - if (!isset($installed['versions'][$packageName]['reference'])) { return null; } - return $installed['versions'][$packageName]['reference']; } - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } - /** * @param string $packageName * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. @@ -232,59 +203,50 @@ public static function getInstallPath($packageName) if (!isset($installed['versions'][$packageName])) { continue; } - return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; } - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); } - /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} */ public static function getRootPackage() { $installed = self::getInstalled(); - return $installed[0]['root']; } - /** * Returns the raw installed.php data for custom implementations * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} */ public static function getRawData() { - @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); - + @\trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', \E_USER_DEPRECATED); if (null === self::$installed) { // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 - if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = include __DIR__ . '/installed.php'; + if (\substr(__DIR__, -8, 1) !== 'C') { + self::$installed = (include __DIR__ . '/installed.php'); } else { self::$installed = array(); } } - return self::$installed; } - /** * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ public static function getAllRawData() { return self::getInstalled(); } - /** * Lets you reload the static array from another file * @@ -301,50 +263,51 @@ public static function getAllRawData() * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data */ public static function reload($data) { self::$installed = $data; self::$installedByVendor = array(); } - /** * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ private static function getInstalled() { if (null === self::$canGetVendors) { - self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + self::$canGetVendors = \method_exists('WpToTwitter_Vendor\\Composer\\Autoload\\ClassLoader', 'getRegisteredLoaders'); } - $installed = array(); - if (self::$canGetVendors) { foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; - } elseif (is_file($vendorDir.'/composer/installed.php')) { - $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; - if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { - self::$installed = $installed[count($installed) - 1]; + } elseif (\is_file($vendorDir . '/composer/installed.php')) { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = (require $vendorDir . '/composer/installed.php'); + $installed[] = self::$installedByVendor[$vendorDir] = $required; + if (null === self::$installed && \strtr($vendorDir . '/composer', '\\', '/') === \strtr(__DIR__, '\\', '/')) { + self::$installed = $installed[\count($installed) - 1]; } } } } - if (null === self::$installed) { // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 - if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = require __DIR__ . '/installed.php'; + if (\substr(__DIR__, -8, 1) !== 'C') { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = (require __DIR__ . '/installed.php'); + self::$installed = $required; } else { self::$installed = array(); } } - $installed[] = self::$installed; - + if (self::$installed !== array()) { + $installed[] = self::$installed; + } return $installed; } } diff --git a/src/vendor/composer/LICENSE b/src/vendor_prefixed/vendor/composer/LICENSE similarity index 100% rename from src/vendor/composer/LICENSE rename to src/vendor_prefixed/vendor/composer/LICENSE diff --git a/src/vendor_prefixed/vendor/composer/autoload_classmap.php b/src/vendor_prefixed/vendor/composer/autoload_classmap.php new file mode 100644 index 0000000..83fcfcb --- /dev/null +++ b/src/vendor_prefixed/vendor/composer/autoload_classmap.php @@ -0,0 +1,130 @@ + $vendorDir . '/composer/InstalledVersions.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\BodySummarizer' => $vendorDir . '/guzzlehttp/guzzle/src/BodySummarizer.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\BodySummarizerInterface' => $vendorDir . '/guzzlehttp/guzzle/src/BodySummarizerInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Client' => $vendorDir . '/guzzlehttp/guzzle/src/Client.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\ClientInterface' => $vendorDir . '/guzzlehttp/guzzle/src/ClientInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\ClientTrait' => $vendorDir . '/guzzlehttp/guzzle/src/ClientTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\CookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\CookieJarInterface' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\FileCookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\SessionCookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\SetCookie' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/SetCookie.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\BadResponseException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/BadResponseException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ClientException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ClientException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ConnectException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ConnectException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\GuzzleException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/GuzzleException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\InvalidArgumentException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\RequestException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/RequestException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ServerException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ServerException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\TooManyRedirectsException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\TransferException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/TransferException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\HandlerStack' => $vendorDir . '/guzzlehttp/guzzle/src/HandlerStack.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlFactory' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/CurlFactory.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlFactoryInterface' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlHandler' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/CurlHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlMultiHandler' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\EasyHandle' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/EasyHandle.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\HeaderProcessor' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\MockHandler' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/MockHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\Proxy' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/Proxy.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\StreamHandler' => $vendorDir . '/guzzlehttp/guzzle/src/Handler/StreamHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\MessageFormatter' => $vendorDir . '/guzzlehttp/guzzle/src/MessageFormatter.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\MessageFormatterInterface' => $vendorDir . '/guzzlehttp/guzzle/src/MessageFormatterInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Middleware' => $vendorDir . '/guzzlehttp/guzzle/src/Middleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Pool' => $vendorDir . '/guzzlehttp/guzzle/src/Pool.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\PrepareBodyMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\AggregateException' => $vendorDir . '/guzzlehttp/promises/src/AggregateException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\CancellationException' => $vendorDir . '/guzzlehttp/promises/src/CancellationException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Coroutine' => $vendorDir . '/guzzlehttp/promises/src/Coroutine.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Create' => $vendorDir . '/guzzlehttp/promises/src/Create.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Each' => $vendorDir . '/guzzlehttp/promises/src/Each.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\EachPromise' => $vendorDir . '/guzzlehttp/promises/src/EachPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\FulfilledPromise' => $vendorDir . '/guzzlehttp/promises/src/FulfilledPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Is' => $vendorDir . '/guzzlehttp/promises/src/Is.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Promise' => $vendorDir . '/guzzlehttp/promises/src/Promise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\PromiseInterface' => $vendorDir . '/guzzlehttp/promises/src/PromiseInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\PromisorInterface' => $vendorDir . '/guzzlehttp/promises/src/PromisorInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\RejectedPromise' => $vendorDir . '/guzzlehttp/promises/src/RejectedPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\RejectionException' => $vendorDir . '/guzzlehttp/promises/src/RejectionException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\TaskQueue' => $vendorDir . '/guzzlehttp/promises/src/TaskQueue.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\TaskQueueInterface' => $vendorDir . '/guzzlehttp/promises/src/TaskQueueInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Utils' => $vendorDir . '/guzzlehttp/promises/src/Utils.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\AppendStream' => $vendorDir . '/guzzlehttp/psr7/src/AppendStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\BufferStream' => $vendorDir . '/guzzlehttp/psr7/src/BufferStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\CachingStream' => $vendorDir . '/guzzlehttp/psr7/src/CachingStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\DroppingStream' => $vendorDir . '/guzzlehttp/psr7/src/DroppingStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Exception\\MalformedUriException' => $vendorDir . '/guzzlehttp/psr7/src/Exception/MalformedUriException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\FnStream' => $vendorDir . '/guzzlehttp/psr7/src/FnStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Header' => $vendorDir . '/guzzlehttp/psr7/src/Header.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\HttpFactory' => $vendorDir . '/guzzlehttp/psr7/src/HttpFactory.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\InflateStream' => $vendorDir . '/guzzlehttp/psr7/src/InflateStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\LazyOpenStream' => $vendorDir . '/guzzlehttp/psr7/src/LazyOpenStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\LimitStream' => $vendorDir . '/guzzlehttp/psr7/src/LimitStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Message' => $vendorDir . '/guzzlehttp/psr7/src/Message.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MessageTrait' => $vendorDir . '/guzzlehttp/psr7/src/MessageTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MimeType' => $vendorDir . '/guzzlehttp/psr7/src/MimeType.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MultipartStream' => $vendorDir . '/guzzlehttp/psr7/src/MultipartStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\NoSeekStream' => $vendorDir . '/guzzlehttp/psr7/src/NoSeekStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\PumpStream' => $vendorDir . '/guzzlehttp/psr7/src/PumpStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Query' => $vendorDir . '/guzzlehttp/psr7/src/Query.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Request' => $vendorDir . '/guzzlehttp/psr7/src/Request.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Response' => $vendorDir . '/guzzlehttp/psr7/src/Response.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Rfc7230' => $vendorDir . '/guzzlehttp/psr7/src/Rfc7230.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\ServerRequest' => $vendorDir . '/guzzlehttp/psr7/src/ServerRequest.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Stream' => $vendorDir . '/guzzlehttp/psr7/src/Stream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\StreamDecoratorTrait' => $vendorDir . '/guzzlehttp/psr7/src/StreamDecoratorTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\StreamWrapper' => $vendorDir . '/guzzlehttp/psr7/src/StreamWrapper.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UploadedFile' => $vendorDir . '/guzzlehttp/psr7/src/UploadedFile.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Uri' => $vendorDir . '/guzzlehttp/psr7/src/Uri.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriComparator' => $vendorDir . '/guzzlehttp/psr7/src/UriComparator.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriNormalizer' => $vendorDir . '/guzzlehttp/psr7/src/UriNormalizer.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriResolver' => $vendorDir . '/guzzlehttp/psr7/src/UriResolver.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Utils' => $vendorDir . '/guzzlehttp/psr7/src/Utils.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RedirectMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RedirectMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RequestOptions' => $vendorDir . '/guzzlehttp/guzzle/src/RequestOptions.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RetryMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RetryMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\Oauth1' => $vendorDir . '/guzzlehttp/oauth-subscriber/src/Oauth1.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\TransferStats' => $vendorDir . '/guzzlehttp/guzzle/src/TransferStats.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Utils' => $vendorDir . '/guzzlehttp/guzzle/src/Utils.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\AbstractController' => $vendorDir . '/noweh/twitter-api-v2-php/src/AbstractController.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Client' => $vendorDir . '/noweh/twitter-api-v2-php/src/Client.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Media' => $vendorDir . '/noweh/twitter-api-v2-php/src/Media.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Retweet' => $vendorDir . '/noweh/twitter-api-v2-php/src/Retweet.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Timeline' => $vendorDir . '/noweh/twitter-api-v2-php/src/Timeline.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Tweet' => $vendorDir . '/noweh/twitter-api-v2-php/src/Tweet.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetBookmarks' => $vendorDir . '/noweh/twitter-api-v2-php/src/TweetBookmarks.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetLikes' => $vendorDir . '/noweh/twitter-api-v2-php/src/TweetLikes.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetLookup' => $vendorDir . '/noweh/twitter-api-v2-php/src/TweetLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetQuotes' => $vendorDir . '/noweh/twitter-api-v2-php/src/TweetQuotes.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetReplies' => $vendorDir . '/noweh/twitter-api-v2-php/src/TweetReplies.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserBlocks' => $vendorDir . '/noweh/twitter-api-v2-php/src/UserBlocks.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserFollows' => $vendorDir . '/noweh/twitter-api-v2-php/src/UserFollows.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserLookup' => $vendorDir . '/noweh/twitter-api-v2-php/src/UserLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserMeLookup' => $vendorDir . '/noweh/twitter-api-v2-php/src/UserMeLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserMutes' => $vendorDir . '/noweh/twitter-api-v2-php/src/UserMutes.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\ClientExceptionInterface' => $vendorDir . '/psr/http-client/src/ClientExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\ClientInterface' => $vendorDir . '/psr/http-client/src/ClientInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\NetworkExceptionInterface' => $vendorDir . '/psr/http-client/src/NetworkExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\RequestExceptionInterface' => $vendorDir . '/psr/http-client/src/RequestExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\MessageInterface' => $vendorDir . '/psr/http-message/src/MessageInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\RequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/RequestFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\RequestInterface' => $vendorDir . '/psr/http-message/src/RequestInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ResponseFactoryInterface' => $vendorDir . '/psr/http-factory/src/ResponseFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ResponseInterface' => $vendorDir . '/psr/http-message/src/ResponseInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ServerRequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/ServerRequestFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ServerRequestInterface' => $vendorDir . '/psr/http-message/src/ServerRequestInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\StreamFactoryInterface' => $vendorDir . '/psr/http-factory/src/StreamFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\StreamInterface' => $vendorDir . '/psr/http-message/src/StreamInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UploadedFileFactoryInterface' => $vendorDir . '/psr/http-factory/src/UploadedFileFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UploadedFileInterface' => $vendorDir . '/psr/http-message/src/UploadedFileInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UriFactoryInterface' => $vendorDir . '/psr/http-factory/src/UriFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UriInterface' => $vendorDir . '/psr/http-message/src/UriInterface.php', +); diff --git a/src/vendor/composer/autoload_files.php b/src/vendor_prefixed/vendor/composer/autoload_files.php similarity index 90% rename from src/vendor/composer/autoload_files.php rename to src/vendor_prefixed/vendor/composer/autoload_files.php index c060ebb..ff3bac2 100644 --- a/src/vendor/composer/autoload_files.php +++ b/src/vendor_prefixed/vendor/composer/autoload_files.php @@ -2,7 +2,7 @@ // autoload_files.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/src/vendor/composer/autoload_namespaces.php b/src/vendor_prefixed/vendor/composer/autoload_namespaces.php similarity index 72% rename from src/vendor/composer/autoload_namespaces.php rename to src/vendor_prefixed/vendor/composer/autoload_namespaces.php index b7fc012..15a2ff3 100644 --- a/src/vendor/composer/autoload_namespaces.php +++ b/src/vendor_prefixed/vendor/composer/autoload_namespaces.php @@ -2,7 +2,7 @@ // autoload_namespaces.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/src/vendor_prefixed/vendor/composer/autoload_psr4.php b/src/vendor_prefixed/vendor/composer/autoload_psr4.php new file mode 100644 index 0000000..fe5ea9f --- /dev/null +++ b/src/vendor_prefixed/vendor/composer/autoload_psr4.php @@ -0,0 +1,16 @@ + array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'), + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'), + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\' => array($vendorDir . '/noweh/twitter-api-v2-php/src'), + 'WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\' => array($vendorDir . '/guzzlehttp/oauth-subscriber/src'), + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'), + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'), + 'WpToTwitter_Vendor\\GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'), +); diff --git a/src/vendor_prefixed/vendor/composer/autoload_real.php b/src/vendor_prefixed/vendor/composer/autoload_real.php new file mode 100644 index 0000000..62279f8 --- /dev/null +++ b/src/vendor_prefixed/vendor/composer/autoload_real.php @@ -0,0 +1,51 @@ +setClassMapAuthoritative(true); + $loader->register(true); + + $filesToLoad = \Composer\Autoload\ComposerStaticInitec64a760bf896e301866df9232c77bd4::$files; + $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + require $file; + } + }, null, null); + foreach ($filesToLoad as $fileIdentifier => $file) { + $requireFile($fileIdentifier, $file); + } + + return $loader; + } +} diff --git a/src/vendor_prefixed/vendor/composer/autoload_static.php b/src/vendor_prefixed/vendor/composer/autoload_static.php new file mode 100644 index 0000000..20a3b7c --- /dev/null +++ b/src/vendor_prefixed/vendor/composer/autoload_static.php @@ -0,0 +1,193 @@ + __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', + '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', + '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', + ); + + public static $prefixLengthsPsr4 = array ( + 'W' => + array ( + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\' => 36, + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\' => 35, + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\' => 36, + 'WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\' => 47, + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\' => 35, + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\' => 38, + 'WpToTwitter_Vendor\\GuzzleHttp\\' => 30, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\' => + array ( + 0 => __DIR__ . '/..' . '/psr/http-factory/src', + 1 => __DIR__ . '/..' . '/psr/http-message/src', + ), + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\' => + array ( + 0 => __DIR__ . '/..' . '/psr/http-client/src', + ), + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\' => + array ( + 0 => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src', + ), + 'WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\' => + array ( + 0 => __DIR__ . '/..' . '/guzzlehttp/oauth-subscriber/src', + ), + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\' => + array ( + 0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src', + ), + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\' => + array ( + 0 => __DIR__ . '/..' . '/guzzlehttp/promises/src', + ), + 'WpToTwitter_Vendor\\GuzzleHttp\\' => + array ( + 0 => __DIR__ . '/..' . '/guzzlehttp/guzzle/src', + ), + ); + + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\BodySummarizer' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/BodySummarizer.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\BodySummarizerInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/BodySummarizerInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Client' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Client.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\ClientInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/ClientInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\ClientTrait' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/ClientTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\CookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\CookieJarInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\FileCookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\SessionCookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Cookie\\SetCookie' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/SetCookie.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\BadResponseException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/BadResponseException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ClientException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ClientException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ConnectException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ConnectException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\GuzzleException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/GuzzleException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\RequestException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/RequestException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\ServerException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ServerException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\TooManyRedirectsException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Exception\\TransferException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/TransferException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\HandlerStack' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/HandlerStack.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlFactory' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/CurlFactory.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlFactoryInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlHandler' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/CurlHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\CurlMultiHandler' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\EasyHandle' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/EasyHandle.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\HeaderProcessor' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\MockHandler' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/MockHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\Proxy' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/Proxy.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Handler\\StreamHandler' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Handler/StreamHandler.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\MessageFormatter' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/MessageFormatter.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\MessageFormatterInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/MessageFormatterInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Middleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Middleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Pool' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Pool.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\PrepareBodyMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\AggregateException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/AggregateException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\CancellationException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/CancellationException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Coroutine' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Coroutine.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Create' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Create.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Each' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Each.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\EachPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/EachPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\FulfilledPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/FulfilledPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Is' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Is.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Promise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Promise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\PromiseInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/PromiseInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\PromisorInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/PromisorInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\RejectedPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/RejectedPromise.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\RejectionException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/RejectionException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\TaskQueue' => __DIR__ . '/..' . '/guzzlehttp/promises/src/TaskQueue.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\TaskQueueInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/TaskQueueInterface.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Promise\\Utils' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Utils.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\AppendStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/AppendStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\BufferStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/BufferStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\CachingStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/CachingStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\DroppingStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/DroppingStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Exception\\MalformedUriException' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Exception/MalformedUriException.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\FnStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/FnStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Header' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Header.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\HttpFactory' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/HttpFactory.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\InflateStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/InflateStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\LazyOpenStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/LazyOpenStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\LimitStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/LimitStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Message' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Message.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MessageTrait' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/MessageTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MimeType' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/MimeType.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\MultipartStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/MultipartStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\NoSeekStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/NoSeekStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\PumpStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/PumpStream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Query' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Query.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Request' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Request.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Response' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Response.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Rfc7230' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Rfc7230.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\ServerRequest' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/ServerRequest.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Stream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Stream.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\StreamDecoratorTrait' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/StreamDecoratorTrait.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\StreamWrapper' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/StreamWrapper.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UploadedFile' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UploadedFile.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Uri' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Uri.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriComparator' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriComparator.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriNormalizer' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriNormalizer.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\UriResolver' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriResolver.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\Utils' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Utils.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RedirectMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RedirectMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RequestOptions' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RequestOptions.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\RetryMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RetryMiddleware.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\Oauth1' => __DIR__ . '/..' . '/guzzlehttp/oauth-subscriber/src/Oauth1.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\TransferStats' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/TransferStats.php', + 'WpToTwitter_Vendor\\GuzzleHttp\\Utils' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Utils.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\AbstractController' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/AbstractController.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Client' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/Client.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Media' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/Media.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Retweet' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/Retweet.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Timeline' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/Timeline.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\Tweet' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/Tweet.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetBookmarks' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/TweetBookmarks.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetLikes' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/TweetLikes.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetLookup' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/TweetLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetQuotes' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/TweetQuotes.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\TweetReplies' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/TweetReplies.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserBlocks' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/UserBlocks.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserFollows' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/UserFollows.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserLookup' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/UserLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserMeLookup' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/UserMeLookup.php', + 'WpToTwitter_Vendor\\Noweh\\TwitterApi\\UserMutes' => __DIR__ . '/..' . '/noweh/twitter-api-v2-php/src/UserMutes.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\ClientExceptionInterface' => __DIR__ . '/..' . '/psr/http-client/src/ClientExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\ClientInterface' => __DIR__ . '/..' . '/psr/http-client/src/ClientInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\NetworkExceptionInterface' => __DIR__ . '/..' . '/psr/http-client/src/NetworkExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Client\\RequestExceptionInterface' => __DIR__ . '/..' . '/psr/http-client/src/RequestExceptionInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\MessageInterface' => __DIR__ . '/..' . '/psr/http-message/src/MessageInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\RequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/RequestFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\RequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/RequestInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ResponseFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ResponseFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ResponseInterface' => __DIR__ . '/..' . '/psr/http-message/src/ResponseInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ServerRequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ServerRequestFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\ServerRequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/ServerRequestInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\StreamFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/StreamFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\StreamInterface' => __DIR__ . '/..' . '/psr/http-message/src/StreamInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UploadedFileFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UploadedFileFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UploadedFileInterface' => __DIR__ . '/..' . '/psr/http-message/src/UploadedFileInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UriFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UriFactoryInterface.php', + 'WpToTwitter_Vendor\\Psr\\Http\\Message\\UriInterface' => __DIR__ . '/..' . '/psr/http-message/src/UriInterface.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitec64a760bf896e301866df9232c77bd4::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitec64a760bf896e301866df9232c77bd4::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitec64a760bf896e301866df9232c77bd4::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/src/vendor/composer/installed.json b/src/vendor_prefixed/vendor/composer/installed.json similarity index 61% rename from src/vendor/composer/installed.json rename to src/vendor_prefixed/vendor/composer/installed.json index d1b0e86..99767b1 100644 --- a/src/vendor/composer/installed.json +++ b/src/vendor_prefixed/vendor/composer/installed.json @@ -1,43 +1,43 @@ { "packages": [ { - "name": "guzzlehttp/guzzle", + "name": "guzzlehttp\/guzzle", "version": "7.7.0", "version_normalized": "7.7.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", + "url": "https:\/\/github.com\/guzzle\/guzzle.git", "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https:\/\/api.github.com\/repos\/guzzle\/guzzle\/zipball\/fb7566caccf22d74d1ab270de3551f72a58399f5", "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp\/promises": "^1.5.3 || ^2.0", + "guzzlehttp\/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" + "psr\/http-client": "^1.0", + "symfony\/deprecation-contracts": "^2.2 || ^3.0" }, "provide": { - "psr/http-client-implementation": "1.0" + "psr\/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni\/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", - "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", - "psr/log": "^1.1 || ^2.0 || ^3.0" + "php-http\/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http\/message-factory": "^1.1", + "phpunit\/phpunit": "^8.5.29 || ^9.5.23", + "psr\/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { "ext-curl": "Required for CURL handler support", "ext-intl": "Required for Internationalized Domain Name (IDN) support", - "psr/log": "Required for using the Log middleware" + "psr\/log": "Required for using the Log middleware" }, "time": "2023-05-21T14:04:53+00:00", "type": "library", @@ -50,13 +50,13 @@ "installation-source": "dist", "autoload": { "files": [ - "src/functions_include.php" + "src\/functions_include.php" ], "psr-4": { - "GuzzleHttp\\": "src/" + "WpToTwitter_Vendor\\GuzzleHttp\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -64,37 +64,37 @@ { "name": "Graham Campbell", "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" + "homepage": "https:\/\/github.com\/GrahamCampbell" }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "homepage": "https:\/\/github.com\/mtdowling" }, { "name": "Jeremy Lindblom", "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" + "homepage": "https:\/\/github.com\/jeremeamia" }, { "name": "George Mponos", "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" + "homepage": "https:\/\/github.com\/gmponos" }, { "name": "Tobias Nyholm", "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "homepage": "https:\/\/github.com\/Nyholm" }, { - "name": "Márk Sági-Kazár", + "name": "M\u00e1rk S\u00e1gi-Kaz\u00e1r", "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" + "homepage": "https:\/\/github.com\/sagikazarmark" }, { "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "homepage": "https:\/\/github.com\/Tobion" } ], "description": "Guzzle is a PHP HTTP client library", @@ -110,47 +110,47 @@ "web service" ], "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.7.0" + "issues": "https:\/\/github.com\/guzzle\/guzzle\/issues", + "source": "https:\/\/github.com\/guzzle\/guzzle\/tree\/7.7.0" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", + "url": "https:\/\/github.com\/GrahamCampbell", "type": "github" }, { - "url": "https://github.com/Nyholm", + "url": "https:\/\/github.com\/Nyholm", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "url": "https:\/\/tidelift.com\/funding\/github\/packagist\/guzzlehttp\/guzzle", "type": "tidelift" } ], - "install-path": "../guzzlehttp/guzzle" + "install-path": "..\/guzzlehttp\/guzzle" }, { - "name": "guzzlehttp/oauth-subscriber", + "name": "guzzlehttp\/oauth-subscriber", "version": "0.6.0", "version_normalized": "0.6.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/oauth-subscriber.git", + "url": "https:\/\/github.com\/guzzle\/oauth-subscriber.git", "reference": "8d6cab29f8397e5712d00a383eeead36108a3c1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/oauth-subscriber/zipball/8d6cab29f8397e5712d00a383eeead36108a3c1f", + "url": "https:\/\/api.github.com\/repos\/guzzle\/oauth-subscriber\/zipball\/8d6cab29f8397e5712d00a383eeead36108a3c1f", "reference": "8d6cab29f8397e5712d00a383eeead36108a3c1f", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.5|^7.2", - "guzzlehttp/psr7": "^1.7|^2.0", + "guzzlehttp\/guzzle": "^6.5|^7.2", + "guzzlehttp\/psr7": "^1.7|^2.0", "php": ">=5.5.0" }, "require-dev": { - "phpunit/phpunit": "~4.0|^9.3.3" + "phpunit\/phpunit": "~4.0|^9.3.3" }, "suggest": { "ext-openssl": "Required to sign using RSA-SHA1" @@ -165,10 +165,10 @@ "installation-source": "dist", "autoload": { "psr-4": { - "GuzzleHttp\\Subscriber\\Oauth\\": "src" + "WpToTwitter_Vendor\\GuzzleHttp\\Subscriber\\Oauth\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -176,33 +176,33 @@ { "name": "Michael Dowling", "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "homepage": "https:\/\/github.com\/mtdowling" } ], "description": "Guzzle OAuth 1.0 subscriber", - "homepage": "http://guzzlephp.org/", + "homepage": "http:\/\/guzzlephp.org\/", "keywords": [ "Guzzle", "oauth" ], "support": { - "issues": "https://github.com/guzzle/oauth-subscriber/issues", - "source": "https://github.com/guzzle/oauth-subscriber/tree/0.6.0" + "issues": "https:\/\/github.com\/guzzle\/oauth-subscriber\/issues", + "source": "https:\/\/github.com\/guzzle\/oauth-subscriber\/tree\/0.6.0" }, - "install-path": "../guzzlehttp/oauth-subscriber" + "install-path": "..\/guzzlehttp\/oauth-subscriber" }, { - "name": "guzzlehttp/promises", + "name": "guzzlehttp\/promises", "version": "2.0.1", "version_normalized": "2.0.1.0", "source": { "type": "git", - "url": "https://github.com/guzzle/promises.git", + "url": "https:\/\/github.com\/guzzle\/promises.git", "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "url": "https:\/\/api.github.com\/repos\/guzzle\/promises\/zipball\/111166291a0f8130081195ac4556a5587d7f1b5d", "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, @@ -210,8 +210,8 @@ "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "bamarni\/composer-bin-plugin": "^1.8.1", + "phpunit\/phpunit": "^8.5.29 || ^9.5.23" }, "time": "2023-08-03T15:11:55+00:00", "type": "library", @@ -224,10 +224,10 @@ "installation-source": "dist", "autoload": { "psr-4": { - "GuzzleHttp\\Promise\\": "src/" + "WpToTwitter_Vendor\\GuzzleHttp\\Promise\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -235,22 +235,22 @@ { "name": "Graham Campbell", "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" + "homepage": "https:\/\/github.com\/GrahamCampbell" }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "homepage": "https:\/\/github.com\/mtdowling" }, { "name": "Tobias Nyholm", "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "homepage": "https:\/\/github.com\/Nyholm" }, { "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "homepage": "https:\/\/github.com\/Tobion" } ], "description": "Guzzle promises library", @@ -258,57 +258,57 @@ "promise" ], "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.1" + "issues": "https:\/\/github.com\/guzzle\/promises\/issues", + "source": "https:\/\/github.com\/guzzle\/promises\/tree\/2.0.1" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", + "url": "https:\/\/github.com\/GrahamCampbell", "type": "github" }, { - "url": "https://github.com/Nyholm", + "url": "https:\/\/github.com\/Nyholm", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "url": "https:\/\/tidelift.com\/funding\/github\/packagist\/guzzlehttp\/promises", "type": "tidelift" } ], - "install-path": "../guzzlehttp/promises" + "install-path": "..\/guzzlehttp\/promises" }, { - "name": "guzzlehttp/psr7", + "name": "guzzlehttp\/psr7", "version": "2.6.0", "version_normalized": "2.6.0.0", "source": { "type": "git", - "url": "https://github.com/guzzle/psr7.git", + "url": "https:\/\/github.com\/guzzle\/psr7.git", "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77", + "url": "https:\/\/api.github.com\/repos\/guzzle\/psr7\/zipball\/8bd7c33a0734ae1c5d074360512beb716bef3f77", "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 || ^2.0", - "ralouphie/getallheaders": "^3.0" + "psr\/http-factory": "^1.0", + "psr\/http-message": "^1.1 || ^2.0", + "ralouphie\/getallheaders": "^3.0" }, "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" + "psr\/http-factory-implementation": "1.0", + "psr\/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "bamarni\/composer-bin-plugin": "^1.8.1", + "http-interop\/http-factory-tests": "^0.9", + "phpunit\/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + "laminas\/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "time": "2023-08-03T15:06:02+00:00", "type": "library", @@ -321,10 +321,10 @@ "installation-source": "dist", "autoload": { "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" + "WpToTwitter_Vendor\\GuzzleHttp\\Psr7\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -332,37 +332,37 @@ { "name": "Graham Campbell", "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" + "homepage": "https:\/\/github.com\/GrahamCampbell" }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "homepage": "https:\/\/github.com\/mtdowling" }, { "name": "George Mponos", "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" + "homepage": "https:\/\/github.com\/gmponos" }, { "name": "Tobias Nyholm", "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "homepage": "https:\/\/github.com\/Nyholm" }, { - "name": "Márk Sági-Kazár", + "name": "M\u00e1rk S\u00e1gi-Kaz\u00e1r", "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" + "homepage": "https:\/\/github.com\/sagikazarmark" }, { "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" + "homepage": "https:\/\/github.com\/Tobion" }, { - "name": "Márk Sági-Kazár", + "name": "M\u00e1rk S\u00e1gi-Kaz\u00e1r", "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "homepage": "https:\/\/sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -377,62 +377,62 @@ "url" ], "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.0" + "issues": "https:\/\/github.com\/guzzle\/psr7\/issues", + "source": "https:\/\/github.com\/guzzle\/psr7\/tree\/2.6.0" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", + "url": "https:\/\/github.com\/GrahamCampbell", "type": "github" }, { - "url": "https://github.com/Nyholm", + "url": "https:\/\/github.com\/Nyholm", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "url": "https:\/\/tidelift.com\/funding\/github\/packagist\/guzzlehttp\/psr7", "type": "tidelift" } ], - "install-path": "../guzzlehttp/psr7" + "install-path": "..\/guzzlehttp\/psr7" }, { - "name": "noweh/twitter-api-v2-php", + "name": "noweh\/twitter-api-v2-php", "version": "3.4.0", "version_normalized": "3.4.0.0", "source": { "type": "git", - "url": "https://github.com/noweh/twitter-api-v2-php.git", + "url": "https:\/\/github.com\/noweh\/twitter-api-v2-php.git", "reference": "0831051dbfae16e6083180c69ad42673e9139d21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/noweh/twitter-api-v2-php/zipball/0831051dbfae16e6083180c69ad42673e9139d21", + "url": "https:\/\/api.github.com\/repos\/noweh\/twitter-api-v2-php\/zipball\/0831051dbfae16e6083180c69ad42673e9139d21", "reference": "0831051dbfae16e6083180c69ad42673e9139d21", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", - "guzzlehttp/guzzle": "^7.5.0", - "guzzlehttp/oauth-subscriber": "^0.6.0", + "guzzlehttp\/guzzle": "^7.5.0", + "guzzlehttp\/oauth-subscriber": "^0.6.0", "php": ">=7.4" }, "require-dev": { - "phpstan/phpstan": "^1.9.14", - "phpunit/php-code-coverage": "^9.2.24", - "phpunit/phpunit": "^9.6.3", - "vlucas/phpdotenv": "^v5.5.0" + "phpstan\/phpstan": "^1.9.14", + "phpunit\/php-code-coverage": "^9.2.24", + "phpunit\/phpunit": "^9.6.3", + "vlucas\/phpdotenv": "^v5.5.0" }, "time": "2023-08-12T14:37:26+00:00", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { - "Noweh\\TwitterApi\\": "src/" + "WpToTwitter_Vendor\\Noweh\\TwitterApi\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -443,7 +443,7 @@ }, { "name": "Martin Zeitler", - "homepage": "https://github.com/syslogic" + "homepage": "https:\/\/github.com\/syslogic" } ], "description": "This library provides methods for sending messages to Twitter and receiving statuses.", @@ -453,29 +453,29 @@ "twitter" ], "support": { - "issues": "https://github.com/noweh/twitter-api-v2-php/issues", - "source": "https://github.com/noweh/twitter-api-v2-php/tree/3.4.0" + "issues": "https:\/\/github.com\/noweh\/twitter-api-v2-php\/issues", + "source": "https:\/\/github.com\/noweh\/twitter-api-v2-php\/tree\/3.4.0" }, - "install-path": "../noweh/twitter-api-v2-php" + "install-path": "..\/noweh\/twitter-api-v2-php" }, { - "name": "psr/http-client", + "name": "psr\/http-client", "version": "1.0.2", "version_normalized": "1.0.2.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-client.git", + "url": "https:\/\/github.com\/php-fig\/http-client.git", "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https:\/\/api.github.com\/repos\/php-fig\/http-client\/zipball\/0955afe48220520692d2d09f7ab7e0f93ffd6a31", "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0 || ^2.0" + "psr\/http-message": "^1.0 || ^2.0" }, "time": "2023-04-10T20:12:12+00:00", "type": "library", @@ -487,21 +487,21 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Psr\\Http\\Client\\": "src/" + "WpToTwitter_Vendor\\Psr\\Http\\Client\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "https:\/\/www.php-fig.org\/" } ], "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", + "homepage": "https:\/\/github.com\/php-fig\/http-client", "keywords": [ "http", "http-client", @@ -509,28 +509,28 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https:\/\/github.com\/php-fig\/http-client\/tree\/1.0.2" }, - "install-path": "../psr/http-client" + "install-path": "..\/psr\/http-client" }, { - "name": "psr/http-factory", + "name": "psr\/http-factory", "version": "1.0.2", "version_normalized": "1.0.2.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-factory.git", + "url": "https:\/\/github.com\/php-fig\/http-factory.git", "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "url": "https:\/\/api.github.com\/repos\/php-fig\/http-factory\/zipball\/e616d01114759c4c489f93b099585439f795fe35", "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0 || ^2.0" + "psr\/http-message": "^1.0 || ^2.0" }, "time": "2023-04-10T20:10:41+00:00", "type": "library", @@ -542,17 +542,17 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "WpToTwitter_Vendor\\Psr\\Http\\Message\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "https:\/\/www.php-fig.org\/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -567,22 +567,22 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https:\/\/github.com\/php-fig\/http-factory\/tree\/1.0.2" }, - "install-path": "../psr/http-factory" + "install-path": "..\/psr\/http-factory" }, { - "name": "psr/http-message", + "name": "psr\/http-message", "version": "2.0", "version_normalized": "2.0.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", + "url": "https:\/\/github.com\/php-fig\/http-message.git", "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "url": "https:\/\/api.github.com\/repos\/php-fig\/http-message\/zipball\/402d35bcb92c70c026d1a6a9883f06b2ead23d71", "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, @@ -599,21 +599,21 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "WpToTwitter_Vendor\\Psr\\Http\\Message\\": "src\/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "https:\/\/www.php-fig.org\/" } ], "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", + "homepage": "https:\/\/github.com\/php-fig\/http-message", "keywords": [ "http", "http-message", @@ -623,22 +623,22 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/2.0" + "source": "https:\/\/github.com\/php-fig\/http-message\/tree\/2.0" }, - "install-path": "../psr/http-message" + "install-path": "..\/psr\/http-message" }, { - "name": "ralouphie/getallheaders", + "name": "ralouphie\/getallheaders", "version": "3.0.3", "version_normalized": "3.0.3.0", "source": { "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", + "url": "https:\/\/github.com\/ralouphie\/getallheaders.git", "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "url": "https:\/\/api.github.com\/repos\/ralouphie\/getallheaders\/zipball\/120b605dfeb996808c31b6477290a714d356e822", "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, @@ -646,18 +646,18 @@ "php": ">=5.6" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" + "php-coveralls\/php-coveralls": "^2.1", + "phpunit\/phpunit": "^5 || ^6.5" }, "time": "2019-03-08T08:55:37+00:00", "type": "library", "installation-source": "dist", "autoload": { "files": [ - "src/getallheaders.php" + "src\/getallheaders.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -669,23 +669,23 @@ ], "description": "A polyfill for getallheaders.", "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" + "issues": "https:\/\/github.com\/ralouphie\/getallheaders\/issues", + "source": "https:\/\/github.com\/ralouphie\/getallheaders\/tree\/develop" }, - "install-path": "../ralouphie/getallheaders" + "install-path": "..\/ralouphie\/getallheaders" }, { - "name": "symfony/deprecation-contracts", + "name": "symfony\/deprecation-contracts", "version": "v2.5.2", "version_normalized": "2.5.2.0", "source": { "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", + "url": "https:\/\/github.com\/symfony\/deprecation-contracts.git", "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https:\/\/api.github.com\/repos\/symfony\/deprecation-contracts\/zipball\/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, @@ -699,8 +699,8 @@ "dev-main": "2.5-dev" }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "name": "symfony\/contracts", + "url": "https:\/\/github.com\/symfony\/contracts" } }, "installation-source": "dist", @@ -709,7 +709,7 @@ "function.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "https:\/\/packagist.org\/downloads\/", "license": [ "MIT" ], @@ -720,31 +720,31 @@ }, { "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "homepage": "https:\/\/symfony.com\/contributors" } ], "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", + "homepage": "https:\/\/symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https:\/\/github.com\/symfony\/deprecation-contracts\/tree\/v2.5.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", + "url": "https:\/\/symfony.com\/sponsor", "type": "custom" }, { - "url": "https://github.com/fabpot", + "url": "https:\/\/github.com\/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "url": "https:\/\/tidelift.com\/funding\/github\/packagist\/symfony\/symfony", "type": "tidelift" } ], - "install-path": "../symfony/deprecation-contracts" + "install-path": "..\/symfony\/deprecation-contracts" } ], "dev": true, "dev-package-names": [] -} +} \ No newline at end of file diff --git a/src/vendor_prefixed/vendor/composer/installed.php b/src/vendor_prefixed/vendor/composer/installed.php new file mode 100644 index 0000000..a5bccf6 --- /dev/null +++ b/src/vendor_prefixed/vendor/composer/installed.php @@ -0,0 +1,5 @@ + array('name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', 'reference' => '5d00cadf5030eca9d53b71de03b025774183eafe', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev' => \true), 'versions' => array('__root__' => array('pretty_version' => 'dev-master', 'version' => 'dev-master', 'reference' => '5d00cadf5030eca9d53b71de03b025774183eafe', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => \false), 'guzzlehttp/guzzle' => array('pretty_version' => '7.7.0', 'version' => '7.7.0.0', 'reference' => 'fb7566caccf22d74d1ab270de3551f72a58399f5', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/guzzle', 'aliases' => array(), 'dev_requirement' => \false), 'guzzlehttp/oauth-subscriber' => array('pretty_version' => '0.6.0', 'version' => '0.6.0.0', 'reference' => '8d6cab29f8397e5712d00a383eeead36108a3c1f', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/oauth-subscriber', 'aliases' => array(), 'dev_requirement' => \false), 'guzzlehttp/promises' => array('pretty_version' => '2.0.1', 'version' => '2.0.1.0', 'reference' => '111166291a0f8130081195ac4556a5587d7f1b5d', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/promises', 'aliases' => array(), 'dev_requirement' => \false), 'guzzlehttp/psr7' => array('pretty_version' => '2.6.0', 'version' => '2.6.0.0', 'reference' => '8bd7c33a0734ae1c5d074360512beb716bef3f77', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/psr7', 'aliases' => array(), 'dev_requirement' => \false), 'noweh/twitter-api-v2-php' => array('pretty_version' => '3.4.0', 'version' => '3.4.0.0', 'reference' => '0831051dbfae16e6083180c69ad42673e9139d21', 'type' => 'library', 'install_path' => __DIR__ . '/../noweh/twitter-api-v2-php', 'aliases' => array(), 'dev_requirement' => \false), 'psr/http-client' => array('pretty_version' => '1.0.2', 'version' => '1.0.2.0', 'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-client', 'aliases' => array(), 'dev_requirement' => \false), 'psr/http-client-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.0')), 'psr/http-factory' => array('pretty_version' => '1.0.2', 'version' => '1.0.2.0', 'reference' => 'e616d01114759c4c489f93b099585439f795fe35', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-factory', 'aliases' => array(), 'dev_requirement' => \false), 'psr/http-factory-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.0')), 'psr/http-message' => array('pretty_version' => '2.0', 'version' => '2.0.0.0', 'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-message', 'aliases' => array(), 'dev_requirement' => \false), 'psr/http-message-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.0')), 'ralouphie/getallheaders' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'reference' => '120b605dfeb996808c31b6477290a714d356e822', 'type' => 'library', 'install_path' => __DIR__ . '/../ralouphie/getallheaders', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/deprecation-contracts' => array('pretty_version' => 'v2.5.2', 'version' => '2.5.2.0', 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/deprecation-contracts', 'aliases' => array(), 'dev_requirement' => \false))); diff --git a/src/vendor/composer/platform_check.php b/src/vendor_prefixed/vendor/composer/platform_check.php similarity index 100% rename from src/vendor/composer/platform_check.php rename to src/vendor_prefixed/vendor/composer/platform_check.php diff --git a/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizer.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizer.php new file mode 100644 index 0000000..418734e --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizer.php @@ -0,0 +1,23 @@ +truncateAt = $truncateAt; + } + /** + * Returns a summarized message body. + */ + public function summarize(MessageInterface $message) : ?string + { + return $this->truncateAt === null ? \WpToTwitter_Vendor\GuzzleHttp\Psr7\Message::bodySummary($message) : \WpToTwitter_Vendor\GuzzleHttp\Psr7\Message::bodySummary($message, $this->truncateAt); + } +} diff --git a/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php new file mode 100644 index 0000000..fec4ebb --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php @@ -0,0 +1,12 @@ +configureDefaults($config); } - /** * @param string $method * @param array $args @@ -83,32 +77,22 @@ public function __call($method, $args) if (\count($args) < 1) { throw new InvalidArgumentException('Magic request methods require a URI and optional options array'); } - $uri = $args[0]; $opts = $args[1] ?? []; - - return \substr($method, -5) === 'Async' - ? $this->requestAsync(\substr($method, 0, -5), $uri, $opts) - : $this->request($method, $uri, $opts); + return \substr($method, -5) === 'Async' ? $this->requestAsync(\substr($method, 0, -5), $uri, $opts) : $this->request($method, $uri, $opts); } - /** * Asynchronously send an HTTP request. * * @param array $options Request options to apply to the given * request and to the transfer. See \GuzzleHttp\RequestOptions. */ - public function sendAsync(RequestInterface $request, array $options = []): PromiseInterface + public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface { // Merge the base URI into the request URI if needed. $options = $this->prepareDefaults($options); - - return $this->transfer( - $request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')), - $options - ); + return $this->transfer($request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')), $options); } - /** * Send an HTTP request. * @@ -117,27 +101,23 @@ public function sendAsync(RequestInterface $request, array $options = []): Promi * * @throws GuzzleException */ - public function send(RequestInterface $request, array $options = []): ResponseInterface + public function send(RequestInterface $request, array $options = []) : ResponseInterface { - $options[RequestOptions::SYNCHRONOUS] = true; - + $options[RequestOptions::SYNCHRONOUS] = \true; return $this->sendAsync($request, $options)->wait(); } - /** * The HttpClient PSR (PSR-18) specify this method. * * {@inheritDoc} */ - public function sendRequest(RequestInterface $request): ResponseInterface + public function sendRequest(RequestInterface $request) : ResponseInterface { - $options[RequestOptions::SYNCHRONOUS] = true; - $options[RequestOptions::ALLOW_REDIRECTS] = false; - $options[RequestOptions::HTTP_ERRORS] = false; - + $options[RequestOptions::SYNCHRONOUS] = \true; + $options[RequestOptions::ALLOW_REDIRECTS] = \false; + $options[RequestOptions::HTTP_ERRORS] = \false; return $this->sendAsync($request, $options)->wait(); } - /** * Create and send an asynchronous HTTP request. * @@ -150,7 +130,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. See \GuzzleHttp\RequestOptions. */ - public function requestAsync(string $method, $uri = '', array $options = []): PromiseInterface + public function requestAsync(string $method, $uri = '', array $options = []) : PromiseInterface { $options = $this->prepareDefaults($options); // Remove request modifying parameter because it can be done up-front. @@ -165,10 +145,8 @@ public function requestAsync(string $method, $uri = '', array $options = []): Pr $request = new Psr7\Request($method, $uri, $headers, $body, $version); // Remove the option so that they are not doubly-applied. unset($options['headers'], $options['body'], $options['version']); - return $this->transfer($request, $options); } - /** * Create and send an HTTP request. * @@ -182,13 +160,11 @@ public function requestAsync(string $method, $uri = '', array $options = []): Pr * * @throws GuzzleException */ - public function request(string $method, $uri = '', array $options = []): ResponseInterface + public function request(string $method, $uri = '', array $options = []) : ResponseInterface { - $options[RequestOptions::SYNCHRONOUS] = true; - + $options[RequestOptions::SYNCHRONOUS] = \true; return $this->requestAsync($method, $uri, $options)->wait(); } - /** * Get a client configuration option. * @@ -204,63 +180,43 @@ public function request(string $method, $uri = '', array $options = []): Respons */ public function getConfig(?string $option = null) { - return $option === null - ? $this->config - : ($this->config[$option] ?? null); + return $option === null ? $this->config : $this->config[$option] ?? null; } - - private function buildUri(UriInterface $uri, array $config): UriInterface + private function buildUri(UriInterface $uri, array $config) : UriInterface { if (isset($config['base_uri'])) { $uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri); } - - if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) { - $idnOptions = ($config['idn_conversion'] === true) ? \IDNA_DEFAULT : $config['idn_conversion']; + if (isset($config['idn_conversion']) && $config['idn_conversion'] !== \false) { + $idnOptions = $config['idn_conversion'] === \true ? \IDNA_DEFAULT : $config['idn_conversion']; $uri = Utils::idnUriConvert($uri, $idnOptions); } - return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri; } - /** * Configures the default options for a client. */ - private function configureDefaults(array $config): void + private function configureDefaults(array $config) : void { - $defaults = [ - 'allow_redirects' => RedirectMiddleware::$defaultSettings, - 'http_errors' => true, - 'decode_content' => true, - 'verify' => true, - 'cookies' => false, - 'idn_conversion' => false, - ]; - + $defaults = ['allow_redirects' => RedirectMiddleware::$defaultSettings, 'http_errors' => \true, 'decode_content' => \true, 'verify' => \true, 'cookies' => \false, 'idn_conversion' => \false]; // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set. - // We can only trust the HTTP_PROXY environment variable in a CLI // process due to the fact that PHP has no reliable mechanism to // get environment variables that start with "HTTP_". if (\PHP_SAPI === 'cli' && ($proxy = Utils::getenv('HTTP_PROXY'))) { $defaults['proxy']['http'] = $proxy; } - if ($proxy = Utils::getenv('HTTPS_PROXY')) { $defaults['proxy']['https'] = $proxy; } - if ($noProxy = Utils::getenv('NO_PROXY')) { $cleanedNoProxy = \str_replace(' ', '', $noProxy); $defaults['proxy']['no'] = \explode(',', $cleanedNoProxy); } - $this->config = $config + $defaults; - - if (!empty($config['cookies']) && $config['cookies'] === true) { + if (!empty($config['cookies']) && $config['cookies'] === \true) { $this->config['cookies'] = new CookieJar(); } - // Add the default user-agent header. if (!isset($this->config['headers'])) { $this->config['headers'] = ['User-Agent' => Utils::defaultUserAgent()]; @@ -274,22 +230,19 @@ private function configureDefaults(array $config): void $this->config['headers']['User-Agent'] = Utils::defaultUserAgent(); } } - /** * Merges default options into the array. * * @param array $options Options to modify by reference */ - private function prepareDefaults(array $options): array + private function prepareDefaults(array $options) : array { $defaults = $this->config; - if (!empty($defaults['headers'])) { // Default headers are only added if they are not present. $defaults['_conditional'] = $defaults['headers']; unset($defaults['headers']); } - // Special handling for headers is required as they are added as // conditional headers and as headers passed to a request ctor. if (\array_key_exists('headers', $options)) { @@ -301,20 +254,16 @@ private function prepareDefaults(array $options): array throw new InvalidArgumentException('headers must be an array'); } } - // Shallow merge defaults underneath options. $result = $options + $defaults; - // Remove null values. foreach ($result as $k => $v) { if ($v === null) { unset($result[$k]); } } - return $result; } - /** * Transfers the given request and applies request options. * @@ -323,43 +272,33 @@ private function prepareDefaults(array $options): array * * @param array $options See \GuzzleHttp\RequestOptions. */ - private function transfer(RequestInterface $request, array $options): PromiseInterface + private function transfer(RequestInterface $request, array $options) : PromiseInterface { $request = $this->applyOptions($request, $options); /** @var HandlerStack $handler */ $handler = $options['handler']; - try { return P\Create::promiseFor($handler($request, $options)); } catch (\Exception $e) { return P\Create::rejectionFor($e); } } - /** * Applies the array of request options to a request. */ - private function applyOptions(RequestInterface $request, array &$options): RequestInterface + private function applyOptions(RequestInterface $request, array &$options) : RequestInterface { - $modify = [ - 'set_headers' => [], - ]; - + $modify = ['set_headers' => []]; if (isset($options['headers'])) { - if (array_keys($options['headers']) === range(0, count($options['headers']) - 1)) { + if (\array_keys($options['headers']) === \range(0, \count($options['headers']) - 1)) { throw new InvalidArgumentException('The headers array must have header name as keys.'); } $modify['set_headers'] = $options['headers']; unset($options['headers']); } - if (isset($options['form_params'])) { if (isset($options['multipart'])) { - throw new InvalidArgumentException('You cannot use ' - .'form_params and multipart at the same time. Use the ' - .'form_params option if you want to send application/' - .'x-www-form-urlencoded requests, and the multipart ' - .'option to send multipart/form-data requests.'); + throw new InvalidArgumentException('You cannot use ' . 'form_params and multipart at the same time. Use the ' . 'form_params option if you want to send application/' . 'x-www-form-urlencoded requests, and the multipart ' . 'option to send multipart/form-data requests.'); } $options['body'] = \http_build_query($options['form_params'], '', '&'); unset($options['form_params']); @@ -367,12 +306,10 @@ private function applyOptions(RequestInterface $request, array &$options): Reque $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']); $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded'; } - if (isset($options['multipart'])) { $options['body'] = new Psr7\MultipartStream($options['multipart']); unset($options['multipart']); } - if (isset($options['json'])) { $options['body'] = Utils::jsonEncode($options['json']); unset($options['json']); @@ -380,15 +317,11 @@ private function applyOptions(RequestInterface $request, array &$options): Reque $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']); $options['_conditional']['Content-Type'] = 'application/json'; } - - if (!empty($options['decode_content']) - && $options['decode_content'] !== true - ) { + if (!empty($options['decode_content']) && $options['decode_content'] !== \true) { // Ensure that we don't have the header in different case and set the new value. $options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']); $modify['set_headers']['Accept-Encoding'] = $options['decode_content']; } - if (isset($options['body'])) { if (\is_array($options['body'])) { throw $this->invalidBody(); @@ -396,7 +329,6 @@ private function applyOptions(RequestInterface $request, array &$options): Reque $modify['body'] = Psr7\Utils::streamFor($options['body']); unset($options['body']); } - if (!empty($options['auth']) && \is_array($options['auth'])) { $value = $options['auth']; $type = isset($value[2]) ? \strtolower($value[2]) : 'basic'; @@ -404,21 +336,19 @@ private function applyOptions(RequestInterface $request, array &$options): Reque case 'basic': // Ensure that we don't have the header in different case and set the new value. $modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']); - $modify['set_headers']['Authorization'] = 'Basic ' - .\base64_encode("$value[0]:$value[1]"); + $modify['set_headers']['Authorization'] = 'Basic ' . \base64_encode("{$value[0]}:{$value[1]}"); break; case 'digest': // @todo: Do not rely on curl $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_DIGEST; - $options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]"; + $options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}"; break; case 'ntlm': $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_NTLM; - $options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]"; + $options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}"; break; } } - if (isset($options['query'])) { $value = $options['query']; if (\is_array($value)) { @@ -430,7 +360,6 @@ private function applyOptions(RequestInterface $request, array &$options): Reque $modify['query'] = $value; unset($options['query']); } - // Ensure that sink is not an invalid value. if (isset($options['sink'])) { // TODO: Add more sink validation? @@ -438,20 +367,16 @@ private function applyOptions(RequestInterface $request, array &$options): Reque throw new InvalidArgumentException('sink must not be a boolean'); } } - if (isset($options['version'])) { $modify['version'] = $options['version']; } - $request = Psr7\Utils::modifyRequest($request, $modify); if ($request->getBody() instanceof Psr7\MultipartStream) { // Use a multipart/form-data POST if a Content-Type is not set. // Ensure that we don't have the header in different case and set the new value. $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']); - $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' - .$request->getBody()->getBoundary(); + $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' . $request->getBody()->getBoundary(); } - // Merge in conditional headers if they are not present. if (isset($options['_conditional'])) { // Build up the changes so it's in a single clone of the message. @@ -465,19 +390,13 @@ private function applyOptions(RequestInterface $request, array &$options): Reque // Don't pass this internal value along to middleware/handlers. unset($options['_conditional']); } - return $request; } - /** * Return an InvalidArgumentException with pre-set message. */ - private function invalidBody(): InvalidArgumentException + private function invalidBody() : InvalidArgumentException { - return new InvalidArgumentException('Passing in the "body" request ' - .'option as an array to send a request is not supported. ' - .'Please use the "form_params" request option to send a ' - .'application/x-www-form-urlencoded request, or the "multipart" ' - .'request option to send a multipart/form-data request.'); + return new InvalidArgumentException('Passing in the "body" request ' . 'option as an array to send a request is not supported. ' . 'Please use the "form_params" request option to send a ' . 'application/x-www-form-urlencoded request, or the "multipart" ' . 'request option to send a multipart/form-data request.'); } } diff --git a/src/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/ClientInterface.php similarity index 84% rename from src/vendor/guzzlehttp/guzzle/src/ClientInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/ClientInterface.php index 6aaee61..dc7c2de 100644 --- a/src/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -1,13 +1,12 @@ request('GET', $uri, $options); } - /** * Create and send an HTTP HEAD request. * @@ -56,11 +53,10 @@ public function get($uri, array $options = []): ResponseInterface * * @throws GuzzleException */ - public function head($uri, array $options = []): ResponseInterface + public function head($uri, array $options = []) : ResponseInterface { return $this->request('HEAD', $uri, $options); } - /** * Create and send an HTTP PUT request. * @@ -73,11 +69,10 @@ public function head($uri, array $options = []): ResponseInterface * * @throws GuzzleException */ - public function put($uri, array $options = []): ResponseInterface + public function put($uri, array $options = []) : ResponseInterface { return $this->request('PUT', $uri, $options); } - /** * Create and send an HTTP POST request. * @@ -90,11 +85,10 @@ public function put($uri, array $options = []): ResponseInterface * * @throws GuzzleException */ - public function post($uri, array $options = []): ResponseInterface + public function post($uri, array $options = []) : ResponseInterface { return $this->request('POST', $uri, $options); } - /** * Create and send an HTTP PATCH request. * @@ -107,11 +101,10 @@ public function post($uri, array $options = []): ResponseInterface * * @throws GuzzleException */ - public function patch($uri, array $options = []): ResponseInterface + public function patch($uri, array $options = []) : ResponseInterface { return $this->request('PATCH', $uri, $options); } - /** * Create and send an HTTP DELETE request. * @@ -124,11 +117,10 @@ public function patch($uri, array $options = []): ResponseInterface * * @throws GuzzleException */ - public function delete($uri, array $options = []): ResponseInterface + public function delete($uri, array $options = []) : ResponseInterface { return $this->request('DELETE', $uri, $options); } - /** * Create and send an asynchronous HTTP request. * @@ -141,8 +133,7 @@ public function delete($uri, array $options = []): ResponseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - abstract public function requestAsync(string $method, $uri, array $options = []): PromiseInterface; - + public abstract function requestAsync(string $method, $uri, array $options = []) : PromiseInterface; /** * Create and send an asynchronous HTTP GET request. * @@ -154,11 +145,10 @@ abstract public function requestAsync(string $method, $uri, array $options = []) * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function getAsync($uri, array $options = []): PromiseInterface + public function getAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('GET', $uri, $options); } - /** * Create and send an asynchronous HTTP HEAD request. * @@ -170,11 +160,10 @@ public function getAsync($uri, array $options = []): PromiseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function headAsync($uri, array $options = []): PromiseInterface + public function headAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('HEAD', $uri, $options); } - /** * Create and send an asynchronous HTTP PUT request. * @@ -186,11 +175,10 @@ public function headAsync($uri, array $options = []): PromiseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function putAsync($uri, array $options = []): PromiseInterface + public function putAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('PUT', $uri, $options); } - /** * Create and send an asynchronous HTTP POST request. * @@ -202,11 +190,10 @@ public function putAsync($uri, array $options = []): PromiseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function postAsync($uri, array $options = []): PromiseInterface + public function postAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('POST', $uri, $options); } - /** * Create and send an asynchronous HTTP PATCH request. * @@ -218,11 +205,10 @@ public function postAsync($uri, array $options = []): PromiseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function patchAsync($uri, array $options = []): PromiseInterface + public function patchAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('PATCH', $uri, $options); } - /** * Create and send an asynchronous HTTP DELETE request. * @@ -234,7 +220,7 @@ public function patchAsync($uri, array $options = []): PromiseInterface * @param string|UriInterface $uri URI object or string. * @param array $options Request options to apply. */ - public function deleteAsync($uri, array $options = []): PromiseInterface + public function deleteAsync($uri, array $options = []) : PromiseInterface { return $this->requestAsync('DELETE', $uri, $options); } diff --git a/src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php similarity index 65% rename from src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php index b4ced5a..f5543d7 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php @@ -1,10 +1,9 @@ strictMode = $strictMode; - foreach ($cookieArray as $cookie) { - if (!($cookie instanceof SetCookie)) { + if (!$cookie instanceof SetCookie) { $cookie = new SetCookie($cookie); } $this->setCookie($cookie); } } - /** * Create a new Cookie jar from an associative array and domain. * * @param array $cookies Cookies to create the jar from * @param string $domain Domain to set the cookies to */ - public static function fromArray(array $cookies, string $domain): self + public static function fromArray(array $cookies, string $domain) : self { $cookieJar = new self(); foreach ($cookies as $name => $value) { - $cookieJar->setCookie(new SetCookie([ - 'Domain' => $domain, - 'Name' => $name, - 'Value' => $value, - 'Discard' => true, - ])); + $cookieJar->setCookie(new SetCookie(['Domain' => $domain, 'Name' => $name, 'Value' => $value, 'Discard' => \true])); } - return $cookieJar; } - /** * Evaluate if this cookie should be persisted to storage * that survives between requests. @@ -67,17 +55,15 @@ public static function fromArray(array $cookies, string $domain): self * @param SetCookie $cookie Being evaluated. * @param bool $allowSessionCookies If we should persist session cookies */ - public static function shouldPersist(SetCookie $cookie, bool $allowSessionCookies = false): bool + public static function shouldPersist(SetCookie $cookie, bool $allowSessionCookies = \false) : bool { if ($cookie->getExpires() || $allowSessionCookies) { if (!$cookie->getDiscard()) { - return true; + return \true; } } - - return false; + return \false; } - /** * Finds and returns the cookie based on the name * @@ -85,153 +71,117 @@ public static function shouldPersist(SetCookie $cookie, bool $allowSessionCookie * * @return SetCookie|null cookie that was found or null if not found */ - public function getCookieByName(string $name): ?SetCookie + public function getCookieByName(string $name) : ?SetCookie { foreach ($this->cookies as $cookie) { if ($cookie->getName() !== null && \strcasecmp($cookie->getName(), $name) === 0) { return $cookie; } } - return null; } - /** * {@inheritDoc} */ - public function toArray(): array + public function toArray() : array { - return \array_map(static function (SetCookie $cookie): array { + return \array_map(static function (SetCookie $cookie) : array { return $cookie->toArray(); }, $this->getIterator()->getArrayCopy()); } - /** * {@inheritDoc} */ - public function clear(?string $domain = null, ?string $path = null, ?string $name = null): void + public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void { if (!$domain) { $this->cookies = []; - return; } elseif (!$path) { - $this->cookies = \array_filter( - $this->cookies, - static function (SetCookie $cookie) use ($domain): bool { - return !$cookie->matchesDomain($domain); - } - ); + $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($domain) : bool { + return !$cookie->matchesDomain($domain); + }); } elseif (!$name) { - $this->cookies = \array_filter( - $this->cookies, - static function (SetCookie $cookie) use ($path, $domain): bool { - return !($cookie->matchesPath($path) && - $cookie->matchesDomain($domain)); - } - ); + $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain) : bool { + return !($cookie->matchesPath($path) && $cookie->matchesDomain($domain)); + }); } else { - $this->cookies = \array_filter( - $this->cookies, - static function (SetCookie $cookie) use ($path, $domain, $name) { - return !($cookie->getName() == $name && - $cookie->matchesPath($path) && - $cookie->matchesDomain($domain)); - } - ); + $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain, $name) { + return !($cookie->getName() == $name && $cookie->matchesPath($path) && $cookie->matchesDomain($domain)); + }); } } - /** * {@inheritDoc} */ - public function clearSessionCookies(): void + public function clearSessionCookies() : void { - $this->cookies = \array_filter( - $this->cookies, - static function (SetCookie $cookie): bool { - return !$cookie->getDiscard() && $cookie->getExpires(); - } - ); + $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) : bool { + return !$cookie->getDiscard() && $cookie->getExpires(); + }); } - /** * {@inheritDoc} */ - public function setCookie(SetCookie $cookie): bool + public function setCookie(SetCookie $cookie) : bool { // If the name string is empty (but not 0), ignore the set-cookie // string entirely. $name = $cookie->getName(); if (!$name && $name !== '0') { - return false; + return \false; } - // Only allow cookies with set and valid domain, name, value $result = $cookie->validate(); - if ($result !== true) { + if ($result !== \true) { if ($this->strictMode) { - throw new \RuntimeException('Invalid cookie: '.$result); + throw new \RuntimeException('Invalid cookie: ' . $result); } $this->removeCookieIfEmpty($cookie); - - return false; + return \false; } - // Resolve conflicts with previously set cookies foreach ($this->cookies as $i => $c) { // Two cookies are identical, when their path, and domain are // identical. - if ($c->getPath() != $cookie->getPath() || - $c->getDomain() != $cookie->getDomain() || - $c->getName() != $cookie->getName() - ) { + if ($c->getPath() != $cookie->getPath() || $c->getDomain() != $cookie->getDomain() || $c->getName() != $cookie->getName()) { continue; } - // The previously set cookie is a discard cookie and this one is // not so allow the new cookie to be set if (!$cookie->getDiscard() && $c->getDiscard()) { unset($this->cookies[$i]); continue; } - // If the new cookie's expiration is further into the future, then // replace the old cookie if ($cookie->getExpires() > $c->getExpires()) { unset($this->cookies[$i]); continue; } - // If the value has changed, we better change it if ($cookie->getValue() !== $c->getValue()) { unset($this->cookies[$i]); continue; } - // The cookie exists, so no need to continue - return false; + return \false; } - $this->cookies[] = $cookie; - - return true; + return \true; } - - public function count(): int + public function count() : int { return \count($this->cookies); } - /** * @return \ArrayIterator */ - public function getIterator(): \ArrayIterator + public function getIterator() : \ArrayIterator { return new \ArrayIterator(\array_values($this->cookies)); } - - public function extractCookies(RequestInterface $request, ResponseInterface $response): void + public function extractCookies(RequestInterface $request, ResponseInterface $response) : void { if ($cookieHeader = $response->getHeader('Set-Cookie')) { foreach ($cookieHeader as $cookie) { @@ -251,13 +201,12 @@ public function extractCookies(RequestInterface $request, ResponseInterface $res } } } - /** * Computes cookie path following RFC 6265 section 5.1.4 * * @see https://tools.ietf.org/html/rfc6265#section-5.1.4 */ - private function getCookiePathFromRequest(RequestInterface $request): string + private function getCookiePathFromRequest(RequestInterface $request) : string { $uriPath = $request->getUri()->getPath(); if ('' === $uriPath) { @@ -270,50 +219,34 @@ private function getCookiePathFromRequest(RequestInterface $request): string return '/'; } $lastSlashPos = \strrpos($uriPath, '/'); - if (0 === $lastSlashPos || false === $lastSlashPos) { + if (0 === $lastSlashPos || \false === $lastSlashPos) { return '/'; } - return \substr($uriPath, 0, $lastSlashPos); } - - public function withCookieHeader(RequestInterface $request): RequestInterface + public function withCookieHeader(RequestInterface $request) : RequestInterface { $values = []; $uri = $request->getUri(); $scheme = $uri->getScheme(); $host = $uri->getHost(); $path = $uri->getPath() ?: '/'; - foreach ($this->cookies as $cookie) { - if ($cookie->matchesPath($path) && - $cookie->matchesDomain($host) && - !$cookie->isExpired() && - (!$cookie->getSecure() || $scheme === 'https') - ) { - $values[] = $cookie->getName().'=' - .$cookie->getValue(); + if ($cookie->matchesPath($path) && $cookie->matchesDomain($host) && !$cookie->isExpired() && (!$cookie->getSecure() || $scheme === 'https')) { + $values[] = $cookie->getName() . '=' . $cookie->getValue(); } } - - return $values - ? $request->withHeader('Cookie', \implode('; ', $values)) - : $request; + return $values ? $request->withHeader('Cookie', \implode('; ', $values)) : $request; } - /** * If a cookie already exists and the server asks to set it again with a * null value, the cookie must be deleted. */ - private function removeCookieIfEmpty(SetCookie $cookie): void + private function removeCookieIfEmpty(SetCookie $cookie) : void { $cookieValue = $cookie->getValue(); if ($cookieValue === null || $cookieValue === '') { - $this->clear( - $cookie->getDomain(), - $cookie->getPath(), - $cookie->getName() - ); + $this->clear($cookie->getDomain(), $cookie->getPath(), $cookie->getName()); } } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php similarity index 83% rename from src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php index 50bc363..5c64ed7 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php @@ -1,10 +1,9 @@ filename = $cookieFile; $this->storeSessionCookies = $storeSessionCookies; - if (\file_exists($cookieFile)) { $this->load($cookieFile); } } - /** * Saves the file when shutting down */ @@ -46,7 +41,6 @@ public function __destruct() { $this->save($this->filename); } - /** * Saves the cookies to a file. * @@ -54,7 +48,7 @@ public function __destruct() * * @throws \RuntimeException if the file cannot be found or created */ - public function save(string $filename): void + public function save(string $filename) : void { $json = []; /** @var SetCookie $cookie */ @@ -63,13 +57,11 @@ public function save(string $filename): void $json[] = $cookie->toArray(); } } - $jsonStr = Utils::jsonEncode($json); - if (false === \file_put_contents($filename, $jsonStr, \LOCK_EX)) { + if (\false === \file_put_contents($filename, $jsonStr, \LOCK_EX)) { throw new \RuntimeException("Unable to save file {$filename}"); } } - /** * Load cookies from a JSON formatted file. * @@ -79,17 +71,16 @@ public function save(string $filename): void * * @throws \RuntimeException if the file cannot be loaded. */ - public function load(string $filename): void + public function load(string $filename) : void { $json = \file_get_contents($filename); - if (false === $json) { + if (\false === $json) { throw new \RuntimeException("Unable to load file {$filename}"); } if ($json === '') { return; } - - $data = Utils::jsonDecode($json, true); + $data = Utils::jsonDecode($json, \true); if (\is_array($data)) { foreach ($data as $cookie) { $this->setCookie(new SetCookie($cookie)); diff --git a/src/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php similarity index 89% rename from src/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php index cb3e67c..a132093 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php @@ -1,6 +1,6 @@ sessionKey = $sessionKey; $this->storeSessionCookies = $storeSessionCookies; $this->load(); } - /** * Saves cookies to session when shutting down */ @@ -40,11 +37,10 @@ public function __destruct() { $this->save(); } - /** * Save cookies to the client session */ - public function save(): void + public function save() : void { $json = []; /** @var SetCookie $cookie */ @@ -53,19 +49,17 @@ public function save(): void $json[] = $cookie->toArray(); } } - $_SESSION[$this->sessionKey] = \json_encode($json); } - /** * Load the contents of the client session into the data array */ - protected function load(): void + protected function load() : void { if (!isset($_SESSION[$this->sessionKey])) { return; } - $data = \json_decode($_SESSION[$this->sessionKey], true); + $data = \json_decode($_SESSION[$this->sessionKey], \true); if (\is_array($data)) { foreach ($data as $cookie) { $this->setCookie(new SetCookie($cookie)); diff --git a/src/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php similarity index 82% rename from src/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php index d74915b..624a1cd 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php @@ -1,6 +1,6 @@ null, - 'Value' => null, - 'Domain' => null, - 'Path' => '/', - 'Max-Age' => null, - 'Expires' => null, - 'Secure' => false, - 'Discard' => false, - 'HttpOnly' => false, - ]; - + private static $defaults = ['Name' => null, 'Value' => null, 'Domain' => null, 'Path' => '/', 'Max-Age' => null, 'Expires' => null, 'Secure' => \false, 'Discard' => \false, 'HttpOnly' => \false]; /** * @var array Cookie data */ private $data; - /** * Create a new SetCookie object from a string. * * @param string $cookie Set-Cookie header string */ - public static function fromString(string $cookie): self + public static function fromString(string $cookie) : self { // Create the default return array $data = self::$defaults; // Explode the cookie string using a series of semicolons $pieces = \array_filter(\array_map('trim', \explode(';', $cookie))); // The name of the cookie (first kvp) must exist and include an equal sign. - if (!isset($pieces[0]) || \strpos($pieces[0], '=') === false) { + if (!isset($pieces[0]) || \strpos($pieces[0], '=') === \false) { return new self($data); } - // Add the cookie pieces into the parsed data array foreach ($pieces as $part) { $cookieParts = \explode('=', $part, 2); $key = \trim($cookieParts[0]); - $value = isset($cookieParts[1]) - ? \trim($cookieParts[1], " \n\r\t\0\x0B") - : true; - + $value = isset($cookieParts[1]) ? \trim($cookieParts[1], " \n\r\t\x00\v") : \true; // Only check for non-cookies when cookies have been found if (!isset($data['Name'])) { $data['Name'] = $key; @@ -59,7 +43,7 @@ public static function fromString(string $cookie): self foreach (\array_keys(self::$defaults) as $search) { if (!\strcasecmp($search, $key)) { if ($search === 'Max-Age') { - if (is_numeric($value)) { + if (\is_numeric($value)) { $data[$search] = (int) $value; } } else { @@ -71,58 +55,45 @@ public static function fromString(string $cookie): self $data[$key] = $value; } } - return new self($data); } - /** * @param array $data Array of cookie data provided by a Cookie parser */ public function __construct(array $data = []) { $this->data = self::$defaults; - if (isset($data['Name'])) { $this->setName($data['Name']); } - if (isset($data['Value'])) { $this->setValue($data['Value']); } - if (isset($data['Domain'])) { $this->setDomain($data['Domain']); } - if (isset($data['Path'])) { $this->setPath($data['Path']); } - if (isset($data['Max-Age'])) { $this->setMaxAge($data['Max-Age']); } - if (isset($data['Expires'])) { $this->setExpires($data['Expires']); } - if (isset($data['Secure'])) { $this->setSecure($data['Secure']); } - if (isset($data['Discard'])) { $this->setDiscard($data['Discard']); } - if (isset($data['HttpOnly'])) { $this->setHttpOnly($data['HttpOnly']); } - // Set the remaining values that don't have extra validation logic - foreach (array_diff(array_keys($data), array_keys(self::$defaults)) as $key) { + foreach (\array_diff(\array_keys($data), \array_keys(self::$defaults)) as $key) { $this->data[$key] = $data[$key]; } - // Extract the Expires value and turn it into a UNIX timestamp if needed if (!$this->getExpires() && $this->getMaxAge()) { // Calculate the Expires date @@ -131,28 +102,24 @@ public function __construct(array $data = []) $this->setExpires($expires); } } - public function __toString() { - $str = $this->data['Name'].'='.($this->data['Value'] ?? '').'; '; + $str = $this->data['Name'] . '=' . ($this->data['Value'] ?? '') . '; '; foreach ($this->data as $k => $v) { - if ($k !== 'Name' && $k !== 'Value' && $v !== null && $v !== false) { + if ($k !== 'Name' && $k !== 'Value' && $v !== null && $v !== \false) { if ($k === 'Expires') { - $str .= 'Expires='.\gmdate('D, d M Y H:i:s \G\M\T', $v).'; '; + $str .= 'Expires=' . \gmdate('D, d M Y H:i:s \\G\\M\\T', $v) . '; '; } else { - $str .= ($v === true ? $k : "{$k}={$v}").'; '; + $str .= ($v === \true ? $k : "{$k}={$v}") . '; '; } } } - return \rtrim($str, '; '); } - - public function toArray(): array + public function toArray() : array { return $this->data; } - /** * Get the cookie name. * @@ -162,21 +129,18 @@ public function getName() { return $this->data['Name']; } - /** * Set the cookie name. * * @param string $name Cookie name */ - public function setName($name): void + public function setName($name) : void { - if (!is_string($name)) { + if (!\is_string($name)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Name'] = (string) $name; } - /** * Get the cookie value. * @@ -186,21 +150,18 @@ public function getValue() { return $this->data['Value']; } - /** * Set the cookie value. * * @param string $value Cookie value */ - public function setValue($value): void + public function setValue($value) : void { - if (!is_string($value)) { + if (!\is_string($value)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Value'] = (string) $value; } - /** * Get the domain. * @@ -210,21 +171,18 @@ public function getDomain() { return $this->data['Domain']; } - /** * Set the domain of the cookie. * * @param string|null $domain */ - public function setDomain($domain): void + public function setDomain($domain) : void { - if (!is_string($domain) && null !== $domain) { + if (!\is_string($domain) && null !== $domain) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Domain'] = null === $domain ? null : (string) $domain; } - /** * Get the path. * @@ -234,21 +192,18 @@ public function getPath() { return $this->data['Path']; } - /** * Set the path of the cookie. * * @param string $path Path of the cookie */ - public function setPath($path): void + public function setPath($path) : void { - if (!is_string($path)) { + if (!\is_string($path)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Path'] = (string) $path; } - /** * Maximum lifetime of the cookie in seconds. * @@ -258,21 +213,18 @@ public function getMaxAge() { return null === $this->data['Max-Age'] ? null : (int) $this->data['Max-Age']; } - /** * Set the max-age of the cookie. * * @param int|null $maxAge Max age of the cookie in seconds */ - public function setMaxAge($maxAge): void + public function setMaxAge($maxAge) : void { - if (!is_int($maxAge) && null !== $maxAge) { + if (!\is_int($maxAge) && null !== $maxAge) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Max-Age'] = $maxAge === null ? null : (int) $maxAge; } - /** * The UNIX timestamp when the cookie Expires. * @@ -282,21 +234,18 @@ public function getExpires() { return $this->data['Expires']; } - /** * Set the unix timestamp for which the cookie will expire. * * @param int|string|null $timestamp Unix timestamp or any English textual datetime description. */ - public function setExpires($timestamp): void + public function setExpires($timestamp) : void { - if (!is_int($timestamp) && !is_string($timestamp) && null !== $timestamp) { + if (!\is_int($timestamp) && !\is_string($timestamp) && null !== $timestamp) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int) $timestamp : \strtotime((string) $timestamp)); } - /** * Get whether or not this is a secure cookie. * @@ -306,21 +255,18 @@ public function getSecure() { return $this->data['Secure']; } - /** * Set whether or not the cookie is secure. * * @param bool $secure Set to true or false if secure */ - public function setSecure($secure): void + public function setSecure($secure) : void { - if (!is_bool($secure)) { + if (!\is_bool($secure)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Secure'] = (bool) $secure; } - /** * Get whether or not this is a session cookie. * @@ -330,21 +276,18 @@ public function getDiscard() { return $this->data['Discard']; } - /** * Set whether or not this is a session cookie. * * @param bool $discard Set to true or false if this is a session cookie */ - public function setDiscard($discard): void + public function setDiscard($discard) : void { - if (!is_bool($discard)) { + if (!\is_bool($discard)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['Discard'] = (bool) $discard; } - /** * Get whether or not this is an HTTP only cookie. * @@ -354,21 +297,18 @@ public function getHttpOnly() { return $this->data['HttpOnly']; } - /** * Set whether or not this is an HTTP only cookie. * * @param bool $httpOnly Set to true or false if this is HTTP only */ - public function setHttpOnly($httpOnly): void + public function setHttpOnly($httpOnly) : void { - if (!is_bool($httpOnly)) { + if (!\is_bool($httpOnly)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->data['HttpOnly'] = (bool) $httpOnly; } - /** * Check if the cookie matches a path value. * @@ -384,69 +324,57 @@ public function setHttpOnly($httpOnly): void * * @param string $requestPath Path to check against */ - public function matchesPath(string $requestPath): bool + public function matchesPath(string $requestPath) : bool { $cookiePath = $this->getPath(); - // Match on exact matches or when path is the default empty "/" if ($cookiePath === '/' || $cookiePath == $requestPath) { - return true; + return \true; } - // Ensure that the cookie-path is a prefix of the request path. if (0 !== \strpos($requestPath, $cookiePath)) { - return false; + return \false; } - // Match if the last character of the cookie-path is "/" if (\substr($cookiePath, -1, 1) === '/') { - return true; + return \true; } - // Match if the first character not included in cookie path is "/" return \substr($requestPath, \strlen($cookiePath), 1) === '/'; } - /** * Check if the cookie matches a domain value. * * @param string $domain Domain to check against */ - public function matchesDomain(string $domain): bool + public function matchesDomain(string $domain) : bool { $cookieDomain = $this->getDomain(); if (null === $cookieDomain) { - return true; + return \true; } - // Remove the leading '.' as per spec in RFC 6265. // https://tools.ietf.org/html/rfc6265#section-5.2.3 $cookieDomain = \ltrim(\strtolower($cookieDomain), '.'); - $domain = \strtolower($domain); - // Domain not set or exact match. if ('' === $cookieDomain || $domain === $cookieDomain) { - return true; + return \true; } - // Matching the subdomain according to RFC 6265. // https://tools.ietf.org/html/rfc6265#section-5.1.3 if (\filter_var($domain, \FILTER_VALIDATE_IP)) { - return false; + return \false; } - - return (bool) \preg_match('/\.'.\preg_quote($cookieDomain, '/').'$/', $domain); + return (bool) \preg_match('/\\.' . \preg_quote($cookieDomain, '/') . '$/', $domain); } - /** * Check if the cookie is expired. */ - public function isExpired(): bool + public function isExpired() : bool { return $this->getExpires() !== null && \time() > $this->getExpires(); } - /** * Check if the cookie is valid according to RFC 6265. * @@ -458,31 +386,22 @@ public function validate() if ($name === '') { return 'The cookie name must not be empty'; } - // Check if any of the invalid characters are present in the cookie name - if (\preg_match( - '/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/', - $name - )) { - return 'Cookie name must not contain invalid characters: ASCII ' - .'Control characters (0-31;127), space, tab and the ' - .'following characters: ()<>@,;:\"/?={}'; + if (\preg_match('/[\\x00-\\x20\\x22\\x28-\\x29\\x2c\\x2f\\x3a-\\x40\\x5c\\x7b\\x7d\\x7f]/', $name)) { + return 'Cookie name must not contain invalid characters: ASCII ' . 'Control characters (0-31;127), space, tab and the ' . 'following characters: ()<>@,;:\\"/?={}'; } - // Value must not be null. 0 and empty string are valid. Empty strings // are technically against RFC 6265, but known to happen in the wild. $value = $this->getValue(); if ($value === null) { return 'The cookie value must not be empty'; } - // Domains must not be empty, but can be 0. "0" is not a valid internet // domain, but may be used as server name in a private network. $domain = $this->getDomain(); if ($domain === null || $domain === '') { return 'The cookie domain must not be empty'; } - - return true; + return \true; } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php similarity index 54% rename from src/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php index a80956c..aba05f5 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php @@ -1,37 +1,29 @@ request = $request; $this->handlerContext = $handlerContext; } - /** * Get the request that caused the exception */ - public function getRequest(): RequestInterface + public function getRequest() : RequestInterface { return $this->request; } - /** * Get contextual information about the error from the underlying handler. * @@ -49,7 +40,7 @@ public function getRequest(): RequestInterface * couple you to a specific handler, but can give more debug information * when needed. */ - public function getHandlerContext(): array + public function getHandlerContext() : array { return $this->handlerContext; } diff --git a/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php new file mode 100644 index 0000000..f3f8287 --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php @@ -0,0 +1,8 @@ +getStatusCode() : 0; parent::__construct($message, $code, $previous); @@ -43,15 +34,13 @@ public function __construct( $this->response = $response; $this->handlerContext = $handlerContext; } - /** * Wrap non-RequestExceptions with a RequestException */ - public static function wrapException(RequestInterface $request, \Throwable $e): RequestException + public static function wrapException(RequestInterface $request, \Throwable $e) : RequestException { return $e instanceof RequestException ? $e : new RequestException($e->getMessage(), $request, null, $e); } - /** * Factory method to create a new exception with a normalized error message * @@ -61,23 +50,11 @@ public static function wrapException(RequestInterface $request, \Throwable $e): * @param array $handlerContext Optional handler context * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer */ - public static function create( - RequestInterface $request, - ResponseInterface $response = null, - \Throwable $previous = null, - array $handlerContext = [], - BodySummarizerInterface $bodySummarizer = null - ): self { + public static function create(RequestInterface $request, ResponseInterface $response = null, \Throwable $previous = null, array $handlerContext = [], BodySummarizerInterface $bodySummarizer = null) : self + { if (!$response) { - return new self( - 'Error completing request', - $request, - null, - $previous, - $handlerContext - ); + return new self('Error completing request', $request, null, $previous, $handlerContext); } - $level = (int) \floor($response->getStatusCode() / 100); if ($level === 4) { $label = 'Client error'; @@ -89,68 +66,49 @@ public static function create( $label = 'Unsuccessful request'; $className = __CLASS__; } - $uri = $request->getUri(); $uri = static::obfuscateUri($uri); - // Client Error: `GET /` resulted in a `404 Not Found` response: // ... (truncated) - $message = \sprintf( - '%s: `%s %s` resulted in a `%s %s` response', - $label, - $request->getMethod(), - $uri->__toString(), - $response->getStatusCode(), - $response->getReasonPhrase() - ); - + $message = \sprintf('%s: `%s %s` resulted in a `%s %s` response', $label, $request->getMethod(), $uri->__toString(), $response->getStatusCode(), $response->getReasonPhrase()); $summary = ($bodySummarizer ?? new BodySummarizer())->summarize($response); - if ($summary !== null) { $message .= ":\n{$summary}\n"; } - return new $className($message, $request, $response, $previous, $handlerContext); } - /** * Obfuscates URI if there is a username and a password present */ - private static function obfuscateUri(UriInterface $uri): UriInterface + private static function obfuscateUri(UriInterface $uri) : UriInterface { $userInfo = $uri->getUserInfo(); - - if (false !== ($pos = \strpos($userInfo, ':'))) { + if (\false !== ($pos = \strpos($userInfo, ':'))) { return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***'); } - return $uri; } - /** * Get the request that caused the exception */ - public function getRequest(): RequestInterface + public function getRequest() : RequestInterface { return $this->request; } - /** * Get the associated response */ - public function getResponse(): ?ResponseInterface + public function getResponse() : ?ResponseInterface { return $this->response; } - /** * Check if a response was received */ - public function hasResponse(): bool + public function hasResponse() : bool { return $this->response !== null; } - /** * Get contextual information about the error from the underlying handler. * @@ -159,7 +117,7 @@ public function hasResponse(): bool * couple you to a specific handler, but can give more debug information * when needed. */ - public function getHandlerContext(): array + public function getHandlerContext() : array { return $this->handlerContext; } diff --git a/src/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php similarity index 71% rename from src/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php index 8055e06..877f1ca 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php @@ -1,6 +1,6 @@ maxHandles = $maxHandles; } - - public function create(RequestInterface $request, array $options): EasyHandle + public function create(RequestInterface $request, array $options) : EasyHandle { if (isset($options['curl']['body_as_string'])) { $options['_body_as_string'] = $options['curl']['body_as_string']; unset($options['curl']['body_as_string']); } - $easy = new EasyHandle(); $easy->request = $request; $easy->options = $options; @@ -59,24 +52,19 @@ public function create(RequestInterface $request, array $options): EasyHandle $this->applyHandlerOptions($easy, $conf); $this->applyHeaders($easy, $conf); unset($conf['_headers']); - // Add handler options from the request configuration options if (isset($options['curl'])) { $conf = \array_replace($conf, $options['curl']); } - $conf[\CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy); $easy->handle = $this->handles ? \array_pop($this->handles) : \curl_init(); - curl_setopt_array($easy->handle, $conf); - + \curl_setopt_array($easy->handle, $conf); return $easy; } - - public function release(EasyHandle $easy): void + public function release(EasyHandle $easy) : void { $resource = $easy->handle; unset($easy->handle); - if (\count($this->handles) >= $this->maxHandles) { \curl_close($resource); } else { @@ -92,7 +80,6 @@ public function release(EasyHandle $easy): void $this->handles[] = $resource; } } - /** * Completes a cURL transaction, either returning a response promise or a * rejected promise. @@ -100,137 +87,74 @@ public function release(EasyHandle $easy): void * @param callable(RequestInterface, array): PromiseInterface $handler * @param CurlFactoryInterface $factory Dictates how the handle is released */ - public static function finish(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface + public static function finish(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory) : PromiseInterface { if (isset($easy->options['on_stats'])) { self::invokeStats($easy); } - if (!$easy->response || $easy->errno) { return self::finishError($handler, $easy, $factory); } - // Return the response if it is present and there is no error. $factory->release($easy); - // Rewind the body of the response if possible. $body = $easy->response->getBody(); if ($body->isSeekable()) { $body->rewind(); } - return new FulfilledPromise($easy->response); } - - private static function invokeStats(EasyHandle $easy): void + private static function invokeStats(EasyHandle $easy) : void { $curlStats = \curl_getinfo($easy->handle); $curlStats['appconnect_time'] = \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME); - $stats = new TransferStats( - $easy->request, - $easy->response, - $curlStats['total_time'], - $easy->errno, - $curlStats - ); - ($easy->options['on_stats'])($stats); + $stats = new TransferStats($easy->request, $easy->response, $curlStats['total_time'], $easy->errno, $curlStats); + $easy->options['on_stats']($stats); } - /** * @param callable(RequestInterface, array): PromiseInterface $handler */ - private static function finishError(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface + private static function finishError(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory) : PromiseInterface { // Get error information and release the handle to the factory. - $ctx = [ - 'errno' => $easy->errno, - 'error' => \curl_error($easy->handle), - 'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME), - ] + \curl_getinfo($easy->handle); + $ctx = ['errno' => $easy->errno, 'error' => \curl_error($easy->handle), 'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME)] + \curl_getinfo($easy->handle); $ctx[self::CURL_VERSION_STR] = \curl_version()['version']; $factory->release($easy); - // Retry when nothing is present or when curl failed to rewind. if (empty($easy->options['_err_message']) && (!$easy->errno || $easy->errno == 65)) { return self::retryFailedRewind($handler, $easy, $ctx); } - return self::createRejection($easy, $ctx); } - - private static function createRejection(EasyHandle $easy, array $ctx): PromiseInterface + private static function createRejection(EasyHandle $easy, array $ctx) : PromiseInterface { - static $connectionErrors = [ - \CURLE_OPERATION_TIMEOUTED => true, - \CURLE_COULDNT_RESOLVE_HOST => true, - \CURLE_COULDNT_CONNECT => true, - \CURLE_SSL_CONNECT_ERROR => true, - \CURLE_GOT_NOTHING => true, - ]; - + static $connectionErrors = [\CURLE_OPERATION_TIMEOUTED => \true, \CURLE_COULDNT_RESOLVE_HOST => \true, \CURLE_COULDNT_CONNECT => \true, \CURLE_SSL_CONNECT_ERROR => \true, \CURLE_GOT_NOTHING => \true]; if ($easy->createResponseException) { - return P\Create::rejectionFor( - new RequestException( - 'An error was encountered while creating the response', - $easy->request, - $easy->response, - $easy->createResponseException, - $ctx - ) - ); + return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $easy->request, $easy->response, $easy->createResponseException, $ctx)); } - // If an exception was encountered during the onHeaders event, then // return a rejected promise that wraps that exception. if ($easy->onHeadersException) { - return P\Create::rejectionFor( - new RequestException( - 'An error was encountered during the on_headers event', - $easy->request, - $easy->response, - $easy->onHeadersException, - $ctx - ) - ); + return P\Create::rejectionFor(new RequestException('An error was encountered during the on_headers event', $easy->request, $easy->response, $easy->onHeadersException, $ctx)); } - - $message = \sprintf( - 'cURL error %s: %s (%s)', - $ctx['errno'], - $ctx['error'], - 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html' - ); + $message = \sprintf('cURL error %s: %s (%s)', $ctx['errno'], $ctx['error'], 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'); $uriString = (string) $easy->request->getUri(); - if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) { + if ($uriString !== '' && \false === \strpos($ctx['error'], $uriString)) { $message .= \sprintf(' for %s', $uriString); } - // Create a connection exception if it was a specific error code. - $error = isset($connectionErrors[$easy->errno]) - ? new ConnectException($message, $easy->request, null, $ctx) - : new RequestException($message, $easy->request, $easy->response, null, $ctx); - + $error = isset($connectionErrors[$easy->errno]) ? new ConnectException($message, $easy->request, null, $ctx) : new RequestException($message, $easy->request, $easy->response, null, $ctx); return P\Create::rejectionFor($error); } - /** * @return array */ - private function getDefaultConf(EasyHandle $easy): array + private function getDefaultConf(EasyHandle $easy) : array { - $conf = [ - '_headers' => $easy->request->getHeaders(), - \CURLOPT_CUSTOMREQUEST => $easy->request->getMethod(), - \CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''), - \CURLOPT_RETURNTRANSFER => false, - \CURLOPT_HEADER => false, - \CURLOPT_CONNECTTIMEOUT => 300, - ]; - + $conf = ['_headers' => $easy->request->getHeaders(), \CURLOPT_CUSTOMREQUEST => $easy->request->getMethod(), \CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''), \CURLOPT_RETURNTRANSFER => \false, \CURLOPT_HEADER => \false, \CURLOPT_CONNECTTIMEOUT => 300]; if (\defined('CURLOPT_PROTOCOLS')) { $conf[\CURLOPT_PROTOCOLS] = \CURLPROTO_HTTP | \CURLPROTO_HTTPS; } - $version = $easy->request->getProtocolVersion(); if ($version == 1.1) { $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1; @@ -239,21 +163,16 @@ private function getDefaultConf(EasyHandle $easy): array } else { $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_0; } - return $conf; } - - private function applyMethod(EasyHandle $easy, array &$conf): void + private function applyMethod(EasyHandle $easy, array &$conf) : void { $body = $easy->request->getBody(); $size = $body->getSize(); - if ($size === null || $size > 0) { $this->applyBody($easy->request, $easy->options, $conf); - return; } - $method = $easy->request->getMethod(); if ($method === 'PUT' || $method === 'POST') { // See https://tools.ietf.org/html/rfc7230#section-3.3.2 @@ -261,31 +180,22 @@ private function applyMethod(EasyHandle $easy, array &$conf): void $conf[\CURLOPT_HTTPHEADER][] = 'Content-Length: 0'; } } elseif ($method === 'HEAD') { - $conf[\CURLOPT_NOBODY] = true; - unset( - $conf[\CURLOPT_WRITEFUNCTION], - $conf[\CURLOPT_READFUNCTION], - $conf[\CURLOPT_FILE], - $conf[\CURLOPT_INFILE] - ); + $conf[\CURLOPT_NOBODY] = \true; + unset($conf[\CURLOPT_WRITEFUNCTION], $conf[\CURLOPT_READFUNCTION], $conf[\CURLOPT_FILE], $conf[\CURLOPT_INFILE]); } } - - private function applyBody(RequestInterface $request, array $options, array &$conf): void + private function applyBody(RequestInterface $request, array $options, array &$conf) : void { - $size = $request->hasHeader('Content-Length') - ? (int) $request->getHeaderLine('Content-Length') - : null; - + $size = $request->hasHeader('Content-Length') ? (int) $request->getHeaderLine('Content-Length') : null; // Send the body as a string if the size is less than 1MB OR if the // [curl][body_as_string] request value is set. - if (($size !== null && $size < 1000000) || !empty($options['_body_as_string'])) { + if ($size !== null && $size < 1000000 || !empty($options['_body_as_string'])) { $conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody(); // Don't duplicate the Content-Length header $this->removeHeader('Content-Length', $conf); $this->removeHeader('Transfer-Encoding', $conf); } else { - $conf[\CURLOPT_UPLOAD] = true; + $conf[\CURLOPT_UPLOAD] = \true; if ($size !== null) { $conf[\CURLOPT_INFILESIZE] = $size; $this->removeHeader('Content-Length', $conf); @@ -294,23 +204,20 @@ private function applyBody(RequestInterface $request, array $options, array &$co if ($body->isSeekable()) { $body->rewind(); } - $conf[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) { + $conf[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use($body) { return $body->read($length); }; } - // If the Expect header is not present, prevent curl from adding it if (!$request->hasHeader('Expect')) { $conf[\CURLOPT_HTTPHEADER][] = 'Expect:'; } - // cURL sometimes adds a content-type by default. Prevent this. if (!$request->hasHeader('Content-Type')) { $conf[\CURLOPT_HTTPHEADER][] = 'Content-Type:'; } } - - private function applyHeaders(EasyHandle $easy, array &$conf): void + private function applyHeaders(EasyHandle $easy, array &$conf) : void { foreach ($conf['_headers'] as $name => $values) { foreach ($values as $value) { @@ -318,47 +225,43 @@ private function applyHeaders(EasyHandle $easy, array &$conf): void if ($value === '') { // cURL requires a special format for empty headers. // See https://github.com/guzzle/guzzle/issues/1882 for more details. - $conf[\CURLOPT_HTTPHEADER][] = "$name;"; + $conf[\CURLOPT_HTTPHEADER][] = "{$name};"; } else { - $conf[\CURLOPT_HTTPHEADER][] = "$name: $value"; + $conf[\CURLOPT_HTTPHEADER][] = "{$name}: {$value}"; } } } - // Remove the Accept header if one was not set if (!$easy->request->hasHeader('Accept')) { $conf[\CURLOPT_HTTPHEADER][] = 'Accept:'; } } - /** * Remove a header from the options array. * * @param string $name Case-insensitive header to remove * @param array $options Array of options to modify */ - private function removeHeader(string $name, array &$options): void + private function removeHeader(string $name, array &$options) : void { foreach (\array_keys($options['_headers']) as $key) { if (!\strcasecmp($key, $name)) { unset($options['_headers'][$key]); - return; } } } - - private function applyHandlerOptions(EasyHandle $easy, array &$conf): void + private function applyHandlerOptions(EasyHandle $easy, array &$conf) : void { $options = $easy->options; if (isset($options['verify'])) { - if ($options['verify'] === false) { + if ($options['verify'] === \false) { unset($conf[\CURLOPT_CAINFO]); $conf[\CURLOPT_SSL_VERIFYHOST] = 0; - $conf[\CURLOPT_SSL_VERIFYPEER] = false; + $conf[\CURLOPT_SSL_VERIFYPEER] = \false; } else { $conf[\CURLOPT_SSL_VERIFYHOST] = 2; - $conf[\CURLOPT_SSL_VERIFYPEER] = true; + $conf[\CURLOPT_SSL_VERIFYPEER] = \true; if (\is_string($options['verify'])) { // Throw an error if the file/folder/link path is not valid or doesn't exist. if (!\file_exists($options['verify'])) { @@ -366,14 +269,7 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void } // If it's a directory or a link to a directory use CURLOPT_CAPATH. // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO. - if ( - \is_dir($options['verify']) || - ( - \is_link($options['verify']) === true && - ($verifyLink = \readlink($options['verify'])) !== false && - \is_dir($verifyLink) - ) - ) { + if (\is_dir($options['verify']) || \is_link($options['verify']) === \true && ($verifyLink = \readlink($options['verify'])) !== \false && \is_dir($verifyLink)) { $conf[\CURLOPT_CAPATH] = $options['verify']; } else { $conf[\CURLOPT_CAINFO] = $options['verify']; @@ -381,7 +277,6 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void } } } - if (!isset($options['curl'][\CURLOPT_ENCODING]) && !empty($options['decode_content'])) { $accept = $easy->request->getHeaderLine('Accept-Encoding'); if ($accept) { @@ -395,14 +290,13 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void $conf[\CURLOPT_HTTPHEADER][] = 'Accept-Encoding:'; } } - if (!isset($options['sink'])) { // Use a default temp stream if no sink was set. - $options['sink'] = \GuzzleHttp\Psr7\Utils::tryFopen('php://temp', 'w+'); + $options['sink'] = \WpToTwitter_Vendor\GuzzleHttp\Psr7\Utils::tryFopen('php://temp', 'w+'); } $sink = $options['sink']; if (!\is_string($sink)) { - $sink = \GuzzleHttp\Psr7\Utils::streamFor($sink); + $sink = \WpToTwitter_Vendor\GuzzleHttp\Psr7\Utils::streamFor($sink); } elseif (!\is_dir(\dirname($sink))) { // Ensure that the directory exists before failing in curl. throw new \RuntimeException(\sprintf('Directory %s does not exist for sink value of %s', \dirname($sink), $sink)); @@ -410,16 +304,14 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void $sink = new LazyOpenStream($sink, 'w+'); } $easy->sink = $sink; - $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int { + $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use($sink) : int { return $sink->write($write); }; - - $timeoutRequiresNoSignal = false; + $timeoutRequiresNoSignal = \false; if (isset($options['timeout'])) { $timeoutRequiresNoSignal |= $options['timeout'] < 1; $conf[\CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000; } - // CURL default value is CURL_IPRESOLVE_WHATEVER if (isset($options['force_ip_resolve'])) { if ('v4' === $options['force_ip_resolve']) { @@ -428,16 +320,13 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void $conf[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V6; } } - if (isset($options['connect_timeout'])) { $timeoutRequiresNoSignal |= $options['connect_timeout'] < 1; $conf[\CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000; } - if ($timeoutRequiresNoSignal && \strtoupper(\substr(\PHP_OS, 0, 3)) !== 'WIN') { - $conf[\CURLOPT_NOSIGNAL] = true; + $conf[\CURLOPT_NOSIGNAL] = \true; } - if (isset($options['proxy'])) { if (!\is_array($options['proxy'])) { $conf[\CURLOPT_PROXY] = $options['proxy']; @@ -453,25 +342,24 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void } } } - if (isset($options['crypto_method'])) { if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) { - if (!defined('CURL_SSLVERSION_TLSv1_0')) { + if (!\defined('CURL_SSLVERSION_TLSv1_0')) { throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL'); } $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0; } elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) { - if (!defined('CURL_SSLVERSION_TLSv1_1')) { + if (!\defined('CURL_SSLVERSION_TLSv1_1')) { throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL'); } $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1; } elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) { - if (!defined('CURL_SSLVERSION_TLSv1_2')) { + if (!\defined('CURL_SSLVERSION_TLSv1_2')) { throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL'); } $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2; - } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) { - if (!defined('CURL_SSLVERSION_TLSv1_3')) { + } elseif (\defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) { + if (!\defined('CURL_SSLVERSION_TLSv1_3')) { throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL'); } $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3; @@ -479,7 +367,6 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided'); } } - if (isset($options['cert'])) { $cert = $options['cert']; if (\is_array($cert)) { @@ -491,13 +378,12 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void } // OpenSSL (versions 0.9.3 and later) also support "P12" for PKCS#12-encoded files. // see https://curl.se/libcurl/c/CURLOPT_SSLCERTTYPE.html - $ext = pathinfo($cert, \PATHINFO_EXTENSION); - if (preg_match('#^(der|p12)$#i', $ext)) { - $conf[\CURLOPT_SSLCERTTYPE] = strtoupper($ext); + $ext = \pathinfo($cert, \PATHINFO_EXTENSION); + if (\preg_match('#^(der|p12)$#i', $ext)) { + $conf[\CURLOPT_SSLCERTTYPE] = \strtoupper($ext); } $conf[\CURLOPT_SSLCERT] = $cert; } - if (isset($options['ssl_key'])) { if (\is_array($options['ssl_key'])) { if (\count($options['ssl_key']) === 2) { @@ -506,32 +392,27 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void [$sslKey] = $options['ssl_key']; } } - $sslKey = $sslKey ?? $options['ssl_key']; - if (!\file_exists($sslKey)) { throw new \InvalidArgumentException("SSL private key not found: {$sslKey}"); } $conf[\CURLOPT_SSLKEY] = $sslKey; } - if (isset($options['progress'])) { $progress = $options['progress']; if (!\is_callable($progress)) { throw new \InvalidArgumentException('progress client option must be callable'); } - $conf[\CURLOPT_NOPROGRESS] = false; - $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) { + $conf[\CURLOPT_NOPROGRESS] = \false; + $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use($progress) { $progress($downloadSize, $downloaded, $uploadSize, $uploaded); }; } - if (!empty($options['debug'])) { $conf[\CURLOPT_STDERR] = Utils::debugResource($options['debug']); - $conf[\CURLOPT_VERBOSE] = true; + $conf[\CURLOPT_VERBOSE] = \true; } } - /** * This function ensures that a response was set on a transaction. If one * was not set, then the request is retried if possible. This error @@ -543,7 +424,7 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf): void * * @param callable(RequestInterface, array): PromiseInterface $handler */ - private static function retryFailedRewind(callable $handler, EasyHandle $easy, array $ctx): PromiseInterface + private static function retryFailedRewind(callable $handler, EasyHandle $easy, array $ctx) : PromiseInterface { try { // Only rewind if the body has been read from. @@ -552,58 +433,38 @@ private static function retryFailedRewind(callable $handler, EasyHandle $easy, a $body->rewind(); } } catch (\RuntimeException $e) { - $ctx['error'] = 'The connection unexpectedly failed without ' - .'providing an error. The request would have been retried, ' - .'but attempting to rewind the request body failed. ' - .'Exception: '.$e; - + $ctx['error'] = 'The connection unexpectedly failed without ' . 'providing an error. The request would have been retried, ' . 'but attempting to rewind the request body failed. ' . 'Exception: ' . $e; return self::createRejection($easy, $ctx); } - // Retry no more than 3 times before giving up. if (!isset($easy->options['_curl_retries'])) { $easy->options['_curl_retries'] = 1; } elseif ($easy->options['_curl_retries'] == 2) { - $ctx['error'] = 'The cURL request was retried 3 times ' - .'and did not succeed. The most likely reason for the failure ' - .'is that cURL was unable to rewind the body of the request ' - .'and subsequent retries resulted in the same error. Turn on ' - .'the debug option to see what went wrong. See ' - .'https://bugs.php.net/bug.php?id=47204 for more information.'; - + $ctx['error'] = 'The cURL request was retried 3 times ' . 'and did not succeed. The most likely reason for the failure ' . 'is that cURL was unable to rewind the body of the request ' . 'and subsequent retries resulted in the same error. Turn on ' . 'the debug option to see what went wrong. See ' . 'https://bugs.php.net/bug.php?id=47204 for more information.'; return self::createRejection($easy, $ctx); } else { ++$easy->options['_curl_retries']; } - return $handler($easy->request, $easy->options); } - - private function createHeaderFn(EasyHandle $easy): callable + private function createHeaderFn(EasyHandle $easy) : callable { if (isset($easy->options['on_headers'])) { $onHeaders = $easy->options['on_headers']; - if (!\is_callable($onHeaders)) { throw new \InvalidArgumentException('on_headers must be callable'); } } else { $onHeaders = null; } - - return static function ($ch, $h) use ( - $onHeaders, - $easy, - &$startingResponse - ) { + return static function ($ch, $h) use($onHeaders, $easy, &$startingResponse) { $value = \trim($h); if ($value === '') { - $startingResponse = true; + $startingResponse = \true; try { $easy->createResponse(); } catch (\Exception $e) { $easy->createResponseException = $e; - return -1; } if ($onHeaders !== null) { @@ -613,17 +474,15 @@ private function createHeaderFn(EasyHandle $easy): callable // Associate the exception with the handle and trigger // a curl header write error by returning 0. $easy->onHeadersException = $e; - return -1; } } } elseif ($startingResponse) { - $startingResponse = false; + $startingResponse = \false; $easy->headers = [$value]; } else { $easy->headers[] = $value; } - return \strlen($h); }; } diff --git a/src/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php similarity index 73% rename from src/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php index fe57ed5..f71b083 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php @@ -1,9 +1,8 @@ factory = $options['handle_factory'] - ?? new CurlFactory(3); + $this->factory = $options['handle_factory'] ?? new CurlFactory(3); } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { if (isset($options['delay'])) { \usleep($options['delay'] * 1000); } - $easy = $this->factory->create($request, $options); \curl_exec($easy->handle); $easy->errno = \curl_errno($easy->handle); - return CurlFactory::finish($this, $easy, $this->factory); } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php similarity index 81% rename from src/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php index f0acde1..bc6d5a3 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php @@ -1,13 +1,12 @@ An array of delay times, indexed by handle id in `addRequest`. * * @see CurlMultiHandler::addRequest */ private $delays = []; - /** * @var array An associative array of CURLMOPT_* options and corresponding values for curl_multi_setopt() */ private $options = []; - /** * This handler accepts the following options: * @@ -68,19 +61,16 @@ class CurlMultiHandler public function __construct(array $options = []) { $this->factory = $options['handle_factory'] ?? new CurlFactory(50); - if (isset($options['select_timeout'])) { $this->selectTimeout = $options['select_timeout']; } elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) { - @trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED); + @\trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED); $this->selectTimeout = (int) $selectTimeout; } else { $this->selectTimeout = 1; } - $this->options = $options['options'] ?? []; } - /** * @param string $name * @@ -94,23 +84,17 @@ public function __get($name) if ($name !== '_mh') { throw new \BadMethodCallException("Can not get other property as '_mh'."); } - $multiHandle = \curl_multi_init(); - - if (false === $multiHandle) { + if (\false === $multiHandle) { throw new \RuntimeException('Can not initialize curl multi handle.'); } - $this->_mh = $multiHandle; - foreach ($this->options as $option => $value) { // A warning is raised in case of a wrong option. - curl_multi_setopt($this->_mh, $option, $value); + \curl_multi_setopt($this->_mh, $option, $value); } - return $this->_mh; } - public function __destruct() { if (isset($this->_mh)) { @@ -118,28 +102,20 @@ public function __destruct() unset($this->_mh); } } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { $easy = $this->factory->create($request, $options); $id = (int) $easy->handle; - - $promise = new Promise( - [$this, 'execute'], - function () use ($id) { - return $this->cancel($id); - } - ); - + $promise = new Promise([$this, 'execute'], function () use($id) { + return $this->cancel($id); + }); $this->addRequest(['easy' => $easy, 'deferred' => $promise]); - return $promise; } - /** * Ticks the curl event loop. */ - public function tick(): void + public function tick() : void { // Add any delayed handles if needed. if ($this->delays) { @@ -147,36 +123,27 @@ public function tick(): void foreach ($this->delays as $id => $delay) { if ($currentTime >= $delay) { unset($this->delays[$id]); - \curl_multi_add_handle( - $this->_mh, - $this->handles[$id]['easy']->handle - ); + \curl_multi_add_handle($this->_mh, $this->handles[$id]['easy']->handle); } } } - // Step through the task queue which may add additional requests. P\Utils::queue()->run(); - if ($this->active && \curl_multi_select($this->_mh, $this->selectTimeout) === -1) { // Perform a usleep if a select returns -1. // See: https://bugs.php.net/bug.php?id=61141 \usleep(250); } - while (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) { } - $this->processMessages(); } - /** * Runs until all outstanding connections have completed. */ - public function execute(): void + public function execute() : void { $queue = P\Utils::queue(); - while ($this->handles || !$queue->isEmpty()) { // If there are no transfers, then sleep for the next delay if (!$this->active && $this->delays) { @@ -185,8 +152,7 @@ public function execute(): void $this->tick(); } } - - private function addRequest(array $entry): void + private function addRequest(array $entry) : void { $easy = $entry['easy']; $id = (int) $easy->handle; @@ -194,10 +160,9 @@ private function addRequest(array $entry): void if (empty($easy->options['delay'])) { \curl_multi_add_handle($this->_mh, $easy->handle); } else { - $this->delays[$id] = Utils::currentTime() + ($easy->options['delay'] / 1000); + $this->delays[$id] = Utils::currentTime() + $easy->options['delay'] / 1000; } } - /** * Cancels a handle from sending and removes references to it. * @@ -205,26 +170,22 @@ private function addRequest(array $entry): void * * @return bool True on success, false on failure. */ - private function cancel($id): bool + private function cancel($id) : bool { - if (!is_int($id)) { + if (!\is_int($id)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an integer to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - // Cannot cancel if it has been processed. if (!isset($this->handles[$id])) { - return false; + return \false; } - $handle = $this->handles[$id]['easy']->handle; unset($this->delays[$id], $this->handles[$id]); \curl_multi_remove_handle($this->_mh, $handle); \curl_close($handle); - - return true; + return \true; } - - private function processMessages(): void + private function processMessages() : void { while ($done = \curl_multi_info_read($this->_mh)) { if ($done['msg'] !== \CURLMSG_DONE) { @@ -233,22 +194,17 @@ private function processMessages(): void } $id = (int) $done['handle']; \curl_multi_remove_handle($this->_mh, $done['handle']); - if (!isset($this->handles[$id])) { // Probably was cancelled. continue; } - $entry = $this->handles[$id]; unset($this->handles[$id], $this->delays[$id]); $entry['easy']->errno = $done['result']; - $entry['deferred']->resolve( - CurlFactory::finish($this, $entry['easy'], $this->factory) - ); + $entry['deferred']->resolve(CurlFactory::finish($this, $entry['easy'], $this->factory)); } } - - private function timeToNext(): int + private function timeToNext() : int { $currentTime = Utils::currentTime(); $nextTime = \PHP_INT_MAX; @@ -257,7 +213,6 @@ private function timeToNext(): int $nextTime = $time; } } - - return ((int) \max(0, $nextTime - $currentTime)) * 1000000; + return (int) \max(0, $nextTime - $currentTime) * 1000000; } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php similarity index 84% rename from src/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php index 1bc39f4..d1da1b2 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php @@ -1,13 +1,12 @@ headers); - $normalizedKeys = Utils::normalizeHeaderKeys($headers); - if (!empty($this->options['decode_content']) && isset($normalizedKeys['content-encoding'])) { $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']]; unset($headers[$normalizedKeys['content-encoding']]); if (isset($normalizedKeys['content-length'])) { $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']]; - $bodyLength = (int) $this->sink->getSize(); if ($bodyLength) { $headers[$normalizedKeys['content-length']] = $bodyLength; @@ -86,17 +73,9 @@ public function createResponse(): void } } } - // Attach a response to the easy handle with the parsed headers. - $this->response = new Response( - $status, - $headers, - $this->sink, - $ver, - $reason - ); + $this->response = new Response($status, $headers, $this->sink, $ver, $reason); } - /** * @param string $name * @@ -106,7 +85,7 @@ public function createResponse(): void */ public function __get($name) { - $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: '.$name; + $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: ' . $name; throw new \BadMethodCallException($msg); } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php similarity index 85% rename from src/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php index 5554b8f..42c4e23 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php @@ -1,9 +1,8 @@ onFulfilled = $onFulfilled; $this->onRejected = $onRejected; - if ($queue) { // array_values included for BC - $this->append(...array_values($queue)); + $this->append(...\array_values($queue)); } } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { if (!$this->queue) { throw new \OutOfBoundsException('Mock queue is empty'); } - if (isset($options['delay']) && \is_numeric($options['delay'])) { \usleep((int) $options['delay'] * 1000); } - $this->lastRequest = $request; $this->lastOptions = $options; $response = \array_shift($this->queue); - if (isset($options['on_headers'])) { if (!\is_callable($options['on_headers'])) { throw new \InvalidArgumentException('on_headers must be callable'); @@ -102,111 +90,85 @@ public function __invoke(RequestInterface $request, array $options): PromiseInte $response = new RequestException($msg, $request, $response, $e); } } - if (\is_callable($response)) { $response = $response($request, $options); } - - $response = $response instanceof \Throwable - ? P\Create::rejectionFor($response) - : P\Create::promiseFor($response); - - return $response->then( - function (?ResponseInterface $value) use ($request, $options) { - $this->invokeStats($request, $options, $value); - if ($this->onFulfilled) { - ($this->onFulfilled)($value); - } - - if ($value !== null && isset($options['sink'])) { - $contents = (string) $value->getBody(); - $sink = $options['sink']; - - if (\is_resource($sink)) { - \fwrite($sink, $contents); - } elseif (\is_string($sink)) { - \file_put_contents($sink, $contents); - } elseif ($sink instanceof StreamInterface) { - $sink->write($contents); - } - } - - return $value; - }, - function ($reason) use ($request, $options) { - $this->invokeStats($request, $options, null, $reason); - if ($this->onRejected) { - ($this->onRejected)($reason); + $response = $response instanceof \Throwable ? P\Create::rejectionFor($response) : P\Create::promiseFor($response); + return $response->then(function (?ResponseInterface $value) use($request, $options) { + $this->invokeStats($request, $options, $value); + if ($this->onFulfilled) { + ($this->onFulfilled)($value); + } + if ($value !== null && isset($options['sink'])) { + $contents = (string) $value->getBody(); + $sink = $options['sink']; + if (\is_resource($sink)) { + \fwrite($sink, $contents); + } elseif (\is_string($sink)) { + \file_put_contents($sink, $contents); + } elseif ($sink instanceof StreamInterface) { + $sink->write($contents); } - - return P\Create::rejectionFor($reason); } - ); + return $value; + }, function ($reason) use($request, $options) { + $this->invokeStats($request, $options, null, $reason); + if ($this->onRejected) { + ($this->onRejected)($reason); + } + return P\Create::rejectionFor($reason); + }); } - /** * Adds one or more variadic requests, exceptions, callables, or promises * to the queue. * * @param mixed ...$values */ - public function append(...$values): void + public function append(...$values) : void { foreach ($values as $value) { - if ($value instanceof ResponseInterface - || $value instanceof \Throwable - || $value instanceof PromiseInterface - || \is_callable($value) - ) { + if ($value instanceof ResponseInterface || $value instanceof \Throwable || $value instanceof PromiseInterface || \is_callable($value)) { $this->queue[] = $value; } else { - throw new \TypeError('Expected a Response, Promise, Throwable or callable. Found '.Utils::describeType($value)); + throw new \TypeError('Expected a Response, Promise, Throwable or callable. Found ' . Utils::describeType($value)); } } } - /** * Get the last received request. */ - public function getLastRequest(): ?RequestInterface + public function getLastRequest() : ?RequestInterface { return $this->lastRequest; } - /** * Get the last received request options. */ - public function getLastOptions(): array + public function getLastOptions() : array { return $this->lastOptions; } - /** * Returns the number of remaining items in the queue. */ - public function count(): int + public function count() : int { return \count($this->queue); } - - public function reset(): void + public function reset() : void { $this->queue = []; } - /** * @param mixed $reason Promise or reason. */ - private function invokeStats( - RequestInterface $request, - array $options, - ResponseInterface $response = null, - $reason = null - ): void { + private function invokeStats(RequestInterface $request, array $options, ResponseInterface $response = null, $reason = null) : void + { if (isset($options['on_stats'])) { $transferTime = $options['transfer_time'] ?? 0; $stats = new TransferStats($request, $response, $transferTime, $reason); - ($options['on_stats'])($stats); + $options['on_stats']($stats); } } } diff --git a/src/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php similarity index 84% rename from src/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php index f045b52..c2f6e47 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php @@ -1,11 +1,10 @@ withoutHeader('Expect'); - // Append a content-length header if body size is zero to match // cURL's behavior. if (0 === $request->getBody()->getSize()) { $request = $request->withHeader('Content-Length', '0'); } - - return $this->createResponse( - $request, - $options, - $this->createStream($request, $options), - $startTime - ); + return $this->createResponse($request, $options, $this->createStream($request, $options), $startTime); } catch (\InvalidArgumentException $e) { throw $e; } catch (\Exception $e) { // Determine if the error was a networking error. $message = $e->getMessage(); // This list can probably get more comprehensive. - if (false !== \strpos($message, 'getaddrinfo') // DNS lookup failed - || false !== \strpos($message, 'Connection refused') - || false !== \strpos($message, "couldn't connect to host") // error on HHVM - || false !== \strpos($message, 'connection attempt failed') - ) { + if (\false !== \strpos($message, 'getaddrinfo') || \false !== \strpos($message, 'Connection refused') || \false !== \strpos($message, "couldn't connect to host") || \false !== \strpos($message, 'connection attempt failed')) { $e = new ConnectException($e->getMessage(), $request, $e); } else { $e = RequestException::wrapException($request, $e); } $this->invokeStats($options, $request, $startTime, null, $e); - return P\Create::rejectionFor($e); } } - - private function invokeStats( - array $options, - RequestInterface $request, - ?float $startTime, - ResponseInterface $response = null, - \Throwable $error = null - ): void { + private function invokeStats(array $options, RequestInterface $request, ?float $startTime, ResponseInterface $response = null, \Throwable $error = null) : void + { if (isset($options['on_stats'])) { $stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []); - ($options['on_stats'])($stats); + $options['on_stats']($stats); } } - /** * @param resource $stream */ - private function createResponse(RequestInterface $request, array $options, $stream, ?float $startTime): PromiseInterface + private function createResponse(RequestInterface $request, array $options, $stream, ?float $startTime) : PromiseInterface { $hdrs = $this->lastHeaders; $this->lastHeaders = []; - try { [$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($hdrs); } catch (\Exception $e) { - return P\Create::rejectionFor( - new RequestException('An error was encountered while creating the response', $request, null, $e) - ); + return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e)); } - [$stream, $headers] = $this->checkDecode($options, $headers, $stream); $stream = Psr7\Utils::streamFor($stream); $sink = $stream; - if (\strcasecmp('HEAD', $request->getMethod())) { $sink = $this->createSink($stream, $options); } - try { $response = new Psr7\Response($status, $headers, $sink, $ver, $reason); } catch (\Exception $e) { - return P\Create::rejectionFor( - new RequestException('An error was encountered while creating the response', $request, null, $e) - ); + return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e)); } - if (isset($options['on_headers'])) { try { $options['on_headers']($response); } catch (\Exception $e) { - return P\Create::rejectionFor( - new RequestException('An error was encountered during the on_headers event', $request, $response, $e) - ); + return P\Create::rejectionFor(new RequestException('An error was encountered during the on_headers event', $request, $response, $e)); } } - // Do not drain when the request is a HEAD request because they have // no body. if ($sink !== $stream) { $this->drain($stream, $sink, $response->getHeaderLine('Content-Length')); } - $this->invokeStats($options, $request, $startTime, $response, null); - return new FulfilledPromise($response); } - - private function createSink(StreamInterface $stream, array $options): StreamInterface + private function createSink(StreamInterface $stream, array $options) : StreamInterface { if (!empty($options['stream'])) { return $stream; } - $sink = $options['sink'] ?? Psr7\Utils::tryFopen('php://temp', 'r+'); - return \is_string($sink) ? new Psr7\LazyOpenStream($sink, 'w+') : Psr7\Utils::streamFor($sink); } - /** * @param resource $stream */ - private function checkDecode(array $options, array $headers, $stream): array + private function checkDecode(array $options, array $headers, $stream) : array { // Automatically decode responses when instructed. if (!empty($options['decode_content'])) { @@ -169,10 +128,8 @@ private function checkDecode(array $options, array $headers, $stream): array if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') { $stream = new Psr7\InflateStream(Psr7\Utils::streamFor($stream)); $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']]; - // Remove content-encoding header unset($headers[$normalizedKeys['content-encoding']]); - // Fix content-length header if (isset($normalizedKeys['content-length'])) { $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']]; @@ -186,10 +143,8 @@ private function checkDecode(array $options, array $headers, $stream): array } } } - return [$stream, $headers]; } - /** * Drains the source stream into the "sink" client option. * @@ -198,24 +153,17 @@ private function checkDecode(array $options, array $headers, $stream): array * * @throws \RuntimeException when the sink option is invalid. */ - private function drain(StreamInterface $source, StreamInterface $sink, string $contentLength): StreamInterface + private function drain(StreamInterface $source, StreamInterface $sink, string $contentLength) : StreamInterface { // If a content-length header is provided, then stop reading once // that number of bytes has been read. This can prevent infinitely // reading from a stream when dealing with servers that do not honor // Connection: Close headers. - Psr7\Utils::copyToStream( - $source, - $sink, - (\strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1 - ); - + Psr7\Utils::copyToStream($source, $sink, \strlen($contentLength) > 0 && (int) $contentLength > 0 ? (int) $contentLength : -1); $sink->seek(0); $source->close(); - return $sink; } - /** * Create a resource and check to ensure it was created successfully * @@ -228,35 +176,26 @@ private function drain(StreamInterface $source, StreamInterface $sink, string $c private function createResource(callable $callback) { $errors = []; - \set_error_handler(static function ($_, $msg, $file, $line) use (&$errors): bool { - $errors[] = [ - 'message' => $msg, - 'file' => $file, - 'line' => $line, - ]; - - return true; + \set_error_handler(static function ($_, $msg, $file, $line) use(&$errors) : bool { + $errors[] = ['message' => $msg, 'file' => $file, 'line' => $line]; + return \true; }); - try { $resource = $callback(); } finally { \restore_error_handler(); } - if (!$resource) { $message = 'Error creating resource: '; foreach ($errors as $err) { foreach ($err as $key => $value) { - $message .= "[$key] $value".\PHP_EOL; + $message .= "[{$key}] {$value}" . \PHP_EOL; } } throw new \RuntimeException(\trim($message)); } - return $resource; } - /** * @return resource */ @@ -266,31 +205,23 @@ private function createStream(RequestInterface $request, array $options) if (!$methods) { $methods = \array_flip(\get_class_methods(__CLASS__)); } - if (!\in_array($request->getUri()->getScheme(), ['http', 'https'])) { throw new RequestException(\sprintf("The scheme '%s' is not supported.", $request->getUri()->getScheme()), $request); } - // HTTP/1.1 streams using the PHP stream wrapper require a // Connection: close header - if ($request->getProtocolVersion() == '1.1' - && !$request->hasHeader('Connection') - ) { + if ($request->getProtocolVersion() == '1.1' && !$request->hasHeader('Connection')) { $request = $request->withHeader('Connection', 'close'); } - // Ensure SSL is verified by default if (!isset($options['verify'])) { - $options['verify'] = true; + $options['verify'] = \true; } - $params = []; $context = $this->getDefaultContext($request); - if (isset($options['on_headers']) && !\is_callable($options['on_headers'])) { throw new \InvalidArgumentException('on_headers must be callable'); } - if (!empty($options)) { foreach ($options as $key => $value) { $method = "add_{$key}"; @@ -299,98 +230,66 @@ private function createStream(RequestInterface $request, array $options) } } } - if (isset($options['stream_context'])) { if (!\is_array($options['stream_context'])) { throw new \InvalidArgumentException('stream_context must be an array'); } $context = \array_replace_recursive($context, $options['stream_context']); } - // Microsoft NTLM authentication only supported with curl handler if (isset($options['auth'][2]) && 'ntlm' === $options['auth'][2]) { throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler'); } - $uri = $this->resolveHost($request, $options); - - $contextResource = $this->createResource( - static function () use ($context, $params) { - return \stream_context_create($context, $params); + $contextResource = $this->createResource(static function () use($context, $params) { + return \stream_context_create($context, $params); + }); + return $this->createResource(function () use($uri, &$http_response_header, $contextResource, $context, $options, $request) { + $resource = @\fopen((string) $uri, 'r', \false, $contextResource); + $this->lastHeaders = $http_response_header ?? []; + if (\false === $resource) { + throw new ConnectException(\sprintf('Connection refused for URI %s', $uri), $request, null, $context); } - ); - - return $this->createResource( - function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) { - $resource = @\fopen((string) $uri, 'r', false, $contextResource); - $this->lastHeaders = $http_response_header ?? []; - - if (false === $resource) { - throw new ConnectException(sprintf('Connection refused for URI %s', $uri), $request, null, $context); - } - - if (isset($options['read_timeout'])) { - $readTimeout = $options['read_timeout']; - $sec = (int) $readTimeout; - $usec = ($readTimeout - $sec) * 100000; - \stream_set_timeout($resource, $sec, $usec); - } - - return $resource; + if (isset($options['read_timeout'])) { + $readTimeout = $options['read_timeout']; + $sec = (int) $readTimeout; + $usec = ($readTimeout - $sec) * 100000; + \stream_set_timeout($resource, $sec, $usec); } - ); + return $resource; + }); } - - private function resolveHost(RequestInterface $request, array $options): UriInterface + private function resolveHost(RequestInterface $request, array $options) : UriInterface { $uri = $request->getUri(); - if (isset($options['force_ip_resolve']) && !\filter_var($uri->getHost(), \FILTER_VALIDATE_IP)) { if ('v4' === $options['force_ip_resolve']) { $records = \dns_get_record($uri->getHost(), \DNS_A); - if (false === $records || !isset($records[0]['ip'])) { + if (\false === $records || !isset($records[0]['ip'])) { throw new ConnectException(\sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request); } - return $uri->withHost($records[0]['ip']); } if ('v6' === $options['force_ip_resolve']) { $records = \dns_get_record($uri->getHost(), \DNS_AAAA); - if (false === $records || !isset($records[0]['ipv6'])) { + if (\false === $records || !isset($records[0]['ipv6'])) { throw new ConnectException(\sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request); } - - return $uri->withHost('['.$records[0]['ipv6'].']'); + return $uri->withHost('[' . $records[0]['ipv6'] . ']'); } } - return $uri; } - - private function getDefaultContext(RequestInterface $request): array + private function getDefaultContext(RequestInterface $request) : array { $headers = ''; foreach ($request->getHeaders() as $name => $value) { foreach ($value as $val) { - $headers .= "$name: $val\r\n"; + $headers .= "{$name}: {$val}\r\n"; } } - - $context = [ - 'http' => [ - 'method' => $request->getMethod(), - 'header' => $headers, - 'protocol_version' => $request->getProtocolVersion(), - 'ignore_errors' => true, - 'follow_location' => 0, - ], - 'ssl' => [ - 'peer_name' => $request->getUri()->getHost(), - ], - ]; - + $context = ['http' => ['method' => $request->getMethod(), 'header' => $headers, 'protocol_version' => $request->getProtocolVersion(), 'ignore_errors' => \true, 'follow_location' => 0], 'ssl' => ['peer_name' => $request->getUri()->getHost()]]; $body = (string) $request->getBody(); - if ('' !== $body) { $context['http']['content'] = $body; // Prevent the HTTP handler from adding a Content-Type header. @@ -398,19 +297,15 @@ private function getDefaultContext(RequestInterface $request): array $context['http']['header'] .= "Content-Type:\r\n"; } } - $context['http']['header'] = \rtrim($context['http']['header']); - return $context; } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_proxy(RequestInterface $request, array &$options, $value, array &$params): void + private function add_proxy(RequestInterface $request, array &$options, $value, array &$params) : void { $uri = null; - if (!\is_array($value)) { $uri = $value; } else { @@ -421,14 +316,11 @@ private function add_proxy(RequestInterface $request, array &$options, $value, a } } } - if (!$uri) { return; } - $parsed = $this->parse_proxy($uri); $options['http']['proxy'] = $parsed['proxy']; - if ($parsed['auth']) { if (!isset($options['http']['header'])) { $options['http']['header'] = []; @@ -436,177 +328,125 @@ private function add_proxy(RequestInterface $request, array &$options, $value, a $options['http']['header'] .= "\r\nProxy-Authorization: {$parsed['auth']}"; } } - /** * Parses the given proxy URL to make it compatible with the format PHP's stream context expects. */ - private function parse_proxy(string $url): array + private function parse_proxy(string $url) : array { $parsed = \parse_url($url); - - if ($parsed !== false && isset($parsed['scheme']) && $parsed['scheme'] === 'http') { + if ($parsed !== \false && isset($parsed['scheme']) && $parsed['scheme'] === 'http') { if (isset($parsed['host']) && isset($parsed['port'])) { $auth = null; if (isset($parsed['user']) && isset($parsed['pass'])) { $auth = \base64_encode("{$parsed['user']}:{$parsed['pass']}"); } - - return [ - 'proxy' => "tcp://{$parsed['host']}:{$parsed['port']}", - 'auth' => $auth ? "Basic {$auth}" : null, - ]; + return ['proxy' => "tcp://{$parsed['host']}:{$parsed['port']}", 'auth' => $auth ? "Basic {$auth}" : null]; } } - // Return proxy as-is. - return [ - 'proxy' => $url, - 'auth' => null, - ]; + return ['proxy' => $url, 'auth' => null]; } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_timeout(RequestInterface $request, array &$options, $value, array &$params): void + private function add_timeout(RequestInterface $request, array &$options, $value, array &$params) : void { if ($value > 0) { $options['http']['timeout'] = $value; } } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_crypto_method(RequestInterface $request, array &$options, $value, array &$params): void + private function add_crypto_method(RequestInterface $request, array &$options, $value, array &$params) : void { - if ( - $value === \STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT - || $value === \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT - || $value === \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT - || (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && $value === \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT) - ) { + if ($value === \STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT || \defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && $value === \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT) { $options['http']['crypto_method'] = $value; - return; } - throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided'); } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_verify(RequestInterface $request, array &$options, $value, array &$params): void + private function add_verify(RequestInterface $request, array &$options, $value, array &$params) : void { - if ($value === false) { - $options['ssl']['verify_peer'] = false; - $options['ssl']['verify_peer_name'] = false; - + if ($value === \false) { + $options['ssl']['verify_peer'] = \false; + $options['ssl']['verify_peer_name'] = \false; return; } - if (\is_string($value)) { $options['ssl']['cafile'] = $value; if (!\file_exists($value)) { - throw new \RuntimeException("SSL CA bundle not found: $value"); + throw new \RuntimeException("SSL CA bundle not found: {$value}"); } - } elseif ($value !== true) { + } elseif ($value !== \true) { throw new \InvalidArgumentException('Invalid verify request option'); } - - $options['ssl']['verify_peer'] = true; - $options['ssl']['verify_peer_name'] = true; - $options['ssl']['allow_self_signed'] = false; + $options['ssl']['verify_peer'] = \true; + $options['ssl']['verify_peer_name'] = \true; + $options['ssl']['allow_self_signed'] = \false; } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_cert(RequestInterface $request, array &$options, $value, array &$params): void + private function add_cert(RequestInterface $request, array &$options, $value, array &$params) : void { if (\is_array($value)) { $options['ssl']['passphrase'] = $value[1]; $value = $value[0]; } - if (!\file_exists($value)) { throw new \RuntimeException("SSL certificate not found: {$value}"); } - $options['ssl']['local_cert'] = $value; } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_progress(RequestInterface $request, array &$options, $value, array &$params): void + private function add_progress(RequestInterface $request, array &$options, $value, array &$params) : void { - self::addNotification( - $params, - static function ($code, $a, $b, $c, $transferred, $total) use ($value) { - if ($code == \STREAM_NOTIFY_PROGRESS) { - // The upload progress cannot be determined. Use 0 for cURL compatibility: - // https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html - $value($total, $transferred, 0, 0); - } + self::addNotification($params, static function ($code, $a, $b, $c, $transferred, $total) use($value) { + if ($code == \STREAM_NOTIFY_PROGRESS) { + // The upload progress cannot be determined. Use 0 for cURL compatibility: + // https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html + $value($total, $transferred, 0, 0); } - ); + }); } - /** * @param mixed $value as passed via Request transfer options. */ - private function add_debug(RequestInterface $request, array &$options, $value, array &$params): void + private function add_debug(RequestInterface $request, array &$options, $value, array &$params) : void { - if ($value === false) { + if ($value === \false) { return; } - - static $map = [ - \STREAM_NOTIFY_CONNECT => 'CONNECT', - \STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED', - \STREAM_NOTIFY_AUTH_RESULT => 'AUTH_RESULT', - \STREAM_NOTIFY_MIME_TYPE_IS => 'MIME_TYPE_IS', - \STREAM_NOTIFY_FILE_SIZE_IS => 'FILE_SIZE_IS', - \STREAM_NOTIFY_REDIRECTED => 'REDIRECTED', - \STREAM_NOTIFY_PROGRESS => 'PROGRESS', - \STREAM_NOTIFY_FAILURE => 'FAILURE', - \STREAM_NOTIFY_COMPLETED => 'COMPLETED', - \STREAM_NOTIFY_RESOLVE => 'RESOLVE', - ]; + static $map = [\STREAM_NOTIFY_CONNECT => 'CONNECT', \STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED', \STREAM_NOTIFY_AUTH_RESULT => 'AUTH_RESULT', \STREAM_NOTIFY_MIME_TYPE_IS => 'MIME_TYPE_IS', \STREAM_NOTIFY_FILE_SIZE_IS => 'FILE_SIZE_IS', \STREAM_NOTIFY_REDIRECTED => 'REDIRECTED', \STREAM_NOTIFY_PROGRESS => 'PROGRESS', \STREAM_NOTIFY_FAILURE => 'FAILURE', \STREAM_NOTIFY_COMPLETED => 'COMPLETED', \STREAM_NOTIFY_RESOLVE => 'RESOLVE']; static $args = ['severity', 'message', 'message_code', 'bytes_transferred', 'bytes_max']; - $value = Utils::debugResource($value); - $ident = $request->getMethod().' '.$request->getUri()->withFragment(''); - self::addNotification( - $params, - static function (int $code, ...$passed) use ($ident, $value, $map, $args): void { - \fprintf($value, '<%s> [%s] ', $ident, $map[$code]); - foreach (\array_filter($passed) as $i => $v) { - \fwrite($value, $args[$i].': "'.$v.'" '); - } - \fwrite($value, "\n"); + $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment(''); + self::addNotification($params, static function (int $code, ...$passed) use($ident, $value, $map, $args) : void { + \fprintf($value, '<%s> [%s] ', $ident, $map[$code]); + foreach (\array_filter($passed) as $i => $v) { + \fwrite($value, $args[$i] . ': "' . $v . '" '); } - ); + \fwrite($value, "\n"); + }); } - - private static function addNotification(array &$params, callable $notify): void + private static function addNotification(array &$params, callable $notify) : void { // Wrap the existing function if needed. if (!isset($params['notification'])) { $params['notification'] = $notify; } else { - $params['notification'] = self::callArray([ - $params['notification'], - $notify, - ]); + $params['notification'] = self::callArray([$params['notification'], $notify]); } } - - private static function callArray(array $functions): callable + private static function callArray(array $functions) : callable { - return static function (...$args) use ($functions) { + return static function (...$args) use($functions) { foreach ($functions as $fn) { $fn(...$args); } diff --git a/src/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/HandlerStack.php similarity index 83% rename from src/vendor/guzzlehttp/guzzle/src/HandlerStack.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/HandlerStack.php index 1ce9c4b..f5dc969 100644 --- a/src/vendor/guzzlehttp/guzzle/src/HandlerStack.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/HandlerStack.php @@ -1,11 +1,10 @@ push(Middleware::httpErrors(), 'http_errors'); $stack->push(Middleware::redirect(), 'allow_redirects'); $stack->push(Middleware::cookies(), 'cookies'); $stack->push(Middleware::prepareBody(), 'prepare_body'); - return $stack; } - /** * @param (callable(RequestInterface, array): PromiseInterface)|null $handler Underlying HTTP handler. */ @@ -62,7 +56,6 @@ public function __construct(callable $handler = null) { $this->handler = $handler; } - /** * Invokes the handler stack as a composed handler * @@ -71,10 +64,8 @@ public function __construct(callable $handler = null) public function __invoke(RequestInterface $request, array $options) { $handler = $this->resolve(); - return $handler($request, $options); } - /** * Dumps a string representation of the stack. * @@ -84,71 +75,62 @@ public function __toString() { $depth = 0; $stack = []; - if ($this->handler !== null) { - $stack[] = '0) Handler: '.$this->debugCallable($this->handler); + $stack[] = '0) Handler: ' . $this->debugCallable($this->handler); } - $result = ''; foreach (\array_reverse($this->stack) as $tuple) { ++$depth; $str = "{$depth}) Name: '{$tuple[1]}', "; - $str .= 'Function: '.$this->debugCallable($tuple[0]); + $str .= 'Function: ' . $this->debugCallable($tuple[0]); $result = "> {$str}\n{$result}"; $stack[] = $str; } - foreach (\array_keys($stack) as $k) { $result .= "< {$stack[$k]}\n"; } - return $result; } - /** * Set the HTTP handler that actually returns a promise. * * @param callable(RequestInterface, array): PromiseInterface $handler Accepts a request and array of options and * returns a Promise. */ - public function setHandler(callable $handler): void + public function setHandler(callable $handler) : void { $this->handler = $handler; $this->cached = null; } - /** * Returns true if the builder has a handler. */ - public function hasHandler(): bool + public function hasHandler() : bool { return $this->handler !== null; } - /** * Unshift a middleware to the bottom of the stack. * * @param callable(callable): callable $middleware Middleware function * @param string $name Name to register for this middleware. */ - public function unshift(callable $middleware, ?string $name = null): void + public function unshift(callable $middleware, ?string $name = null) : void { \array_unshift($this->stack, [$middleware, $name]); $this->cached = null; } - /** * Push a middleware to the top of the stack. * * @param callable(callable): callable $middleware Middleware function * @param string $name Name to register for this middleware. */ - public function push(callable $middleware, string $name = ''): void + public function push(callable $middleware, string $name = '') : void { $this->stack[] = [$middleware, $name]; $this->cached = null; } - /** * Add a middleware before another middleware by name. * @@ -156,11 +138,10 @@ public function push(callable $middleware, string $name = ''): void * @param callable(callable): callable $middleware Middleware function * @param string $withName Name to register for this middleware. */ - public function before(string $findName, callable $middleware, string $withName = ''): void + public function before(string $findName, callable $middleware, string $withName = '') : void { - $this->splice($findName, $withName, $middleware, true); + $this->splice($findName, $withName, $middleware, \true); } - /** * Add a middleware after another middleware by name. * @@ -168,75 +149,62 @@ public function before(string $findName, callable $middleware, string $withName * @param callable(callable): callable $middleware Middleware function * @param string $withName Name to register for this middleware. */ - public function after(string $findName, callable $middleware, string $withName = ''): void + public function after(string $findName, callable $middleware, string $withName = '') : void { - $this->splice($findName, $withName, $middleware, false); + $this->splice($findName, $withName, $middleware, \false); } - /** * Remove a middleware by instance or name from the stack. * * @param callable|string $remove Middleware to remove by instance or name. */ - public function remove($remove): void + public function remove($remove) : void { - if (!is_string($remove) && !is_callable($remove)) { + if (!\is_string($remove) && !\is_callable($remove)) { trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a callable or string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__); } - $this->cached = null; $idx = \is_callable($remove) ? 0 : 1; - $this->stack = \array_values(\array_filter( - $this->stack, - static function ($tuple) use ($idx, $remove) { - return $tuple[$idx] !== $remove; - } - )); + $this->stack = \array_values(\array_filter($this->stack, static function ($tuple) use($idx, $remove) { + return $tuple[$idx] !== $remove; + })); } - /** * Compose the middleware and handler into a single callable function. * * @return callable(RequestInterface, array): PromiseInterface */ - public function resolve(): callable + public function resolve() : callable { if ($this->cached === null) { if (($prev = $this->handler) === null) { throw new \LogicException('No handler has been specified'); } - foreach (\array_reverse($this->stack) as $fn) { /** @var callable(RequestInterface, array): PromiseInterface $prev */ $prev = $fn[0]($prev); } - $this->cached = $prev; } - return $this->cached; } - - private function findByName(string $name): int + private function findByName(string $name) : int { foreach ($this->stack as $k => $v) { if ($v[1] === $name) { return $k; } } - - throw new \InvalidArgumentException("Middleware not found: $name"); + throw new \InvalidArgumentException("Middleware not found: {$name}"); } - /** * Splices a function into the middleware list at a specific position. */ - private function splice(string $findName, string $withName, callable $middleware, bool $before): void + private function splice(string $findName, string $withName, callable $middleware, bool $before) : void { $this->cached = null; $idx = $this->findByName($findName); $tuple = [$middleware, $withName]; - if ($before) { if ($idx === 0) { \array_unshift($this->stack, $tuple); @@ -251,25 +219,20 @@ private function splice(string $findName, string $withName, callable $middleware \array_splice($this->stack, $idx, 1, $replacement); } } - /** * Provides a debug string for a given callable. * * @param callable|string $fn Function to write as a string. */ - private function debugCallable($fn): string + private function debugCallable($fn) : string { if (\is_string($fn)) { return "callable({$fn})"; } - if (\is_array($fn)) { - return \is_string($fn[0]) - ? "callable({$fn[0]}::{$fn[1]})" - : "callable(['".\get_class($fn[0])."', '{$fn[1]}'])"; + return \is_string($fn[0]) ? "callable({$fn[0]}::{$fn[1]})" : "callable(['" . \get_class($fn[0]) . "', '{$fn[1]}'])"; } - /** @var object $fn */ - return 'callable('.\spl_object_hash($fn).')'; + return 'callable(' . \spl_object_hash($fn) . ')'; } } diff --git a/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatter.php new file mode 100644 index 0000000..e1da672 --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatter.php @@ -0,0 +1,168 @@ +>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}"; + public const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}'; + /** + * @var string Template used to format log messages + */ + private $template; + /** + * @param string $template Log message template + */ + public function __construct(?string $template = self::CLF) + { + $this->template = $template ?: self::CLF; + } + /** + * Returns a formatted message string. + * + * @param RequestInterface $request Request that was sent + * @param ResponseInterface|null $response Response that was received + * @param \Throwable|null $error Exception that was received + */ + public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null) : string + { + $cache = []; + /** @var string */ + return \preg_replace_callback('/{\\s*([A-Za-z_\\-\\.0-9]+)\\s*}/', function (array $matches) use($request, $response, $error, &$cache) { + if (isset($cache[$matches[1]])) { + return $cache[$matches[1]]; + } + $result = ''; + switch ($matches[1]) { + case 'request': + $result = Psr7\Message::toString($request); + break; + case 'response': + $result = $response ? Psr7\Message::toString($response) : ''; + break; + case 'req_headers': + $result = \trim($request->getMethod() . ' ' . $request->getRequestTarget()) . ' HTTP/' . $request->getProtocolVersion() . "\r\n" . $this->headers($request); + break; + case 'res_headers': + $result = $response ? \sprintf('HTTP/%s %d %s', $response->getProtocolVersion(), $response->getStatusCode(), $response->getReasonPhrase()) . "\r\n" . $this->headers($response) : 'NULL'; + break; + case 'req_body': + $result = $request->getBody()->__toString(); + break; + case 'res_body': + if (!$response instanceof ResponseInterface) { + $result = 'NULL'; + break; + } + $body = $response->getBody(); + if (!$body->isSeekable()) { + $result = 'RESPONSE_NOT_LOGGEABLE'; + break; + } + $result = $response->getBody()->__toString(); + break; + case 'ts': + case 'date_iso_8601': + $result = \gmdate('c'); + break; + case 'date_common_log': + $result = \date('d/M/Y:H:i:s O'); + break; + case 'method': + $result = $request->getMethod(); + break; + case 'version': + $result = $request->getProtocolVersion(); + break; + case 'uri': + case 'url': + $result = $request->getUri()->__toString(); + break; + case 'target': + $result = $request->getRequestTarget(); + break; + case 'req_version': + $result = $request->getProtocolVersion(); + break; + case 'res_version': + $result = $response ? $response->getProtocolVersion() : 'NULL'; + break; + case 'host': + $result = $request->getHeaderLine('Host'); + break; + case 'hostname': + $result = \gethostname(); + break; + case 'code': + $result = $response ? $response->getStatusCode() : 'NULL'; + break; + case 'phrase': + $result = $response ? $response->getReasonPhrase() : 'NULL'; + break; + case 'error': + $result = $error ? $error->getMessage() : 'NULL'; + break; + default: + // handle prefixed dynamic headers + if (\strpos($matches[1], 'req_header_') === 0) { + $result = $request->getHeaderLine(\substr($matches[1], 11)); + } elseif (\strpos($matches[1], 'res_header_') === 0) { + $result = $response ? $response->getHeaderLine(\substr($matches[1], 11)) : 'NULL'; + } + } + $cache[$matches[1]] = $result; + return $result; + }, $this->template); + } + /** + * Get headers from message as string + */ + private function headers(MessageInterface $message) : string + { + $result = ''; + foreach ($message->getHeaders() as $name => $values) { + $result .= $name . ': ' . \implode(', ', $values) . "\r\n"; + } + return \trim($result); + } +} diff --git a/src/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php similarity index 64% rename from src/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php index a39ac24..fb83aef 100644 --- a/src/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php @@ -1,10 +1,9 @@ withCookieHeader($request); - - return $handler($request, $options) - ->then( - static function (ResponseInterface $response) use ($cookieJar, $request): ResponseInterface { - $cookieJar->extractCookies($request, $response); - - return $response; - } - ); + return $handler($request, $options)->then(static function (ResponseInterface $response) use($cookieJar, $request) : ResponseInterface { + $cookieJar->extractCookies($request, $response); + return $response; + }); }; }; } - /** * Middleware that throws exceptions for 4xx or 5xx responses when the * "http_errors" request option is set to true. @@ -55,27 +48,23 @@ static function (ResponseInterface $response) use ($cookieJar, $request): Respon * * @return callable(callable): callable Returns a function that accepts the next handler. */ - public static function httpErrors(BodySummarizerInterface $bodySummarizer = null): callable + public static function httpErrors(BodySummarizerInterface $bodySummarizer = null) : callable { - return static function (callable $handler) use ($bodySummarizer): callable { - return static function ($request, array $options) use ($handler, $bodySummarizer) { + return static function (callable $handler) use($bodySummarizer) : callable { + return static function ($request, array $options) use($handler, $bodySummarizer) { if (empty($options['http_errors'])) { return $handler($request, $options); } - - return $handler($request, $options)->then( - static function (ResponseInterface $response) use ($request, $bodySummarizer) { - $code = $response->getStatusCode(); - if ($code < 400) { - return $response; - } - throw RequestException::create($request, $response, null, [], $bodySummarizer); + return $handler($request, $options)->then(static function (ResponseInterface $response) use($request, $bodySummarizer) { + $code = $response->getStatusCode(); + if ($code < 400) { + return $response; } - ); + throw RequestException::create($request, $response, null, [], $bodySummarizer); + }); }; }; } - /** * Middleware that pushes history data to an ArrayAccess container. * @@ -85,40 +74,23 @@ static function (ResponseInterface $response) use ($request, $bodySummarizer) { * * @throws \InvalidArgumentException if container is not an array or ArrayAccess. */ - public static function history(&$container): callable + public static function history(&$container) : callable { if (!\is_array($container) && !$container instanceof \ArrayAccess) { throw new \InvalidArgumentException('history container must be an array or object implementing ArrayAccess'); } - - return static function (callable $handler) use (&$container): callable { - return static function (RequestInterface $request, array $options) use ($handler, &$container) { - return $handler($request, $options)->then( - static function ($value) use ($request, &$container, $options) { - $container[] = [ - 'request' => $request, - 'response' => $value, - 'error' => null, - 'options' => $options, - ]; - - return $value; - }, - static function ($reason) use ($request, &$container, $options) { - $container[] = [ - 'request' => $request, - 'response' => null, - 'error' => $reason, - 'options' => $options, - ]; - - return P\Create::rejectionFor($reason); - } - ); + return static function (callable $handler) use(&$container) : callable { + return static function (RequestInterface $request, array $options) use($handler, &$container) { + return $handler($request, $options)->then(static function ($value) use($request, &$container, $options) { + $container[] = ['request' => $request, 'response' => $value, 'error' => null, 'options' => $options]; + return $value; + }, static function ($reason) use($request, &$container, $options) { + $container[] = ['request' => $request, 'response' => null, 'error' => $reason, 'options' => $options]; + return P\Create::rejectionFor($reason); + }); }; }; } - /** * Middleware that invokes a callback before and after sending a request. * @@ -132,10 +104,10 @@ static function ($reason) use ($request, &$container, $options) { * * @return callable Returns a function that accepts the next handler. */ - public static function tap(callable $before = null, callable $after = null): callable + public static function tap(callable $before = null, callable $after = null) : callable { - return static function (callable $handler) use ($before, $after): callable { - return static function (RequestInterface $request, array $options) use ($handler, $before, $after) { + return static function (callable $handler) use($before, $after) : callable { + return static function (RequestInterface $request, array $options) use($handler, $before, $after) { if ($before) { $before($request, $options); } @@ -143,24 +115,21 @@ public static function tap(callable $before = null, callable $after = null): cal if ($after) { $after($request, $options, $response); } - return $response; }; }; } - /** * Middleware that handles request redirects. * * @return callable Returns a function that accepts the next handler. */ - public static function redirect(): callable + public static function redirect() : callable { - return static function (callable $handler): RedirectMiddleware { + return static function (callable $handler) : RedirectMiddleware { return new RedirectMiddleware($handler); }; } - /** * Middleware that retries requests based on the boolean result of * invoking the provided "decider" function. @@ -176,13 +145,12 @@ public static function redirect(): callable * * @return callable Returns a function that accepts the next handler. */ - public static function retry(callable $decider, callable $delay = null): callable + public static function retry(callable $decider, callable $delay = null) : callable { - return static function (callable $handler) use ($decider, $delay): RetryMiddleware { + return static function (callable $handler) use($decider, $delay) : RetryMiddleware { return new RetryMiddleware($decider, $handler, $delay); }; } - /** * Middleware that logs requests, responses, and errors using a message * formatter. @@ -195,45 +163,37 @@ public static function retry(callable $decider, callable $delay = null): callabl * * @return callable Returns a function that accepts the next handler. */ - public static function log(LoggerInterface $logger, $formatter, string $logLevel = 'info'): callable + public static function log(LoggerInterface $logger, $formatter, string $logLevel = 'info') : callable { // To be compatible with Guzzle 7.1.x we need to allow users to pass a MessageFormatter if (!$formatter instanceof MessageFormatter && !$formatter instanceof MessageFormatterInterface) { - throw new \LogicException(sprintf('Argument 2 to %s::log() must be of type %s', self::class, MessageFormatterInterface::class)); + throw new \LogicException(\sprintf('Argument 2 to %s::log() must be of type %s', self::class, MessageFormatterInterface::class)); } - - return static function (callable $handler) use ($logger, $formatter, $logLevel): callable { - return static function (RequestInterface $request, array $options = []) use ($handler, $logger, $formatter, $logLevel) { - return $handler($request, $options)->then( - static function ($response) use ($logger, $request, $formatter, $logLevel): ResponseInterface { - $message = $formatter->format($request, $response); - $logger->log($logLevel, $message); - - return $response; - }, - static function ($reason) use ($logger, $request, $formatter): PromiseInterface { - $response = $reason instanceof RequestException ? $reason->getResponse() : null; - $message = $formatter->format($request, $response, P\Create::exceptionFor($reason)); - $logger->error($message); - - return P\Create::rejectionFor($reason); - } - ); + return static function (callable $handler) use($logger, $formatter, $logLevel) : callable { + return static function (RequestInterface $request, array $options = []) use($handler, $logger, $formatter, $logLevel) { + return $handler($request, $options)->then(static function ($response) use($logger, $request, $formatter, $logLevel) : ResponseInterface { + $message = $formatter->format($request, $response); + $logger->log($logLevel, $message); + return $response; + }, static function ($reason) use($logger, $request, $formatter) : PromiseInterface { + $response = $reason instanceof RequestException ? $reason->getResponse() : null; + $message = $formatter->format($request, $response, P\Create::exceptionFor($reason)); + $logger->error($message); + return P\Create::rejectionFor($reason); + }); }; }; } - /** * This middleware adds a default content-type if possible, a default * content-length or transfer-encoding header, and the expect header. */ - public static function prepareBody(): callable + public static function prepareBody() : callable { - return static function (callable $handler): PrepareBodyMiddleware { + return static function (callable $handler) : PrepareBodyMiddleware { return new PrepareBodyMiddleware($handler); }; } - /** * Middleware that applies a map function to the request before passing to * the next handler. @@ -241,15 +201,14 @@ public static function prepareBody(): callable * @param callable $fn Function that accepts a RequestInterface and returns * a RequestInterface. */ - public static function mapRequest(callable $fn): callable + public static function mapRequest(callable $fn) : callable { - return static function (callable $handler) use ($fn): callable { - return static function (RequestInterface $request, array $options) use ($handler, $fn) { + return static function (callable $handler) use($fn) : callable { + return static function (RequestInterface $request, array $options) use($handler, $fn) { return $handler($fn($request), $options); }; }; } - /** * Middleware that applies a map function to the resolved promise's * response. @@ -257,10 +216,10 @@ public static function mapRequest(callable $fn): callable * @param callable $fn Function that accepts a ResponseInterface and * returns a ResponseInterface. */ - public static function mapResponse(callable $fn): callable + public static function mapResponse(callable $fn) : callable { - return static function (callable $handler) use ($fn): callable { - return static function (RequestInterface $request, array $options) use ($handler, $fn) { + return static function (callable $handler) use($fn) : callable { + return static function (RequestInterface $request, array $options) use($handler, $fn) { return $handler($request, $options)->then($fn); }; }; diff --git a/src/vendor/guzzlehttp/guzzle/src/Pool.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Pool.php similarity index 79% rename from src/vendor/guzzlehttp/guzzle/src/Pool.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Pool.php index 6277c61..03b78a9 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Pool.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Pool.php @@ -1,13 +1,12 @@ $rfn) { if ($rfn instanceof RequestInterface) { - yield $key => $client->sendAsync($rfn, $opts); + (yield $key => $client->sendAsync($rfn, $opts)); } elseif (\is_callable($rfn)) { - yield $key => $rfn($opts); + (yield $key => $rfn($opts)); } else { - throw new \InvalidArgumentException('Each value yielded by the iterator must be a Psr7\Http\Message\RequestInterface or a callable that returns a promise that fulfills with a Psr7\Message\Http\ResponseInterface object.'); + throw new \InvalidArgumentException('Each value yielded by the iterator must be a Psr7\\Http\\Message\\RequestInterface or a callable that returns a promise that fulfills with a Psr7\\Message\\Http\\ResponseInterface object.'); } } }; - $this->each = new EachPromise($requests(), $config); } - /** * Get promise */ - public function promise(): PromiseInterface + public function promise() : PromiseInterface { return $this->each->promise(); } - /** * Sends multiple requests concurrently and returns an array of responses * and exceptions that uses the same ordering as the provided requests. @@ -93,7 +86,7 @@ public function promise(): PromiseInterface * * @throws \InvalidArgumentException if the event format is incorrect. */ - public static function batch(ClientInterface $client, $requests, array $options = []): array + public static function batch(ClientInterface $client, $requests, array $options = []) : array { $res = []; self::cmpCallback($options, 'fulfilled', $res); @@ -101,22 +94,20 @@ public static function batch(ClientInterface $client, $requests, array $options $pool = new static($client, $requests, $options); $pool->promise()->wait(); \ksort($res); - return $res; } - /** * Execute callback(s) */ - private static function cmpCallback(array &$options, string $name, array &$results): void + private static function cmpCallback(array &$options, string $name, array &$results) : void { if (!isset($options[$name])) { - $options[$name] = static function ($v, $k) use (&$results) { + $options[$name] = static function ($v, $k) use(&$results) { $results[$k] = $v; }; } else { $currentFn = $options[$name]; - $options[$name] = static function ($v, $k) use (&$results, $currentFn) { + $options[$name] = static function ($v, $k) use(&$results, $currentFn) { $currentFn($v, $k); $results[$k] = $v; }; diff --git a/src/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php similarity index 83% rename from src/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php index 0a8de81..acae4e5 100644 --- a/src/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php @@ -1,10 +1,9 @@ nextHandler = $nextHandler; } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { $fn = $this->nextHandler; - // Don't do anything if the request has no body. if ($request->getBody()->getSize() === 0) { return $fn($request, $options); } - $modify = []; - // Add a default content-type if possible. if (!$request->hasHeader('Content-Type')) { if ($uri = $request->getBody()->getMetadata('uri')) { - if (is_string($uri) && $type = Psr7\MimeType::fromFilename($uri)) { + if (\is_string($uri) && ($type = Psr7\MimeType::fromFilename($uri))) { $modify['set_headers']['Content-Type'] = $type; } } } - // Add a default content-length or transfer-encoding header. - if (!$request->hasHeader('Content-Length') - && !$request->hasHeader('Transfer-Encoding') - ) { + if (!$request->hasHeader('Content-Length') && !$request->hasHeader('Transfer-Encoding')) { $size = $request->getBody()->getSize(); if ($size !== null) { $modify['set_headers']['Content-Length'] = $size; @@ -57,47 +48,37 @@ public function __invoke(RequestInterface $request, array $options): PromiseInte $modify['set_headers']['Transfer-Encoding'] = 'chunked'; } } - // Add the expect header if needed. $this->addExpectHeader($request, $options, $modify); - return $fn(Psr7\Utils::modifyRequest($request, $modify), $options); } - /** * Add expect header */ - private function addExpectHeader(RequestInterface $request, array $options, array &$modify): void + private function addExpectHeader(RequestInterface $request, array $options, array &$modify) : void { // Determine if the Expect header should be used if ($request->hasHeader('Expect')) { return; } - $expect = $options['expect'] ?? null; - // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0 - if ($expect === false || $request->getProtocolVersion() < 1.1) { + if ($expect === \false || $request->getProtocolVersion() < 1.1) { return; } - // The expect header is unconditionally enabled - if ($expect === true) { + if ($expect === \true) { $modify['set_headers']['Expect'] = '100-Continue'; - return; } - // By default, send the expect header when the payload is > 1mb if ($expect === null) { $expect = 1048576; } - // Always add if the body cannot be rewound, the size cannot be // determined, or the size is greater than the cutoff threshold $body = $request->getBody(); $size = $body->getSize(); - if ($size === null || $size >= (int) $expect || !$body->isSeekable()) { $modify['set_headers']['Expect'] = '100-Continue'; } diff --git a/src/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php similarity index 59% rename from src/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php index f32808a..e6c2712 100644 --- a/src/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php @@ -1,14 +1,13 @@ 5, - 'protocols' => ['http', 'https'], - 'strict' => false, - 'referer' => false, - 'track_redirects' => false, - ]; - + public static $defaultSettings = ['max' => 5, 'protocols' => ['http', 'https'], 'strict' => \false, 'referer' => \false, 'track_redirects' => \false]; /** * @var callable(RequestInterface, array): PromiseInterface */ private $nextHandler; - /** * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke. */ @@ -46,16 +35,13 @@ public function __construct(callable $nextHandler) { $this->nextHandler = $nextHandler; } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { $fn = $this->nextHandler; - if (empty($options['allow_redirects'])) { return $fn($request, $options); } - - if ($options['allow_redirects'] === true) { + if ($options['allow_redirects'] === \true) { $options['allow_redirects'] = self::$defaultSettings; } elseif (!\is_array($options['allow_redirects'])) { throw new \InvalidArgumentException('allow_redirects must be true, false, or array'); @@ -63,166 +49,114 @@ public function __invoke(RequestInterface $request, array $options): PromiseInte // Merge the default settings with the provided settings $options['allow_redirects'] += self::$defaultSettings; } - if (empty($options['allow_redirects']['max'])) { return $fn($request, $options); } - - return $fn($request, $options) - ->then(function (ResponseInterface $response) use ($request, $options) { - return $this->checkRedirect($request, $options, $response); - }); + return $fn($request, $options)->then(function (ResponseInterface $response) use($request, $options) { + return $this->checkRedirect($request, $options, $response); + }); } - /** * @return ResponseInterface|PromiseInterface */ public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response) { - if (\strpos((string) $response->getStatusCode(), '3') !== 0 - || !$response->hasHeader('Location') - ) { + if (\strpos((string) $response->getStatusCode(), '3') !== 0 || !$response->hasHeader('Location')) { return $response; } - $this->guardMax($request, $response, $options); $nextRequest = $this->modifyRequest($request, $options, $response); - // If authorization is handled by curl, unset it if URI is cross-origin. - if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && defined('\CURLOPT_HTTPAUTH')) { - unset( - $options['curl'][\CURLOPT_HTTPAUTH], - $options['curl'][\CURLOPT_USERPWD] - ); + if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && \defined('\\CURLOPT_HTTPAUTH')) { + unset($options['curl'][\CURLOPT_HTTPAUTH], $options['curl'][\CURLOPT_USERPWD]); } - if (isset($options['allow_redirects']['on_redirect'])) { - ($options['allow_redirects']['on_redirect'])( - $request, - $response, - $nextRequest->getUri() - ); + $options['allow_redirects']['on_redirect']($request, $response, $nextRequest->getUri()); } - $promise = $this($nextRequest, $options); - // Add headers to be able to track history of redirects. if (!empty($options['allow_redirects']['track_redirects'])) { - return $this->withTracking( - $promise, - (string) $nextRequest->getUri(), - $response->getStatusCode() - ); + return $this->withTracking($promise, (string) $nextRequest->getUri(), $response->getStatusCode()); } - return $promise; } - /** * Enable tracking on promise. */ - private function withTracking(PromiseInterface $promise, string $uri, int $statusCode): PromiseInterface + private function withTracking(PromiseInterface $promise, string $uri, int $statusCode) : PromiseInterface { - return $promise->then( - static function (ResponseInterface $response) use ($uri, $statusCode) { - // Note that we are pushing to the front of the list as this - // would be an earlier response than what is currently present - // in the history header. - $historyHeader = $response->getHeader(self::HISTORY_HEADER); - $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER); - \array_unshift($historyHeader, $uri); - \array_unshift($statusHeader, (string) $statusCode); - - return $response->withHeader(self::HISTORY_HEADER, $historyHeader) - ->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader); - } - ); + return $promise->then(static function (ResponseInterface $response) use($uri, $statusCode) { + // Note that we are pushing to the front of the list as this + // would be an earlier response than what is currently present + // in the history header. + $historyHeader = $response->getHeader(self::HISTORY_HEADER); + $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER); + \array_unshift($historyHeader, $uri); + \array_unshift($statusHeader, (string) $statusCode); + return $response->withHeader(self::HISTORY_HEADER, $historyHeader)->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader); + }); } - /** * Check for too many redirects. * * @throws TooManyRedirectsException Too many redirects. */ - private function guardMax(RequestInterface $request, ResponseInterface $response, array &$options): void + private function guardMax(RequestInterface $request, ResponseInterface $response, array &$options) : void { - $current = $options['__redirect_count'] - ?? 0; + $current = $options['__redirect_count'] ?? 0; $options['__redirect_count'] = $current + 1; $max = $options['allow_redirects']['max']; - if ($options['__redirect_count'] > $max) { throw new TooManyRedirectsException("Will not follow more than {$max} redirects", $request, $response); } } - - public function modifyRequest(RequestInterface $request, array $options, ResponseInterface $response): RequestInterface + public function modifyRequest(RequestInterface $request, array $options, ResponseInterface $response) : RequestInterface { // Request modifications to apply. $modify = []; $protocols = $options['allow_redirects']['protocols']; - // Use a GET request if this is an entity enclosing request and we are // not forcing RFC compliance, but rather emulating what all browsers // would do. $statusCode = $response->getStatusCode(); - if ($statusCode == 303 || - ($statusCode <= 302 && !$options['allow_redirects']['strict']) - ) { + if ($statusCode == 303 || $statusCode <= 302 && !$options['allow_redirects']['strict']) { $safeMethods = ['GET', 'HEAD', 'OPTIONS']; $requestMethod = $request->getMethod(); - - $modify['method'] = in_array($requestMethod, $safeMethods) ? $requestMethod : 'GET'; + $modify['method'] = \in_array($requestMethod, $safeMethods) ? $requestMethod : 'GET'; $modify['body'] = ''; } - $uri = self::redirectUri($request, $response, $protocols); - if (isset($options['idn_conversion']) && ($options['idn_conversion'] !== false)) { - $idnOptions = ($options['idn_conversion'] === true) ? \IDNA_DEFAULT : $options['idn_conversion']; + if (isset($options['idn_conversion']) && $options['idn_conversion'] !== \false) { + $idnOptions = $options['idn_conversion'] === \true ? \IDNA_DEFAULT : $options['idn_conversion']; $uri = Utils::idnUriConvert($uri, $idnOptions); } - $modify['uri'] = $uri; Psr7\Message::rewindBody($request); - // Add the Referer header if it is told to do so and only // add the header if we are not redirecting from https to http. - if ($options['allow_redirects']['referer'] - && $modify['uri']->getScheme() === $request->getUri()->getScheme() - ) { + if ($options['allow_redirects']['referer'] && $modify['uri']->getScheme() === $request->getUri()->getScheme()) { $uri = $request->getUri()->withUserInfo(''); $modify['set_headers']['Referer'] = (string) $uri; } else { $modify['remove_headers'][] = 'Referer'; } - // Remove Authorization and Cookie headers if URI is cross-origin. if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) { $modify['remove_headers'][] = 'Authorization'; $modify['remove_headers'][] = 'Cookie'; } - return Psr7\Utils::modifyRequest($request, $modify); } - /** * Set the appropriate URL on the request based on the location header. */ - private static function redirectUri( - RequestInterface $request, - ResponseInterface $response, - array $protocols - ): UriInterface { - $location = Psr7\UriResolver::resolve( - $request->getUri(), - new Psr7\Uri($response->getHeaderLine('Location')) - ); - + private static function redirectUri(RequestInterface $request, ResponseInterface $response, array $protocols) : UriInterface + { + $location = Psr7\UriResolver::resolve($request->getUri(), new Psr7\Uri($response->getHeaderLine('Location'))); // Ensure that the redirect URI is allowed based on the protocols. if (!\in_array($location->getScheme(), $protocols)) { throw new BadResponseException(\sprintf('Redirect URI, %s, does not use one of the allowed redirect protocols: %s', $location, \implode(', ', $protocols)), $request, $response); } - return $location; } } diff --git a/src/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RequestOptions.php similarity index 99% rename from src/vendor/guzzlehttp/guzzle/src/RequestOptions.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RequestOptions.php index bf3b02b..4544264 100644 --- a/src/vendor/guzzlehttp/guzzle/src/RequestOptions.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/RequestOptions.php @@ -1,6 +1,6 @@ decider = $decider; $this->nextHandler = $nextHandler; - $this->delay = $delay ?: __CLASS__.'::exponentialDelay'; + $this->delay = $delay ?: __CLASS__ . '::exponentialDelay'; } - /** * Default exponential backoff delay function. * * @return int milliseconds. */ - public static function exponentialDelay(int $retries): int + public static function exponentialDelay(int $retries) : int { return (int) 2 ** ($retries - 1) * 1000; } - - public function __invoke(RequestInterface $request, array $options): PromiseInterface + public function __invoke(RequestInterface $request, array $options) : PromiseInterface { if (!isset($options['retries'])) { $options['retries'] = 0; } - $fn = $this->nextHandler; - - return $fn($request, $options) - ->then( - $this->onFulfilled($request, $options), - $this->onRejected($request, $options) - ); + return $fn($request, $options)->then($this->onFulfilled($request, $options), $this->onRejected($request, $options)); } - /** * Execute fulfilled closure */ - private function onFulfilled(RequestInterface $request, array $options): callable + private function onFulfilled(RequestInterface $request, array $options) : callable { - return function ($value) use ($request, $options) { - if (!($this->decider)( - $options['retries'], - $request, - $value, - null - )) { + return function ($value) use($request, $options) { + if (!($this->decider)($options['retries'], $request, $value, null)) { return $value; } - return $this->doRetry($request, $options, $value); }; } - /** * Execute rejected closure */ - private function onRejected(RequestInterface $req, array $options): callable + private function onRejected(RequestInterface $req, array $options) : callable { - return function ($reason) use ($req, $options) { - if (!($this->decider)( - $options['retries'], - $req, - null, - $reason - )) { + return function ($reason) use($req, $options) { + if (!($this->decider)($options['retries'], $req, null, $reason)) { return P\Create::rejectionFor($reason); } - return $this->doRetry($req, $options); }; } - - private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null): PromiseInterface + private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null) : PromiseInterface { $options['delay'] = ($this->delay)(++$options['retries'], $response, $request); - return $this($request, $options); } } diff --git a/src/vendor/guzzlehttp/guzzle/src/TransferStats.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/TransferStats.php similarity index 78% rename from src/vendor/guzzlehttp/guzzle/src/TransferStats.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/TransferStats.php index 93fa334..1cf22ca 100644 --- a/src/vendor/guzzlehttp/guzzle/src/TransferStats.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/TransferStats.php @@ -1,11 +1,10 @@ request = $request; $this->response = $response; $this->transferTime = $transferTime; $this->handlerErrorData = $handlerErrorData; $this->handlerStats = $handlerStats; } - - public function getRequest(): RequestInterface + public function getRequest() : RequestInterface { return $this->request; } - /** * Returns the response that was received (if any). */ - public function getResponse(): ?ResponseInterface + public function getResponse() : ?ResponseInterface { return $this->response; } - /** * Returns true if a response was received. */ - public function hasResponse(): bool + public function hasResponse() : bool { return $this->response !== null; } - /** * Gets handler specific error data. * @@ -92,33 +77,29 @@ public function getHandlerErrorData() { return $this->handlerErrorData; } - /** * Get the effective URI the request was sent to. */ - public function getEffectiveUri(): UriInterface + public function getEffectiveUri() : UriInterface { return $this->request->getUri(); } - /** * Get the estimated time the request was being transferred by the handler. * * @return float|null Time in seconds. */ - public function getTransferTime(): ?float + public function getTransferTime() : ?float { return $this->transferTime; } - /** * Gets an array of all of the handler specific transfer data. */ - public function getHandlerStats(): array + public function getHandlerStats() : array { return $this->handlerStats; } - /** * Get a specific handler statistic from the handler by name. * diff --git a/src/vendor/guzzlehttp/guzzle/src/Utils.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Utils.php similarity index 83% rename from src/vendor/guzzlehttp/guzzle/src/Utils.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Utils.php index fcf571d..816d1c7 100644 --- a/src/vendor/guzzlehttp/guzzle/src/Utils.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/Utils.php @@ -1,14 +1,13 @@ getHost()) { $asciiHost = self::idnToAsci($uri->getHost(), $options, $info); - if ($asciiHost === false) { + if ($asciiHost === \false) { $errorBitSet = $info['errors'] ?? 0; - - $errorConstants = array_filter(array_keys(get_defined_constants()), static function (string $name): bool { - return substr($name, 0, 11) === 'IDNA_ERROR_'; + $errorConstants = \array_filter(\array_keys(\get_defined_constants()), static function (string $name) : bool { + return \substr($name, 0, 11) === 'IDNA_ERROR_'; }); - $errors = []; foreach ($errorConstants as $errorConstant) { - if ($errorBitSet & constant($errorConstant)) { + if ($errorBitSet & \constant($errorConstant)) { $errors[] = $errorConstant; } } - $errorMessage = 'IDN conversion failed'; if ($errors) { - $errorMessage .= ' (errors: '.implode(', ', $errors).')'; + $errorMessage .= ' (errors: ' . \implode(', ', $errors) . ')'; } - throw new InvalidArgumentException($errorMessage); } if ($uri->getHost() !== $asciiHost) { @@ -351,26 +312,21 @@ public static function idnUriConvert(UriInterface $uri, int $options = 0): UriIn $uri = $uri->withHost($asciiHost); } } - return $uri; } - /** * @internal */ - public static function getenv(string $name): ?string + public static function getenv(string $name) : ?string { if (isset($_SERVER[$name])) { return (string) $_SERVER[$name]; } - - if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== false && $value !== null) { + if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== \false && $value !== null) { return (string) $value; } - return null; } - /** * @return string|false */ @@ -379,7 +335,6 @@ private static function idnToAsci(string $domain, int $options, ?array &$info = if (\function_exists('idn_to_ascii') && \defined('INTL_IDNA_VARIANT_UTS46')) { return \idn_to_ascii($domain, $options, \INTL_IDNA_VARIANT_UTS46, $info); } - throw new \Error('ext-idn or symfony/polyfill-intl-idn not loaded or too old'); } } diff --git a/src/vendor/guzzlehttp/guzzle/src/functions.php b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/functions.php similarity index 91% rename from src/vendor/guzzlehttp/guzzle/src/functions.php rename to src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/functions.php index 5edc66a..bc85c85 100644 --- a/src/vendor/guzzlehttp/guzzle/src/functions.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/guzzle/src/functions.php @@ -1,6 +1,6 @@ config = [ - 'version' => '1.0', - 'request_method' => self::REQUEST_METHOD_HEADER, - 'consumer_key' => 'anonymous', - 'consumer_secret' => 'anonymous', - 'signature_method' => self::SIGNATURE_METHOD_HMAC, - ]; - + $this->config = ['version' => '1.0', 'request_method' => self::REQUEST_METHOD_HEADER, 'consumer_key' => 'anonymous', 'consumer_secret' => 'anonymous', 'signature_method' => self::SIGNATURE_METHOD_HMAC]; foreach ($config as $key => $value) { $this->config[$key] = $value; } } - /** * Called when the middleware is handled. * @@ -79,26 +67,18 @@ public function __construct($config) */ public function __invoke(callable $handler) { - return function ($request, array $options) use ($handler) { - + return function ($request, array $options) use($handler) { if (isset($options['auth']) && $options['auth'] == 'oauth') { $request = $this->onBefore($request); } - return $handler($request, $options); }; } - private function onBefore(RequestInterface $request) { - $oauthparams = $this->getOauthParams( - $this->generateNonce($request), - $this->config - ); - + $oauthparams = $this->getOauthParams($this->generateNonce($request), $this->config); $oauthparams['oauth_signature'] = $this->getSignature($request, $oauthparams); - uksort($oauthparams, 'strcmp'); - + \uksort($oauthparams, 'strcmp'); switch ($this->config['request_method']) { case self::REQUEST_METHOD_HEADER: list($header, $value) = $this->buildAuthorizationHeader($oauthparams); @@ -110,15 +90,10 @@ private function onBefore(RequestInterface $request) $request = $request->withUri($request->getUri()->withQuery($preparedParams)); break; default: - throw new \InvalidArgumentException(sprintf( - 'Invalid consumer method "%s"', - $this->config['request_method'] - )); + throw new \InvalidArgumentException(\sprintf('Invalid consumer method "%s"', $this->config['request_method'])); } - return $request; } - /** * Calculate signature for request * @@ -134,22 +109,15 @@ public function getSignature(RequestInterface $request, array $params) // Remove oauth_signature if present // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.") unset($params['oauth_signature']); - // Add POST fields if the request uses POST fields and no files if ($request->getHeaderLine('Content-Type') === 'application/x-www-form-urlencoded') { $body = Query::parse($request->getBody()->getContents()); $params += $body; } - // Parse & add query string parameters as base string parameters $query = $request->getUri()->getQuery(); $params += Query::parse($query); - - $baseString = $this->createBaseString( - $request, - $this->prepareParameters($params) - ); - + $baseString = $this->createBaseString($request, $this->prepareParameters($params)); // Implements double-dispatch to sign requests switch ($this->config['signature_method']) { case Oauth1::SIGNATURE_METHOD_HMAC: @@ -168,10 +136,8 @@ public function getSignature(RequestInterface $request, array $params) throw new \RuntimeException('Unknown signature method: ' . $this->config['signature_method']); break; } - - return base64_encode($signature); + return \base64_encode($signature); } - /** * Returns a Nonce Based on the unique id and URL. * @@ -184,9 +150,8 @@ public function getSignature(RequestInterface $request, array $params) */ public function generateNonce(RequestInterface $request) { - return sha1(uniqid('', true) . $request->getUri()->getHost() . $request->getUri()->getPath()); + return \sha1(\uniqid('', \true) . $request->getUri()->getHost() . $request->getUri()->getPath()); } - /** * Creates the Signature Base String. * @@ -204,13 +169,9 @@ protected function createBaseString(RequestInterface $request, array $params) { // Remove query params from URL. Ref: Spec: 9.1.2. $url = $request->getUri()->withQuery(''); - $query = http_build_query($params, '', '&', PHP_QUERY_RFC3986); - - return strtoupper($request->getMethod()) - . '&' . rawurlencode($url) - . '&' . rawurlencode($query); + $query = \http_build_query($params, '', '&', \PHP_QUERY_RFC3986); + return \strtoupper($request->getMethod()) . '&' . \rawurlencode($url) . '&' . \rawurlencode($query); } - /** * Convert booleans to strings, removed unset parameters, and sorts the array * @@ -222,17 +183,14 @@ private function prepareParameters($data) { // Parameters are sorted by name, using lexicographical byte value // ordering. Ref: Spec: 9.1.1 (1). - uksort($data, 'strcmp'); - + \uksort($data, 'strcmp'); foreach ($data as $key => $value) { if ($value === null) { unset($data[$key]); } } - return $data; } - /** * @param string $algo Name of selected hashing algorithm (i.e. "md5", "sha256", "haval160,4", etc..) * @param string $baseString @@ -241,14 +199,12 @@ private function prepareParameters($data) */ private function signUsingHmac($algo, $baseString) { - $key = rawurlencode($this->config['consumer_secret']) . '&'; + $key = \rawurlencode($this->config['consumer_secret']) . '&'; if (isset($this->config['token_secret'])) { - $key .= rawurlencode($this->config['token_secret']); + $key .= \rawurlencode($this->config['token_secret']); } - - return hash_hmac($algo, $baseString, $key, true); + return \hash_hmac($algo, $baseString, $key, \true); } - /** * @param string $baseString * @@ -256,23 +212,15 @@ private function signUsingHmac($algo, $baseString) */ private function signUsingRsaSha1($baseString) { - if (!function_exists('openssl_pkey_get_private')) { - throw new \RuntimeException('RSA-SHA1 signature method ' - . 'requires the OpenSSL extension.'); + if (!\function_exists('openssl_pkey_get_private')) { + throw new \RuntimeException('RSA-SHA1 signature method ' . 'requires the OpenSSL extension.'); } - - $privateKey = openssl_pkey_get_private( - file_get_contents($this->config['private_key_file']), - $this->config['private_key_passphrase'] - ); - + $privateKey = \openssl_pkey_get_private(\file_get_contents($this->config['private_key_file']), $this->config['private_key_passphrase']); $signature = ''; - openssl_sign($baseString, $signature, $privateKey); + \openssl_sign($baseString, $signature, $privateKey); unset($privateKey); - return $signature; } - /** * @param string $baseString * @@ -282,7 +230,6 @@ private function signUsingPlaintext($baseString) { return $baseString; } - /** * Builds the Authorization header for a request * @@ -293,19 +240,13 @@ private function signUsingPlaintext($baseString) private function buildAuthorizationHeader(array $params) { foreach ($params as $key => $value) { - $params[$key] = $key . '="' . rawurlencode($value) . '"'; + $params[$key] = $key . '="' . \rawurlencode($value) . '"'; } - if (isset($this->config['realm'])) { - array_unshift( - $params, - 'realm="' . rawurlencode($this->config['realm']) . '"' - ); + \array_unshift($params, 'realm="' . \rawurlencode($this->config['realm']) . '"'); } - - return ['Authorization', 'OAuth ' . implode(', ', $params)]; + return ['Authorization', 'OAuth ' . \implode(', ', $params)]; } - /** * Get the oauth parameters as named by the oauth spec * @@ -316,30 +257,16 @@ private function buildAuthorizationHeader(array $params) */ private function getOauthParams($nonce, array $config) { - $params = [ - 'oauth_consumer_key' => $config['consumer_key'], - 'oauth_nonce' => $nonce, - 'oauth_signature_method' => $config['signature_method'], - 'oauth_timestamp' => time(), - ]; - + $params = ['oauth_consumer_key' => $config['consumer_key'], 'oauth_nonce' => $nonce, 'oauth_signature_method' => $config['signature_method'], 'oauth_timestamp' => \time()]; // Optional parameters should not be set if they have not been set in // the config as the parameter may be considered invalid by the Oauth // service. - $optionalParams = [ - 'callback' => 'oauth_callback', - 'token' => 'oauth_token', - 'verifier' => 'oauth_verifier', - 'version' => 'oauth_version', - 'bodyhash' => 'oauth_body_hash' - ]; - + $optionalParams = ['callback' => 'oauth_callback', 'token' => 'oauth_token', 'verifier' => 'oauth_verifier', 'version' => 'oauth_version', 'bodyhash' => 'oauth_body_hash']; foreach ($optionalParams as $optionName => $oauthName) { if (isset($config[$optionName])) { $params[$oauthName] = $config[$optionName]; } } - return $params; } } diff --git a/src/vendor/guzzlehttp/promises/src/AggregateException.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/AggregateException.php similarity index 54% rename from src/vendor/guzzlehttp/promises/src/AggregateException.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/AggregateException.php index 40ffdbc..fe880e0 100644 --- a/src/vendor/guzzlehttp/promises/src/AggregateException.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/AggregateException.php @@ -1,8 +1,7 @@ generator = $generatorFn(); - $this->result = new Promise(function (): void { + $this->result = new Promise(function () : void { while (isset($this->currentPromise)) { $this->currentPromise->wait(); } @@ -74,63 +69,50 @@ public function __construct(callable $generatorFn) $this->result->reject($throwable); } } - /** * Create a new coroutine. */ - public static function of(callable $generatorFn): self + public static function of(callable $generatorFn) : self { return new self($generatorFn); } - - public function then( - callable $onFulfilled = null, - callable $onRejected = null - ): PromiseInterface { + public function then(callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { return $this->result->then($onFulfilled, $onRejected); } - - public function otherwise(callable $onRejected): PromiseInterface + public function otherwise(callable $onRejected) : PromiseInterface { return $this->result->otherwise($onRejected); } - - public function wait(bool $unwrap = true) + public function wait(bool $unwrap = \true) { return $this->result->wait($unwrap); } - - public function getState(): string + public function getState() : string { return $this->result->getState(); } - - public function resolve($value): void + public function resolve($value) : void { $this->result->resolve($value); } - - public function reject($reason): void + public function reject($reason) : void { $this->result->reject($reason); } - - public function cancel(): void + public function cancel() : void { $this->currentPromise->cancel(); $this->result->cancel(); } - - private function nextCoroutine($yielded): void + private function nextCoroutine($yielded) : void { - $this->currentPromise = Create::promiseFor($yielded) - ->then([$this, '_handleSuccess'], [$this, '_handleFailure']); + $this->currentPromise = Create::promiseFor($yielded)->then([$this, '_handleSuccess'], [$this, '_handleFailure']); } - /** * @internal */ - public function _handleSuccess($value): void + public function _handleSuccess($value) : void { unset($this->currentPromise); try { @@ -144,11 +126,10 @@ public function _handleSuccess($value): void $this->result->reject($throwable); } } - /** * @internal */ - public function _handleFailure($reason): void + public function _handleFailure($reason) : void { unset($this->currentPromise); try { diff --git a/src/vendor/guzzlehttp/promises/src/Create.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Create.php similarity index 71% rename from src/vendor/guzzlehttp/promises/src/Create.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/Create.php index 9d3fc4a..4cf07a3 100644 --- a/src/vendor/guzzlehttp/promises/src/Create.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Create.php @@ -1,8 +1,7 @@ then([$promise, 'resolve'], [$promise, 'reject']); - return $promise; } - return new FulfilledPromise($value); } - /** * Creates a rejected promise for a reason if the reason is not a promise. * If the provided reason is a promise, then it is returned as-is. * * @param mixed $reason Promise or reason. */ - public static function rejectionFor($reason): PromiseInterface + public static function rejectionFor($reason) : PromiseInterface { if ($reason instanceof PromiseInterface) { return $reason; } - return new RejectedPromise($reason); } - /** * Create an exception for a rejected promise value. * * @param mixed $reason */ - public static function exceptionFor($reason): \Throwable + public static function exceptionFor($reason) : \Throwable { if ($reason instanceof \Throwable) { return $reason; } - return new RejectionException($reason); } - /** * Returns an iterator for the given value. * * @param mixed $value */ - public static function iterFor($value): \Iterator + public static function iterFor($value) : \Iterator { if ($value instanceof \Iterator) { return $value; } - - if (is_array($value)) { + if (\is_array($value)) { return new \ArrayIterator($value); } - return new \ArrayIterator([$value]); } } diff --git a/src/vendor/guzzlehttp/promises/src/Each.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Each.php similarity index 60% rename from src/vendor/guzzlehttp/promises/src/Each.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/Each.php index 1a7aa0f..ec45eff 100644 --- a/src/vendor/guzzlehttp/promises/src/Each.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Each.php @@ -1,8 +1,7 @@ $onFulfilled, - 'rejected' => $onRejected, - ]))->promise(); + public static function of($iterable, callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { + return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected]))->promise(); } - /** * Like of, but only allows a certain number of outstanding promises at any * given time. @@ -47,19 +39,10 @@ public static function of( * @param callable $onFulfilled * @param callable $onRejected */ - public static function ofLimit( - $iterable, - $concurrency, - callable $onFulfilled = null, - callable $onRejected = null - ): PromiseInterface { - return (new EachPromise($iterable, [ - 'fulfilled' => $onFulfilled, - 'rejected' => $onRejected, - 'concurrency' => $concurrency, - ]))->promise(); + public static function ofLimit($iterable, $concurrency, callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { + return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected, 'concurrency' => $concurrency]))->promise(); } - /** * Like limit, but ensures that no promise in the given $iterable argument * is rejected. If any promise is rejected, then the aggregate promise is @@ -69,18 +52,10 @@ public static function ofLimit( * @param int|callable $concurrency * @param callable $onFulfilled */ - public static function ofLimitAll( - $iterable, - $concurrency, - callable $onFulfilled = null - ): PromiseInterface { - return self::ofLimit( - $iterable, - $concurrency, - $onFulfilled, - function ($reason, $idx, PromiseInterface $aggregate): void { - $aggregate->reject($reason); - } - ); + public static function ofLimitAll($iterable, $concurrency, callable $onFulfilled = null) : PromiseInterface + { + return self::ofLimit($iterable, $concurrency, $onFulfilled, function ($reason, $idx, PromiseInterface $aggregate) : void { + $aggregate->reject($reason); + }); } } diff --git a/src/vendor/guzzlehttp/promises/src/EachPromise.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/EachPromise.php similarity index 73% rename from src/vendor/guzzlehttp/promises/src/EachPromise.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/EachPromise.php index 28dd979..3c52fb6 100644 --- a/src/vendor/guzzlehttp/promises/src/EachPromise.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/EachPromise.php @@ -1,8 +1,7 @@ iterable = Create::iterFor($iterable); - if (isset($config['concurrency'])) { $this->concurrency = $config['concurrency']; } - if (isset($config['fulfilled'])) { $this->onFulfilled = $config['fulfilled']; } - if (isset($config['rejected'])) { $this->onRejected = $config['rejected']; } } - /** @psalm-suppress InvalidNullableReturnType */ - public function promise(): PromiseInterface + public function promise() : PromiseInterface { if ($this->aggregate) { return $this->aggregate; } - try { $this->createPromise(); /** @psalm-assert Promise $this->aggregate */ @@ -87,57 +73,48 @@ public function promise(): PromiseInterface } catch (\Throwable $e) { $this->aggregate->reject($e); } - /** * @psalm-suppress NullableReturnStatement */ return $this->aggregate; } - - private function createPromise(): void + private function createPromise() : void { - $this->mutex = false; - $this->aggregate = new Promise(function (): void { + $this->mutex = \false; + $this->aggregate = new Promise(function () : void { if ($this->checkIfFinished()) { return; } - reset($this->pending); + \reset($this->pending); // Consume a potentially fluctuating list of promises while // ensuring that indexes are maintained (precluding array_shift). - while ($promise = current($this->pending)) { - next($this->pending); + while ($promise = \current($this->pending)) { + \next($this->pending); $promise->wait(); if (Is::settled($this->aggregate)) { return; } } }); - // Clear the references when the promise is resolved. - $clearFn = function (): void { + $clearFn = function () : void { $this->iterable = $this->concurrency = $this->pending = null; $this->onFulfilled = $this->onRejected = null; $this->nextPendingIndex = 0; }; - $this->aggregate->then($clearFn, $clearFn); } - - private function refillPending(): void + private function refillPending() : void { if (!$this->concurrency) { // Add all pending promises. while ($this->addPending() && $this->advanceIterator()) { } - return; } - // Add only up to N pending promises. - $concurrency = is_callable($this->concurrency) - ? call_user_func($this->concurrency, count($this->pending)) - : $this->concurrency; - $concurrency = max($concurrency - count($this->pending), 0); + $concurrency = \is_callable($this->concurrency) ? \call_user_func($this->concurrency, \count($this->pending)) : $this->concurrency; + $concurrency = \max($concurrency - \count($this->pending), 0); // Concurrency may be set to 0 to disallow new promises. if (!$concurrency) { return; @@ -148,85 +125,57 @@ private function refillPending(): void // not advance the iterator after adding the first promise. This // helps work around issues with generators that might not have the // next value to yield until promise callbacks are called. - while (--$concurrency - && $this->advanceIterator() - && $this->addPending()) { + while (--$concurrency && $this->advanceIterator() && $this->addPending()) { } } - - private function addPending(): bool + private function addPending() : bool { if (!$this->iterable || !$this->iterable->valid()) { - return false; + return \false; } - $promise = Create::promiseFor($this->iterable->current()); $key = $this->iterable->key(); - // Iterable keys may not be unique, so we use a counter to // guarantee uniqueness $idx = $this->nextPendingIndex++; - - $this->pending[$idx] = $promise->then( - function ($value) use ($idx, $key): void { - if ($this->onFulfilled) { - call_user_func( - $this->onFulfilled, - $value, - $key, - $this->aggregate - ); - } - $this->step($idx); - }, - function ($reason) use ($idx, $key): void { - if ($this->onRejected) { - call_user_func( - $this->onRejected, - $reason, - $key, - $this->aggregate - ); - } - $this->step($idx); + $this->pending[$idx] = $promise->then(function ($value) use($idx, $key) : void { + if ($this->onFulfilled) { + \call_user_func($this->onFulfilled, $value, $key, $this->aggregate); } - ); - - return true; + $this->step($idx); + }, function ($reason) use($idx, $key) : void { + if ($this->onRejected) { + \call_user_func($this->onRejected, $reason, $key, $this->aggregate); + } + $this->step($idx); + }); + return \true; } - - private function advanceIterator(): bool + private function advanceIterator() : bool { // Place a lock on the iterator so that we ensure to not recurse, // preventing fatal generator errors. if ($this->mutex) { - return false; + return \false; } - - $this->mutex = true; - + $this->mutex = \true; try { $this->iterable->next(); - $this->mutex = false; - - return true; + $this->mutex = \false; + return \true; } catch (\Throwable $e) { $this->aggregate->reject($e); - $this->mutex = false; - - return false; + $this->mutex = \false; + return \false; } } - - private function step(int $idx): void + private function step(int $idx) : void { // If the promise was already resolved, then ignore this step. if (Is::settled($this->aggregate)) { return; } - unset($this->pending[$idx]); - // Only refill pending promises if we are not locked, preventing the // EachPromise to recursively invoke the provided iterator, which // cause a fatal error: "Cannot resume an already running generator" @@ -235,16 +184,13 @@ private function step(int $idx): void $this->refillPending(); } } - - private function checkIfFinished(): bool + private function checkIfFinished() : bool { if (!$this->pending && !$this->iterable->valid()) { // Resolve the promise if there's nothing left to do. $this->aggregate->resolve(null); - - return true; + return \true; } - - return false; + return \false; } } diff --git a/src/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/FulfilledPromise.php similarity index 63% rename from src/vendor/guzzlehttp/promises/src/FulfilledPromise.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/FulfilledPromise.php index ab71296..e9e62ed 100644 --- a/src/vendor/guzzlehttp/promises/src/FulfilledPromise.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/FulfilledPromise.php @@ -1,8 +1,7 @@ value = $value; } - - public function then( - callable $onFulfilled = null, - callable $onRejected = null - ): PromiseInterface { + public function then(callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { // Return itself if there is no onFulfilled function. if (!$onFulfilled) { return $this; } - $queue = Utils::queue(); $p = new Promise([$queue, 'run']); $value = $this->value; - $queue->add(static function () use ($p, $value, $onFulfilled): void { + $queue->add(static function () use($p, $value, $onFulfilled) : void { if (Is::pending($p)) { try { $p->resolve($onFulfilled($value)); @@ -51,38 +42,31 @@ public function then( } } }); - return $p; } - - public function otherwise(callable $onRejected): PromiseInterface + public function otherwise(callable $onRejected) : PromiseInterface { return $this->then(null, $onRejected); } - - public function wait(bool $unwrap = true) + public function wait(bool $unwrap = \true) { return $unwrap ? $this->value : null; } - - public function getState(): string + public function getState() : string { return self::FULFILLED; } - - public function resolve($value): void + public function resolve($value) : void { if ($value !== $this->value) { throw new \LogicException('Cannot resolve a fulfilled promise'); } } - - public function reject($reason): void + public function reject($reason) : void { throw new \LogicException('Cannot reject a fulfilled promise'); } - - public function cancel(): void + public function cancel() : void { // pass } diff --git a/src/vendor/guzzlehttp/promises/src/Is.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Is.php similarity index 64% rename from src/vendor/guzzlehttp/promises/src/Is.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/Is.php index f3f0503..7c8e934 100644 --- a/src/vendor/guzzlehttp/promises/src/Is.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Is.php @@ -1,39 +1,35 @@ getState() === PromiseInterface::PENDING; } - /** * Returns true if a promise is fulfilled or rejected. */ - public static function settled(PromiseInterface $promise): bool + public static function settled(PromiseInterface $promise) : bool { return $promise->getState() !== PromiseInterface::PENDING; } - /** * Returns true if a promise is fulfilled. */ - public static function fulfilled(PromiseInterface $promise): bool + public static function fulfilled(PromiseInterface $promise) : bool { return $promise->getState() === PromiseInterface::FULFILLED; } - /** * Returns true if a promise is rejected. */ - public static function rejected(PromiseInterface $promise): bool + public static function rejected(PromiseInterface $promise) : bool { return $promise->getState() === PromiseInterface::REJECTED; } diff --git a/src/vendor/guzzlehttp/promises/src/Promise.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Promise.php similarity index 77% rename from src/vendor/guzzlehttp/promises/src/Promise.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/Promise.php index 1b07bdc..1a27c0e 100644 --- a/src/vendor/guzzlehttp/promises/src/Promise.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/Promise.php @@ -1,8 +1,7 @@ waitFn = $waitFn; $this->cancelFn = $cancelFn; } - - public function then( - callable $onFulfilled = null, - callable $onRejected = null - ): PromiseInterface { + public function then(callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { if ($this->state === self::PENDING) { $p = new Promise(null, [$this, 'cancel']); $this->handlers[] = [$p, $onFulfilled, $onRejected]; $p->waitList = $this->waitList; $p->waitList[] = $this; - return $p; } - // Return a fulfilled promise and immediately invoke any callbacks. if ($this->state === self::FULFILLED) { $promise = Create::promiseFor($this->result); - return $onFulfilled ? $promise->then($onFulfilled) : $promise; } - // It's either cancelled or rejected, so return a rejected promise // and immediately invoke any callbacks. $rejection = Create::rejectionFor($this->result); - return $onRejected ? $rejection->then(null, $onRejected) : $rejection; } - - public function otherwise(callable $onRejected): PromiseInterface + public function otherwise(callable $onRejected) : PromiseInterface { return $this->then(null, $onRejected); } - - public function wait(bool $unwrap = true) + public function wait(bool $unwrap = \true) { $this->waitIfPending(); - if ($this->result instanceof PromiseInterface) { return $this->result->wait($unwrap); } @@ -79,20 +64,16 @@ public function wait(bool $unwrap = true) throw Create::exceptionFor($this->result); } } - - public function getState(): string + public function getState() : string { return $this->state; } - - public function cancel(): void + public function cancel() : void { if ($this->state !== self::PENDING) { return; } - $this->waitFn = $this->waitList = null; - if ($this->cancelFn) { $fn = $this->cancelFn; $this->cancelFn = null; @@ -102,40 +83,32 @@ public function cancel(): void $this->reject($e); } } - // Reject the promise only if it wasn't rejected in a then callback. /** @psalm-suppress RedundantCondition */ if ($this->state === self::PENDING) { $this->reject(new CancellationException('Promise has been cancelled')); } } - - public function resolve($value): void + public function resolve($value) : void { $this->settle(self::FULFILLED, $value); } - - public function reject($reason): void + public function reject($reason) : void { $this->settle(self::REJECTED, $reason); } - - private function settle(string $state, $value): void + private function settle(string $state, $value) : void { if ($this->state !== self::PENDING) { // Ignore calls with the same resolution. if ($state === $this->state && $value === $this->result) { return; } - throw $this->state === $state - ? new \LogicException("The promise is already {$state}.") - : new \LogicException("Cannot change a {$this->state} promise to {$state}"); + throw $this->state === $state ? new \LogicException("The promise is already {$state}.") : new \LogicException("Cannot change a {$this->state} promise to {$state}"); } - if ($value === $this) { throw new \LogicException('Cannot fulfill or reject a promise with itself'); } - // Clear out the state of the promise but stash the handlers. $this->state = $state; $this->result = $value; @@ -143,41 +116,35 @@ private function settle(string $state, $value): void $this->handlers = null; $this->waitList = $this->waitFn = null; $this->cancelFn = null; - if (!$handlers) { return; } - // If the value was not a settled promise or a thenable, then resolve // it in the task queue using the correct ID. - if (!is_object($value) || !method_exists($value, 'then')) { + if (!\is_object($value) || !\method_exists($value, 'then')) { $id = $state === self::FULFILLED ? 1 : 2; // It's a success, so resolve the handlers in the queue. - Utils::queue()->add(static function () use ($id, $value, $handlers): void { + Utils::queue()->add(static function () use($id, $value, $handlers) : void { foreach ($handlers as $handler) { self::callHandler($id, $value, $handler); } }); } elseif ($value instanceof Promise && Is::pending($value)) { // We can just merge our handlers onto the next promise. - $value->handlers = array_merge($value->handlers, $handlers); + $value->handlers = \array_merge($value->handlers, $handlers); } else { // Resolve the handlers when the forwarded promise is resolved. - $value->then( - static function ($value) use ($handlers): void { - foreach ($handlers as $handler) { - self::callHandler(1, $value, $handler); - } - }, - static function ($reason) use ($handlers): void { - foreach ($handlers as $handler) { - self::callHandler(2, $reason, $handler); - } + $value->then(static function ($value) use($handlers) : void { + foreach ($handlers as $handler) { + self::callHandler(1, $value, $handler); + } + }, static function ($reason) use($handlers) : void { + foreach ($handlers as $handler) { + self::callHandler(2, $reason, $handler); } - ); + }); } } - /** * Call a stack of handlers using a specific callback index and value. * @@ -185,17 +152,15 @@ static function ($reason) use ($handlers): void { * @param mixed $value Value to pass to the callback. * @param array $handler Array of handler data (promise and callbacks). */ - private static function callHandler(int $index, $value, array $handler): void + private static function callHandler(int $index, $value, array $handler) : void { /** @var PromiseInterface $promise */ $promise = $handler[0]; - // The promise may have been cancelled or resolved before placing // this thunk in the queue. if (Is::settled($promise)) { return; } - try { if (isset($handler[$index])) { /* @@ -218,8 +183,7 @@ private static function callHandler(int $index, $value, array $handler): void $promise->reject($reason); } } - - private function waitIfPending(): void + private function waitIfPending() : void { if ($this->state !== self::PENDING) { return; @@ -229,26 +193,20 @@ private function waitIfPending(): void $this->invokeWaitList(); } else { // If there's no wait function, then reject the promise. - $this->reject('Cannot wait on a promise that has ' - .'no internal wait function. You must provide a wait ' - .'function when constructing the promise to be able to ' - .'wait on a promise.'); + $this->reject('Cannot wait on a promise that has ' . 'no internal wait function. You must provide a wait ' . 'function when constructing the promise to be able to ' . 'wait on a promise.'); } - Utils::queue()->run(); - /** @psalm-suppress RedundantCondition */ if ($this->state === self::PENDING) { $this->reject('Invoking the wait callback did not resolve the promise'); } } - - private function invokeWaitFn(): void + private function invokeWaitFn() : void { try { $wfn = $this->waitFn; $this->waitFn = null; - $wfn(true); + $wfn(\true); } catch (\Throwable $reason) { if ($this->state === self::PENDING) { // The promise has not been resolved yet, so reject the promise @@ -261,20 +219,17 @@ private function invokeWaitFn(): void } } } - - private function invokeWaitList(): void + private function invokeWaitList() : void { $waitList = $this->waitList; $this->waitList = null; - foreach ($waitList as $result) { do { $result->waitIfPending(); $result = $result->result; } while ($result instanceof Promise); - if ($result instanceof PromiseInterface) { - $result->wait(false); + $result->wait(\false); } } } diff --git a/src/vendor/guzzlehttp/promises/src/PromiseInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/PromiseInterface.php similarity index 83% rename from src/vendor/guzzlehttp/promises/src/PromiseInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/PromiseInterface.php index 2824802..5baa395 100644 --- a/src/vendor/guzzlehttp/promises/src/PromiseInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/PromiseInterface.php @@ -1,8 +1,7 @@ reason = $reason; } - - public function then( - callable $onFulfilled = null, - callable $onRejected = null - ): PromiseInterface { + public function then(callable $onFulfilled = null, callable $onRejected = null) : PromiseInterface + { // If there's no onRejected callback then just return self. if (!$onRejected) { return $this; } - $queue = Utils::queue(); $reason = $this->reason; $p = new Promise([$queue, 'run']); - $queue->add(static function () use ($p, $reason, $onRejected): void { + $queue->add(static function () use($p, $reason, $onRejected) : void { if (Is::pending($p)) { try { // Return a resolved promise if onRejected does not throw. @@ -53,42 +44,34 @@ public function then( } } }); - return $p; } - - public function otherwise(callable $onRejected): PromiseInterface + public function otherwise(callable $onRejected) : PromiseInterface { return $this->then(null, $onRejected); } - - public function wait(bool $unwrap = true) + public function wait(bool $unwrap = \true) { if ($unwrap) { throw Create::exceptionFor($this->reason); } - return null; } - - public function getState(): string + public function getState() : string { return self::REJECTED; } - - public function resolve($value): void + public function resolve($value) : void { throw new \LogicException('Cannot resolve a rejected promise'); } - - public function reject($reason): void + public function reject($reason) : void { if ($reason !== $this->reason) { throw new \LogicException('Cannot reject a rejected promise'); } } - - public function cancel(): void + public function cancel() : void { // pass } diff --git a/src/vendor/guzzlehttp/promises/src/RejectionException.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/RejectionException.php similarity index 68% rename from src/vendor/guzzlehttp/promises/src/RejectionException.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/RejectionException.php index 47dca86..8052093 100644 --- a/src/vendor/guzzlehttp/promises/src/RejectionException.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/RejectionException.php @@ -1,8 +1,7 @@ reason = $reason; - $message = 'The promise was rejected'; - if ($description) { - $message .= ' with reason: '.$description; - } elseif (is_string($reason) - || (is_object($reason) && method_exists($reason, '__toString')) - ) { - $message .= ' with reason: '.$this->reason; + $message .= ' with reason: ' . $description; + } elseif (\is_string($reason) || \is_object($reason) && \method_exists($reason, '__toString')) { + $message .= ' with reason: ' . $this->reason; } elseif ($reason instanceof \JsonSerializable) { - $message .= ' with reason: '.json_encode($this->reason, JSON_PRETTY_PRINT); + $message .= ' with reason: ' . \json_encode($this->reason, \JSON_PRETTY_PRINT); } - parent::__construct($message); } - /** * Returns the rejection reason. * diff --git a/src/vendor/guzzlehttp/promises/src/TaskQueue.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueue.php similarity index 70% rename from src/vendor/guzzlehttp/promises/src/TaskQueue.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueue.php index 503e0b2..4d0c94d 100644 --- a/src/vendor/guzzlehttp/promises/src/TaskQueue.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueue.php @@ -1,8 +1,7 @@ enableShutdown) { // Only run the tasks if an E_ERROR didn't occur. - $err = error_get_last(); - if (!$err || ($err['type'] ^ E_ERROR)) { + $err = \error_get_last(); + if (!$err || $err['type'] ^ \E_ERROR) { $this->run(); } } }); } } - - public function isEmpty(): bool + public function isEmpty() : bool { return !$this->queue; } - - public function add(callable $task): void + public function add(callable $task) : void { $this->queue[] = $task; } - - public function run(): void + public function run() : void { - while ($task = array_shift($this->queue)) { + while ($task = \array_shift($this->queue)) { /** @var callable $task */ $task(); } } - /** * The task queue will be run and exhausted by default when the process * exits IFF the exit is not the result of a PHP E_ERROR error. @@ -64,8 +58,8 @@ public function run(): void * * Note: This shutdown will occur before any destructors are triggered. */ - public function disableShutdown(): void + public function disableShutdown() : void { - $this->enableShutdown = false; + $this->enableShutdown = \false; } } diff --git a/src/vendor/guzzlehttp/promises/src/TaskQueueInterface.php b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueueInterface.php similarity index 58% rename from src/vendor/guzzlehttp/promises/src/TaskQueueInterface.php rename to src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueueInterface.php index 34c561a..91f43d7 100644 --- a/src/vendor/guzzlehttp/promises/src/TaskQueueInterface.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/promises/src/TaskQueueInterface.php @@ -1,24 +1,21 @@ add(function () use ($task, $promise): void { + $queue->add(function () use($task, $promise) : void { try { if (Is::pending($promise)) { $promise->resolve($task()); @@ -53,10 +49,8 @@ public static function task(callable $task): PromiseInterface $promise->reject($e); } }); - return $promise; } - /** * Synchronously waits on a promise to resolve and returns an inspection * state array. @@ -69,20 +63,16 @@ public static function task(callable $task): PromiseInterface * * @param PromiseInterface $promise Promise or value. */ - public static function inspect(PromiseInterface $promise): array + public static function inspect(PromiseInterface $promise) : array { try { - return [ - 'state' => PromiseInterface::FULFILLED, - 'value' => $promise->wait(), - ]; + return ['state' => PromiseInterface::FULFILLED, 'value' => $promise->wait()]; } catch (RejectionException $e) { return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()]; } catch (\Throwable $e) { return ['state' => PromiseInterface::REJECTED, 'reason' => $e]; } } - /** * Waits on all of the provided promises, but does not unwrap rejected * promises as thrown exception. @@ -93,16 +83,14 @@ public static function inspect(PromiseInterface $promise): array * * @param PromiseInterface[] $promises Traversable of promises to wait upon. */ - public static function inspectAll($promises): array + public static function inspectAll($promises) : array { $results = []; foreach ($promises as $key => $promise) { $results[$key] = self::inspect($promise); } - return $results; } - /** * Waits on all of the provided promises and returns the fulfilled values. * @@ -114,16 +102,14 @@ public static function inspectAll($promises): array * * @throws \Throwable on error */ - public static function unwrap($promises): array + public static function unwrap($promises) : array { $results = []; foreach ($promises as $key => $promise) { $results[$key] = $promise->wait(); } - return $results; } - /** * Given an array of promises, return a promise that is fulfilled when all * the items in the array are fulfilled. @@ -135,38 +121,29 @@ public static function unwrap($promises): array * @param mixed $promises Promises or values. * @param bool $recursive If true, resolves new promises that might have been added to the stack during its own resolution. */ - public static function all($promises, bool $recursive = false): PromiseInterface + public static function all($promises, bool $recursive = \false) : PromiseInterface { $results = []; - $promise = Each::of( - $promises, - function ($value, $idx) use (&$results): void { - $results[$idx] = $value; - }, - function ($reason, $idx, Promise $aggregate): void { - $aggregate->reject($reason); - } - )->then(function () use (&$results) { - ksort($results); - + $promise = Each::of($promises, function ($value, $idx) use(&$results) : void { + $results[$idx] = $value; + }, function ($reason, $idx, Promise $aggregate) : void { + $aggregate->reject($reason); + })->then(function () use(&$results) { + \ksort($results); return $results; }); - - if (true === $recursive) { - $promise = $promise->then(function ($results) use ($recursive, &$promises) { + if (\true === $recursive) { + $promise = $promise->then(function ($results) use($recursive, &$promises) { foreach ($promises as $promise) { if (Is::pending($promise)) { return self::all($promises, $recursive); } } - return $results; }); } - return $promise; } - /** * Initiate a competitive race between multiple promises or values (values * will become immediately fulfilled promises). @@ -181,53 +158,40 @@ function ($reason, $idx, Promise $aggregate): void { * @param int $count Total number of promises. * @param mixed $promises Promises or values. */ - public static function some(int $count, $promises): PromiseInterface + public static function some(int $count, $promises) : PromiseInterface { $results = []; $rejections = []; - - return Each::of( - $promises, - function ($value, $idx, PromiseInterface $p) use (&$results, $count): void { - if (Is::settled($p)) { - return; - } - $results[$idx] = $value; - if (count($results) >= $count) { - $p->resolve(null); - } - }, - function ($reason) use (&$rejections): void { - $rejections[] = $reason; + return Each::of($promises, function ($value, $idx, PromiseInterface $p) use(&$results, $count) : void { + if (Is::settled($p)) { + return; } - )->then( - function () use (&$results, &$rejections, $count) { - if (count($results) !== $count) { - throw new AggregateException( - 'Not enough promises to fulfill count', - $rejections - ); - } - ksort($results); - - return array_values($results); + $results[$idx] = $value; + if (\count($results) >= $count) { + $p->resolve(null); } - ); + }, function ($reason) use(&$rejections) : void { + $rejections[] = $reason; + })->then(function () use(&$results, &$rejections, $count) { + if (\count($results) !== $count) { + throw new AggregateException('Not enough promises to fulfill count', $rejections); + } + \ksort($results); + return \array_values($results); + }); } - /** * Like some(), with 1 as count. However, if the promise fulfills, the * fulfillment value is not an array of 1 but the value directly. * * @param mixed $promises Promises or values. */ - public static function any($promises): PromiseInterface + public static function any($promises) : PromiseInterface { return self::some(1, $promises)->then(function ($values) { return $values[0]; }); } - /** * Returns a promise that is fulfilled when all of the provided promises have * been fulfilled or rejected. @@ -238,21 +202,15 @@ public static function any($promises): PromiseInterface * * @param mixed $promises Promises or values. */ - public static function settle($promises): PromiseInterface + public static function settle($promises) : PromiseInterface { $results = []; - - return Each::of( - $promises, - function ($value, $idx) use (&$results): void { - $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value]; - }, - function ($reason, $idx) use (&$results): void { - $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason]; - } - )->then(function () use (&$results) { - ksort($results); - + return Each::of($promises, function ($value, $idx) use(&$results) : void { + $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value]; + }, function ($reason, $idx) use(&$results) : void { + $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason]; + })->then(function () use(&$results) { + \ksort($results); return $results; }); } diff --git a/src/vendor/guzzlehttp/psr7/src/AppendStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/AppendStream.php similarity index 74% rename from src/vendor/guzzlehttp/psr7/src/AppendStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/AppendStream.php index 8361564..a4111bd 100644 --- a/src/vendor/guzzlehttp/psr7/src/AppendStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/AppendStream.php @@ -1,11 +1,9 @@ addStream($stream); } } - - public function __toString(): string + public function __toString() : string { try { $this->rewind(); - return $this->getContents(); } catch (\Throwable $e) { if (\PHP_VERSION_ID >= 70400) { throw $e; } - trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR); - + \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR); return ''; } } - /** * Add a stream to the AppendStream * @@ -59,40 +49,33 @@ public function __toString(): string * * @throws \InvalidArgumentException if the stream is not readable */ - public function addStream(StreamInterface $stream): void + public function addStream(StreamInterface $stream) : void { if (!$stream->isReadable()) { throw new \InvalidArgumentException('Each stream must be readable'); } - // The stream is only seekable if all streams are seekable if (!$stream->isSeekable()) { - $this->seekable = false; + $this->seekable = \false; } - $this->streams[] = $stream; } - - public function getContents(): string + public function getContents() : string { return Utils::copyToString($this); } - /** * Closes each attached stream. */ - public function close(): void + public function close() : void { $this->pos = $this->current = 0; - $this->seekable = true; - + $this->seekable = \true; foreach ($this->streams as $stream) { $stream->close(); } - $this->streams = []; } - /** * Detaches each attached stream. * @@ -101,32 +84,26 @@ public function close(): void public function detach() { $this->pos = $this->current = 0; - $this->seekable = true; - + $this->seekable = \true; foreach ($this->streams as $stream) { $stream->detach(); } - $this->streams = []; - return null; } - - public function tell(): int + public function tell() : int { return $this->pos; } - /** * Tries to calculate the size by adding the size of each stream. * * If any of the streams do not return a valid number, then the size of the * append stream cannot be determined and null is returned. */ - public function getSize(): ?int + public function getSize() : ?int { $size = 0; - foreach ($this->streams as $stream) { $s = $stream->getSize(); if ($s === null) { @@ -134,110 +111,88 @@ public function getSize(): ?int } $size += $s; } - return $size; } - - public function eof(): bool + public function eof() : bool { - return !$this->streams || - ($this->current >= count($this->streams) - 1 && - $this->streams[$this->current]->eof()); + return !$this->streams || $this->current >= \count($this->streams) - 1 && $this->streams[$this->current]->eof(); } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - /** * Attempts to seek to the given position. Only supports SEEK_SET. */ - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { if (!$this->seekable) { throw new \RuntimeException('This AppendStream is not seekable'); - } elseif ($whence !== SEEK_SET) { + } elseif ($whence !== \SEEK_SET) { throw new \RuntimeException('The AppendStream can only seek with SEEK_SET'); } - $this->pos = $this->current = 0; - // Rewind each stream foreach ($this->streams as $i => $stream) { try { $stream->rewind(); } catch (\Exception $e) { - throw new \RuntimeException('Unable to seek stream ' - .$i.' of the AppendStream', 0, $e); + throw new \RuntimeException('Unable to seek stream ' . $i . ' of the AppendStream', 0, $e); } } - // Seek to the actual position by reading from each stream while ($this->pos < $offset && !$this->eof()) { - $result = $this->read(min(8096, $offset - $this->pos)); + $result = $this->read(\min(8096, $offset - $this->pos)); if ($result === '') { break; } } } - /** * Reads from all of the appended streams until the length is met or EOF. */ - public function read($length): string + public function read($length) : string { $buffer = ''; - $total = count($this->streams) - 1; + $total = \count($this->streams) - 1; $remaining = $length; - $progressToNext = false; - + $progressToNext = \false; while ($remaining > 0) { // Progress to the next stream if needed. if ($progressToNext || $this->streams[$this->current]->eof()) { - $progressToNext = false; + $progressToNext = \false; if ($this->current === $total) { break; } ++$this->current; } - $result = $this->streams[$this->current]->read($remaining); - if ($result === '') { - $progressToNext = true; + $progressToNext = \true; continue; } - $buffer .= $result; - $remaining = $length - strlen($buffer); + $remaining = $length - \strlen($buffer); } - - $this->pos += strlen($buffer); - + $this->pos += \strlen($buffer); return $buffer; } - - public function isReadable(): bool + public function isReadable() : bool { - return true; + return \true; } - - public function isWritable(): bool + public function isWritable() : bool { - return false; + return \false; } - - public function isSeekable(): bool + public function isSeekable() : bool { return $this->seekable; } - - public function write($string): int + public function write($string) : int { throw new \RuntimeException('Cannot write to an AppendStream'); } - /** * {@inheritdoc} * diff --git a/src/vendor/guzzlehttp/psr7/src/BufferStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/BufferStream.php similarity index 67% rename from src/vendor/guzzlehttp/psr7/src/BufferStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/BufferStream.php index 21be8c0..ca564cf 100644 --- a/src/vendor/guzzlehttp/psr7/src/BufferStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/BufferStream.php @@ -1,11 +1,9 @@ hwm = $hwm; } - - public function __toString(): string + public function __toString() : string { return $this->getContents(); } - - public function getContents(): string + public function getContents() : string { $buffer = $this->buffer; $this->buffer = ''; - return $buffer; } - - public function close(): void + public function close() : void { $this->buffer = ''; } - public function detach() { $this->close(); - return null; } - - public function getSize(): ?int + public function getSize() : ?int { - return strlen($this->buffer); + return \strlen($this->buffer); } - - public function isReadable(): bool + public function isReadable() : bool { - return true; + return \true; } - - public function isWritable(): bool + public function isWritable() : bool { - return true; + return \true; } - - public function isSeekable(): bool + public function isSeekable() : bool { - return false; + return \false; } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { throw new \RuntimeException('Cannot seek a BufferStream'); } - - public function eof(): bool + public function eof() : bool { - return strlen($this->buffer) === 0; + return \strlen($this->buffer) === 0; } - - public function tell(): int + public function tell() : int { throw new \RuntimeException('Cannot determine the position of a BufferStream'); } - /** * Reads data from the buffer. */ - public function read($length): string + public function read($length) : string { - $currentLength = strlen($this->buffer); - + $currentLength = \strlen($this->buffer); if ($length >= $currentLength) { // No need to slice the buffer because we don't have enough data. $result = $this->buffer; $this->buffer = ''; } else { // Slice up the result to provide a subset of the buffer. - $result = substr($this->buffer, 0, $length); - $this->buffer = substr($this->buffer, $length); + $result = \substr($this->buffer, 0, $length); + $this->buffer = \substr($this->buffer, $length); } - return $result; } - /** * Writes data to the buffer. */ - public function write($string): int + public function write($string) : int { $this->buffer .= $string; - - if (strlen($this->buffer) >= $this->hwm) { + if (\strlen($this->buffer) >= $this->hwm) { return 0; } - - return strlen($string); + return \strlen($string); } - /** * {@inheritdoc} * @@ -143,7 +118,6 @@ public function getMetadata($key = null) if ($key === 'hwm') { return $this->hwm; } - return $key ? null : []; } } diff --git a/src/vendor/guzzlehttp/psr7/src/CachingStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/CachingStream.php similarity index 74% rename from src/vendor/guzzlehttp/psr7/src/CachingStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/CachingStream.php index f34722c..d9df2d6 100644 --- a/src/vendor/guzzlehttp/psr7/src/CachingStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/CachingStream.php @@ -1,11 +1,9 @@ remoteStream = $stream; $this->stream = $target ?: new Stream(Utils::tryFopen('php://temp', 'r+')); } - - public function getSize(): ?int + public function getSize() : ?int { $remoteSize = $this->remoteStream->getSize(); - if (null === $remoteSize) { return null; } - - return max($this->stream->getSize(), $remoteSize); + return \max($this->stream->getSize(), $remoteSize); } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { - if ($whence === SEEK_SET) { + if ($whence === \SEEK_SET) { $byte = $offset; - } elseif ($whence === SEEK_CUR) { + } elseif ($whence === \SEEK_CUR) { $byte = $offset + $this->tell(); - } elseif ($whence === SEEK_END) { + } elseif ($whence === \SEEK_END) { $size = $this->remoteStream->getSize(); if ($size === null) { $size = $this->cacheEntireStream(); @@ -70,9 +57,7 @@ public function seek($offset, $whence = SEEK_SET): void } else { throw new \InvalidArgumentException('Invalid whence'); } - $diff = $byte - $this->stream->getSize(); - if ($diff > 0) { // Read the remoteStream until we have read in at least the amount // of bytes requested, or we reach the end of the file. @@ -85,69 +70,56 @@ public function seek($offset, $whence = SEEK_SET): void $this->stream->seek($byte); } } - - public function read($length): string + public function read($length) : string { // Perform a regular read on any previously read data from the buffer $data = $this->stream->read($length); - $remaining = $length - strlen($data); - + $remaining = $length - \strlen($data); // More data was requested so read from the remote stream if ($remaining) { // If data was written to the buffer in a position that would have // been filled from the remote stream, then we must skip bytes on // the remote stream to emulate overwriting bytes from that // position. This mimics the behavior of other PHP stream wrappers. - $remoteData = $this->remoteStream->read( - $remaining + $this->skipReadBytes - ); - + $remoteData = $this->remoteStream->read($remaining + $this->skipReadBytes); if ($this->skipReadBytes) { - $len = strlen($remoteData); - $remoteData = substr($remoteData, $this->skipReadBytes); - $this->skipReadBytes = max(0, $this->skipReadBytes - $len); + $len = \strlen($remoteData); + $remoteData = \substr($remoteData, $this->skipReadBytes); + $this->skipReadBytes = \max(0, $this->skipReadBytes - $len); } - $data .= $remoteData; $this->stream->write($remoteData); } - return $data; } - - public function write($string): int + public function write($string) : int { // When appending to the end of the currently read stream, you'll want // to skip bytes from being read from the remote stream to emulate // other stream wrappers. Basically replacing bytes of data of a fixed // length. - $overflow = (strlen($string) + $this->tell()) - $this->remoteStream->tell(); + $overflow = \strlen($string) + $this->tell() - $this->remoteStream->tell(); if ($overflow > 0) { $this->skipReadBytes += $overflow; } - return $this->stream->write($string); } - - public function eof(): bool + public function eof() : bool { return $this->stream->eof() && $this->remoteStream->eof(); } - /** * Close both the remote stream and buffer stream */ - public function close(): void + public function close() : void { $this->remoteStream->close(); $this->stream->close(); } - - private function cacheEntireStream(): int + private function cacheEntireStream() : int { $target = new FnStream(['write' => 'strlen']); Utils::copyToStream($this, $target); - return $this->tell(); } } diff --git a/src/vendor/guzzlehttp/psr7/src/DroppingStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/DroppingStream.php similarity index 77% rename from src/vendor/guzzlehttp/psr7/src/DroppingStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/DroppingStream.php index 6e3d209..f51e691 100644 --- a/src/vendor/guzzlehttp/psr7/src/DroppingStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/DroppingStream.php @@ -1,11 +1,9 @@ stream = $stream; $this->maxLength = $maxLength; } - - public function write($string): int + public function write($string) : int { $diff = $this->maxLength - $this->stream->getSize(); - // Begin returning 0 when the underlying stream is too large. if ($diff <= 0) { return 0; } - // Write the stream or a subset of the stream if needed. - if (strlen($string) < $diff) { + if (\strlen($string) < $diff) { return $this->stream->write($string); } - - return $this->stream->write(substr($string, 0, $diff)); + return $this->stream->write(\substr($string, 0, $diff)); } } diff --git a/src/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php similarity index 68% rename from src/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php index 3a08477..e876260 100644 --- a/src/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php @@ -1,11 +1,9 @@ */ private $methods; - /** * @param array $methods Hash of method name to a callable. */ public function __construct(array $methods) { $this->methods = $methods; - // Create the functions on the class foreach ($methods as $name => $fn) { - $this->{'_fn_'.$name} = $fn; + $this->{'_fn_' . $name} = $fn; } } - /** * Lazily determine which methods are not implemented. * * @throws \BadMethodCallException */ - public function __get(string $name): void + public function __get(string $name) : void { - throw new \BadMethodCallException(str_replace('_fn_', '', $name) - .'() is not implemented in the FnStream'); + throw new \BadMethodCallException(\str_replace('_fn_', '', $name) . '() is not implemented in the FnStream'); } - /** * The close method is called on the underlying stream only if possible. */ public function __destruct() { if (isset($this->_fn_close)) { - call_user_func($this->_fn_close); + \call_user_func($this->_fn_close); } } - /** * An unserialize would allow the __destruct to run when the unserialized value goes out of scope. * * @throws \LogicException */ - public function __wakeup(): void + public function __wakeup() : void { throw new \LogicException('FnStream should never be unserialized'); } - /** * Adds custom functionality to an underlying stream by intercepting * specific method calls. @@ -81,94 +67,77 @@ public static function decorate(StreamInterface $stream, array $methods) { // If any of the required methods were not provided, then simply // proxy to the decorated stream. - foreach (array_diff(self::SLOTS, array_keys($methods)) as $diff) { + foreach (\array_diff(self::SLOTS, \array_keys($methods)) as $diff) { /** @var callable $callable */ $callable = [$stream, $diff]; $methods[$diff] = $callable; } - return new self($methods); } - - public function __toString(): string + public function __toString() : string { try { - return call_user_func($this->_fn___toString); + return \call_user_func($this->_fn___toString); } catch (\Throwable $e) { if (\PHP_VERSION_ID >= 70400) { throw $e; } - trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR); - + \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR); return ''; } } - - public function close(): void + public function close() : void { - call_user_func($this->_fn_close); + \call_user_func($this->_fn_close); } - public function detach() { - return call_user_func($this->_fn_detach); + return \call_user_func($this->_fn_detach); } - - public function getSize(): ?int + public function getSize() : ?int { - return call_user_func($this->_fn_getSize); + return \call_user_func($this->_fn_getSize); } - - public function tell(): int + public function tell() : int { - return call_user_func($this->_fn_tell); + return \call_user_func($this->_fn_tell); } - - public function eof(): bool + public function eof() : bool { - return call_user_func($this->_fn_eof); + return \call_user_func($this->_fn_eof); } - - public function isSeekable(): bool + public function isSeekable() : bool { - return call_user_func($this->_fn_isSeekable); + return \call_user_func($this->_fn_isSeekable); } - - public function rewind(): void + public function rewind() : void { - call_user_func($this->_fn_rewind); + \call_user_func($this->_fn_rewind); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { - call_user_func($this->_fn_seek, $offset, $whence); + \call_user_func($this->_fn_seek, $offset, $whence); } - - public function isWritable(): bool + public function isWritable() : bool { - return call_user_func($this->_fn_isWritable); + return \call_user_func($this->_fn_isWritable); } - - public function write($string): int + public function write($string) : int { - return call_user_func($this->_fn_write, $string); + return \call_user_func($this->_fn_write, $string); } - - public function isReadable(): bool + public function isReadable() : bool { - return call_user_func($this->_fn_isReadable); + return \call_user_func($this->_fn_isReadable); } - - public function read($length): string + public function read($length) : string { - return call_user_func($this->_fn_read, $length); + return \call_user_func($this->_fn_read, $length); } - - public function getContents(): string + public function getContents() : string { - return call_user_func($this->_fn_getContents); + return \call_user_func($this->_fn_getContents); } - /** * {@inheritdoc} * @@ -176,6 +145,6 @@ public function getContents(): string */ public function getMetadata($key = null) { - return call_user_func($this->_fn_getMetadata, $key); + return \call_user_func($this->_fn_getMetadata, $key); } } diff --git a/src/vendor/guzzlehttp/psr7/src/Header.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Header.php similarity index 82% rename from src/vendor/guzzlehttp/psr7/src/Header.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Header.php index 6e38e00..cc29c79 100644 --- a/src/vendor/guzzlehttp/psr7/src/Header.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Header.php @@ -1,8 +1,7 @@ ]+>|[^=]+/', $kvp, $matches)) { + foreach (\preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) { + if (\preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) { $m = $matches[0]; if (isset($m[1])) { - $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed); + $part[\trim($m[0], $trimmed)] = \trim($m[1], $trimmed); } else { - $part[] = trim($m[0], $trimmed); + $part[] = \trim($m[0], $trimmed); } } } @@ -37,10 +35,8 @@ public static function parse($header): array } } } - return $params; } - /** * Converts an array of header values that may contain comma separated * headers into an array of headers with no comma separated values. @@ -49,7 +45,7 @@ public static function parse($header): array * * @deprecated Use self::splitList() instead. */ - public static function normalize($header): array + public static function normalize($header) : array { $result = []; foreach ((array) $header as $value) { @@ -57,10 +53,8 @@ public static function normalize($header): array $result[] = $parsed; } } - return $result; } - /** * Splits a HTTP header defined to contain a comma-separated list into * each individual value. Empty values will be removed. @@ -74,61 +68,50 @@ public static function normalize($header): array * * @return string[] */ - public static function splitList($values): array + public static function splitList($values) : array { if (!\is_array($values)) { $values = [$values]; } - $result = []; foreach ($values as $value) { if (!\is_string($value)) { throw new \TypeError('$header must either be a string or an array containing strings.'); } - $v = ''; - $isQuoted = false; - $isEscaped = false; + $isQuoted = \false; + $isEscaped = \false; for ($i = 0, $max = \strlen($value); $i < $max; ++$i) { if ($isEscaped) { $v .= $value[$i]; - $isEscaped = false; - + $isEscaped = \false; continue; } - if (!$isQuoted && $value[$i] === ',') { $v = \trim($v); if ($v !== '') { $result[] = $v; } - $v = ''; continue; } - if ($isQuoted && $value[$i] === '\\') { - $isEscaped = true; + $isEscaped = \true; $v .= $value[$i]; - continue; } if ($value[$i] === '"') { $isQuoted = !$isQuoted; $v .= $value[$i]; - continue; } - $v .= $value[$i]; } - $v = \trim($v); if ($v !== '') { $result[] = $v; } } - return $result; } } diff --git a/src/vendor/guzzlehttp/psr7/src/HttpFactory.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/HttpFactory.php similarity index 50% rename from src/vendor/guzzlehttp/psr7/src/HttpFactory.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/HttpFactory.php index 73d17e3..7c444ee 100644 --- a/src/vendor/guzzlehttp/psr7/src/HttpFactory.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/HttpFactory.php @@ -1,22 +1,20 @@ getSize(); } - return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType); } - - public function createStream(string $content = ''): StreamInterface + public function createStream(string $content = '') : StreamInterface { return Utils::streamFor($content); } - - public function createStreamFromFile(string $file, string $mode = 'r'): StreamInterface + public function createStreamFromFile(string $file, string $mode = 'r') : StreamInterface { try { $resource = Utils::tryFopen($file, $mode); } catch (\RuntimeException $e) { - if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true)) { - throw new \InvalidArgumentException(sprintf('Invalid file opening mode "%s"', $mode), 0, $e); + if ('' === $mode || \false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], \true)) { + throw new \InvalidArgumentException(\sprintf('Invalid file opening mode "%s"', $mode), 0, $e); } - throw $e; } - return Utils::streamFor($resource); } - - public function createStreamFromResource($resource): StreamInterface + public function createStreamFromResource($resource) : StreamInterface { return Utils::streamFor($resource); } - - public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface + public function createServerRequest(string $method, $uri, array $serverParams = []) : ServerRequestInterface { if (empty($method)) { if (!empty($serverParams['REQUEST_METHOD'])) { @@ -73,21 +59,17 @@ public function createServerRequest(string $method, $uri, array $serverParams = throw new \InvalidArgumentException('Cannot determine HTTP method'); } } - return new ServerRequest($method, $uri, [], null, '1.1', $serverParams); } - - public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface + public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface { return new Response($code, [], null, '1.1', $reasonPhrase); } - - public function createRequest(string $method, $uri): RequestInterface + public function createRequest(string $method, $uri) : RequestInterface { return new Request($method, $uri); } - - public function createUri(string $uri = ''): UriInterface + public function createUri(string $uri = '') : UriInterface { return new Uri($uri); } diff --git a/src/vendor/guzzlehttp/psr7/src/InflateStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/InflateStream.php similarity index 83% rename from src/vendor/guzzlehttp/psr7/src/InflateStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/InflateStream.php index 599b55d..ad81433 100644 --- a/src/vendor/guzzlehttp/psr7/src/InflateStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/InflateStream.php @@ -1,11 +1,9 @@ 15 + 32]); + \stream_filter_append($resource, 'zlib.inflate', \STREAM_FILTER_READ, ['window' => 15 + 32]); $this->stream = $stream->isSeekable() ? new Stream($resource) : new NoSeekStream(new Stream($resource)); } } diff --git a/src/vendor/guzzlehttp/psr7/src/LazyOpenStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LazyOpenStream.php similarity index 83% rename from src/vendor/guzzlehttp/psr7/src/LazyOpenStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LazyOpenStream.php index f6c8490..534b591 100644 --- a/src/vendor/guzzlehttp/psr7/src/LazyOpenStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LazyOpenStream.php @@ -1,11 +1,9 @@ filename = $filename; $this->mode = $mode; - // unsetting the property forces the first access to go through // __get(). unset($this->stream); } - /** * Creates the underlying stream lazily when required. */ - protected function createStream(): StreamInterface + protected function createStream() : StreamInterface { return Utils::streamFor(Utils::tryFopen($this->filename, $this->mode)); } diff --git a/src/vendor/guzzlehttp/psr7/src/LimitStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LimitStream.php similarity index 75% rename from src/vendor/guzzlehttp/psr7/src/LimitStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LimitStream.php index fb22325..97df196 100644 --- a/src/vendor/guzzlehttp/psr7/src/LimitStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/LimitStream.php @@ -1,27 +1,21 @@ stream = $stream; $this->setLimit($limit); $this->setOffset($offset); } - - public function eof(): bool + public function eof() : bool { // Always return true if the underlying stream is EOF if ($this->stream->eof()) { - return true; + return \true; } - // No limit and the underlying stream is not at EOF if ($this->limit === -1) { - return false; + return \false; } - return $this->stream->tell() >= $this->offset + $this->limit; } - /** * Returns the size of the limited subset of data */ - public function getSize(): ?int + public function getSize() : ?int { if (null === ($length = $this->stream->getSize())) { return null; } elseif ($this->limit === -1) { return $length - $this->offset; } else { - return min($this->limit, $length - $this->offset); + return \min($this->limit, $length - $this->offset); } } - /** * Allow for a bounded seek on the read limited stream */ - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { - if ($whence !== SEEK_SET || $offset < 0) { - throw new \RuntimeException(sprintf( - 'Cannot seek to offset %s with whence %s', - $offset, - $whence - )); + if ($whence !== \SEEK_SET || $offset < 0) { + throw new \RuntimeException(\sprintf('Cannot seek to offset %s with whence %s', $offset, $whence)); } - $offset += $this->offset; - if ($this->limit !== -1) { if ($offset > $this->offset + $this->limit) { $offset = $this->offset + $this->limit; } } - $this->stream->seek($offset); } - /** * Give a relative tell() */ - public function tell(): int + public function tell() : int { return $this->stream->tell() - $this->offset; } - /** * Set the offset to start limiting from * @@ -107,24 +84,21 @@ public function tell(): int * * @throws \RuntimeException if the stream cannot be seeked. */ - public function setOffset(int $offset): void + public function setOffset(int $offset) : void { $current = $this->stream->tell(); - if ($current !== $offset) { // If the stream cannot seek to the offset position, then read to it if ($this->stream->isSeekable()) { $this->stream->seek($offset); } elseif ($current > $offset) { - throw new \RuntimeException("Could not seek to stream offset $offset"); + throw new \RuntimeException("Could not seek to stream offset {$offset}"); } else { $this->stream->read($offset - $current); } } - $this->offset = $offset; } - /** * Set the limit of bytes that the decorator allows to be read from the * stream. @@ -132,26 +106,23 @@ public function setOffset(int $offset): void * @param int $limit Number of bytes to allow to be read from the stream. * Use -1 for no limit. */ - public function setLimit(int $limit): void + public function setLimit(int $limit) : void { $this->limit = $limit; } - - public function read($length): string + public function read($length) : string { if ($this->limit === -1) { return $this->stream->read($length); } - // Check if the current position is less than the total allowed // bytes + original offset - $remaining = ($this->offset + $this->limit) - $this->stream->tell(); + $remaining = $this->offset + $this->limit - $this->stream->tell(); if ($remaining > 0) { // Only return the amount of requested data, ensuring that the byte // limit is not exceeded - return $this->stream->read(min($remaining, $length)); + return $this->stream->read(\min($remaining, $length)); } - return ''; } } diff --git a/src/vendor/guzzlehttp/psr7/src/Message.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Message.php similarity index 60% rename from src/vendor/guzzlehttp/psr7/src/Message.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Message.php index 9b74b8d..cebe9bd 100644 --- a/src/vendor/guzzlehttp/psr7/src/Message.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Message.php @@ -1,13 +1,11 @@ getMethod().' ' - .$message->getRequestTarget()) - .' HTTP/'.$message->getProtocolVersion(); + $msg = \trim($message->getMethod() . ' ' . $message->getRequestTarget()) . ' HTTP/' . $message->getProtocolVersion(); if (!$message->hasHeader('host')) { - $msg .= "\r\nHost: ".$message->getUri()->getHost(); + $msg .= "\r\nHost: " . $message->getUri()->getHost(); } } elseif ($message instanceof ResponseInterface) { - $msg = 'HTTP/'.$message->getProtocolVersion().' ' - .$message->getStatusCode().' ' - .$message->getReasonPhrase(); + $msg = 'HTTP/' . $message->getProtocolVersion() . ' ' . $message->getStatusCode() . ' ' . $message->getReasonPhrase(); } else { throw new \InvalidArgumentException('Unknown message type'); } - foreach ($message->getHeaders() as $name => $values) { - if (strtolower($name) === 'set-cookie') { + if (\strtolower($name) === 'set-cookie') { foreach ($values as $value) { - $msg .= "\r\n{$name}: ".$value; + $msg .= "\r\n{$name}: " . $value; } } else { - $msg .= "\r\n{$name}: ".implode(', ', $values); + $msg .= "\r\n{$name}: " . \implode(', ', $values); } } - - return "{$msg}\r\n\r\n".$message->getBody(); + return "{$msg}\r\n\r\n" . $message->getBody(); } - /** * Get a short summary of the message body. * @@ -53,37 +44,29 @@ public static function toString(MessageInterface $message): string * @param MessageInterface $message The message to get the body summary * @param int $truncateAt The maximum allowed size of the summary */ - public static function bodySummary(MessageInterface $message, int $truncateAt = 120): ?string + public static function bodySummary(MessageInterface $message, int $truncateAt = 120) : ?string { $body = $message->getBody(); - if (!$body->isSeekable() || !$body->isReadable()) { return null; } - $size = $body->getSize(); - if ($size === 0) { return null; } - $body->rewind(); $summary = $body->read($truncateAt); $body->rewind(); - if ($size > $truncateAt) { $summary .= ' (truncated...)'; } - // Matches any printable character, including unicode characters: // letters, marks, numbers, punctuation, spacing, and separators. - if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/u', $summary) !== 0) { + if (\preg_match('/[^\\pL\\pM\\pN\\pP\\pS\\pZ\\n\\r\\t]/u', $summary) !== 0) { return null; } - return $summary; } - /** * Attempts to rewind a message body and throws an exception on failure. * @@ -94,15 +77,13 @@ public static function bodySummary(MessageInterface $message, int $truncateAt = * * @throws \RuntimeException */ - public static function rewindBody(MessageInterface $message): void + public static function rewindBody(MessageInterface $message) : void { $body = $message->getBody(); - if ($body->tell()) { $body->rewind(); } } - /** * Parses an HTTP message into an associative array. * @@ -112,135 +93,97 @@ public static function rewindBody(MessageInterface $message): void * * @param string $message HTTP request or response to parse. */ - public static function parseMessage(string $message): array + public static function parseMessage(string $message) : array { if (!$message) { throw new \InvalidArgumentException('Invalid message'); } - - $message = ltrim($message, "\r\n"); - - $messageParts = preg_split("/\r?\n\r?\n/", $message, 2); - - if ($messageParts === false || count($messageParts) !== 2) { + $message = \ltrim($message, "\r\n"); + $messageParts = \preg_split("/\r?\n\r?\n/", $message, 2); + if ($messageParts === \false || \count($messageParts) !== 2) { throw new \InvalidArgumentException('Invalid message: Missing header delimiter'); } - [$rawHeaders, $body] = $messageParts; - $rawHeaders .= "\r\n"; // Put back the delimiter we split previously - $headerParts = preg_split("/\r?\n/", $rawHeaders, 2); - - if ($headerParts === false || count($headerParts) !== 2) { + $rawHeaders .= "\r\n"; + // Put back the delimiter we split previously + $headerParts = \preg_split("/\r?\n/", $rawHeaders, 2); + if ($headerParts === \false || \count($headerParts) !== 2) { throw new \InvalidArgumentException('Invalid message: Missing status line'); } - [$startLine, $rawHeaders] = $headerParts; - - if (preg_match("/(?:^HTTP\/|^[A-Z]+ \S+ HTTP\/)(\d+(?:\.\d+)?)/i", $startLine, $matches) && $matches[1] === '1.0') { + if (\preg_match("/(?:^HTTP\\/|^[A-Z]+ \\S+ HTTP\\/)(\\d+(?:\\.\\d+)?)/i", $startLine, $matches) && $matches[1] === '1.0') { // Header folding is deprecated for HTTP/1.1, but allowed in HTTP/1.0 - $rawHeaders = preg_replace(Rfc7230::HEADER_FOLD_REGEX, ' ', $rawHeaders); + $rawHeaders = \preg_replace(Rfc7230::HEADER_FOLD_REGEX, ' ', $rawHeaders); } - /** @var array[] $headerLines */ - $count = preg_match_all(Rfc7230::HEADER_REGEX, $rawHeaders, $headerLines, PREG_SET_ORDER); - + $count = \preg_match_all(Rfc7230::HEADER_REGEX, $rawHeaders, $headerLines, \PREG_SET_ORDER); // If these aren't the same, then one line didn't match and there's an invalid header. - if ($count !== substr_count($rawHeaders, "\n")) { + if ($count !== \substr_count($rawHeaders, "\n")) { // Folding is deprecated, see https://tools.ietf.org/html/rfc7230#section-3.2.4 - if (preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) { + if (\preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) { throw new \InvalidArgumentException('Invalid header syntax: Obsolete line folding'); } - throw new \InvalidArgumentException('Invalid header syntax'); } - $headers = []; - foreach ($headerLines as $headerLine) { $headers[$headerLine[1]][] = $headerLine[2]; } - - return [ - 'start-line' => $startLine, - 'headers' => $headers, - 'body' => $body, - ]; + return ['start-line' => $startLine, 'headers' => $headers, 'body' => $body]; } - /** * Constructs a URI for an HTTP request message. * * @param string $path Path from the start-line * @param array $headers Array of headers (each value an array). */ - public static function parseRequestUri(string $path, array $headers): string + public static function parseRequestUri(string $path, array $headers) : string { - $hostKey = array_filter(array_keys($headers), function ($k) { + $hostKey = \array_filter(\array_keys($headers), function ($k) { // Numeric array keys are converted to int by PHP. $k = (string) $k; - - return strtolower($k) === 'host'; + return \strtolower($k) === 'host'; }); - // If no host is found, then a full URI cannot be constructed. if (!$hostKey) { return $path; } - - $host = $headers[reset($hostKey)][0]; - $scheme = substr($host, -4) === ':443' ? 'https' : 'http'; - - return $scheme.'://'.$host.'/'.ltrim($path, '/'); + $host = $headers[\reset($hostKey)][0]; + $scheme = \substr($host, -4) === ':443' ? 'https' : 'http'; + return $scheme . '://' . $host . '/' . \ltrim($path, '/'); } - /** * Parses a request message string into a request object. * * @param string $message Request message string. */ - public static function parseRequest(string $message): RequestInterface + public static function parseRequest(string $message) : RequestInterface { $data = self::parseMessage($message); $matches = []; - if (!preg_match('/^[\S]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) { + if (!\preg_match('/^[\\S]+\\s+([a-zA-Z]+:\\/\\/|\\/).*/', $data['start-line'], $matches)) { throw new \InvalidArgumentException('Invalid request string'); } - $parts = explode(' ', $data['start-line'], 3); - $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1'; - - $request = new Request( - $parts[0], - $matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1], - $data['headers'], - $data['body'], - $version - ); - + $parts = \explode(' ', $data['start-line'], 3); + $version = isset($parts[2]) ? \explode('/', $parts[2])[1] : '1.1'; + $request = new Request($parts[0], $matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1], $data['headers'], $data['body'], $version); return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]); } - /** * Parses a response message string into a response object. * * @param string $message Response message string. */ - public static function parseResponse(string $message): ResponseInterface + public static function parseResponse(string $message) : ResponseInterface { $data = self::parseMessage($message); // According to https://tools.ietf.org/html/rfc7230#section-3.1.2 the space // between status-code and reason-phrase is required. But browsers accept // responses without space and reason as well. - if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) { - throw new \InvalidArgumentException('Invalid response string: '.$data['start-line']); + if (!\preg_match('/^HTTP\\/.* [0-9]{3}( .*|$)/', $data['start-line'])) { + throw new \InvalidArgumentException('Invalid response string: ' . $data['start-line']); } - $parts = explode(' ', $data['start-line'], 3); - - return new Response( - (int) $parts[1], - $data['headers'], - $data['body'], - explode('/', $parts[0])[1], - $parts[2] ?? null - ); + $parts = \explode(' ', $data['start-line'], 3); + return new Response((int) $parts[1], $data['headers'], $data['body'], \explode('/', $parts[0])[1], $parts[2] ?? null); } } diff --git a/src/vendor/guzzlehttp/psr7/src/MessageTrait.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MessageTrait.php similarity index 64% rename from src/vendor/guzzlehttp/psr7/src/MessageTrait.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MessageTrait.php index a85d3ab..048a544 100644 --- a/src/vendor/guzzlehttp/psr7/src/MessageTrait.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MessageTrait.php @@ -1,12 +1,10 @@ Map of all registered headers, as original name => array of values */ private $headers = []; - /** @var array Map of lowercase header name => original name at registration */ private $headerNames = []; - /** @var string */ private $protocol = '1.1'; - /** @var StreamInterface|null */ private $stream; - - public function getProtocolVersion(): string + public function getProtocolVersion() : string { return $this->protocol; } - - public function withProtocolVersion($version): MessageInterface + public function withProtocolVersion($version) : MessageInterface { if ($this->protocol === $version) { return $this; } - $new = clone $this; $new->protocol = $version; - return $new; } - - public function getHeaders(): array + public function getHeaders() : array { return $this->headers; } - - public function hasHeader($header): bool + public function hasHeader($header) : bool { - return isset($this->headerNames[strtolower($header)]); + return isset($this->headerNames[\strtolower($header)]); } - - public function getHeader($header): array + public function getHeader($header) : array { - $header = strtolower($header); - + $header = \strtolower($header); if (!isset($this->headerNames[$header])) { return []; } - $header = $this->headerNames[$header]; - return $this->headers[$header]; } - - public function getHeaderLine($header): string + public function getHeaderLine($header) : string { - return implode(', ', $this->getHeader($header)); + return \implode(', ', $this->getHeader($header)); } - - public function withHeader($header, $value): MessageInterface + public function withHeader($header, $value) : MessageInterface { $this->assertHeader($header); $value = $this->normalizeHeaderValue($value); - $normalized = strtolower($header); - + $normalized = \strtolower($header); $new = clone $this; if (isset($new->headerNames[$normalized])) { unset($new->headers[$new->headerNames[$normalized]]); } $new->headerNames[$normalized] = $header; $new->headers[$header] = $value; - return $new; } - - public function withAddedHeader($header, $value): MessageInterface + public function withAddedHeader($header, $value) : MessageInterface { $this->assertHeader($header); $value = $this->normalizeHeaderValue($value); - $normalized = strtolower($header); - + $normalized = \strtolower($header); $new = clone $this; if (isset($new->headerNames[$normalized])) { $header = $this->headerNames[$normalized]; - $new->headers[$header] = array_merge($this->headers[$header], $value); + $new->headers[$header] = \array_merge($this->headers[$header], $value); } else { $new->headerNames[$normalized] = $header; $new->headers[$header] = $value; } - return $new; } - - public function withoutHeader($header): MessageInterface + public function withoutHeader($header) : MessageInterface { - $normalized = strtolower($header); - + $normalized = \strtolower($header); if (!isset($this->headerNames[$normalized])) { return $this; } - $header = $this->headerNames[$normalized]; - $new = clone $this; unset($new->headers[$header], $new->headerNames[$normalized]); - return $new; } - - public function getBody(): StreamInterface + public function getBody() : StreamInterface { if (!$this->stream) { $this->stream = Utils::streamFor(''); } - return $this->stream; } - - public function withBody(StreamInterface $body): MessageInterface + public function withBody(StreamInterface $body) : MessageInterface { if ($body === $this->stream) { return $this; } - $new = clone $this; $new->stream = $body; - return $new; } - /** * @param array $headers */ - private function setHeaders(array $headers): void + private function setHeaders(array $headers) : void { $this->headerNames = $this->headers = []; foreach ($headers as $header => $value) { // Numeric array keys are converted to int by PHP. $header = (string) $header; - $this->assertHeader($header); $value = $this->normalizeHeaderValue($value); - $normalized = strtolower($header); + $normalized = \strtolower($header); if (isset($this->headerNames[$normalized])) { $header = $this->headerNames[$normalized]; - $this->headers[$header] = array_merge($this->headers[$header], $value); + $this->headers[$header] = \array_merge($this->headers[$header], $value); } else { $this->headerNames[$normalized] = $header; $this->headers[$header] = $value; } } } - /** * @param mixed $value * * @return string[] */ - private function normalizeHeaderValue($value): array + private function normalizeHeaderValue($value) : array { - if (!is_array($value)) { + if (!\is_array($value)) { return $this->trimAndValidateHeaderValues([$value]); } - - if (count($value) === 0) { + if (\count($value) === 0) { throw new \InvalidArgumentException('Header value can not be an empty array.'); } - return $this->trimAndValidateHeaderValues($value); } - /** * Trims whitespace from the header values. * @@ -195,44 +157,31 @@ private function normalizeHeaderValue($value): array * * @see https://tools.ietf.org/html/rfc7230#section-3.2.4 */ - private function trimAndValidateHeaderValues(array $values): array + private function trimAndValidateHeaderValues(array $values) : array { - return array_map(function ($value) { - if (!is_scalar($value) && null !== $value) { - throw new \InvalidArgumentException(sprintf( - 'Header value must be scalar or null but %s provided.', - is_object($value) ? get_class($value) : gettype($value) - )); + return \array_map(function ($value) { + if (!\is_scalar($value) && null !== $value) { + throw new \InvalidArgumentException(\sprintf('Header value must be scalar or null but %s provided.', \is_object($value) ? \get_class($value) : \gettype($value))); } - - $trimmed = trim((string) $value, " \t"); + $trimmed = \trim((string) $value, " \t"); $this->assertValue($trimmed); - return $trimmed; - }, array_values($values)); + }, \array_values($values)); } - /** * @see https://tools.ietf.org/html/rfc7230#section-3.2 * * @param mixed $header */ - private function assertHeader($header): void + private function assertHeader($header) : void { - if (!is_string($header)) { - throw new \InvalidArgumentException(sprintf( - 'Header name must be a string but %s provided.', - is_object($header) ? get_class($header) : gettype($header) - )); + if (!\is_string($header)) { + throw new \InvalidArgumentException(\sprintf('Header name must be a string but %s provided.', \is_object($header) ? \get_class($header) : \gettype($header))); } - - if (!preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $header)) { - throw new \InvalidArgumentException( - sprintf('"%s" is not valid header name.', $header) - ); + if (!\preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $header)) { + throw new \InvalidArgumentException(\sprintf('"%s" is not valid header name.', $header)); } } - /** * @see https://tools.ietf.org/html/rfc7230#section-3.2 * @@ -243,7 +192,7 @@ private function assertHeader($header): void * obs-text = %x80-FF * obs-fold = CRLF 1*( SP / HTAB ) */ - private function assertValue(string $value): void + private function assertValue(string $value) : void { // The regular expression intentionally does not support the obs-fold production, because as // per RFC 7230#3.2.4: @@ -256,10 +205,8 @@ private function assertValue(string $value): void // Clients must not send a request with line folding and a server sending folded headers is // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting // folding is not likely to break any legitimate use case. - if (!preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/D', $value)) { - throw new \InvalidArgumentException( - sprintf('"%s" is not valid header value.', $value) - ); + if (!\preg_match('/^[\\x20\\x09\\x21-\\x7E\\x80-\\xFF]*$/D', $value)) { + throw new \InvalidArgumentException(\sprintf('"%s" is not valid header value.', $value)); } } } diff --git a/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MimeType.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MimeType.php new file mode 100644 index 0000000..66cd56d --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MimeType.php @@ -0,0 +1,27 @@ + 'application/vnd.1000minds.decision-model+xml', '3dml' => 'text/vnd.in3d.3dml', '3ds' => 'image/x-3ds', '3g2' => 'video/3gpp2', '3gp' => 'video/3gp', '3gpp' => 'video/3gpp', '3mf' => 'model/3mf', '7z' => 'application/x-7z-compressed', '7zip' => 'application/x-7z-compressed', '123' => 'application/vnd.lotus-1-2-3', 'aab' => 'application/x-authorware-bin', 'aac' => 'audio/aac', 'aam' => 'application/x-authorware-map', 'aas' => 'application/x-authorware-seg', 'abw' => 'application/x-abiword', 'ac' => 'application/vnd.nokia.n-gage.ac+xml', 'ac3' => 'audio/ac3', 'acc' => 'application/vnd.americandynamics.acc', 'ace' => 'application/x-ace-compressed', 'acu' => 'application/vnd.acucobol', 'acutc' => 'application/vnd.acucorp', 'adp' => 'audio/adpcm', 'adts' => 'audio/aac', 'aep' => 'application/vnd.audiograph', 'afm' => 'application/x-font-type1', 'afp' => 'application/vnd.ibm.modcap', 'age' => 'application/vnd.age', 'ahead' => 'application/vnd.ahead.space', 'ai' => 'application/pdf', 'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'air' => 'application/vnd.adobe.air-application-installer-package+zip', 'ait' => 'application/vnd.dvb.ait', 'ami' => 'application/vnd.amiga.ami', 'aml' => 'application/automationml-aml+xml', 'amlx' => 'application/automationml-amlx+zip', 'amr' => 'audio/amr', 'apk' => 'application/vnd.android.package-archive', 'apng' => 'image/apng', 'appcache' => 'text/cache-manifest', 'appinstaller' => 'application/appinstaller', 'application' => 'application/x-ms-application', 'appx' => 'application/appx', 'appxbundle' => 'application/appxbundle', 'apr' => 'application/vnd.lotus-approach', 'arc' => 'application/x-freearc', 'arj' => 'application/x-arj', 'asc' => 'application/pgp-signature', 'asf' => 'video/x-ms-asf', 'asm' => 'text/x-asm', 'aso' => 'application/vnd.accpac.simply.aso', 'asx' => 'video/x-ms-asf', 'atc' => 'application/vnd.acucorp', 'atom' => 'application/atom+xml', 'atomcat' => 'application/atomcat+xml', 'atomdeleted' => 'application/atomdeleted+xml', 'atomsvc' => 'application/atomsvc+xml', 'atx' => 'application/vnd.antix.game-component', 'au' => 'audio/x-au', 'avci' => 'image/avci', 'avcs' => 'image/avcs', 'avi' => 'video/x-msvideo', 'avif' => 'image/avif', 'aw' => 'application/applixware', 'azf' => 'application/vnd.airzip.filesecure.azf', 'azs' => 'application/vnd.airzip.filesecure.azs', 'azv' => 'image/vnd.airzip.accelerator.azv', 'azw' => 'application/vnd.amazon.ebook', 'b16' => 'image/vnd.pco.b16', 'bat' => 'application/x-msdownload', 'bcpio' => 'application/x-bcpio', 'bdf' => 'application/x-font-bdf', 'bdm' => 'application/vnd.syncml.dm+wbxml', 'bdoc' => 'application/x-bdoc', 'bed' => 'application/vnd.realvnc.bed', 'bh2' => 'application/vnd.fujitsu.oasysprs', 'bin' => 'application/octet-stream', 'blb' => 'application/x-blorb', 'blorb' => 'application/x-blorb', 'bmi' => 'application/vnd.bmi', 'bmml' => 'application/vnd.balsamiq.bmml+xml', 'bmp' => 'image/bmp', 'book' => 'application/vnd.framemaker', 'box' => 'application/vnd.previewsystems.box', 'boz' => 'application/x-bzip2', 'bpk' => 'application/octet-stream', 'bpmn' => 'application/octet-stream', 'bsp' => 'model/vnd.valve.source.compiled-map', 'btf' => 'image/prs.btif', 'btif' => 'image/prs.btif', 'buffer' => 'application/octet-stream', 'bz' => 'application/x-bzip', 'bz2' => 'application/x-bzip2', 'c' => 'text/x-c', 'c4d' => 'application/vnd.clonk.c4group', 'c4f' => 'application/vnd.clonk.c4group', 'c4g' => 'application/vnd.clonk.c4group', 'c4p' => 'application/vnd.clonk.c4group', 'c4u' => 'application/vnd.clonk.c4group', 'c11amc' => 'application/vnd.cluetrust.cartomobile-config', 'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg', 'cab' => 'application/vnd.ms-cab-compressed', 'caf' => 'audio/x-caf', 'cap' => 'application/vnd.tcpdump.pcap', 'car' => 'application/vnd.curl.car', 'cat' => 'application/vnd.ms-pki.seccat', 'cb7' => 'application/x-cbr', 'cba' => 'application/x-cbr', 'cbr' => 'application/x-cbr', 'cbt' => 'application/x-cbr', 'cbz' => 'application/x-cbr', 'cc' => 'text/x-c', 'cco' => 'application/x-cocoa', 'cct' => 'application/x-director', 'ccxml' => 'application/ccxml+xml', 'cdbcmsg' => 'application/vnd.contact.cmsg', 'cdf' => 'application/x-netcdf', 'cdfx' => 'application/cdfx+xml', 'cdkey' => 'application/vnd.mediastation.cdkey', 'cdmia' => 'application/cdmi-capability', 'cdmic' => 'application/cdmi-container', 'cdmid' => 'application/cdmi-domain', 'cdmio' => 'application/cdmi-object', 'cdmiq' => 'application/cdmi-queue', 'cdr' => 'application/cdr', 'cdx' => 'chemical/x-cdx', 'cdxml' => 'application/vnd.chemdraw+xml', 'cdy' => 'application/vnd.cinderella', 'cer' => 'application/pkix-cert', 'cfs' => 'application/x-cfs-compressed', 'cgm' => 'image/cgm', 'chat' => 'application/x-chat', 'chm' => 'application/vnd.ms-htmlhelp', 'chrt' => 'application/vnd.kde.kchart', 'cif' => 'chemical/x-cif', 'cii' => 'application/vnd.anser-web-certificate-issue-initiation', 'cil' => 'application/vnd.ms-artgalry', 'cjs' => 'application/node', 'cla' => 'application/vnd.claymore', 'class' => 'application/octet-stream', 'cld' => 'model/vnd.cld', 'clkk' => 'application/vnd.crick.clicker.keyboard', 'clkp' => 'application/vnd.crick.clicker.palette', 'clkt' => 'application/vnd.crick.clicker.template', 'clkw' => 'application/vnd.crick.clicker.wordbank', 'clkx' => 'application/vnd.crick.clicker', 'clp' => 'application/x-msclip', 'cmc' => 'application/vnd.cosmocaller', 'cmdf' => 'chemical/x-cmdf', 'cml' => 'chemical/x-cml', 'cmp' => 'application/vnd.yellowriver-custom-menu', 'cmx' => 'image/x-cmx', 'cod' => 'application/vnd.rim.cod', 'coffee' => 'text/coffeescript', 'com' => 'application/x-msdownload', 'conf' => 'text/plain', 'cpio' => 'application/x-cpio', 'cpl' => 'application/cpl+xml', 'cpp' => 'text/x-c', 'cpt' => 'application/mac-compactpro', 'crd' => 'application/x-mscardfile', 'crl' => 'application/pkix-crl', 'crt' => 'application/x-x509-ca-cert', 'crx' => 'application/x-chrome-extension', 'cryptonote' => 'application/vnd.rig.cryptonote', 'csh' => 'application/x-csh', 'csl' => 'application/vnd.citationstyles.style+xml', 'csml' => 'chemical/x-csml', 'csp' => 'application/vnd.commonspace', 'csr' => 'application/octet-stream', 'css' => 'text/css', 'cst' => 'application/x-director', 'csv' => 'text/csv', 'cu' => 'application/cu-seeme', 'curl' => 'text/vnd.curl', 'cwl' => 'application/cwl', 'cww' => 'application/prs.cww', 'cxt' => 'application/x-director', 'cxx' => 'text/x-c', 'dae' => 'model/vnd.collada+xml', 'daf' => 'application/vnd.mobius.daf', 'dart' => 'application/vnd.dart', 'dataless' => 'application/vnd.fdsn.seed', 'davmount' => 'application/davmount+xml', 'dbf' => 'application/vnd.dbf', 'dbk' => 'application/docbook+xml', 'dcr' => 'application/x-director', 'dcurl' => 'text/vnd.curl.dcurl', 'dd2' => 'application/vnd.oma.dd2+xml', 'ddd' => 'application/vnd.fujixerox.ddd', 'ddf' => 'application/vnd.syncml.dmddf+xml', 'dds' => 'image/vnd.ms-dds', 'deb' => 'application/x-debian-package', 'def' => 'text/plain', 'deploy' => 'application/octet-stream', 'der' => 'application/x-x509-ca-cert', 'dfac' => 'application/vnd.dreamfactory', 'dgc' => 'application/x-dgc-compressed', 'dib' => 'image/bmp', 'dic' => 'text/x-c', 'dir' => 'application/x-director', 'dis' => 'application/vnd.mobius.dis', 'disposition-notification' => 'message/disposition-notification', 'dist' => 'application/octet-stream', 'distz' => 'application/octet-stream', 'djv' => 'image/vnd.djvu', 'djvu' => 'image/vnd.djvu', 'dll' => 'application/octet-stream', 'dmg' => 'application/x-apple-diskimage', 'dmn' => 'application/octet-stream', 'dmp' => 'application/vnd.tcpdump.pcap', 'dms' => 'application/octet-stream', 'dna' => 'application/vnd.dna', 'doc' => 'application/msword', 'docm' => 'application/vnd.ms-word.template.macroEnabled.12', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'dot' => 'application/msword', 'dotm' => 'application/vnd.ms-word.template.macroEnabled.12', 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'dp' => 'application/vnd.osgi.dp', 'dpg' => 'application/vnd.dpgraph', 'dpx' => 'image/dpx', 'dra' => 'audio/vnd.dra', 'drle' => 'image/dicom-rle', 'dsc' => 'text/prs.lines.tag', 'dssc' => 'application/dssc+der', 'dtb' => 'application/x-dtbook+xml', 'dtd' => 'application/xml-dtd', 'dts' => 'audio/vnd.dts', 'dtshd' => 'audio/vnd.dts.hd', 'dump' => 'application/octet-stream', 'dvb' => 'video/vnd.dvb.file', 'dvi' => 'application/x-dvi', 'dwd' => 'application/atsc-dwd+xml', 'dwf' => 'model/vnd.dwf', 'dwg' => 'image/vnd.dwg', 'dxf' => 'image/vnd.dxf', 'dxp' => 'application/vnd.spotfire.dxp', 'dxr' => 'application/x-director', 'ear' => 'application/java-archive', 'ecelp4800' => 'audio/vnd.nuera.ecelp4800', 'ecelp7470' => 'audio/vnd.nuera.ecelp7470', 'ecelp9600' => 'audio/vnd.nuera.ecelp9600', 'ecma' => 'application/ecmascript', 'edm' => 'application/vnd.novadigm.edm', 'edx' => 'application/vnd.novadigm.edx', 'efif' => 'application/vnd.picsel', 'ei6' => 'application/vnd.pg.osasli', 'elc' => 'application/octet-stream', 'emf' => 'image/emf', 'eml' => 'message/rfc822', 'emma' => 'application/emma+xml', 'emotionml' => 'application/emotionml+xml', 'emz' => 'application/x-msmetafile', 'eol' => 'audio/vnd.digital-winds', 'eot' => 'application/vnd.ms-fontobject', 'eps' => 'application/postscript', 'epub' => 'application/epub+zip', 'es3' => 'application/vnd.eszigno3+xml', 'esa' => 'application/vnd.osgi.subsystem', 'esf' => 'application/vnd.epson.esf', 'et3' => 'application/vnd.eszigno3+xml', 'etx' => 'text/x-setext', 'eva' => 'application/x-eva', 'evy' => 'application/x-envoy', 'exe' => 'application/octet-stream', 'exi' => 'application/exi', 'exp' => 'application/express', 'exr' => 'image/aces', 'ext' => 'application/vnd.novadigm.ext', 'ez' => 'application/andrew-inset', 'ez2' => 'application/vnd.ezpix-album', 'ez3' => 'application/vnd.ezpix-package', 'f' => 'text/x-fortran', 'f4v' => 'video/mp4', 'f77' => 'text/x-fortran', 'f90' => 'text/x-fortran', 'fbs' => 'image/vnd.fastbidsheet', 'fcdt' => 'application/vnd.adobe.formscentral.fcdt', 'fcs' => 'application/vnd.isac.fcs', 'fdf' => 'application/vnd.fdf', 'fdt' => 'application/fdt+xml', 'fe_launch' => 'application/vnd.denovo.fcselayout-link', 'fg5' => 'application/vnd.fujitsu.oasysgp', 'fgd' => 'application/x-director', 'fh' => 'image/x-freehand', 'fh4' => 'image/x-freehand', 'fh5' => 'image/x-freehand', 'fh7' => 'image/x-freehand', 'fhc' => 'image/x-freehand', 'fig' => 'application/x-xfig', 'fits' => 'image/fits', 'flac' => 'audio/x-flac', 'fli' => 'video/x-fli', 'flo' => 'application/vnd.micrografx.flo', 'flv' => 'video/x-flv', 'flw' => 'application/vnd.kde.kivio', 'flx' => 'text/vnd.fmi.flexstor', 'fly' => 'text/vnd.fly', 'fm' => 'application/vnd.framemaker', 'fnc' => 'application/vnd.frogans.fnc', 'fo' => 'application/vnd.software602.filler.form+xml', 'for' => 'text/x-fortran', 'fpx' => 'image/vnd.fpx', 'frame' => 'application/vnd.framemaker', 'fsc' => 'application/vnd.fsc.weblaunch', 'fst' => 'image/vnd.fst', 'ftc' => 'application/vnd.fluxtime.clip', 'fti' => 'application/vnd.anser-web-funds-transfer-initiation', 'fvt' => 'video/vnd.fvt', 'fxp' => 'application/vnd.adobe.fxp', 'fxpl' => 'application/vnd.adobe.fxp', 'fzs' => 'application/vnd.fuzzysheet', 'g2w' => 'application/vnd.geoplan', 'g3' => 'image/g3fax', 'g3w' => 'application/vnd.geospace', 'gac' => 'application/vnd.groove-account', 'gam' => 'application/x-tads', 'gbr' => 'application/rpki-ghostbusters', 'gca' => 'application/x-gca-compressed', 'gdl' => 'model/vnd.gdl', 'gdoc' => 'application/vnd.google-apps.document', 'ged' => 'text/vnd.familysearch.gedcom', 'geo' => 'application/vnd.dynageo', 'geojson' => 'application/geo+json', 'gex' => 'application/vnd.geometry-explorer', 'ggb' => 'application/vnd.geogebra.file', 'ggt' => 'application/vnd.geogebra.tool', 'ghf' => 'application/vnd.groove-help', 'gif' => 'image/gif', 'gim' => 'application/vnd.groove-identity-message', 'glb' => 'model/gltf-binary', 'gltf' => 'model/gltf+json', 'gml' => 'application/gml+xml', 'gmx' => 'application/vnd.gmx', 'gnumeric' => 'application/x-gnumeric', 'gpg' => 'application/gpg-keys', 'gph' => 'application/vnd.flographit', 'gpx' => 'application/gpx+xml', 'gqf' => 'application/vnd.grafeq', 'gqs' => 'application/vnd.grafeq', 'gram' => 'application/srgs', 'gramps' => 'application/x-gramps-xml', 'gre' => 'application/vnd.geometry-explorer', 'grv' => 'application/vnd.groove-injector', 'grxml' => 'application/srgs+xml', 'gsf' => 'application/x-font-ghostscript', 'gsheet' => 'application/vnd.google-apps.spreadsheet', 'gslides' => 'application/vnd.google-apps.presentation', 'gtar' => 'application/x-gtar', 'gtm' => 'application/vnd.groove-tool-message', 'gtw' => 'model/vnd.gtw', 'gv' => 'text/vnd.graphviz', 'gxf' => 'application/gxf', 'gxt' => 'application/vnd.geonext', 'gz' => 'application/gzip', 'gzip' => 'application/gzip', 'h' => 'text/x-c', 'h261' => 'video/h261', 'h263' => 'video/h263', 'h264' => 'video/h264', 'hal' => 'application/vnd.hal+xml', 'hbci' => 'application/vnd.hbci', 'hbs' => 'text/x-handlebars-template', 'hdd' => 'application/x-virtualbox-hdd', 'hdf' => 'application/x-hdf', 'heic' => 'image/heic', 'heics' => 'image/heic-sequence', 'heif' => 'image/heif', 'heifs' => 'image/heif-sequence', 'hej2' => 'image/hej2k', 'held' => 'application/atsc-held+xml', 'hh' => 'text/x-c', 'hjson' => 'application/hjson', 'hlp' => 'application/winhlp', 'hpgl' => 'application/vnd.hp-hpgl', 'hpid' => 'application/vnd.hp-hpid', 'hps' => 'application/vnd.hp-hps', 'hqx' => 'application/mac-binhex40', 'hsj2' => 'image/hsj2', 'htc' => 'text/x-component', 'htke' => 'application/vnd.kenameaapp', 'htm' => 'text/html', 'html' => 'text/html', 'hvd' => 'application/vnd.yamaha.hv-dic', 'hvp' => 'application/vnd.yamaha.hv-voice', 'hvs' => 'application/vnd.yamaha.hv-script', 'i2g' => 'application/vnd.intergeo', 'icc' => 'application/vnd.iccprofile', 'ice' => 'x-conference/x-cooltalk', 'icm' => 'application/vnd.iccprofile', 'ico' => 'image/x-icon', 'ics' => 'text/calendar', 'ief' => 'image/ief', 'ifb' => 'text/calendar', 'ifm' => 'application/vnd.shana.informed.formdata', 'iges' => 'model/iges', 'igl' => 'application/vnd.igloader', 'igm' => 'application/vnd.insors.igm', 'igs' => 'model/iges', 'igx' => 'application/vnd.micrografx.igx', 'iif' => 'application/vnd.shana.informed.interchange', 'img' => 'application/octet-stream', 'imp' => 'application/vnd.accpac.simply.imp', 'ims' => 'application/vnd.ms-ims', 'in' => 'text/plain', 'ini' => 'text/plain', 'ink' => 'application/inkml+xml', 'inkml' => 'application/inkml+xml', 'install' => 'application/x-install-instructions', 'iota' => 'application/vnd.astraea-software.iota', 'ipfix' => 'application/ipfix', 'ipk' => 'application/vnd.shana.informed.package', 'irm' => 'application/vnd.ibm.rights-management', 'irp' => 'application/vnd.irepository.package+xml', 'iso' => 'application/x-iso9660-image', 'itp' => 'application/vnd.shana.informed.formtemplate', 'its' => 'application/its+xml', 'ivp' => 'application/vnd.immervision-ivp', 'ivu' => 'application/vnd.immervision-ivu', 'jad' => 'text/vnd.sun.j2me.app-descriptor', 'jade' => 'text/jade', 'jam' => 'application/vnd.jam', 'jar' => 'application/java-archive', 'jardiff' => 'application/x-java-archive-diff', 'java' => 'text/x-java-source', 'jhc' => 'image/jphc', 'jisp' => 'application/vnd.jisp', 'jls' => 'image/jls', 'jlt' => 'application/vnd.hp-jlyt', 'jng' => 'image/x-jng', 'jnlp' => 'application/x-java-jnlp-file', 'joda' => 'application/vnd.joost.joda-archive', 'jp2' => 'image/jp2', 'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'jpf' => 'image/jpx', 'jpg' => 'image/jpeg', 'jpg2' => 'image/jp2', 'jpgm' => 'video/jpm', 'jpgv' => 'video/jpeg', 'jph' => 'image/jph', 'jpm' => 'video/jpm', 'jpx' => 'image/jpx', 'js' => 'application/javascript', 'json' => 'application/json', 'json5' => 'application/json5', 'jsonld' => 'application/ld+json', 'jsonml' => 'application/jsonml+json', 'jsx' => 'text/jsx', 'jt' => 'model/jt', 'jxr' => 'image/jxr', 'jxra' => 'image/jxra', 'jxrs' => 'image/jxrs', 'jxs' => 'image/jxs', 'jxsc' => 'image/jxsc', 'jxsi' => 'image/jxsi', 'jxss' => 'image/jxss', 'kar' => 'audio/midi', 'karbon' => 'application/vnd.kde.karbon', 'kdb' => 'application/octet-stream', 'kdbx' => 'application/x-keepass2', 'key' => 'application/x-iwork-keynote-sffkey', 'kfo' => 'application/vnd.kde.kformula', 'kia' => 'application/vnd.kidspiration', 'kml' => 'application/vnd.google-earth.kml+xml', 'kmz' => 'application/vnd.google-earth.kmz', 'kne' => 'application/vnd.kinar', 'knp' => 'application/vnd.kinar', 'kon' => 'application/vnd.kde.kontour', 'kpr' => 'application/vnd.kde.kpresenter', 'kpt' => 'application/vnd.kde.kpresenter', 'kpxx' => 'application/vnd.ds-keypoint', 'ksp' => 'application/vnd.kde.kspread', 'ktr' => 'application/vnd.kahootz', 'ktx' => 'image/ktx', 'ktx2' => 'image/ktx2', 'ktz' => 'application/vnd.kahootz', 'kwd' => 'application/vnd.kde.kword', 'kwt' => 'application/vnd.kde.kword', 'lasxml' => 'application/vnd.las.las+xml', 'latex' => 'application/x-latex', 'lbd' => 'application/vnd.llamagraphics.life-balance.desktop', 'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml', 'les' => 'application/vnd.hhe.lesson-player', 'less' => 'text/less', 'lgr' => 'application/lgr+xml', 'lha' => 'application/octet-stream', 'link66' => 'application/vnd.route66.link66+xml', 'list' => 'text/plain', 'list3820' => 'application/vnd.ibm.modcap', 'listafp' => 'application/vnd.ibm.modcap', 'litcoffee' => 'text/coffeescript', 'lnk' => 'application/x-ms-shortcut', 'log' => 'text/plain', 'lostxml' => 'application/lost+xml', 'lrf' => 'application/octet-stream', 'lrm' => 'application/vnd.ms-lrm', 'ltf' => 'application/vnd.frogans.ltf', 'lua' => 'text/x-lua', 'luac' => 'application/x-lua-bytecode', 'lvp' => 'audio/vnd.lucent.voice', 'lwp' => 'application/vnd.lotus-wordpro', 'lzh' => 'application/octet-stream', 'm1v' => 'video/mpeg', 'm2a' => 'audio/mpeg', 'm2v' => 'video/mpeg', 'm3a' => 'audio/mpeg', 'm3u' => 'text/plain', 'm3u8' => 'application/vnd.apple.mpegurl', 'm4a' => 'audio/x-m4a', 'm4p' => 'application/mp4', 'm4s' => 'video/iso.segment', 'm4u' => 'application/vnd.mpegurl', 'm4v' => 'video/x-m4v', 'm13' => 'application/x-msmediaview', 'm14' => 'application/x-msmediaview', 'm21' => 'application/mp21', 'ma' => 'application/mathematica', 'mads' => 'application/mads+xml', 'maei' => 'application/mmt-aei+xml', 'mag' => 'application/vnd.ecowin.chart', 'maker' => 'application/vnd.framemaker', 'man' => 'text/troff', 'manifest' => 'text/cache-manifest', 'map' => 'application/json', 'mar' => 'application/octet-stream', 'markdown' => 'text/markdown', 'mathml' => 'application/mathml+xml', 'mb' => 'application/mathematica', 'mbk' => 'application/vnd.mobius.mbk', 'mbox' => 'application/mbox', 'mc1' => 'application/vnd.medcalcdata', 'mcd' => 'application/vnd.mcd', 'mcurl' => 'text/vnd.curl.mcurl', 'md' => 'text/markdown', 'mdb' => 'application/x-msaccess', 'mdi' => 'image/vnd.ms-modi', 'mdx' => 'text/mdx', 'me' => 'text/troff', 'mesh' => 'model/mesh', 'meta4' => 'application/metalink4+xml', 'metalink' => 'application/metalink+xml', 'mets' => 'application/mets+xml', 'mfm' => 'application/vnd.mfmp', 'mft' => 'application/rpki-manifest', 'mgp' => 'application/vnd.osgeo.mapguide.package', 'mgz' => 'application/vnd.proteus.magazine', 'mid' => 'audio/midi', 'midi' => 'audio/midi', 'mie' => 'application/x-mie', 'mif' => 'application/vnd.mif', 'mime' => 'message/rfc822', 'mj2' => 'video/mj2', 'mjp2' => 'video/mj2', 'mjs' => 'text/javascript', 'mk3d' => 'video/x-matroska', 'mka' => 'audio/x-matroska', 'mkd' => 'text/x-markdown', 'mks' => 'video/x-matroska', 'mkv' => 'video/x-matroska', 'mlp' => 'application/vnd.dolby.mlp', 'mmd' => 'application/vnd.chipnuts.karaoke-mmd', 'mmf' => 'application/vnd.smaf', 'mml' => 'text/mathml', 'mmr' => 'image/vnd.fujixerox.edmics-mmr', 'mng' => 'video/x-mng', 'mny' => 'application/x-msmoney', 'mobi' => 'application/x-mobipocket-ebook', 'mods' => 'application/mods+xml', 'mov' => 'video/quicktime', 'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg', 'mp2a' => 'audio/mpeg', 'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4', 'mp4a' => 'audio/mp4', 'mp4s' => 'application/mp4', 'mp4v' => 'video/mp4', 'mp21' => 'application/mp21', 'mpc' => 'application/vnd.mophun.certificate', 'mpd' => 'application/dash+xml', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 'mpf' => 'application/media-policy-dataset+xml', 'mpg' => 'video/mpeg', 'mpg4' => 'video/mp4', 'mpga' => 'audio/mpeg', 'mpkg' => 'application/vnd.apple.installer+xml', 'mpm' => 'application/vnd.blueice.multipass', 'mpn' => 'application/vnd.mophun.application', 'mpp' => 'application/vnd.ms-project', 'mpt' => 'application/vnd.ms-project', 'mpy' => 'application/vnd.ibm.minipay', 'mqy' => 'application/vnd.mobius.mqy', 'mrc' => 'application/marc', 'mrcx' => 'application/marcxml+xml', 'ms' => 'text/troff', 'mscml' => 'application/mediaservercontrol+xml', 'mseed' => 'application/vnd.fdsn.mseed', 'mseq' => 'application/vnd.mseq', 'msf' => 'application/vnd.epson.msf', 'msg' => 'application/vnd.ms-outlook', 'msh' => 'model/mesh', 'msi' => 'application/x-msdownload', 'msix' => 'application/msix', 'msixbundle' => 'application/msixbundle', 'msl' => 'application/vnd.mobius.msl', 'msm' => 'application/octet-stream', 'msp' => 'application/octet-stream', 'msty' => 'application/vnd.muvee.style', 'mtl' => 'model/mtl', 'mts' => 'model/vnd.mts', 'mus' => 'application/vnd.musician', 'musd' => 'application/mmt-usd+xml', 'musicxml' => 'application/vnd.recordare.musicxml+xml', 'mvb' => 'application/x-msmediaview', 'mvt' => 'application/vnd.mapbox-vector-tile', 'mwf' => 'application/vnd.mfer', 'mxf' => 'application/mxf', 'mxl' => 'application/vnd.recordare.musicxml', 'mxmf' => 'audio/mobile-xmf', 'mxml' => 'application/xv+xml', 'mxs' => 'application/vnd.triscape.mxs', 'mxu' => 'video/vnd.mpegurl', 'n-gage' => 'application/vnd.nokia.n-gage.symbian.install', 'n3' => 'text/n3', 'nb' => 'application/mathematica', 'nbp' => 'application/vnd.wolfram.player', 'nc' => 'application/x-netcdf', 'ncx' => 'application/x-dtbncx+xml', 'nfo' => 'text/x-nfo', 'ngdat' => 'application/vnd.nokia.n-gage.data', 'nitf' => 'application/vnd.nitf', 'nlu' => 'application/vnd.neurolanguage.nlu', 'nml' => 'application/vnd.enliven', 'nnd' => 'application/vnd.noblenet-directory', 'nns' => 'application/vnd.noblenet-sealer', 'nnw' => 'application/vnd.noblenet-web', 'npx' => 'image/vnd.net-fpx', 'nq' => 'application/n-quads', 'nsc' => 'application/x-conference', 'nsf' => 'application/vnd.lotus-notes', 'nt' => 'application/n-triples', 'ntf' => 'application/vnd.nitf', 'numbers' => 'application/x-iwork-numbers-sffnumbers', 'nzb' => 'application/x-nzb', 'oa2' => 'application/vnd.fujitsu.oasys2', 'oa3' => 'application/vnd.fujitsu.oasys3', 'oas' => 'application/vnd.fujitsu.oasys', 'obd' => 'application/x-msbinder', 'obgx' => 'application/vnd.openblox.game+xml', 'obj' => 'model/obj', 'oda' => 'application/oda', 'odb' => 'application/vnd.oasis.opendocument.database', 'odc' => 'application/vnd.oasis.opendocument.chart', 'odf' => 'application/vnd.oasis.opendocument.formula', 'odft' => 'application/vnd.oasis.opendocument.formula-template', 'odg' => 'application/vnd.oasis.opendocument.graphics', 'odi' => 'application/vnd.oasis.opendocument.image', 'odm' => 'application/vnd.oasis.opendocument.text-master', 'odp' => 'application/vnd.oasis.opendocument.presentation', 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', 'odt' => 'application/vnd.oasis.opendocument.text', 'oga' => 'audio/ogg', 'ogex' => 'model/vnd.opengex', 'ogg' => 'audio/ogg', 'ogv' => 'video/ogg', 'ogx' => 'application/ogg', 'omdoc' => 'application/omdoc+xml', 'onepkg' => 'application/onenote', 'onetmp' => 'application/onenote', 'onetoc' => 'application/onenote', 'onetoc2' => 'application/onenote', 'opf' => 'application/oebps-package+xml', 'opml' => 'text/x-opml', 'oprc' => 'application/vnd.palm', 'opus' => 'audio/ogg', 'org' => 'text/x-org', 'osf' => 'application/vnd.yamaha.openscoreformat', 'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml', 'osm' => 'application/vnd.openstreetmap.data+xml', 'otc' => 'application/vnd.oasis.opendocument.chart-template', 'otf' => 'font/otf', 'otg' => 'application/vnd.oasis.opendocument.graphics-template', 'oth' => 'application/vnd.oasis.opendocument.text-web', 'oti' => 'application/vnd.oasis.opendocument.image-template', 'otp' => 'application/vnd.oasis.opendocument.presentation-template', 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', 'ott' => 'application/vnd.oasis.opendocument.text-template', 'ova' => 'application/x-virtualbox-ova', 'ovf' => 'application/x-virtualbox-ovf', 'owl' => 'application/rdf+xml', 'oxps' => 'application/oxps', 'oxt' => 'application/vnd.openofficeorg.extension', 'p' => 'text/x-pascal', 'p7a' => 'application/x-pkcs7-signature', 'p7b' => 'application/x-pkcs7-certificates', 'p7c' => 'application/pkcs7-mime', 'p7m' => 'application/pkcs7-mime', 'p7r' => 'application/x-pkcs7-certreqresp', 'p7s' => 'application/pkcs7-signature', 'p8' => 'application/pkcs8', 'p10' => 'application/x-pkcs10', 'p12' => 'application/x-pkcs12', 'pac' => 'application/x-ns-proxy-autoconfig', 'pages' => 'application/x-iwork-pages-sffpages', 'pas' => 'text/x-pascal', 'paw' => 'application/vnd.pawaafile', 'pbd' => 'application/vnd.powerbuilder6', 'pbm' => 'image/x-portable-bitmap', 'pcap' => 'application/vnd.tcpdump.pcap', 'pcf' => 'application/x-font-pcf', 'pcl' => 'application/vnd.hp-pcl', 'pclxl' => 'application/vnd.hp-pclxl', 'pct' => 'image/x-pict', 'pcurl' => 'application/vnd.curl.pcurl', 'pcx' => 'image/x-pcx', 'pdb' => 'application/x-pilot', 'pde' => 'text/x-processing', 'pdf' => 'application/pdf', 'pem' => 'application/x-x509-user-cert', 'pfa' => 'application/x-font-type1', 'pfb' => 'application/x-font-type1', 'pfm' => 'application/x-font-type1', 'pfr' => 'application/font-tdpfr', 'pfx' => 'application/x-pkcs12', 'pgm' => 'image/x-portable-graymap', 'pgn' => 'application/x-chess-pgn', 'pgp' => 'application/pgp', 'phar' => 'application/octet-stream', 'php' => 'application/x-httpd-php', 'php3' => 'application/x-httpd-php', 'php4' => 'application/x-httpd-php', 'phps' => 'application/x-httpd-php-source', 'phtml' => 'application/x-httpd-php', 'pic' => 'image/x-pict', 'pkg' => 'application/octet-stream', 'pki' => 'application/pkixcmp', 'pkipath' => 'application/pkix-pkipath', 'pkpass' => 'application/vnd.apple.pkpass', 'pl' => 'application/x-perl', 'plb' => 'application/vnd.3gpp.pic-bw-large', 'plc' => 'application/vnd.mobius.plc', 'plf' => 'application/vnd.pocketlearn', 'pls' => 'application/pls+xml', 'pm' => 'application/x-perl', 'pml' => 'application/vnd.ctc-posml', 'png' => 'image/png', 'pnm' => 'image/x-portable-anymap', 'portpkg' => 'application/vnd.macports.portpkg', 'pot' => 'application/vnd.ms-powerpoint', 'potm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ppa' => 'application/vnd.ms-powerpoint', 'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12', 'ppd' => 'application/vnd.cups-ppd', 'ppm' => 'image/x-portable-pixmap', 'pps' => 'application/vnd.ms-powerpoint', 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', 'ppt' => 'application/powerpoint', 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'pqa' => 'application/vnd.palm', 'prc' => 'model/prc', 'pre' => 'application/vnd.lotus-freelance', 'prf' => 'application/pics-rules', 'provx' => 'application/provenance+xml', 'ps' => 'application/postscript', 'psb' => 'application/vnd.3gpp.pic-bw-small', 'psd' => 'application/x-photoshop', 'psf' => 'application/x-font-linux-psf', 'pskcxml' => 'application/pskc+xml', 'pti' => 'image/prs.pti', 'ptid' => 'application/vnd.pvi.ptid1', 'pub' => 'application/x-mspublisher', 'pvb' => 'application/vnd.3gpp.pic-bw-var', 'pwn' => 'application/vnd.3m.post-it-notes', 'pya' => 'audio/vnd.ms-playready.media.pya', 'pyo' => 'model/vnd.pytha.pyox', 'pyox' => 'model/vnd.pytha.pyox', 'pyv' => 'video/vnd.ms-playready.media.pyv', 'qam' => 'application/vnd.epson.quickanime', 'qbo' => 'application/vnd.intu.qbo', 'qfx' => 'application/vnd.intu.qfx', 'qps' => 'application/vnd.publishare-delta-tree', 'qt' => 'video/quicktime', 'qwd' => 'application/vnd.quark.quarkxpress', 'qwt' => 'application/vnd.quark.quarkxpress', 'qxb' => 'application/vnd.quark.quarkxpress', 'qxd' => 'application/vnd.quark.quarkxpress', 'qxl' => 'application/vnd.quark.quarkxpress', 'qxt' => 'application/vnd.quark.quarkxpress', 'ra' => 'audio/x-realaudio', 'ram' => 'audio/x-pn-realaudio', 'raml' => 'application/raml+yaml', 'rapd' => 'application/route-apd+xml', 'rar' => 'application/x-rar', 'ras' => 'image/x-cmu-raster', 'rcprofile' => 'application/vnd.ipunplugged.rcprofile', 'rdf' => 'application/rdf+xml', 'rdz' => 'application/vnd.data-vision.rdz', 'relo' => 'application/p2p-overlay+xml', 'rep' => 'application/vnd.businessobjects', 'res' => 'application/x-dtbresource+xml', 'rgb' => 'image/x-rgb', 'rif' => 'application/reginfo+xml', 'rip' => 'audio/vnd.rip', 'ris' => 'application/x-research-info-systems', 'rl' => 'application/resource-lists+xml', 'rlc' => 'image/vnd.fujixerox.edmics-rlc', 'rld' => 'application/resource-lists-diff+xml', 'rm' => 'audio/x-pn-realaudio', 'rmi' => 'audio/midi', 'rmp' => 'audio/x-pn-realaudio-plugin', 'rms' => 'application/vnd.jcp.javame.midlet-rms', 'rmvb' => 'application/vnd.rn-realmedia-vbr', 'rnc' => 'application/relax-ng-compact-syntax', 'rng' => 'application/xml', 'roa' => 'application/rpki-roa', 'roff' => 'text/troff', 'rp9' => 'application/vnd.cloanto.rp9', 'rpm' => 'audio/x-pn-realaudio-plugin', 'rpss' => 'application/vnd.nokia.radio-presets', 'rpst' => 'application/vnd.nokia.radio-preset', 'rq' => 'application/sparql-query', 'rs' => 'application/rls-services+xml', 'rsa' => 'application/x-pkcs7', 'rsat' => 'application/atsc-rsat+xml', 'rsd' => 'application/rsd+xml', 'rsheet' => 'application/urc-ressheet+xml', 'rss' => 'application/rss+xml', 'rtf' => 'text/rtf', 'rtx' => 'text/richtext', 'run' => 'application/x-makeself', 'rusd' => 'application/route-usd+xml', 'rv' => 'video/vnd.rn-realvideo', 's' => 'text/x-asm', 's3m' => 'audio/s3m', 'saf' => 'application/vnd.yamaha.smaf-audio', 'sass' => 'text/x-sass', 'sbml' => 'application/sbml+xml', 'sc' => 'application/vnd.ibm.secure-container', 'scd' => 'application/x-msschedule', 'scm' => 'application/vnd.lotus-screencam', 'scq' => 'application/scvp-cv-request', 'scs' => 'application/scvp-cv-response', 'scss' => 'text/x-scss', 'scurl' => 'text/vnd.curl.scurl', 'sda' => 'application/vnd.stardivision.draw', 'sdc' => 'application/vnd.stardivision.calc', 'sdd' => 'application/vnd.stardivision.impress', 'sdkd' => 'application/vnd.solent.sdkm+xml', 'sdkm' => 'application/vnd.solent.sdkm+xml', 'sdp' => 'application/sdp', 'sdw' => 'application/vnd.stardivision.writer', 'sea' => 'application/octet-stream', 'see' => 'application/vnd.seemail', 'seed' => 'application/vnd.fdsn.seed', 'sema' => 'application/vnd.sema', 'semd' => 'application/vnd.semd', 'semf' => 'application/vnd.semf', 'senmlx' => 'application/senml+xml', 'sensmlx' => 'application/sensml+xml', 'ser' => 'application/java-serialized-object', 'setpay' => 'application/set-payment-initiation', 'setreg' => 'application/set-registration-initiation', 'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data', 'sfs' => 'application/vnd.spotfire.sfs', 'sfv' => 'text/x-sfv', 'sgi' => 'image/sgi', 'sgl' => 'application/vnd.stardivision.writer-global', 'sgm' => 'text/sgml', 'sgml' => 'text/sgml', 'sh' => 'application/x-sh', 'shar' => 'application/x-shar', 'shex' => 'text/shex', 'shf' => 'application/shf+xml', 'shtml' => 'text/html', 'sid' => 'image/x-mrsid-image', 'sieve' => 'application/sieve', 'sig' => 'application/pgp-signature', 'sil' => 'audio/silk', 'silo' => 'model/mesh', 'sis' => 'application/vnd.symbian.install', 'sisx' => 'application/vnd.symbian.install', 'sit' => 'application/x-stuffit', 'sitx' => 'application/x-stuffitx', 'siv' => 'application/sieve', 'skd' => 'application/vnd.koan', 'skm' => 'application/vnd.koan', 'skp' => 'application/vnd.koan', 'skt' => 'application/vnd.koan', 'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12', 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide', 'slim' => 'text/slim', 'slm' => 'text/slim', 'sls' => 'application/route-s-tsid+xml', 'slt' => 'application/vnd.epson.salt', 'sm' => 'application/vnd.stepmania.stepchart', 'smf' => 'application/vnd.stardivision.math', 'smi' => 'application/smil', 'smil' => 'application/smil', 'smv' => 'video/x-smv', 'smzip' => 'application/vnd.stepmania.package', 'snd' => 'audio/basic', 'snf' => 'application/x-font-snf', 'so' => 'application/octet-stream', 'spc' => 'application/x-pkcs7-certificates', 'spdx' => 'text/spdx', 'spf' => 'application/vnd.yamaha.smaf-phrase', 'spl' => 'application/x-futuresplash', 'spot' => 'text/vnd.in3d.spot', 'spp' => 'application/scvp-vp-response', 'spq' => 'application/scvp-vp-request', 'spx' => 'audio/ogg', 'sql' => 'application/x-sql', 'src' => 'application/x-wais-source', 'srt' => 'application/x-subrip', 'sru' => 'application/sru+xml', 'srx' => 'application/sparql-results+xml', 'ssdl' => 'application/ssdl+xml', 'sse' => 'application/vnd.kodak-descriptor', 'ssf' => 'application/vnd.epson.ssf', 'ssml' => 'application/ssml+xml', 'sst' => 'application/octet-stream', 'st' => 'application/vnd.sailingtracker.track', 'stc' => 'application/vnd.sun.xml.calc.template', 'std' => 'application/vnd.sun.xml.draw.template', 'step' => 'application/STEP', 'stf' => 'application/vnd.wt.stf', 'sti' => 'application/vnd.sun.xml.impress.template', 'stk' => 'application/hyperstudio', 'stl' => 'model/stl', 'stp' => 'application/STEP', 'stpx' => 'model/step+xml', 'stpxz' => 'model/step-xml+zip', 'stpz' => 'model/step+zip', 'str' => 'application/vnd.pg.format', 'stw' => 'application/vnd.sun.xml.writer.template', 'styl' => 'text/stylus', 'stylus' => 'text/stylus', 'sub' => 'text/vnd.dvb.subtitle', 'sus' => 'application/vnd.sus-calendar', 'susp' => 'application/vnd.sus-calendar', 'sv4cpio' => 'application/x-sv4cpio', 'sv4crc' => 'application/x-sv4crc', 'svc' => 'application/vnd.dvb.service', 'svd' => 'application/vnd.svd', 'svg' => 'image/svg+xml', 'svgz' => 'image/svg+xml', 'swa' => 'application/x-director', 'swf' => 'application/x-shockwave-flash', 'swi' => 'application/vnd.aristanetworks.swi', 'swidtag' => 'application/swid+xml', 'sxc' => 'application/vnd.sun.xml.calc', 'sxd' => 'application/vnd.sun.xml.draw', 'sxg' => 'application/vnd.sun.xml.writer.global', 'sxi' => 'application/vnd.sun.xml.impress', 'sxm' => 'application/vnd.sun.xml.math', 'sxw' => 'application/vnd.sun.xml.writer', 't' => 'text/troff', 't3' => 'application/x-t3vm-image', 't38' => 'image/t38', 'taglet' => 'application/vnd.mynfc', 'tao' => 'application/vnd.tao.intent-module-archive', 'tap' => 'image/vnd.tencent.tap', 'tar' => 'application/x-tar', 'tcap' => 'application/vnd.3gpp2.tcap', 'tcl' => 'application/x-tcl', 'td' => 'application/urc-targetdesc+xml', 'teacher' => 'application/vnd.smart.teacher', 'tei' => 'application/tei+xml', 'teicorpus' => 'application/tei+xml', 'tex' => 'application/x-tex', 'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', 'text' => 'text/plain', 'tfi' => 'application/thraud+xml', 'tfm' => 'application/x-tex-tfm', 'tfx' => 'image/tiff-fx', 'tga' => 'image/x-tga', 'tgz' => 'application/x-tar', 'thmx' => 'application/vnd.ms-officetheme', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'tk' => 'application/x-tcl', 'tmo' => 'application/vnd.tmobile-livetv', 'toml' => 'application/toml', 'torrent' => 'application/x-bittorrent', 'tpl' => 'application/vnd.groove-tool-template', 'tpt' => 'application/vnd.trid.tpt', 'tr' => 'text/troff', 'tra' => 'application/vnd.trueapp', 'trig' => 'application/trig', 'trm' => 'application/x-msterminal', 'ts' => 'video/mp2t', 'tsd' => 'application/timestamped-data', 'tsv' => 'text/tab-separated-values', 'ttc' => 'font/collection', 'ttf' => 'font/ttf', 'ttl' => 'text/turtle', 'ttml' => 'application/ttml+xml', 'twd' => 'application/vnd.simtech-mindmapper', 'twds' => 'application/vnd.simtech-mindmapper', 'txd' => 'application/vnd.genomatix.tuxedo', 'txf' => 'application/vnd.mobius.txf', 'txt' => 'text/plain', 'u3d' => 'model/u3d', 'u8dsn' => 'message/global-delivery-status', 'u8hdr' => 'message/global-headers', 'u8mdn' => 'message/global-disposition-notification', 'u8msg' => 'message/global', 'u32' => 'application/x-authorware-bin', 'ubj' => 'application/ubjson', 'udeb' => 'application/x-debian-package', 'ufd' => 'application/vnd.ufdl', 'ufdl' => 'application/vnd.ufdl', 'ulx' => 'application/x-glulx', 'umj' => 'application/vnd.umajin', 'unityweb' => 'application/vnd.unity', 'uo' => 'application/vnd.uoml+xml', 'uoml' => 'application/vnd.uoml+xml', 'uri' => 'text/uri-list', 'uris' => 'text/uri-list', 'urls' => 'text/uri-list', 'usda' => 'model/vnd.usda', 'usdz' => 'model/vnd.usdz+zip', 'ustar' => 'application/x-ustar', 'utz' => 'application/vnd.uiq.theme', 'uu' => 'text/x-uuencode', 'uva' => 'audio/vnd.dece.audio', 'uvd' => 'application/vnd.dece.data', 'uvf' => 'application/vnd.dece.data', 'uvg' => 'image/vnd.dece.graphic', 'uvh' => 'video/vnd.dece.hd', 'uvi' => 'image/vnd.dece.graphic', 'uvm' => 'video/vnd.dece.mobile', 'uvp' => 'video/vnd.dece.pd', 'uvs' => 'video/vnd.dece.sd', 'uvt' => 'application/vnd.dece.ttml+xml', 'uvu' => 'video/vnd.uvvu.mp4', 'uvv' => 'video/vnd.dece.video', 'uvva' => 'audio/vnd.dece.audio', 'uvvd' => 'application/vnd.dece.data', 'uvvf' => 'application/vnd.dece.data', 'uvvg' => 'image/vnd.dece.graphic', 'uvvh' => 'video/vnd.dece.hd', 'uvvi' => 'image/vnd.dece.graphic', 'uvvm' => 'video/vnd.dece.mobile', 'uvvp' => 'video/vnd.dece.pd', 'uvvs' => 'video/vnd.dece.sd', 'uvvt' => 'application/vnd.dece.ttml+xml', 'uvvu' => 'video/vnd.uvvu.mp4', 'uvvv' => 'video/vnd.dece.video', 'uvvx' => 'application/vnd.dece.unspecified', 'uvvz' => 'application/vnd.dece.zip', 'uvx' => 'application/vnd.dece.unspecified', 'uvz' => 'application/vnd.dece.zip', 'vbox' => 'application/x-virtualbox-vbox', 'vbox-extpack' => 'application/x-virtualbox-vbox-extpack', 'vcard' => 'text/vcard', 'vcd' => 'application/x-cdlink', 'vcf' => 'text/x-vcard', 'vcg' => 'application/vnd.groove-vcard', 'vcs' => 'text/x-vcalendar', 'vcx' => 'application/vnd.vcx', 'vdi' => 'application/x-virtualbox-vdi', 'vds' => 'model/vnd.sap.vds', 'vhd' => 'application/x-virtualbox-vhd', 'vis' => 'application/vnd.visionary', 'viv' => 'video/vnd.vivo', 'vlc' => 'application/videolan', 'vmdk' => 'application/x-virtualbox-vmdk', 'vob' => 'video/x-ms-vob', 'vor' => 'application/vnd.stardivision.writer', 'vox' => 'application/x-authorware-bin', 'vrml' => 'model/vrml', 'vsd' => 'application/vnd.visio', 'vsf' => 'application/vnd.vsf', 'vss' => 'application/vnd.visio', 'vst' => 'application/vnd.visio', 'vsw' => 'application/vnd.visio', 'vtf' => 'image/vnd.valve.source.texture', 'vtt' => 'text/vtt', 'vtu' => 'model/vnd.vtu', 'vxml' => 'application/voicexml+xml', 'w3d' => 'application/x-director', 'wad' => 'application/x-doom', 'wadl' => 'application/vnd.sun.wadl+xml', 'war' => 'application/java-archive', 'wasm' => 'application/wasm', 'wav' => 'audio/x-wav', 'wax' => 'audio/x-ms-wax', 'wbmp' => 'image/vnd.wap.wbmp', 'wbs' => 'application/vnd.criticaltools.wbs+xml', 'wbxml' => 'application/wbxml', 'wcm' => 'application/vnd.ms-works', 'wdb' => 'application/vnd.ms-works', 'wdp' => 'image/vnd.ms-photo', 'weba' => 'audio/webm', 'webapp' => 'application/x-web-app-manifest+json', 'webm' => 'video/webm', 'webmanifest' => 'application/manifest+json', 'webp' => 'image/webp', 'wg' => 'application/vnd.pmi.widget', 'wgsl' => 'text/wgsl', 'wgt' => 'application/widget', 'wif' => 'application/watcherinfo+xml', 'wks' => 'application/vnd.ms-works', 'wm' => 'video/x-ms-wm', 'wma' => 'audio/x-ms-wma', 'wmd' => 'application/x-ms-wmd', 'wmf' => 'image/wmf', 'wml' => 'text/vnd.wap.wml', 'wmlc' => 'application/wmlc', 'wmls' => 'text/vnd.wap.wmlscript', 'wmlsc' => 'application/vnd.wap.wmlscriptc', 'wmv' => 'video/x-ms-wmv', 'wmx' => 'video/x-ms-wmx', 'wmz' => 'application/x-msmetafile', 'woff' => 'font/woff', 'woff2' => 'font/woff2', 'word' => 'application/msword', 'wpd' => 'application/vnd.wordperfect', 'wpl' => 'application/vnd.ms-wpl', 'wps' => 'application/vnd.ms-works', 'wqd' => 'application/vnd.wqd', 'wri' => 'application/x-mswrite', 'wrl' => 'model/vrml', 'wsc' => 'message/vnd.wfa.wsc', 'wsdl' => 'application/wsdl+xml', 'wspolicy' => 'application/wspolicy+xml', 'wtb' => 'application/vnd.webturbo', 'wvx' => 'video/x-ms-wvx', 'x3d' => 'model/x3d+xml', 'x3db' => 'model/x3d+fastinfoset', 'x3dbz' => 'model/x3d+binary', 'x3dv' => 'model/x3d-vrml', 'x3dvz' => 'model/x3d+vrml', 'x3dz' => 'model/x3d+xml', 'x32' => 'application/x-authorware-bin', 'x_b' => 'model/vnd.parasolid.transmit.binary', 'x_t' => 'model/vnd.parasolid.transmit.text', 'xaml' => 'application/xaml+xml', 'xap' => 'application/x-silverlight-app', 'xar' => 'application/vnd.xara', 'xav' => 'application/xcap-att+xml', 'xbap' => 'application/x-ms-xbap', 'xbd' => 'application/vnd.fujixerox.docuworks.binder', 'xbm' => 'image/x-xbitmap', 'xca' => 'application/xcap-caps+xml', 'xcs' => 'application/calendar+xml', 'xdf' => 'application/xcap-diff+xml', 'xdm' => 'application/vnd.syncml.dm+xml', 'xdp' => 'application/vnd.adobe.xdp+xml', 'xdssc' => 'application/dssc+xml', 'xdw' => 'application/vnd.fujixerox.docuworks', 'xel' => 'application/xcap-el+xml', 'xenc' => 'application/xenc+xml', 'xer' => 'application/patch-ops-error+xml', 'xfdf' => 'application/xfdf', 'xfdl' => 'application/vnd.xfdl', 'xht' => 'application/xhtml+xml', 'xhtm' => 'application/vnd.pwg-xhtml-print+xml', 'xhtml' => 'application/xhtml+xml', 'xhvml' => 'application/xv+xml', 'xif' => 'image/vnd.xiff', 'xl' => 'application/excel', 'xla' => 'application/vnd.ms-excel', 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12', 'xlc' => 'application/vnd.ms-excel', 'xlf' => 'application/xliff+xml', 'xlm' => 'application/vnd.ms-excel', 'xls' => 'application/vnd.ms-excel', 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', 'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'xlt' => 'application/vnd.ms-excel', 'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12', 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'xlw' => 'application/vnd.ms-excel', 'xm' => 'audio/xm', 'xml' => 'application/xml', 'xns' => 'application/xcap-ns+xml', 'xo' => 'application/vnd.olpc-sugar', 'xop' => 'application/xop+xml', 'xpi' => 'application/x-xpinstall', 'xpl' => 'application/xproc+xml', 'xpm' => 'image/x-xpixmap', 'xpr' => 'application/vnd.is-xpr', 'xps' => 'application/vnd.ms-xpsdocument', 'xpw' => 'application/vnd.intercon.formnet', 'xpx' => 'application/vnd.intercon.formnet', 'xsd' => 'application/xml', 'xsf' => 'application/prs.xsf+xml', 'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml', 'xsm' => 'application/vnd.syncml+xml', 'xspf' => 'application/xspf+xml', 'xul' => 'application/vnd.mozilla.xul+xml', 'xvm' => 'application/xv+xml', 'xvml' => 'application/xv+xml', 'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz', 'xz' => 'application/x-xz', 'yaml' => 'text/yaml', 'yang' => 'application/yang', 'yin' => 'application/yin+xml', 'yml' => 'text/yaml', 'ymp' => 'text/x-suse-ymp', 'z' => 'application/x-compress', 'z1' => 'application/x-zmachine', 'z2' => 'application/x-zmachine', 'z3' => 'application/x-zmachine', 'z4' => 'application/x-zmachine', 'z5' => 'application/x-zmachine', 'z6' => 'application/x-zmachine', 'z7' => 'application/x-zmachine', 'z8' => 'application/x-zmachine', 'zaz' => 'application/vnd.zzazz.deck+xml', 'zip' => 'application/zip', 'zir' => 'application/vnd.zul', 'zirz' => 'application/vnd.zul', 'zmm' => 'application/vnd.handheld-entertainment+xml', 'zsh' => 'text/x-scriptzsh']; + /** + * Determines the mimetype of a file by looking at its extension. + * + * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json + */ + public static function fromFilename(string $filename) : ?string + { + return self::fromExtension(\pathinfo($filename, \PATHINFO_EXTENSION)); + } + /** + * Maps a file extensions to a mimetype. + * + * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json + */ + public static function fromExtension(string $extension) : ?string + { + return self::MIME_TYPES[\strtolower($extension)] ?? null; + } +} diff --git a/src/vendor/guzzlehttp/psr7/src/MultipartStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MultipartStream.php similarity index 75% rename from src/vendor/guzzlehttp/psr7/src/MultipartStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MultipartStream.php index 41c48ee..d4904d5 100644 --- a/src/vendor/guzzlehttp/psr7/src/MultipartStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/MultipartStream.php @@ -1,11 +1,9 @@ boundary = $boundary ?: bin2hex(random_bytes(20)); + $this->boundary = $boundary ?: \bin2hex(\random_bytes(20)); $this->stream = $this->createStream($elements); } - - public function getBoundary(): string + public function getBoundary() : string { return $this->boundary; } - - public function isWritable(): bool + public function isWritable() : bool { - return false; + return \false; } - /** * Get the headers needed before transferring the content of a POST file * * @param array $headers */ - private function getHeaders(array $headers): string + private function getHeaders(array $headers) : string { $str = ''; foreach ($headers as $key => $value) { $str .= "{$key}: {$value}\r\n"; } - - return "--{$this->boundary}\r\n".trim($str)."\r\n\r\n"; + return "--{$this->boundary}\r\n" . \trim($str) . "\r\n\r\n"; } - /** * Create the aggregate stream that will be used to upload the POST data */ - protected function createStream(array $elements = []): StreamInterface + protected function createStream(array $elements = []) : StreamInterface { $stream = new AppendStream(); - foreach ($elements as $element) { - if (!is_array($element)) { + if (!\is_array($element)) { throw new \UnexpectedValueException('An array is expected'); } $this->addElement($stream, $element); } - // Add the trailing boundary with CRLF $stream->addStream(Utils::streamFor("--{$this->boundary}--\r\n")); - return $stream; } - - private function addElement(AppendStream $stream, array $element): void + private function addElement(AppendStream $stream, array $element) : void { foreach (['contents', 'name'] as $key) { - if (!array_key_exists($key, $element)) { + if (!\array_key_exists($key, $element)) { throw new \InvalidArgumentException("A '{$key}' key is required"); } } - $element['contents'] = Utils::streamFor($element['contents']); - if (empty($element['filename'])) { $uri = $element['contents']->getMetadata('uri'); if ($uri && \is_string($uri) && \substr($uri, 0, 6) !== 'php://' && \substr($uri, 0, 7) !== 'data://') { $element['filename'] = $uri; } } - - [$body, $headers] = $this->createElement( - $element['name'], - $element['contents'], - $element['filename'] ?? null, - $element['headers'] ?? [] - ); - + [$body, $headers] = $this->createElement($element['name'], $element['contents'], $element['filename'] ?? null, $element['headers'] ?? []); $stream->addStream(Utils::streamFor($this->getHeaders($headers))); $stream->addStream($body); $stream->addStream(Utils::streamFor("\r\n")); } - - private function createElement(string $name, StreamInterface $stream, ?string $filename, array $headers): array + private function createElement(string $name, StreamInterface $stream, ?string $filename, array $headers) : array { // Set a default content-disposition header if one was no provided $disposition = $this->getHeader($headers, 'content-disposition'); if (!$disposition) { - $headers['Content-Disposition'] = ($filename === '0' || $filename) - ? sprintf( - 'form-data; name="%s"; filename="%s"', - $name, - basename($filename) - ) - : "form-data; name=\"{$name}\""; + $headers['Content-Disposition'] = $filename === '0' || $filename ? \sprintf('form-data; name="%s"; filename="%s"', $name, \basename($filename)) : "form-data; name=\"{$name}\""; } - // Set a default content-length header if one was no provided $length = $this->getHeader($headers, 'content-length'); if (!$length) { @@ -133,25 +102,21 @@ private function createElement(string $name, StreamInterface $stream, ?string $f $headers['Content-Length'] = (string) $length; } } - // Set a default Content-Type if one was not supplied $type = $this->getHeader($headers, 'content-type'); if (!$type && ($filename === '0' || $filename)) { $headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream'; } - return [$stream, $headers]; } - private function getHeader(array $headers, string $key) { - $lowercaseHeader = strtolower($key); + $lowercaseHeader = \strtolower($key); foreach ($headers as $k => $v) { - if (strtolower($k) === $lowercaseHeader) { + if (\strtolower($k) === $lowercaseHeader) { return $v; } } - return null; } } diff --git a/src/vendor/guzzlehttp/psr7/src/NoSeekStream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/NoSeekStream.php similarity index 54% rename from src/vendor/guzzlehttp/psr7/src/NoSeekStream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/NoSeekStream.php index 161a224..118ea26 100644 --- a/src/vendor/guzzlehttp/psr7/src/NoSeekStream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/NoSeekStream.php @@ -1,28 +1,23 @@ metadata = $options['metadata'] ?? []; $this->buffer = new BufferStream(); } - - public function __toString(): string + public function __toString() : string { try { return Utils::copyToString($this); @@ -59,96 +51,77 @@ public function __toString(): string if (\PHP_VERSION_ID >= 70400) { throw $e; } - trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR); - + \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR); return ''; } } - - public function close(): void + public function close() : void { $this->detach(); } - public function detach() { $this->tellPos = 0; $this->source = null; - return null; } - - public function getSize(): ?int + public function getSize() : ?int { return $this->size; } - - public function tell(): int + public function tell() : int { return $this->tellPos; } - - public function eof(): bool + public function eof() : bool { return $this->source === null; } - - public function isSeekable(): bool + public function isSeekable() : bool { - return false; + return \false; } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { throw new \RuntimeException('Cannot seek a PumpStream'); } - - public function isWritable(): bool + public function isWritable() : bool { - return false; + return \false; } - - public function write($string): int + public function write($string) : int { throw new \RuntimeException('Cannot write to a PumpStream'); } - - public function isReadable(): bool + public function isReadable() : bool { - return true; + return \true; } - - public function read($length): string + public function read($length) : string { $data = $this->buffer->read($length); - $readLen = strlen($data); + $readLen = \strlen($data); $this->tellPos += $readLen; $remaining = $length - $readLen; - if ($remaining) { $this->pump($remaining); $data .= $this->buffer->read($remaining); - $this->tellPos += strlen($data) - $readLen; + $this->tellPos += \strlen($data) - $readLen; } - return $data; } - - public function getContents(): string + public function getContents() : string { $result = ''; while (!$this->eof()) { $result .= $this->read(1000000); } - return $result; } - /** * {@inheritdoc} * @@ -159,22 +132,19 @@ public function getMetadata($key = null) if (!$key) { return $this->metadata; } - return $this->metadata[$key] ?? null; } - - private function pump(int $length): void + private function pump(int $length) : void { if ($this->source) { do { - $data = call_user_func($this->source, $length); - if ($data === false || $data === null) { + $data = \call_user_func($this->source, $length); + if ($data === \false || $data === null) { $this->source = null; - return; } $this->buffer->write($data); - $length -= strlen($data); + $length -= \strlen($data); } while ($length > 0); } } diff --git a/src/vendor/guzzlehttp/psr7/src/Query.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Query.php similarity index 67% rename from src/vendor/guzzlehttp/psr7/src/Query.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Query.php index 8b94927..771a0e3 100644 --- a/src/vendor/guzzlehttp/psr7/src/Query.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Query.php @@ -1,8 +1,7 @@ $v) { $k = $encoder((string) $k); - if (!is_array($v)) { + if (!\is_array($v)) { $qs .= $k; - $v = is_bool($v) ? (int) $v : $v; + $v = \is_bool($v) ? (int) $v : $v; if ($v !== null) { - $qs .= '='.$encoder((string) $v); + $qs .= '=' . $encoder((string) $v); } $qs .= '&'; } else { foreach ($v as $vv) { $qs .= $k; - $vv = is_bool($vv) ? (int) $vv : $vv; + $vv = \is_bool($vv) ? (int) $vv : $vv; if ($vv !== null) { - $qs .= '='.$encoder((string) $vv); + $qs .= '=' . $encoder((string) $vv); } $qs .= '&'; } } } - - return $qs ? (string) substr($qs, 0, -1) : ''; + return $qs ? (string) \substr($qs, 0, -1) : ''; } } diff --git a/src/vendor/guzzlehttp/psr7/src/Request.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Request.php similarity index 67% rename from src/vendor/guzzlehttp/psr7/src/Request.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Request.php index db29d95..3f0690c 100644 --- a/src/vendor/guzzlehttp/psr7/src/Request.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Request.php @@ -1,30 +1,24 @@ assertMethod($method); - if (!($uri instanceof UriInterface)) { + if (!$uri instanceof UriInterface) { $uri = new Uri($uri); } - - $this->method = strtoupper($method); + $this->method = \strtoupper($method); $this->uri = $uri; $this->setHeaders($headers); $this->protocol = $version; - if (!isset($this->headerNames['host'])) { $this->updateHostFromUri(); } - if ($body !== '' && $body !== null) { $this->stream = Utils::streamFor($body); } } - - public function getRequestTarget(): string + public function getRequestTarget() : string { if ($this->requestTarget !== null) { return $this->requestTarget; } - $target = $this->uri->getPath(); if ($target === '') { $target = '/'; } if ($this->uri->getQuery() != '') { - $target .= '?'.$this->uri->getQuery(); + $target .= '?' . $this->uri->getQuery(); } - return $target; } - - public function withRequestTarget($requestTarget): RequestInterface + public function withRequestTarget($requestTarget) : RequestInterface { - if (preg_match('#\s#', $requestTarget)) { - throw new InvalidArgumentException( - 'Invalid request target provided; cannot contain whitespace' - ); + if (\preg_match('#\\s#', $requestTarget)) { + throw new InvalidArgumentException('Invalid request target provided; cannot contain whitespace'); } - $new = clone $this; $new->requestTarget = $requestTarget; - return $new; } - - public function getMethod(): string + public function getMethod() : string { return $this->method; } - - public function withMethod($method): RequestInterface + public function withMethod($method) : RequestInterface { $this->assertMethod($method); $new = clone $this; - $new->method = strtoupper($method); - + $new->method = \strtoupper($method); return $new; } - - public function getUri(): UriInterface + public function getUri() : UriInterface { return $this->uri; } - - public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface + public function withUri(UriInterface $uri, $preserveHost = \false) : RequestInterface { if ($uri === $this->uri) { return $this; } - $new = clone $this; $new->uri = $uri; - if (!$preserveHost || !isset($this->headerNames['host'])) { $new->updateHostFromUri(); } - return $new; } - - private function updateHostFromUri(): void + private function updateHostFromUri() : void { $host = $this->uri->getHost(); - if ($host == '') { return; } - if (($port = $this->uri->getPort()) !== null) { - $host .= ':'.$port; + $host .= ':' . $port; } - if (isset($this->headerNames['host'])) { $header = $this->headerNames['host']; } else { @@ -146,13 +112,12 @@ private function updateHostFromUri(): void // See: http://tools.ietf.org/html/rfc7230#section-5.4 $this->headers = [$header => [$host]] + $this->headers; } - /** * @param mixed $method */ - private function assertMethod($method): void + private function assertMethod($method) : void { - if (!is_string($method) || $method === '') { + if (!\is_string($method) || $method === '') { throw new InvalidArgumentException('Method must be a non-empty string.'); } } diff --git a/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Response.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Response.php new file mode 100644 index 0000000..0b6dccd --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Response.php @@ -0,0 +1,78 @@ + 'Continue', 101 => 'Switching Protocols', 102 => 'Processing', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 207 => 'Multi-status', 208 => 'Already Reported', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => 'Switch Proxy', 307 => 'Temporary Redirect', 308 => 'Permanent Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', 418 => 'I\'m a teapot', 422 => 'Unprocessable Entity', 423 => 'Locked', 424 => 'Failed Dependency', 425 => 'Unordered Collection', 426 => 'Upgrade Required', 428 => 'Precondition Required', 429 => 'Too Many Requests', 431 => 'Request Header Fields Too Large', 451 => 'Unavailable For Legal Reasons', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported', 506 => 'Variant Also Negotiates', 507 => 'Insufficient Storage', 508 => 'Loop Detected', 510 => 'Not Extended', 511 => 'Network Authentication Required']; + /** @var string */ + private $reasonPhrase; + /** @var int */ + private $statusCode; + /** + * @param int $status Status code + * @param array $headers Response headers + * @param string|resource|StreamInterface|null $body Response body + * @param string $version Protocol version + * @param string|null $reason Reason phrase (when empty a default will be used based on the status code) + */ + public function __construct(int $status = 200, array $headers = [], $body = null, string $version = '1.1', string $reason = null) + { + $this->assertStatusCodeRange($status); + $this->statusCode = $status; + if ($body !== '' && $body !== null) { + $this->stream = Utils::streamFor($body); + } + $this->setHeaders($headers); + if ($reason == '' && isset(self::PHRASES[$this->statusCode])) { + $this->reasonPhrase = self::PHRASES[$this->statusCode]; + } else { + $this->reasonPhrase = (string) $reason; + } + $this->protocol = $version; + } + public function getStatusCode() : int + { + return $this->statusCode; + } + public function getReasonPhrase() : string + { + return $this->reasonPhrase; + } + public function withStatus($code, $reasonPhrase = '') : ResponseInterface + { + $this->assertStatusCodeIsInteger($code); + $code = (int) $code; + $this->assertStatusCodeRange($code); + $new = clone $this; + $new->statusCode = $code; + if ($reasonPhrase == '' && isset(self::PHRASES[$new->statusCode])) { + $reasonPhrase = self::PHRASES[$new->statusCode]; + } + $new->reasonPhrase = (string) $reasonPhrase; + return $new; + } + /** + * @param mixed $statusCode + */ + private function assertStatusCodeIsInteger($statusCode) : void + { + if (\filter_var($statusCode, \FILTER_VALIDATE_INT) === \false) { + throw new \InvalidArgumentException('Status code must be an integer value.'); + } + } + private function assertStatusCodeRange(int $statusCode) : void + { + if ($statusCode < 100 || $statusCode >= 600) { + throw new \InvalidArgumentException('Status code must be an integer value between 1xx and 5xx.'); + } + } +} diff --git a/src/vendor/guzzlehttp/psr7/src/Rfc7230.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Rfc7230.php similarity index 70% rename from src/vendor/guzzlehttp/psr7/src/Rfc7230.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Rfc7230.php index 8219dba..a6f5869 100644 --- a/src/vendor/guzzlehttp/psr7/src/Rfc7230.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Rfc7230.php @@ -1,8 +1,7 @@ @,;:\\\"/[\]?={}\x01-\x20\x7F]++):[ \t]*+((?:[ \t]*+[\x21-\x7E\x80-\xFF]++)*+)[ \t]*+\r?\n)m"; + public const HEADER_REGEX = "(^([^()<>@,;:\\\"/[\\]?={}\x01- ]++):[ \t]*+((?:[ \t]*+[!-~\x80-\xff]++)*+)[ \t]*+\r?\n)m"; public const HEADER_FOLD_REGEX = "(\r?\n[ \t]++)"; } diff --git a/src/vendor/guzzlehttp/psr7/src/ServerRequest.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/ServerRequest.php similarity index 70% rename from src/vendor/guzzlehttp/psr7/src/ServerRequest.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/ServerRequest.php index 1198ff6..b51444b 100644 --- a/src/vendor/guzzlehttp/psr7/src/ServerRequest.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/ServerRequest.php @@ -1,15 +1,13 @@ serverParams = $serverParams; - parent::__construct($method, $uri, $headers, $body, $version); } - /** * Return an UploadedFile instance array. * @@ -84,26 +68,23 @@ public function __construct( * * @throws InvalidArgumentException for unrecognized values */ - public static function normalizeFiles(array $files): array + public static function normalizeFiles(array $files) : array { $normalized = []; - foreach ($files as $key => $value) { if ($value instanceof UploadedFileInterface) { $normalized[$key] = $value; - } elseif (is_array($value) && isset($value['tmp_name'])) { + } elseif (\is_array($value) && isset($value['tmp_name'])) { $normalized[$key] = self::createUploadedFileFromSpec($value); - } elseif (is_array($value)) { + } elseif (\is_array($value)) { $normalized[$key] = self::normalizeFiles($value); continue; } else { throw new InvalidArgumentException('Invalid value in files specification'); } } - return $normalized; } - /** * Create and return an UploadedFile instance from a $_FILES specification. * @@ -116,19 +97,11 @@ public static function normalizeFiles(array $files): array */ private static function createUploadedFileFromSpec(array $value) { - if (is_array($value['tmp_name'])) { + if (\is_array($value['tmp_name'])) { return self::normalizeNestedFileSpec($value); } - - return new UploadedFile( - $value['tmp_name'], - (int) $value['size'], - (int) $value['error'], - $value['name'], - $value['type'] - ); + return new UploadedFile($value['tmp_name'], (int) $value['size'], (int) $value['error'], $value['name'], $value['type']); } - /** * Normalize an array of file specifications. * @@ -137,24 +110,15 @@ private static function createUploadedFileFromSpec(array $value) * * @return UploadedFileInterface[] */ - private static function normalizeNestedFileSpec(array $files = []): array + private static function normalizeNestedFileSpec(array $files = []) : array { $normalizedFiles = []; - - foreach (array_keys($files['tmp_name']) as $key) { - $spec = [ - 'tmp_name' => $files['tmp_name'][$key], - 'size' => $files['size'][$key] ?? null, - 'error' => $files['error'][$key] ?? null, - 'name' => $files['name'][$key] ?? null, - 'type' => $files['type'][$key] ?? null, - ]; + foreach (\array_keys($files['tmp_name']) as $key) { + $spec = ['tmp_name' => $files['tmp_name'][$key], 'size' => $files['size'][$key] ?? null, 'error' => $files['error'][$key] ?? null, 'name' => $files['name'][$key] ?? null, 'type' => $files['type'][$key] ?? null]; $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec); } - return $normalizedFiles; } - /** * Return a ServerRequest populated with superglobals: * $_GET @@ -163,55 +127,42 @@ private static function normalizeNestedFileSpec(array $files = []): array * $_FILES * $_SERVER */ - public static function fromGlobals(): ServerRequestInterface + public static function fromGlobals() : ServerRequestInterface { $method = $_SERVER['REQUEST_METHOD'] ?? 'GET'; - $headers = getallheaders(); + $headers = \getallheaders(); $uri = self::getUriFromGlobals(); $body = new CachingStream(new LazyOpenStream('php://input', 'r+')); - $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']) : '1.1'; - + $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? \str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']) : '1.1'; $serverRequest = new ServerRequest($method, $uri, $headers, $body, $protocol, $_SERVER); - - return $serverRequest - ->withCookieParams($_COOKIE) - ->withQueryParams($_GET) - ->withParsedBody($_POST) - ->withUploadedFiles(self::normalizeFiles($_FILES)); + return $serverRequest->withCookieParams($_COOKIE)->withQueryParams($_GET)->withParsedBody($_POST)->withUploadedFiles(self::normalizeFiles($_FILES)); } - - private static function extractHostAndPortFromAuthority(string $authority): array + private static function extractHostAndPortFromAuthority(string $authority) : array { - $uri = 'http://'.$authority; - $parts = parse_url($uri); - if (false === $parts) { + $uri = 'http://' . $authority; + $parts = \parse_url($uri); + if (\false === $parts) { return [null, null]; } - $host = $parts['host'] ?? null; $port = $parts['port'] ?? null; - return [$host, $port]; } - /** * Get a Uri populated with values from $_SERVER. */ - public static function getUriFromGlobals(): UriInterface + public static function getUriFromGlobals() : UriInterface { $uri = new Uri(''); - $uri = $uri->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http'); - - $hasPort = false; + $hasPort = \false; if (isset($_SERVER['HTTP_HOST'])) { [$host, $port] = self::extractHostAndPortFromAuthority($_SERVER['HTTP_HOST']); if ($host !== null) { $uri = $uri->withHost($host); } - if ($port !== null) { - $hasPort = true; + $hasPort = \true; $uri = $uri->withPort($port); } } elseif (isset($_SERVER['SERVER_NAME'])) { @@ -219,72 +170,57 @@ public static function getUriFromGlobals(): UriInterface } elseif (isset($_SERVER['SERVER_ADDR'])) { $uri = $uri->withHost($_SERVER['SERVER_ADDR']); } - if (!$hasPort && isset($_SERVER['SERVER_PORT'])) { $uri = $uri->withPort($_SERVER['SERVER_PORT']); } - - $hasQuery = false; + $hasQuery = \false; if (isset($_SERVER['REQUEST_URI'])) { - $requestUriParts = explode('?', $_SERVER['REQUEST_URI'], 2); + $requestUriParts = \explode('?', $_SERVER['REQUEST_URI'], 2); $uri = $uri->withPath($requestUriParts[0]); if (isset($requestUriParts[1])) { - $hasQuery = true; + $hasQuery = \true; $uri = $uri->withQuery($requestUriParts[1]); } } - if (!$hasQuery && isset($_SERVER['QUERY_STRING'])) { $uri = $uri->withQuery($_SERVER['QUERY_STRING']); } - return $uri; } - - public function getServerParams(): array + public function getServerParams() : array { return $this->serverParams; } - - public function getUploadedFiles(): array + public function getUploadedFiles() : array { return $this->uploadedFiles; } - - public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface + public function withUploadedFiles(array $uploadedFiles) : ServerRequestInterface { $new = clone $this; $new->uploadedFiles = $uploadedFiles; - return $new; } - - public function getCookieParams(): array + public function getCookieParams() : array { return $this->cookieParams; } - - public function withCookieParams(array $cookies): ServerRequestInterface + public function withCookieParams(array $cookies) : ServerRequestInterface { $new = clone $this; $new->cookieParams = $cookies; - return $new; } - - public function getQueryParams(): array + public function getQueryParams() : array { return $this->queryParams; } - - public function withQueryParams(array $query): ServerRequestInterface + public function withQueryParams(array $query) : ServerRequestInterface { $new = clone $this; $new->queryParams = $query; - return $new; } - /** * {@inheritdoc} * @@ -294,20 +230,16 @@ public function getParsedBody() { return $this->parsedBody; } - - public function withParsedBody($data): ServerRequestInterface + public function withParsedBody($data) : ServerRequestInterface { $new = clone $this; $new->parsedBody = $data; - return $new; } - - public function getAttributes(): array + public function getAttributes() : array { return $this->attributes; } - /** * {@inheritdoc} * @@ -315,30 +247,24 @@ public function getAttributes(): array */ public function getAttribute($attribute, $default = null) { - if (false === array_key_exists($attribute, $this->attributes)) { + if (\false === \array_key_exists($attribute, $this->attributes)) { return $default; } - return $this->attributes[$attribute]; } - - public function withAttribute($attribute, $value): ServerRequestInterface + public function withAttribute($attribute, $value) : ServerRequestInterface { $new = clone $this; $new->attributes[$attribute] = $value; - return $new; } - - public function withoutAttribute($attribute): ServerRequestInterface + public function withoutAttribute($attribute) : ServerRequestInterface { - if (false === array_key_exists($attribute, $this->attributes)) { + if (\false === \array_key_exists($attribute, $this->attributes)) { return $this; } - $new = clone $this; unset($new->attributes[$attribute]); - return $new; } } diff --git a/src/vendor/guzzlehttp/psr7/src/Stream.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Stream.php similarity index 72% rename from src/vendor/guzzlehttp/psr7/src/Stream.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Stream.php index c2477fe..39ccf4b 100644 --- a/src/vendor/guzzlehttp/psr7/src/Stream.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Stream.php @@ -1,11 +1,9 @@ size = $options['size']; } - $this->customMetadata = $options['metadata'] ?? []; $this->stream = $stream; - $meta = stream_get_meta_data($this->stream); + $meta = \stream_get_meta_data($this->stream); $this->seekable = $meta['seekable']; - $this->readable = (bool) preg_match(self::READABLE_MODES, $meta['mode']); - $this->writable = (bool) preg_match(self::WRITABLE_MODES, $meta['mode']); + $this->readable = (bool) \preg_match(self::READABLE_MODES, $meta['mode']); + $this->writable = (bool) \preg_match(self::WRITABLE_MODES, $meta['mode']); $this->uri = $this->getMetadata('uri'); } - /** * Closes the stream when the destructed */ @@ -73,148 +66,118 @@ public function __destruct() { $this->close(); } - - public function __toString(): string + public function __toString() : string { try { if ($this->isSeekable()) { $this->seek(0); } - return $this->getContents(); } catch (\Throwable $e) { if (\PHP_VERSION_ID >= 70400) { throw $e; } - trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR); - + \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR); return ''; } } - - public function getContents(): string + public function getContents() : string { if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); } - if (!$this->readable) { throw new \RuntimeException('Cannot read from non-readable stream'); } - return Utils::tryGetContents($this->stream); } - - public function close(): void + public function close() : void { if (isset($this->stream)) { - if (is_resource($this->stream)) { - fclose($this->stream); + if (\is_resource($this->stream)) { + \fclose($this->stream); } $this->detach(); } } - public function detach() { if (!isset($this->stream)) { return null; } - $result = $this->stream; unset($this->stream); $this->size = $this->uri = null; - $this->readable = $this->writable = $this->seekable = false; - + $this->readable = $this->writable = $this->seekable = \false; return $result; } - - public function getSize(): ?int + public function getSize() : ?int { if ($this->size !== null) { return $this->size; } - if (!isset($this->stream)) { return null; } - // Clear the stat cache if the stream has a URI if ($this->uri) { - clearstatcache(true, $this->uri); + \clearstatcache(\true, $this->uri); } - - $stats = fstat($this->stream); - if (is_array($stats) && isset($stats['size'])) { + $stats = \fstat($this->stream); + if (\is_array($stats) && isset($stats['size'])) { $this->size = $stats['size']; - return $this->size; } - return null; } - - public function isReadable(): bool + public function isReadable() : bool { return $this->readable; } - - public function isWritable(): bool + public function isWritable() : bool { return $this->writable; } - - public function isSeekable(): bool + public function isSeekable() : bool { return $this->seekable; } - - public function eof(): bool + public function eof() : bool { if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); } - - return feof($this->stream); + return \feof($this->stream); } - - public function tell(): int + public function tell() : int { if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); } - - $result = ftell($this->stream); - - if ($result === false) { + $result = \ftell($this->stream); + if ($result === \false) { throw new \RuntimeException('Unable to determine stream position'); } - return $result; } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { $whence = (int) $whence; - if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); } if (!$this->seekable) { throw new \RuntimeException('Stream is not seekable'); } - if (fseek($this->stream, $offset, $whence) === -1) { - throw new \RuntimeException('Unable to seek to stream position ' - .$offset.' with whence '.var_export($whence, true)); + if (\fseek($this->stream, $offset, $whence) === -1) { + throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, \true)); } } - - public function read($length): string + public function read($length) : string { if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); @@ -225,25 +188,20 @@ public function read($length): string if ($length < 0) { throw new \RuntimeException('Length parameter cannot be negative'); } - if (0 === $length) { return ''; } - try { - $string = fread($this->stream, $length); + $string = \fread($this->stream, $length); } catch (\Exception $e) { throw new \RuntimeException('Unable to read from stream', 0, $e); } - - if (false === $string) { + if (\false === $string) { throw new \RuntimeException('Unable to read from stream'); } - return $string; } - - public function write($string): int + public function write($string) : int { if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); @@ -251,18 +209,14 @@ public function write($string): int if (!$this->writable) { throw new \RuntimeException('Cannot write to a non-writable stream'); } - // We can't know the size after writing anything $this->size = null; - $result = fwrite($this->stream, $string); - - if ($result === false) { + $result = \fwrite($this->stream, $string); + if ($result === \false) { throw new \RuntimeException('Unable to write to stream'); } - return $result; } - /** * {@inheritdoc} * @@ -273,13 +227,11 @@ public function getMetadata($key = null) if (!isset($this->stream)) { return $key ? null : []; } elseif (!$key) { - return $this->customMetadata + stream_get_meta_data($this->stream); + return $this->customMetadata + \stream_get_meta_data($this->stream); } elseif (isset($this->customMetadata[$key])) { return $this->customMetadata[$key]; } - - $meta = stream_get_meta_data($this->stream); - + $meta = \stream_get_meta_data($this->stream); return $meta[$key] ?? null; } } diff --git a/src/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php similarity index 71% rename from src/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php index dfb3e45..24b7130 100644 --- a/src/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php @@ -1,11 +1,9 @@ stream = $stream; } - /** * Magic method used to create a new stream if streams are not added in * the constructor of a decorator (e.g., LazyOpenStream). @@ -31,36 +28,29 @@ public function __get(string $name) { if ($name === 'stream') { $this->stream = $this->createStream(); - return $this->stream; } - - throw new \UnexpectedValueException("$name not found on class"); + throw new \UnexpectedValueException("{$name} not found on class"); } - - public function __toString(): string + public function __toString() : string { try { if ($this->isSeekable()) { $this->seek(0); } - return $this->getContents(); } catch (\Throwable $e) { if (\PHP_VERSION_ID >= 70400) { throw $e; } - trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR); - + \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR); return ''; } } - - public function getContents(): string + public function getContents() : string { return Utils::copyToString($this); } - /** * Allow decorators to implement custom methods * @@ -70,17 +60,14 @@ public function __call(string $method, array $args) { /** @var callable $callable */ $callable = [$this->stream, $method]; - $result = call_user_func_array($callable, $args); - + $result = \call_user_func_array($callable, $args); // Always return the wrapped object if the result is a return $this return $result === $this->stream ? $this : $result; } - - public function close(): void + public function close() : void { $this->stream->close(); } - /** * {@inheritdoc} * @@ -90,68 +77,56 @@ public function getMetadata($key = null) { return $this->stream->getMetadata($key); } - public function detach() { return $this->stream->detach(); } - - public function getSize(): ?int + public function getSize() : ?int { return $this->stream->getSize(); } - - public function eof(): bool + public function eof() : bool { return $this->stream->eof(); } - - public function tell(): int + public function tell() : int { return $this->stream->tell(); } - - public function isReadable(): bool + public function isReadable() : bool { return $this->stream->isReadable(); } - - public function isWritable(): bool + public function isWritable() : bool { return $this->stream->isWritable(); } - - public function isSeekable(): bool + public function isSeekable() : bool { return $this->stream->isSeekable(); } - - public function rewind(): void + public function rewind() : void { $this->seek(0); } - - public function seek($offset, $whence = SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) : void { $this->stream->seek($offset, $whence); } - - public function read($length): string + public function read($length) : string { return $this->stream->read($length); } - - public function write($string): int + public function write($string) : int { return $this->stream->write($string); } - /** * Implement in subclasses to dynamically create streams when requested. * * @throws \BadMethodCallException */ - protected function createStream(): StreamInterface + protected function createStream() : StreamInterface { throw new \BadMethodCallException('Not implemented'); } diff --git a/src/vendor/guzzlehttp/psr7/src/StreamWrapper.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamWrapper.php similarity index 50% rename from src/vendor/guzzlehttp/psr7/src/StreamWrapper.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamWrapper.php index b3655cb..9efe977 100644 --- a/src/vendor/guzzlehttp/psr7/src/StreamWrapper.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/StreamWrapper.php @@ -1,11 +1,9 @@ isReadable()) { $mode = $stream->isWritable() ? 'r+' : 'r'; } elseif ($stream->isWritable()) { $mode = 'w'; } else { - throw new \InvalidArgumentException('The stream must be readable, ' - .'writable, or both.'); + throw new \InvalidArgumentException('The stream must be readable, ' . 'writable, or both.'); } - - return fopen('guzzle://stream', $mode, false, self::createStreamContext($stream)); + return \fopen('guzzle://stream', $mode, \false, self::createStreamContext($stream)); } - /** * Creates a stream context that can be used to open a stream as a php stream resource. * @@ -54,62 +45,48 @@ public static function getResource(StreamInterface $stream) */ public static function createStreamContext(StreamInterface $stream) { - return stream_context_create([ - 'guzzle' => ['stream' => $stream], - ]); + return \stream_context_create(['guzzle' => ['stream' => $stream]]); } - /** * Registers the stream wrapper if needed */ - public static function register(): void + public static function register() : void { - if (!in_array('guzzle', stream_get_wrappers())) { - stream_wrapper_register('guzzle', __CLASS__); + if (!\in_array('guzzle', \stream_get_wrappers())) { + \stream_wrapper_register('guzzle', __CLASS__); } } - - public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool + public function stream_open(string $path, string $mode, int $options, string &$opened_path = null) : bool { - $options = stream_context_get_options($this->context); - + $options = \stream_context_get_options($this->context); if (!isset($options['guzzle']['stream'])) { - return false; + return \false; } - $this->mode = $mode; $this->stream = $options['guzzle']['stream']; - - return true; + return \true; } - - public function stream_read(int $count): string + public function stream_read(int $count) : string { return $this->stream->read($count); } - - public function stream_write(string $data): int + public function stream_write(string $data) : int { return $this->stream->write($data); } - - public function stream_tell(): int + public function stream_tell() : int { return $this->stream->tell(); } - - public function stream_eof(): bool + public function stream_eof() : bool { return $this->stream->eof(); } - - public function stream_seek(int $offset, int $whence): bool + public function stream_seek(int $offset, int $whence) : bool { $this->stream->seek($offset, $whence); - - return true; + return \true; } - /** * @return resource|false */ @@ -117,59 +94,21 @@ public function stream_cast(int $cast_as) { $stream = clone $this->stream; $resource = $stream->detach(); - - return $resource ?? false; + return $resource ?? \false; } - /** * @return array */ - public function stream_stat(): array + public function stream_stat() : array { - static $modeMap = [ - 'r' => 33060, - 'rb' => 33060, - 'r+' => 33206, - 'w' => 33188, - 'wb' => 33188, - ]; - - return [ - 'dev' => 0, - 'ino' => 0, - 'mode' => $modeMap[$this->mode], - 'nlink' => 0, - 'uid' => 0, - 'gid' => 0, - 'rdev' => 0, - 'size' => $this->stream->getSize() ?: 0, - 'atime' => 0, - 'mtime' => 0, - 'ctime' => 0, - 'blksize' => 0, - 'blocks' => 0, - ]; + static $modeMap = ['r' => 33060, 'rb' => 33060, 'r+' => 33206, 'w' => 33188, 'wb' => 33188]; + return ['dev' => 0, 'ino' => 0, 'mode' => $modeMap[$this->mode], 'nlink' => 0, 'uid' => 0, 'gid' => 0, 'rdev' => 0, 'size' => $this->stream->getSize() ?: 0, 'atime' => 0, 'mtime' => 0, 'ctime' => 0, 'blksize' => 0, 'blocks' => 0]; } - /** * @return array */ - public function url_stat(string $path, int $flags): array + public function url_stat(string $path, int $flags) : array { - return [ - 'dev' => 0, - 'ino' => 0, - 'mode' => 0, - 'nlink' => 0, - 'uid' => 0, - 'gid' => 0, - 'rdev' => 0, - 'size' => 0, - 'atime' => 0, - 'mtime' => 0, - 'ctime' => 0, - 'blksize' => 0, - 'blocks' => 0, - ]; + return ['dev' => 0, 'ino' => 0, 'mode' => 0, 'nlink' => 0, 'uid' => 0, 'gid' => 0, 'rdev' => 0, 'size' => 0, 'atime' => 0, 'mtime' => 0, 'ctime' => 0, 'blksize' => 0, 'blocks' => 0]; } } diff --git a/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UploadedFile.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UploadedFile.php new file mode 100644 index 0000000..6ccf966 --- /dev/null +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UploadedFile.php @@ -0,0 +1,152 @@ +setError($errorStatus); + $this->size = $size; + $this->clientFilename = $clientFilename; + $this->clientMediaType = $clientMediaType; + if ($this->isOk()) { + $this->setStreamOrFile($streamOrFile); + } + } + /** + * Depending on the value set file or stream variable + * + * @param StreamInterface|string|resource $streamOrFile + * + * @throws InvalidArgumentException + */ + private function setStreamOrFile($streamOrFile) : void + { + if (\is_string($streamOrFile)) { + $this->file = $streamOrFile; + } elseif (\is_resource($streamOrFile)) { + $this->stream = new Stream($streamOrFile); + } elseif ($streamOrFile instanceof StreamInterface) { + $this->stream = $streamOrFile; + } else { + throw new InvalidArgumentException('Invalid stream or file provided for UploadedFile'); + } + } + /** + * @throws InvalidArgumentException + */ + private function setError(int $error) : void + { + if (\false === \in_array($error, UploadedFile::ERRORS, \true)) { + throw new InvalidArgumentException('Invalid error status for UploadedFile'); + } + $this->error = $error; + } + private function isStringNotEmpty($param) : bool + { + return \is_string($param) && \false === empty($param); + } + /** + * Return true if there is no upload error + */ + private function isOk() : bool + { + return $this->error === \UPLOAD_ERR_OK; + } + public function isMoved() : bool + { + return $this->moved; + } + /** + * @throws RuntimeException if is moved or not ok + */ + private function validateActive() : void + { + if (\false === $this->isOk()) { + throw new RuntimeException('Cannot retrieve stream due to upload error'); + } + if ($this->isMoved()) { + throw new RuntimeException('Cannot retrieve stream after it has already been moved'); + } + } + public function getStream() : StreamInterface + { + $this->validateActive(); + if ($this->stream instanceof StreamInterface) { + return $this->stream; + } + /** @var string $file */ + $file = $this->file; + return new LazyOpenStream($file, 'r+'); + } + public function moveTo($targetPath) : void + { + $this->validateActive(); + if (\false === $this->isStringNotEmpty($targetPath)) { + throw new InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string'); + } + if ($this->file) { + $this->moved = \PHP_SAPI === 'cli' ? \rename($this->file, $targetPath) : \move_uploaded_file($this->file, $targetPath); + } else { + Utils::copyToStream($this->getStream(), new LazyOpenStream($targetPath, 'w')); + $this->moved = \true; + } + if (\false === $this->moved) { + throw new RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath)); + } + } + public function getSize() : ?int + { + return $this->size; + } + public function getError() : int + { + return $this->error; + } + public function getClientFilename() : ?string + { + return $this->clientFilename; + } + public function getClientMediaType() : ?string + { + return $this->clientMediaType; + } +} diff --git a/src/vendor/guzzlehttp/psr7/src/Uri.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Uri.php similarity index 68% rename from src/vendor/guzzlehttp/psr7/src/Uri.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Uri.php index fbba7f1..4610d4f 100644 --- a/src/vendor/guzzlehttp/psr7/src/Uri.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Uri.php @@ -1,12 +1,10 @@ 80, - 'https' => 443, - 'ftp' => 21, - 'gopher' => 70, - 'nntp' => 119, - 'news' => 119, - 'telnet' => 23, - 'tn3270' => 23, - 'imap' => 143, - 'pop' => 110, - 'ldap' => 389, - ]; - + private const DEFAULT_PORTS = ['http' => 80, 'https' => 443, 'ftp' => 21, 'gopher' => 70, 'nntp' => 119, 'news' => 119, 'telnet' => 23, 'tn3270' => 23, 'imap' => 143, 'pop' => 110, 'ldap' => 389]; /** * Unreserved characters for use in a regex. * * @see https://tools.ietf.org/html/rfc3986#section-2.3 */ - private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~'; - + private const CHAR_UNRESERVED = 'a-zA-Z0-9_\\-\\.~'; /** * Sub-delims for use in a regex. * * @see https://tools.ietf.org/html/rfc3986#section-2.2 */ - private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;='; + private const CHAR_SUB_DELIMS = '!\\$&\'\\(\\)\\*\\+,;='; private const QUERY_SEPARATORS_REPLACEMENT = ['=' => '%3D', '&' => '%26']; - /** @var string Uri scheme. */ private $scheme = ''; - /** @var string Uri user info. */ private $userInfo = ''; - /** @var string Uri host. */ private $host = ''; - /** @var int|null Uri port. */ private $port; - /** @var string Uri path. */ private $path = ''; - /** @var string Uri query string. */ private $query = ''; - /** @var string Uri fragment. */ private $fragment = ''; - /** @var string|null String representation */ private $composedComponents; - public function __construct(string $uri = '') { if ($uri !== '') { $parts = self::parse($uri); - if ($parts === false) { - throw new MalformedUriException("Unable to parse URI: $uri"); + if ($parts === \false) { + throw new MalformedUriException("Unable to parse URI: {$uri}"); } $this->applyParts($parts); } } - /** * UTF-8 aware \parse_url() replacement. * @@ -107,45 +80,28 @@ private static function parse(string $url) { // If IPv6 $prefix = ''; - if (preg_match('%^(.*://\[[0-9:a-f]+\])(.*?)$%', $url, $matches)) { + if (\preg_match('%^(.*://\\[[0-9:a-f]+\\])(.*?)$%', $url, $matches)) { /** @var array{0:string, 1:string, 2:string} $matches */ $prefix = $matches[1]; $url = $matches[2]; } - /** @var string */ - $encodedUrl = preg_replace_callback( - '%[^:/@?&=#]+%usD', - static function ($matches) { - return urlencode($matches[0]); - }, - $url - ); - - $result = parse_url($prefix.$encodedUrl); - - if ($result === false) { - return false; + $encodedUrl = \preg_replace_callback('%[^:/@?&=#]+%usD', static function ($matches) { + return \urlencode($matches[0]); + }, $url); + $result = \parse_url($prefix . $encodedUrl); + if ($result === \false) { + return \false; } - - return array_map('urldecode', $result); + return \array_map('urldecode', $result); } - - public function __toString(): string + public function __toString() : string { if ($this->composedComponents === null) { - $this->composedComponents = self::composeComponents( - $this->scheme, - $this->getAuthority(), - $this->path, - $this->query, - $this->fragment - ); + $this->composedComponents = self::composeComponents($this->scheme, $this->getAuthority(), $this->path, $this->query, $this->fragment); } - return $this->composedComponents; } - /** * Composes a URI reference string from its various components. * @@ -164,48 +120,38 @@ public function __toString(): string * * @see https://tools.ietf.org/html/rfc3986#section-5.3 */ - public static function composeComponents(?string $scheme, ?string $authority, string $path, ?string $query, ?string $fragment): string + public static function composeComponents(?string $scheme, ?string $authority, string $path, ?string $query, ?string $fragment) : string { $uri = ''; - // weak type checks to also accept null until we can add scalar type hints if ($scheme != '') { - $uri .= $scheme.':'; + $uri .= $scheme . ':'; } - if ($authority != '' || $scheme === 'file') { - $uri .= '//'.$authority; + $uri .= '//' . $authority; } - if ($authority != '' && $path != '' && $path[0] != '/') { - $path = '/'.$path; + $path = '/' . $path; } - $uri .= $path; - if ($query != '') { - $uri .= '?'.$query; + $uri .= '?' . $query; } - if ($fragment != '') { - $uri .= '#'.$fragment; + $uri .= '#' . $fragment; } - return $uri; } - /** * Whether the URI has the default port of the current scheme. * * `Psr\Http\Message\UriInterface::getPort` may return null or the standard port. This method can be used * independently of the implementation. */ - public static function isDefaultPort(UriInterface $uri): bool + public static function isDefaultPort(UriInterface $uri) : bool { - return $uri->getPort() === null - || (isset(self::DEFAULT_PORTS[$uri->getScheme()]) && $uri->getPort() === self::DEFAULT_PORTS[$uri->getScheme()]); + return $uri->getPort() === null || isset(self::DEFAULT_PORTS[$uri->getScheme()]) && $uri->getPort() === self::DEFAULT_PORTS[$uri->getScheme()]; } - /** * Whether the URI is absolute, i.e. it has a scheme. * @@ -221,11 +167,10 @@ public static function isDefaultPort(UriInterface $uri): bool * @see Uri::isRelativePathReference * @see https://tools.ietf.org/html/rfc3986#section-4 */ - public static function isAbsolute(UriInterface $uri): bool + public static function isAbsolute(UriInterface $uri) : bool { return $uri->getScheme() !== ''; } - /** * Whether the URI is a network-path reference. * @@ -233,11 +178,10 @@ public static function isAbsolute(UriInterface $uri): bool * * @see https://tools.ietf.org/html/rfc3986#section-4.2 */ - public static function isNetworkPathReference(UriInterface $uri): bool + public static function isNetworkPathReference(UriInterface $uri) : bool { return $uri->getScheme() === '' && $uri->getAuthority() !== ''; } - /** * Whether the URI is a absolute-path reference. * @@ -245,14 +189,10 @@ public static function isNetworkPathReference(UriInterface $uri): bool * * @see https://tools.ietf.org/html/rfc3986#section-4.2 */ - public static function isAbsolutePathReference(UriInterface $uri): bool + public static function isAbsolutePathReference(UriInterface $uri) : bool { - return $uri->getScheme() === '' - && $uri->getAuthority() === '' - && isset($uri->getPath()[0]) - && $uri->getPath()[0] === '/'; + return $uri->getScheme() === '' && $uri->getAuthority() === '' && isset($uri->getPath()[0]) && $uri->getPath()[0] === '/'; } - /** * Whether the URI is a relative-path reference. * @@ -260,13 +200,10 @@ public static function isAbsolutePathReference(UriInterface $uri): bool * * @see https://tools.ietf.org/html/rfc3986#section-4.2 */ - public static function isRelativePathReference(UriInterface $uri): bool + public static function isRelativePathReference(UriInterface $uri) : bool { - return $uri->getScheme() === '' - && $uri->getAuthority() === '' - && (!isset($uri->getPath()[0]) || $uri->getPath()[0] !== '/'); + return $uri->getScheme() === '' && $uri->getAuthority() === '' && (!isset($uri->getPath()[0]) || $uri->getPath()[0] !== '/'); } - /** * Whether the URI is a same-document reference. * @@ -279,20 +216,14 @@ public static function isRelativePathReference(UriInterface $uri): bool * * @see https://tools.ietf.org/html/rfc3986#section-4.4 */ - public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool + public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null) : bool { if ($base !== null) { $uri = UriResolver::resolve($base, $uri); - - return ($uri->getScheme() === $base->getScheme()) - && ($uri->getAuthority() === $base->getAuthority()) - && ($uri->getPath() === $base->getPath()) - && ($uri->getQuery() === $base->getQuery()); + return $uri->getScheme() === $base->getScheme() && $uri->getAuthority() === $base->getAuthority() && $uri->getPath() === $base->getPath() && $uri->getQuery() === $base->getQuery(); } - return $uri->getScheme() === '' && $uri->getAuthority() === '' && $uri->getPath() === '' && $uri->getQuery() === ''; } - /** * Creates a new URI with a specific query string value removed. * @@ -302,13 +233,11 @@ public static function isSameDocumentReference(UriInterface $uri, UriInterface $ * @param UriInterface $uri URI to use as a base. * @param string $key Query string key to remove. */ - public static function withoutQueryValue(UriInterface $uri, string $key): UriInterface + public static function withoutQueryValue(UriInterface $uri, string $key) : UriInterface { $result = self::getFilteredQueryString($uri, [$key]); - - return $uri->withQuery(implode('&', $result)); + return $uri->withQuery(\implode('&', $result)); } - /** * Creates a new URI with a specific query string value. * @@ -322,15 +251,12 @@ public static function withoutQueryValue(UriInterface $uri, string $key): UriInt * @param string $key Key to set. * @param string|null $value Value to set */ - public static function withQueryValue(UriInterface $uri, string $key, ?string $value): UriInterface + public static function withQueryValue(UriInterface $uri, string $key, ?string $value) : UriInterface { $result = self::getFilteredQueryString($uri, [$key]); - $result[] = self::generateQueryString($key, $value); - - return $uri->withQuery(implode('&', $result)); + return $uri->withQuery(\implode('&', $result)); } - /** * Creates a new URI with multiple specific query string values. * @@ -339,17 +265,14 @@ public static function withQueryValue(UriInterface $uri, string $key, ?string $v * @param UriInterface $uri URI to use as a base. * @param array $keyValueArray Associative array of key and values */ - public static function withQueryValues(UriInterface $uri, array $keyValueArray): UriInterface + public static function withQueryValues(UriInterface $uri, array $keyValueArray) : UriInterface { - $result = self::getFilteredQueryString($uri, array_keys($keyValueArray)); - + $result = self::getFilteredQueryString($uri, \array_keys($keyValueArray)); foreach ($keyValueArray as $key => $value) { $result[] = self::generateQueryString((string) $key, $value !== null ? (string) $value : null); } - - return $uri->withQuery(implode('&', $result)); + return $uri->withQuery(\implode('&', $result)); } - /** * Creates a URI from a hash of `parse_url` components. * @@ -357,327 +280,247 @@ public static function withQueryValues(UriInterface $uri, array $keyValueArray): * * @throws MalformedUriException If the components do not form a valid URI. */ - public static function fromParts(array $parts): UriInterface + public static function fromParts(array $parts) : UriInterface { $uri = new self(); $uri->applyParts($parts); $uri->validateState(); - return $uri; } - - public function getScheme(): string + public function getScheme() : string { return $this->scheme; } - - public function getAuthority(): string + public function getAuthority() : string { $authority = $this->host; if ($this->userInfo !== '') { - $authority = $this->userInfo.'@'.$authority; + $authority = $this->userInfo . '@' . $authority; } - if ($this->port !== null) { - $authority .= ':'.$this->port; + $authority .= ':' . $this->port; } - return $authority; } - - public function getUserInfo(): string + public function getUserInfo() : string { return $this->userInfo; } - - public function getHost(): string + public function getHost() : string { return $this->host; } - - public function getPort(): ?int + public function getPort() : ?int { return $this->port; } - - public function getPath(): string + public function getPath() : string { return $this->path; } - - public function getQuery(): string + public function getQuery() : string { return $this->query; } - - public function getFragment(): string + public function getFragment() : string { return $this->fragment; } - - public function withScheme($scheme): UriInterface + public function withScheme($scheme) : UriInterface { $scheme = $this->filterScheme($scheme); - if ($this->scheme === $scheme) { return $this; } - $new = clone $this; $new->scheme = $scheme; $new->composedComponents = null; $new->removeDefaultPort(); $new->validateState(); - return $new; } - - public function withUserInfo($user, $password = null): UriInterface + public function withUserInfo($user, $password = null) : UriInterface { $info = $this->filterUserInfoComponent($user); if ($password !== null) { - $info .= ':'.$this->filterUserInfoComponent($password); + $info .= ':' . $this->filterUserInfoComponent($password); } - if ($this->userInfo === $info) { return $this; } - $new = clone $this; $new->userInfo = $info; $new->composedComponents = null; $new->validateState(); - return $new; } - - public function withHost($host): UriInterface + public function withHost($host) : UriInterface { $host = $this->filterHost($host); - if ($this->host === $host) { return $this; } - $new = clone $this; $new->host = $host; $new->composedComponents = null; $new->validateState(); - return $new; } - - public function withPort($port): UriInterface + public function withPort($port) : UriInterface { $port = $this->filterPort($port); - if ($this->port === $port) { return $this; } - $new = clone $this; $new->port = $port; $new->composedComponents = null; $new->removeDefaultPort(); $new->validateState(); - return $new; } - - public function withPath($path): UriInterface + public function withPath($path) : UriInterface { $path = $this->filterPath($path); - if ($this->path === $path) { return $this; } - $new = clone $this; $new->path = $path; $new->composedComponents = null; $new->validateState(); - return $new; } - - public function withQuery($query): UriInterface + public function withQuery($query) : UriInterface { $query = $this->filterQueryAndFragment($query); - if ($this->query === $query) { return $this; } - $new = clone $this; $new->query = $query; $new->composedComponents = null; - return $new; } - - public function withFragment($fragment): UriInterface + public function withFragment($fragment) : UriInterface { $fragment = $this->filterQueryAndFragment($fragment); - if ($this->fragment === $fragment) { return $this; } - $new = clone $this; $new->fragment = $fragment; $new->composedComponents = null; - return $new; } - - public function jsonSerialize(): string + public function jsonSerialize() : string { return $this->__toString(); } - /** * Apply parse_url parts to a URI. * * @param array $parts Array of parse_url parts to apply. */ - private function applyParts(array $parts): void - { - $this->scheme = isset($parts['scheme']) - ? $this->filterScheme($parts['scheme']) - : ''; - $this->userInfo = isset($parts['user']) - ? $this->filterUserInfoComponent($parts['user']) - : ''; - $this->host = isset($parts['host']) - ? $this->filterHost($parts['host']) - : ''; - $this->port = isset($parts['port']) - ? $this->filterPort($parts['port']) - : null; - $this->path = isset($parts['path']) - ? $this->filterPath($parts['path']) - : ''; - $this->query = isset($parts['query']) - ? $this->filterQueryAndFragment($parts['query']) - : ''; - $this->fragment = isset($parts['fragment']) - ? $this->filterQueryAndFragment($parts['fragment']) - : ''; + private function applyParts(array $parts) : void + { + $this->scheme = isset($parts['scheme']) ? $this->filterScheme($parts['scheme']) : ''; + $this->userInfo = isset($parts['user']) ? $this->filterUserInfoComponent($parts['user']) : ''; + $this->host = isset($parts['host']) ? $this->filterHost($parts['host']) : ''; + $this->port = isset($parts['port']) ? $this->filterPort($parts['port']) : null; + $this->path = isset($parts['path']) ? $this->filterPath($parts['path']) : ''; + $this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : ''; + $this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : ''; if (isset($parts['pass'])) { - $this->userInfo .= ':'.$this->filterUserInfoComponent($parts['pass']); + $this->userInfo .= ':' . $this->filterUserInfoComponent($parts['pass']); } - $this->removeDefaultPort(); } - /** * @param mixed $scheme * * @throws \InvalidArgumentException If the scheme is invalid. */ - private function filterScheme($scheme): string + private function filterScheme($scheme) : string { - if (!is_string($scheme)) { + if (!\is_string($scheme)) { throw new \InvalidArgumentException('Scheme must be a string'); } - return \strtr($scheme, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); } - /** * @param mixed $component * * @throws \InvalidArgumentException If the user info is invalid. */ - private function filterUserInfoComponent($component): string + private function filterUserInfoComponent($component) : string { - if (!is_string($component)) { + if (!\is_string($component)) { throw new \InvalidArgumentException('User info must be a string'); } - - return preg_replace_callback( - '/(?:[^%'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.']+|%(?![A-Fa-f0-9]{2}))/', - [$this, 'rawurlencodeMatchZero'], - $component - ); + return \preg_replace_callback('/(?:[^%' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ']+|%(?![A-Fa-f0-9]{2}))/', [$this, 'rawurlencodeMatchZero'], $component); } - /** * @param mixed $host * * @throws \InvalidArgumentException If the host is invalid. */ - private function filterHost($host): string + private function filterHost($host) : string { - if (!is_string($host)) { + if (!\is_string($host)) { throw new \InvalidArgumentException('Host must be a string'); } - return \strtr($host, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); } - /** * @param mixed $port * * @throws \InvalidArgumentException If the port is invalid. */ - private function filterPort($port): ?int + private function filterPort($port) : ?int { if ($port === null) { return null; } - $port = (int) $port; - if (0 > $port || 0xFFFF < $port) { - throw new \InvalidArgumentException( - sprintf('Invalid port: %d. Must be between 0 and 65535', $port) - ); + if (0 > $port || 0xffff < $port) { + throw new \InvalidArgumentException(\sprintf('Invalid port: %d. Must be between 0 and 65535', $port)); } - return $port; } - /** * @param string[] $keys * * @return string[] */ - private static function getFilteredQueryString(UriInterface $uri, array $keys): array + private static function getFilteredQueryString(UriInterface $uri, array $keys) : array { $current = $uri->getQuery(); - if ($current === '') { return []; } - - $decodedKeys = array_map('rawurldecode', $keys); - - return array_filter(explode('&', $current), function ($part) use ($decodedKeys) { - return !in_array(rawurldecode(explode('=', $part)[0]), $decodedKeys, true); + $decodedKeys = \array_map('rawurldecode', $keys); + return \array_filter(\explode('&', $current), function ($part) use($decodedKeys) { + return !\in_array(\rawurldecode(\explode('=', $part)[0]), $decodedKeys, \true); }); } - - private static function generateQueryString(string $key, ?string $value): string + private static function generateQueryString(string $key, ?string $value) : string { // Query string separators ("=", "&") within the key or value need to be encoded // (while preventing double-encoding) before setting the query string. All other // chars that need percent-encoding will be encoded by withQuery(). - $queryString = strtr($key, self::QUERY_SEPARATORS_REPLACEMENT); - + $queryString = \strtr($key, self::QUERY_SEPARATORS_REPLACEMENT); if ($value !== null) { - $queryString .= '='.strtr($value, self::QUERY_SEPARATORS_REPLACEMENT); + $queryString .= '=' . \strtr($value, self::QUERY_SEPARATORS_REPLACEMENT); } - return $queryString; } - - private function removeDefaultPort(): void + private function removeDefaultPort() : void { if ($this->port !== null && self::isDefaultPort($this)) { $this->port = null; } } - /** * Filters the path of a URI * @@ -685,19 +528,13 @@ private function removeDefaultPort(): void * * @throws \InvalidArgumentException If the path is invalid. */ - private function filterPath($path): string + private function filterPath($path) : string { - if (!is_string($path)) { + if (!\is_string($path)) { throw new \InvalidArgumentException('Path must be a string'); } - - return preg_replace_callback( - '/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/', - [$this, 'rawurlencodeMatchZero'], - $path - ); + return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\\/]++|%(?![A-Fa-f0-9]{2}))/', [$this, 'rawurlencodeMatchZero'], $path); } - /** * Filters the query string or fragment of a URI. * @@ -705,35 +542,27 @@ private function filterPath($path): string * * @throws \InvalidArgumentException If the query or fragment is invalid. */ - private function filterQueryAndFragment($str): string + private function filterQueryAndFragment($str) : string { - if (!is_string($str)) { + if (!\is_string($str)) { throw new \InvalidArgumentException('Query and fragment must be a string'); } - - return preg_replace_callback( - '/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', - [$this, 'rawurlencodeMatchZero'], - $str - ); + return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\\/\\?]++|%(?![A-Fa-f0-9]{2}))/', [$this, 'rawurlencodeMatchZero'], $str); } - - private function rawurlencodeMatchZero(array $match): string + private function rawurlencodeMatchZero(array $match) : string { - return rawurlencode($match[0]); + return \rawurlencode($match[0]); } - - private function validateState(): void + private function validateState() : void { if ($this->host === '' && ($this->scheme === 'http' || $this->scheme === 'https')) { $this->host = self::HTTP_DEFAULT_HOST; } - if ($this->getAuthority() === '') { - if (0 === strpos($this->path, '//')) { + if (0 === \strpos($this->path, '//')) { throw new MalformedUriException('The path of a URI without an authority must not start with two slashes "//"'); } - if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) { + if ($this->scheme === '' && \false !== \strpos(\explode('/', $this->path, 2)[0], ':')) { throw new MalformedUriException('A relative URI must not have a path beginning with a segment containing a colon'); } } diff --git a/src/vendor/guzzlehttp/psr7/src/UriComparator.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriComparator.php similarity index 72% rename from src/vendor/guzzlehttp/psr7/src/UriComparator.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriComparator.php index 70c582a..c2b1ff5 100644 --- a/src/vendor/guzzlehttp/psr7/src/UriComparator.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriComparator.php @@ -1,11 +1,9 @@ getHost(), $modified->getHost()) !== 0) { - return true; + return \true; } - if ($original->getScheme() !== $modified->getScheme()) { - return true; + return \true; } - if (self::computePort($original) !== self::computePort($modified)) { - return true; + return \true; } - - return false; + return \false; } - - private static function computePort(UriInterface $uri): int + private static function computePort(UriInterface $uri) : int { $port = $uri->getPort(); - if (null !== $port) { return $port; } - return 'https' === $uri->getScheme() ? 443 : 80; } - private function __construct() { // cannot be instantiated diff --git a/src/vendor/guzzlehttp/psr7/src/UriNormalizer.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriNormalizer.php similarity index 83% rename from src/vendor/guzzlehttp/psr7/src/UriNormalizer.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriNormalizer.php index 3d98210..1c367b9 100644 --- a/src/vendor/guzzlehttp/psr7/src/UriNormalizer.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriNormalizer.php @@ -1,11 +1,9 @@ getPath() === '' && - ($uri->getScheme() === 'http' || $uri->getScheme() === 'https') - ) { + if ($flags & self::CONVERT_EMPTY_PATH && $uri->getPath() === '' && ($uri->getScheme() === 'http' || $uri->getScheme() === 'https')) { $uri = $uri->withPath('/'); } - if ($flags & self::REMOVE_DEFAULT_HOST && $uri->getScheme() === 'file' && $uri->getHost() === 'localhost') { $uri = $uri->withHost(''); } - if ($flags & self::REMOVE_DEFAULT_PORT && $uri->getPort() !== null && Uri::isDefaultPort($uri)) { $uri = $uri->withPort(null); } - if ($flags & self::REMOVE_DOT_SEGMENTS && !Uri::isRelativePathReference($uri)) { $uri = $uri->withPath(UriResolver::removeDotSegments($uri->getPath())); } - if ($flags & self::REMOVE_DUPLICATE_SLASHES) { - $uri = $uri->withPath(preg_replace('#//++#', '/', $uri->getPath())); + $uri = $uri->withPath(\preg_replace('#//++#', '/', $uri->getPath())); } - if ($flags & self::SORT_QUERY_PARAMETERS && $uri->getQuery() !== '') { - $queryKeyValues = explode('&', $uri->getQuery()); - sort($queryKeyValues); - $uri = $uri->withQuery(implode('&', $queryKeyValues)); + $queryKeyValues = \explode('&', $uri->getQuery()); + \sort($queryKeyValues); + $uri = $uri->withQuery(\implode('&', $queryKeyValues)); } - return $uri; } - /** * Whether two URIs can be considered equivalent. * @@ -176,43 +148,26 @@ public static function normalize(UriInterface $uri, int $flags = self::PRESERVIN * * @see https://tools.ietf.org/html/rfc3986#section-6.1 */ - public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool + public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS) : bool { return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations); } - - private static function capitalizePercentEncoding(UriInterface $uri): UriInterface + private static function capitalizePercentEncoding(UriInterface $uri) : UriInterface { $regex = '/(?:%[A-Fa-f0-9]{2})++/'; - $callback = function (array $match) { - return strtoupper($match[0]); + return \strtoupper($match[0]); }; - - return - $uri->withPath( - preg_replace_callback($regex, $callback, $uri->getPath()) - )->withQuery( - preg_replace_callback($regex, $callback, $uri->getQuery()) - ); + return $uri->withPath(\preg_replace_callback($regex, $callback, $uri->getPath()))->withQuery(\preg_replace_callback($regex, $callback, $uri->getQuery())); } - - private static function decodeUnreservedCharacters(UriInterface $uri): UriInterface + private static function decodeUnreservedCharacters(UriInterface $uri) : UriInterface { $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i'; - $callback = function (array $match) { - return rawurldecode($match[0]); + return \rawurldecode($match[0]); }; - - return - $uri->withPath( - preg_replace_callback($regex, $callback, $uri->getPath()) - )->withQuery( - preg_replace_callback($regex, $callback, $uri->getQuery()) - ); + return $uri->withPath(\preg_replace_callback($regex, $callback, $uri->getPath()))->withQuery(\preg_replace_callback($regex, $callback, $uri->getQuery())); } - private function __construct() { // cannot be instantiated diff --git a/src/vendor/guzzlehttp/psr7/src/UriResolver.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriResolver.php similarity index 79% rename from src/vendor/guzzlehttp/psr7/src/UriResolver.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriResolver.php index b942d1c..9563431 100644 --- a/src/vendor/guzzlehttp/psr7/src/UriResolver.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/UriResolver.php @@ -1,11 +1,9 @@ getScheme() != '') { return $rel->withPath(self::removeDotSegments($rel->getPath())); } - if ($rel->getAuthority() != '') { $targetAuthority = $rel->getAuthority(); $targetPath = self::removeDotSegments($rel->getPath()); @@ -80,13 +71,13 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf $targetPath = $rel->getPath(); } else { if ($targetAuthority != '' && $base->getPath() === '') { - $targetPath = '/'.$rel->getPath(); + $targetPath = '/' . $rel->getPath(); } else { - $lastSlashPos = strrpos($base->getPath(), '/'); - if ($lastSlashPos === false) { + $lastSlashPos = \strrpos($base->getPath(), '/'); + if ($lastSlashPos === \false) { $targetPath = $rel->getPath(); } else { - $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1).$rel->getPath(); + $targetPath = \substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath(); } } } @@ -94,16 +85,8 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf $targetQuery = $rel->getQuery(); } } - - return new Uri(Uri::composeComponents( - $base->getScheme(), - $targetAuthority, - $targetPath, - $targetQuery, - $rel->getFragment() - )); + return new Uri(Uri::composeComponents($base->getScheme(), $targetAuthority, $targetPath, $targetQuery, $rel->getFragment())); } - /** * Returns the target URI as a relative reference from the base URI. * @@ -125,58 +108,47 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf * * echo UriResolver::relativize($base, new Uri('/a/b/c')); // prints 'c' as well */ - public static function relativize(UriInterface $base, UriInterface $target): UriInterface + public static function relativize(UriInterface $base, UriInterface $target) : UriInterface { - if ($target->getScheme() !== '' && - ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '') - ) { + if ($target->getScheme() !== '' && ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '')) { return $target; } - if (Uri::isRelativePathReference($target)) { // As the target is already highly relative we return it as-is. It would be possible to resolve // the target with `$target = self::resolve($base, $target);` and then try make it more relative // by removing a duplicate query. But let's not do that automatically. return $target; } - if ($target->getAuthority() !== '' && $base->getAuthority() !== $target->getAuthority()) { return $target->withScheme(''); } - // We must remove the path before removing the authority because if the path starts with two slashes, the URI // would turn invalid. And we also cannot set a relative path before removing the authority, as that is also // invalid. $emptyPathUri = $target->withScheme('')->withPath('')->withUserInfo('')->withPort(null)->withHost(''); - if ($base->getPath() !== $target->getPath()) { return $emptyPathUri->withPath(self::getRelativePath($base, $target)); } - if ($base->getQuery() === $target->getQuery()) { // Only the target fragment is left. And it must be returned even if base and target fragment are the same. return $emptyPathUri->withQuery(''); } - // If the base URI has a query but the target has none, we cannot return an empty path reference as it would // inherit the base query component when resolving. if ($target->getQuery() === '') { - $segments = explode('/', $target->getPath()); + $segments = \explode('/', $target->getPath()); /** @var string $lastSegment */ - $lastSegment = end($segments); - + $lastSegment = \end($segments); return $emptyPathUri->withPath($lastSegment === '' ? './' : $lastSegment); } - return $emptyPathUri; } - - private static function getRelativePath(UriInterface $base, UriInterface $target): string + private static function getRelativePath(UriInterface $base, UriInterface $target) : string { - $sourceSegments = explode('/', $base->getPath()); - $targetSegments = explode('/', $target->getPath()); - array_pop($sourceSegments); - $targetLastSegment = array_pop($targetSegments); + $sourceSegments = \explode('/', $base->getPath()); + $targetSegments = \explode('/', $target->getPath()); + \array_pop($sourceSegments); + $targetLastSegment = \array_pop($targetSegments); foreach ($sourceSegments as $i => $segment) { if (isset($targetSegments[$i]) && $segment === $targetSegments[$i]) { unset($sourceSegments[$i], $targetSegments[$i]); @@ -185,25 +157,22 @@ private static function getRelativePath(UriInterface $base, UriInterface $target } } $targetSegments[] = $targetLastSegment; - $relativePath = str_repeat('../', count($sourceSegments)).implode('/', $targetSegments); - + $relativePath = \str_repeat('../', \count($sourceSegments)) . \implode('/', $targetSegments); // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./". // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used // as the first segment of a relative-path reference, as it would be mistaken for a scheme name. - if ('' === $relativePath || false !== strpos(explode('/', $relativePath, 2)[0], ':')) { - $relativePath = "./$relativePath"; + if ('' === $relativePath || \false !== \strpos(\explode('/', $relativePath, 2)[0], ':')) { + $relativePath = "./{$relativePath}"; } elseif ('/' === $relativePath[0]) { if ($base->getAuthority() != '' && $base->getPath() === '') { // In this case an extra slash is added by resolve() automatically. So we must not add one here. - $relativePath = ".$relativePath"; + $relativePath = ".{$relativePath}"; } else { - $relativePath = "./$relativePath"; + $relativePath = "./{$relativePath}"; } } - return $relativePath; } - private function __construct() { // cannot be instantiated diff --git a/src/vendor/guzzlehttp/psr7/src/Utils.php b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Utils.php similarity index 76% rename from src/vendor/guzzlehttp/psr7/src/Utils.php rename to src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Utils.php index 49b481e..75413fe 100644 --- a/src/vendor/guzzlehttp/psr7/src/Utils.php +++ b/src/vendor_prefixed/vendor/guzzlehttp/psr7/src/Utils.php @@ -1,14 +1,12 @@ $v) { - if (!is_string($k) || !in_array(strtolower($k), $keys)) { + if (!\is_string($k) || !\in_array(\strtolower($k), $keys)) { $result[$k] = $v; } } - return $result; } - /** * Copy the contents of a stream into another stream until the given number * of bytes have been read. @@ -44,10 +38,9 @@ public static function caselessRemove(array $keys, array $data): array * * @throws \RuntimeException on error. */ - public static function copyToStream(StreamInterface $source, StreamInterface $dest, int $maxLen = -1): void + public static function copyToStream(StreamInterface $source, StreamInterface $dest, int $maxLen = -1) : void { $bufferSize = 8192; - if ($maxLen === -1) { while (!$source->eof()) { if (!$dest->write($source->read($bufferSize))) { @@ -57,8 +50,8 @@ public static function copyToStream(StreamInterface $source, StreamInterface $de } else { $remaining = $maxLen; while ($remaining > 0 && !$source->eof()) { - $buf = $source->read(min($bufferSize, $remaining)); - $len = strlen($buf); + $buf = $source->read(\min($bufferSize, $remaining)); + $len = \strlen($buf); if (!$len) { break; } @@ -67,7 +60,6 @@ public static function copyToStream(StreamInterface $source, StreamInterface $de } } } - /** * Copy the contents of a stream into a string until the given number of * bytes have been read. @@ -78,10 +70,9 @@ public static function copyToStream(StreamInterface $source, StreamInterface $de * * @throws \RuntimeException on error. */ - public static function copyToString(StreamInterface $stream, int $maxLen = -1): string + public static function copyToString(StreamInterface $stream, int $maxLen = -1) : string { $buffer = ''; - if ($maxLen === -1) { while (!$stream->eof()) { $buf = $stream->read(1048576); @@ -90,10 +81,8 @@ public static function copyToString(StreamInterface $stream, int $maxLen = -1): } $buffer .= $buf; } - return $buffer; } - $len = 0; while (!$stream->eof() && $len < $maxLen) { $buf = $stream->read($maxLen - $len); @@ -101,12 +90,10 @@ public static function copyToString(StreamInterface $stream, int $maxLen = -1): break; } $buffer .= $buf; - $len = strlen($buffer); + $len = \strlen($buffer); } - return $buffer; } - /** * Calculate a hash of a stream. * @@ -119,25 +106,20 @@ public static function copyToString(StreamInterface $stream, int $maxLen = -1): * * @throws \RuntimeException on error. */ - public static function hash(StreamInterface $stream, string $algo, bool $rawOutput = false): string + public static function hash(StreamInterface $stream, string $algo, bool $rawOutput = \false) : string { $pos = $stream->tell(); - if ($pos > 0) { $stream->rewind(); } - - $ctx = hash_init($algo); + $ctx = \hash_init($algo); while (!$stream->eof()) { - hash_update($ctx, $stream->read(1048576)); + \hash_update($ctx, $stream->read(1048576)); } - - $out = hash_final($ctx, $rawOutput); + $out = \hash_final($ctx, $rawOutput); $stream->seek($pos); - return $out; } - /** * Clone and modify a request with the given changes. * @@ -156,86 +138,57 @@ public static function hash(StreamInterface $stream, string $algo, bool $rawOutp * @param RequestInterface $request Request to clone and modify. * @param array $changes Changes to apply. */ - public static function modifyRequest(RequestInterface $request, array $changes): RequestInterface + public static function modifyRequest(RequestInterface $request, array $changes) : RequestInterface { if (!$changes) { return $request; } - $headers = $request->getHeaders(); - if (!isset($changes['uri'])) { $uri = $request->getUri(); } else { // Remove the host header if one is on the URI if ($host = $changes['uri']->getHost()) { $changes['set_headers']['Host'] = $host; - if ($port = $changes['uri']->getPort()) { $standardPorts = ['http' => 80, 'https' => 443]; $scheme = $changes['uri']->getScheme(); if (isset($standardPorts[$scheme]) && $port != $standardPorts[$scheme]) { - $changes['set_headers']['Host'] .= ':'.$port; + $changes['set_headers']['Host'] .= ':' . $port; } } } $uri = $changes['uri']; } - if (!empty($changes['remove_headers'])) { $headers = self::caselessRemove($changes['remove_headers'], $headers); } - if (!empty($changes['set_headers'])) { - $headers = self::caselessRemove(array_keys($changes['set_headers']), $headers); + $headers = self::caselessRemove(\array_keys($changes['set_headers']), $headers); $headers = $changes['set_headers'] + $headers; } - if (isset($changes['query'])) { $uri = $uri->withQuery($changes['query']); } - if ($request instanceof ServerRequestInterface) { - $new = (new ServerRequest( - $changes['method'] ?? $request->getMethod(), - $uri, - $headers, - $changes['body'] ?? $request->getBody(), - $changes['version'] ?? $request->getProtocolVersion(), - $request->getServerParams() - )) - ->withParsedBody($request->getParsedBody()) - ->withQueryParams($request->getQueryParams()) - ->withCookieParams($request->getCookieParams()) - ->withUploadedFiles($request->getUploadedFiles()); - + $new = (new ServerRequest($changes['method'] ?? $request->getMethod(), $uri, $headers, $changes['body'] ?? $request->getBody(), $changes['version'] ?? $request->getProtocolVersion(), $request->getServerParams()))->withParsedBody($request->getParsedBody())->withQueryParams($request->getQueryParams())->withCookieParams($request->getCookieParams())->withUploadedFiles($request->getUploadedFiles()); foreach ($request->getAttributes() as $key => $value) { $new = $new->withAttribute($key, $value); } - return $new; } - - return new Request( - $changes['method'] ?? $request->getMethod(), - $uri, - $headers, - $changes['body'] ?? $request->getBody(), - $changes['version'] ?? $request->getProtocolVersion() - ); + return new Request($changes['method'] ?? $request->getMethod(), $uri, $headers, $changes['body'] ?? $request->getBody(), $changes['version'] ?? $request->getProtocolVersion()); } - /** * Read a line from the stream up to the maximum allowed buffer length. * * @param StreamInterface $stream Stream to read from * @param int|null $maxLength Maximum buffer length */ - public static function readLine(StreamInterface $stream, ?int $maxLength = null): string + public static function readLine(StreamInterface $stream, ?int $maxLength = null) : string { $buffer = ''; $size = 0; - while (!$stream->eof()) { if ('' === ($byte = $stream->read(1))) { return $buffer; @@ -246,10 +199,8 @@ public static function readLine(StreamInterface $stream, ?int $maxLength = null) break; } } - return $buffer; } - /** * Create a new stream based on the input type. * @@ -284,63 +235,55 @@ public static function readLine(StreamInterface $stream, ?int $maxLength = null) * * @throws \InvalidArgumentException if the $resource arg is not valid. */ - public static function streamFor($resource = '', array $options = []): StreamInterface + public static function streamFor($resource = '', array $options = []) : StreamInterface { - if (is_scalar($resource)) { + if (\is_scalar($resource)) { $stream = self::tryFopen('php://temp', 'r+'); if ($resource !== '') { - fwrite($stream, (string) $resource); - fseek($stream, 0); + \fwrite($stream, (string) $resource); + \fseek($stream, 0); } - return new Stream($stream, $options); } - - switch (gettype($resource)) { + switch (\gettype($resource)) { case 'resource': /* * The 'php://input' is a special stream with quirks and inconsistencies. * We avoid using that stream by reading it into php://temp */ - /** @var resource $resource */ if ((\stream_get_meta_data($resource)['uri'] ?? '') === 'php://input') { $stream = self::tryFopen('php://temp', 'w+'); - stream_copy_to_stream($resource, $stream); - fseek($stream, 0); + \stream_copy_to_stream($resource, $stream); + \fseek($stream, 0); $resource = $stream; } - return new Stream($resource, $options); case 'object': /** @var object $resource */ if ($resource instanceof StreamInterface) { return $resource; } elseif ($resource instanceof \Iterator) { - return new PumpStream(function () use ($resource) { + return new PumpStream(function () use($resource) { if (!$resource->valid()) { - return false; + return \false; } $result = $resource->current(); $resource->next(); - return $result; }, $options); - } elseif (method_exists($resource, '__toString')) { + } elseif (\method_exists($resource, '__toString')) { return self::streamFor((string) $resource, $options); } break; case 'NULL': return new Stream(self::tryFopen('php://temp', 'r+'), $options); } - - if (is_callable($resource)) { + if (\is_callable($resource)) { return new PumpStream($resource, $options); } - - throw new \InvalidArgumentException('Invalid resource type: '.gettype($resource)); + throw new \InvalidArgumentException('Invalid resource type: ' . \gettype($resource)); } - /** * Safely opens a PHP stream resource using a filename. * @@ -357,39 +300,23 @@ public static function streamFor($resource = '', array $options = []): StreamInt public static function tryFopen(string $filename, string $mode) { $ex = null; - set_error_handler(static function (int $errno, string $errstr) use ($filename, $mode, &$ex): bool { - $ex = new \RuntimeException(sprintf( - 'Unable to open "%s" using mode "%s": %s', - $filename, - $mode, - $errstr - )); - - return true; + \set_error_handler(static function (int $errno, string $errstr) use($filename, $mode, &$ex) : bool { + $ex = new \RuntimeException(\sprintf('Unable to open "%s" using mode "%s": %s', $filename, $mode, $errstr)); + return \true; }); - try { /** @var resource $handle */ - $handle = fopen($filename, $mode); + $handle = \fopen($filename, $mode); } catch (\Throwable $e) { - $ex = new \RuntimeException(sprintf( - 'Unable to open "%s" using mode "%s": %s', - $filename, - $mode, - $e->getMessage() - ), 0, $e); + $ex = new \RuntimeException(\sprintf('Unable to open "%s" using mode "%s": %s', $filename, $mode, $e->getMessage()), 0, $e); } - - restore_error_handler(); - + \restore_error_handler(); if ($ex) { /** @var $ex \RuntimeException */ throw $ex; } - return $handle; } - /** * Safely gets the contents of a given stream. * @@ -401,42 +328,29 @@ public static function tryFopen(string $filename, string $mode) * * @throws \RuntimeException if the stream cannot be read */ - public static function tryGetContents($stream): string + public static function tryGetContents($stream) : string { $ex = null; - set_error_handler(static function (int $errno, string $errstr) use (&$ex): bool { - $ex = new \RuntimeException(sprintf( - 'Unable to read stream contents: %s', - $errstr - )); - - return true; + \set_error_handler(static function (int $errno, string $errstr) use(&$ex) : bool { + $ex = new \RuntimeException(\sprintf('Unable to read stream contents: %s', $errstr)); + return \true; }); - try { /** @var string|false $contents */ - $contents = stream_get_contents($stream); - - if ($contents === false) { + $contents = \stream_get_contents($stream); + if ($contents === \false) { $ex = new \RuntimeException('Unable to read stream contents'); } } catch (\Throwable $e) { - $ex = new \RuntimeException(sprintf( - 'Unable to read stream contents: %s', - $e->getMessage() - ), 0, $e); + $ex = new \RuntimeException(\sprintf('Unable to read stream contents: %s', $e->getMessage()), 0, $e); } - - restore_error_handler(); - + \restore_error_handler(); if ($ex) { /** @var $ex \RuntimeException */ throw $ex; } - return $contents; } - /** * Returns a UriInterface for the given value. * @@ -448,16 +362,14 @@ public static function tryGetContents($stream): string * * @throws \InvalidArgumentException */ - public static function uriFor($uri): UriInterface + public static function uriFor($uri) : UriInterface { if ($uri instanceof UriInterface) { return $uri; } - - if (is_string($uri)) { + if (\is_string($uri)) { return new Uri($uri); } - throw new \InvalidArgumentException('URI must be a string or UriInterface'); } } diff --git a/src/vendor/noweh/twitter-api-v2-php/coverage.xml b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/coverage.xml similarity index 100% rename from src/vendor/noweh/twitter-api-v2-php/coverage.xml rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/coverage.xml diff --git a/src/vendor/noweh/twitter-api-v2-php/phpunit.xml b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/phpunit.xml similarity index 100% rename from src/vendor/noweh/twitter-api-v2-php/phpunit.xml rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/phpunit.xml diff --git a/src/vendor/noweh/twitter-api-v2-php/src/AbstractController.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/AbstractController.php similarity index 63% rename from src/vendor/noweh/twitter-api-v2-php/src/AbstractController.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/AbstractController.php index 30ced25..394d8a8 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/AbstractController.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/AbstractController.php @@ -1,23 +1,21 @@ performRequest(). */ protected const API_METHODS = ['GET', 'POST', 'PUT', 'DELETE']; - /** * @var int $auth_mode API Auth Mode * 0 use Bearer token. @@ -25,40 +23,28 @@ abstract class AbstractController * 2 use Authorization Code Flow */ protected int $auth_mode = 0; - /** @var string $endpoint */ private string $endpoint = ''; - /** @var int $account_id OAuth1 User ID */ protected int $account_id; - /** @var string */ private string $access_token; - /** @var string */ private string $access_token_secret; - /** @var string */ private string $consumer_key; - /** @var string */ private string $consumer_secret; - /** @var string */ private string $bearer_token; - /** @var string|null $next_page_token Next Page Token for API pagination. */ protected ?string $next_page_token = null; - /** @var string $mode mode of operation */ private string $http_request_method = 'GET'; - /** @var array $query_string */ protected array $query_string = []; - /** @var array $post_body */ protected array $post_body = []; - /** * Creates object. Requires an array of settings. * @param array $settings @@ -70,85 +56,65 @@ public function __construct(array $settings) $this->extensionLoaded('json'); $this->parseSettings($settings); } - /** * Perform the request to Twitter API * @param array $postData * @return mixed * @throws \GuzzleHttp\Exception\GuzzleException|\RuntimeException|\JsonException */ - public function performRequest(array $postData = [], $withHeaders = false) + public function performRequest(array $postData = [], $withHeaders = \false) { try { - $headers = [ - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - ]; - - if ($this->auth_mode === 0) { // Bearer Token + $headers = ['Content-Type' => 'application/json', 'Accept' => 'application/json']; + if ($this->auth_mode === 0) { + // Bearer Token // Inject the Bearer token header $client = new Client(['base_uri' => self::API_BASE_URI]); $headers['Authorization'] = 'Bearer ' . $this->bearer_token; - } elseif ($this->auth_mode === 1) { // OAuth 1.0a User Context + } elseif ($this->auth_mode === 1) { + // OAuth 1.0a User Context // Insert Oauth1 middleware $stack = HandlerStack::create(); - $middleware = new Oauth1([ - 'consumer_key' => $this->consumer_key, - 'consumer_secret' => $this->consumer_secret, - 'token' => $this->access_token, - 'token_secret' => $this->access_token_secret, - ]); + $middleware = new Oauth1(['consumer_key' => $this->consumer_key, 'consumer_secret' => $this->consumer_secret, 'token' => $this->access_token, 'token_secret' => $this->access_token_secret]); $stack->push($middleware); - $client = new Client([ - 'base_uri' => self::API_BASE_URI, - 'handler' => $stack, - 'auth' => 'oauth' - ]); - } else { // OAuth 2.0 Authorization Code Flow + $client = new Client(['base_uri' => self::API_BASE_URI, 'handler' => $stack, 'auth' => 'oauth']); + } else { + // OAuth 2.0 Authorization Code Flow throw new \RuntimeException('OAuth 2.0 Authorization Code Flow had not been implemented & also requires user interaction.'); } - - $response = $client->request($this->getHttpRequestMethod(), $this->constructEndpoint(), [ - 'verify' => !$this->is_windows(), // else composer script will break. + $response = $client->request($this->getHttpRequestMethod(), $this->constructEndpoint(), [ + 'verify' => !$this->is_windows(), + // else composer script will break. 'headers' => $headers, // This is always array from function spec, use count to see if data set. // Otherwise, twitter error on empty data. - 'json' => count($postData) ? $postData : null, + 'json' => \count($postData) ? $postData : null, ]); - - $body = json_decode($response->getBody()->getContents(), false, 512, JSON_THROW_ON_ERROR); - + $body = \json_decode($response->getBody()->getContents(), \false, 512, \JSON_THROW_ON_ERROR); if ($withHeaders) { $body->headers = $response->getHeaders(); } - if ($response->getStatusCode() >= 400) { $error = new \stdClass(); $error->message = 'cURL error'; if ($body) { $error->details = $response; } - throw new \RuntimeException( - json_encode($error, JSON_THROW_ON_ERROR), - $response->getStatusCode() - ); + throw new \RuntimeException(\json_encode($error, \JSON_THROW_ON_ERROR), $response->getStatusCode()); } return $body; - } catch (ServerException $e) { /** @var \stdClass $payload */ - $payload = json_decode(str_replace("\n", "", $e->getResponse()->getBody()->getContents()), false, 512, - JSON_THROW_ON_ERROR); + $payload = \json_decode(\str_replace("\n", "", $e->getResponse()->getBody()->getContents()), \false, 512, \JSON_THROW_ON_ERROR); throw new \RuntimeException($payload->detail, $payload->status); - } catch (\GuzzleHttp\Exception\RequestException $e) { + } catch (\WpToTwitter_Vendor\GuzzleHttp\Exception\RequestException $e) { throw new \RuntimeException($e->getResponse()->getBody()->getContents(), $e->getCode()); } } - - private function is_windows(): bool { - return DIRECTORY_SEPARATOR === '\\'; + private function is_windows() : bool + { + return \DIRECTORY_SEPARATOR === '\\'; } - /** * Set Auth-Mode * @param int $value 0 use Bearer token. @@ -156,44 +122,29 @@ private function is_windows(): bool { * 2 not implemented. * @return void */ - public function setAuthMode(int $value): void + public function setAuthMode(int $value) : void { $this->auth_mode = $value; } - /** * @throws \Exception */ - private function extensionLoaded(string $ext): void + private function extensionLoaded(string $ext) : void { - if (!extension_loaded($ext)) { - throw new \Exception('PHP extension '.strtoupper($ext).' is not loaded.'); + if (!\extension_loaded($ext)) { + throw new \Exception('PHP extension ' . \strtoupper($ext) . ' is not loaded.'); } } - /** * @param array $settings * @return void * @throws \Exception */ - private function parseSettings(array $settings): void + private function parseSettings(array $settings) : void { - if (!isset( - // Account ID - $settings['account_id'], - - // Consumer Keys - $settings['consumer_key'], - $settings['consumer_secret'], - - // Authentication Tokens - $settings['bearer_token'], - $settings['access_token'], - $settings['access_token_secret'] - )) { + if (!isset($settings['account_id'], $settings['consumer_key'], $settings['consumer_secret'], $settings['bearer_token'], $settings['access_token'], $settings['access_token_secret'])) { throw new \Exception('Incomplete settings passed.'); } - $this->account_id = (int) $settings['account_id']; $this->consumer_key = $settings['consumer_key']; $this->consumer_secret = $settings['consumer_secret']; @@ -201,55 +152,50 @@ private function parseSettings(array $settings): void $this->access_token = $settings['access_token']; $this->access_token_secret = $settings['access_token_secret']; } - /** * Set Endpoint value * @param string $endpoint * @return void */ - protected function setEndpoint(string $endpoint): void + protected function setEndpoint(string $endpoint) : void { $this->endpoint = $endpoint; } - /** * Retrieve Endpoint value * @return string */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { return $this->endpoint; } - /** * Set Pagination Token * @param string $value * @return AbstractController * @noinspection PhpUnused */ - public function setPaginationToken(string $value): AbstractController + public function setPaginationToken(string $value) : AbstractController { $this->next_page_token = $value; return $this; } - /** * Set HTTP Request Method * @param string $value * @return void */ - protected function setHttpRequestMethod(string $value): void + protected function setHttpRequestMethod(string $value) : void { - if (in_array($value, self::API_METHODS)) { + if (\in_array($value, self::API_METHODS)) { $this->http_request_method = $value; } } - /** * Get HTTP Request Method * @return string */ - private function getHttpRequestMethod(): string + private function getHttpRequestMethod() : string { return $this->http_request_method; } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/Client.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Client.php similarity index 79% rename from src/vendor/noweh/twitter-api-v2-php/src/Client.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Client.php index 985f0d1..8421a6e 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/Client.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Client.php @@ -1,6 +1,6 @@ */ protected array $settings = []; - /** * Client initialization. * @param array $settings @@ -18,143 +17,129 @@ public function __construct(array $settings) { $this->settings = $settings; } - /** * Upload Media to Twitter * @return Media * @throws \Exception */ - public function uploadMedia(): Media + public function uploadMedia() : Media { return new Media($this->settings); } - /** * Access to Retweet endpoints. * @return Retweet * @throws \Exception */ - public function retweet(): Retweet + public function retweet() : Retweet { return new Retweet($this->settings); } - /** * Access to Timeline endpoints. * @return Timeline * @throws \Exception */ - public function timeline(): Timeline + public function timeline() : Timeline { return new Timeline($this->settings); } - /** * Access to Tweet endpoints. * @return Tweet * @throws \Exception */ - public function tweet(): Tweet + public function tweet() : Tweet { return new Tweet($this->settings); } - /** * Access to Tweet/Bookmarks endpoints. * @return TweetBookmarks * @throws \Exception */ - public function tweetBookmarks(): TweetBookmarks + public function tweetBookmarks() : TweetBookmarks { return new TweetBookmarks($this->settings); } - /** * Access to Tweet/Likes endpoints. * @return TweetLikes * @throws \Exception */ - public function tweetLikes(): TweetLikes + public function tweetLikes() : TweetLikes { return new TweetLikes($this->settings); } - /** * Access to Tweet/Lookup endpoints. * @return TweetLookup * @throws \Exception */ - public function tweetLookup(): TweetLookup + public function tweetLookup() : TweetLookup { return new TweetLookup($this->settings); } - /** * Access to Tweet/Quotes endpoints. * @return TweetQuotes * @throws \Exception */ - public function tweetQuotes(): TweetQuotes + public function tweetQuotes() : TweetQuotes { return new TweetQuotes($this->settings); } - /** * Access to Tweet/Replies endpoints. * @return TweetReplies * @throws \Exception */ - public function tweetReplies(): TweetReplies + public function tweetReplies() : TweetReplies { return new TweetReplies($this->settings); } - /** * Access To User/Blocks endpoints. * @return UserBlocks * @throws \Exception */ - public function userBlocks(): UserBlocks + public function userBlocks() : UserBlocks { return new UserBlocks($this->settings); } - /** * Access To User/Follows endpoints. * @return UserFollows * @throws \Exception */ - public function userFollows(): UserFollows + public function userFollows() : UserFollows { return new UserFollows($this->settings); } - /** * Access To User/Lookup endpoints. * @return UserLookup * @throws \Exception */ - public function userLookup(): UserLookup + public function userLookup() : UserLookup { return new UserLookup($this->settings); } - /** * Access To user/me endpoint. * @return UserMeLookup * @throws \Exception */ - public function userMeLookup(): UserMeLookup + public function userMeLookup() : UserMeLookup { return new UserMeLookup($this->settings); } - /** * Access To User/Mutes endpoints. * @return UserMutes * @throws \Exception */ - public function userMutes(): UserMutes + public function userMutes() : UserMutes { return new UserMutes($this->settings); } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/Media.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Media.php similarity index 51% rename from src/vendor/noweh/twitter-api-v2-php/src/Media.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Media.php index 0a3229a..15033b9 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/Media.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Media.php @@ -1,13 +1,12 @@ @@ -19,7 +18,6 @@ class Media extends AbstractController * @var Client */ private Client $client; - /** * @param array $settings * @throws Exception @@ -31,30 +29,19 @@ public function __construct(array $settings) $this->setHttpRequestMethod('POST'); $this->prepareRequest($settings); } - /** * Prepare request to upload images to Twitter * @param array $settings * @return void */ - private function prepareRequest(array $settings = []): void + private function prepareRequest(array $settings = []) : void { // Insert Oauth1 middleware $stack = HandlerStack::create(); - $oAuth1 = new Oauth1([ - 'consumer_key' => $settings['consumer_key'], - 'consumer_secret' => $settings['consumer_secret'], - 'token' => $settings['access_token'], - 'token_secret' => $settings['access_token_secret'], - ]); + $oAuth1 = new Oauth1(['consumer_key' => $settings['consumer_key'], 'consumer_secret' => $settings['consumer_secret'], 'token' => $settings['access_token'], 'token_secret' => $settings['access_token_secret']]); $stack->push($oAuth1); - $this->client = new Client([ - 'base_uri' => "https://upload.twitter.com/1.1/", - 'handler' => $stack, - 'auth' => 'oauth' - ]); + $this->client = new Client(['base_uri' => "https://upload.twitter.com/1.1/", 'handler' => $stack, 'auth' => 'oauth']); } - /** * Upload media to Twitter * @param string $filedata Base64 encoded binary file @@ -62,31 +49,17 @@ private function prepareRequest(array $settings = []): void * @throws JsonException * @throws Exception */ - public function upload(string $filedata = ""): ?array + public function upload(string $filedata = "") : ?array { try { - $headers = [ - 'Accept' => 'application/json' - ]; - - $response = $this->client->request("POST", "media/upload.json?media_category=TWEET_IMAGE", [ - 'verify' => !(DIRECTORY_SEPARATOR === '\\'), - 'headers' => $headers, - 'multipart' => [ - [ - "name" => "media_data", - "contents" => $filedata - ] - ], - ]); - + $headers = ['Accept' => 'application/json']; + $response = $this->client->request("POST", "media/upload.json?media_category=TWEET_IMAGE", ['verify' => !(\DIRECTORY_SEPARATOR === '\\'), 'headers' => $headers, 'multipart' => [["name" => "media_data", "contents" => $filedata]]]); if ($response->getStatusCode() === 200) { - return json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR); + return \json_decode($response->getBody()->getContents(), \true, 512, \JSON_THROW_ON_ERROR); } } catch (Exception $e) { throw new \RuntimeException($e->getResponse()->getBody()->getContents(), $e->getCode()); } - return null; } } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/Retweet.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Retweet.php similarity index 92% rename from src/vendor/noweh/twitter-api-v2-php/src/Retweet.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Retweet.php index a3b99c4..7642009 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/Retweet.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Retweet.php @@ -1,6 +1,6 @@ setEndpoint('users/' . $user_id . '/mentions'); return $this; } - /** * User Tweet timeline * Returns most recent Tweets composed a specified user ID * @param string $user_id * @return Timeline */ - public function getRecentTweets(string $user_id): Timeline + public function getRecentTweets(string $user_id) : Timeline { $this->setEndpoint('users/' . $user_id . '/tweets'); return $this; } - /** * Reverse chronological timeline * Returns a collection of recent Tweets by you and users you follow. * @return Timeline * @throws \Exception */ - public function getReverseChronological(): Timeline + public function getReverseChronological() : Timeline { - if (property_exists($this, 'account_id')) { + if (\property_exists($this, 'account_id')) { $this->setEndpoint('users/' . $this->account_id . '/timelines/reverse_chronological'); } else { throw new \Exception('Incomplete settings passed. Expected "account_id"'); @@ -49,17 +47,17 @@ public function getReverseChronological(): Timeline $this->setAuthMode(1); return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string { + protected function constructEndpoint() : string + { $endpoint = parent::constructEndpoint(); - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; - $endpoint .= '?' . http_build_query($this->query_string); + $endpoint .= '?' . \http_build_query($this->query_string); } return $endpoint; } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/Tweet.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Tweet.php similarity index 84% rename from src/vendor/noweh/twitter-api-v2-php/src/Tweet.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Tweet.php index 5329c3a..a26625f 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/Tweet.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/Tweet.php @@ -1,6 +1,6 @@ setAuthMode(1); } - - public function fetch(int $tweet_id): Tweet + public function fetch(int $tweet_id) : Tweet { $this->setEndpoint('tweets?ids=' . $tweet_id); $this->setHttpRequestMethod('GET'); return $this; } - /** * Create a Tweet. * @see https://developer.twitter.com/en/docs/twitter-api/tweets/manage-tweets/api-reference/post-tweets * @return Tweet */ - public function create(): Tweet + public function create() : Tweet { $this->setEndpoint('tweets'); $this->setHttpRequestMethod('POST'); return $this; } - /** * Delete a Tweet. * @param int $tweet_id * @return Tweet */ - public function delete(int $tweet_id): Tweet + public function delete(int $tweet_id) : Tweet { $this->setEndpoint('tweets/' . $tweet_id); $this->setHttpRequestMethod('DELETE'); diff --git a/src/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php similarity index 80% rename from src/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php index 18f4d50..424afcc 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetBookmarks.php @@ -1,6 +1,6 @@ setAuthMode(2); } - /** * Lookup a user's Bookmarks. * @return TweetBookmarks */ - public function lookup(): TweetBookmarks + public function lookup() : TweetBookmarks { $this->setEndpoint('users/' . $this->account_id . '/bookmarks'); return $this; } - /** * Bookmark a Tweet. * @return TweetBookmarks */ - public function bookmarkTweet(): TweetBookmarks + public function bookmarkTweet() : TweetBookmarks { $this->setHttpRequestMethod('POST'); $this->setEndpoint('users/' . $this->account_id . '/bookmarks'); return $this; } - /** * Remove a Bookmark of a Tweet. * @param int $target_tweet_id * @return TweetBookmarks */ - public function removeBookmark(int $target_tweet_id): TweetBookmarks + public function removeBookmark(int $target_tweet_id) : TweetBookmarks { $this->setHttpRequestMethod('DELETE'); $this->setEndpoint('users/' . $this->account_id . '/bookmarks/' . $target_tweet_id); return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { $endpoint = parent::constructEndpoint(); - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; - $endpoint .= '?' . http_build_query($this->query_string); + $endpoint .= '?' . \http_build_query($this->query_string); } return $endpoint; } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php similarity index 72% rename from src/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php index 08155cf..a278234 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLikes.php @@ -1,6 +1,6 @@ $settings * @throws \Exception @@ -21,7 +20,6 @@ public function __construct(array $settings) parent::__construct($settings); $this->setAuthMode(1); } - /** * The maximum number of search results to be returned by a request. * A number between 10 and 100. @@ -29,75 +27,70 @@ public function __construct(array $settings) * @param int $number * @return $this */ - public function addMaxResults(int $number): TweetLikes + public function addMaxResults(int $number) : TweetLikes { $this->maxResults = $number; return $this; } - /** * Tweets liked by a user. * @param string $user_id * @return TweetLikes */ - public function getLikedTweets(string $user_id): TweetLikes + public function getLikedTweets(string $user_id) : TweetLikes { - $this->setEndpoint('users/'.$user_id.'/liked_tweets'); + $this->setEndpoint('users/' . $user_id . '/liked_tweets'); $this->setHttpRequestMethod('GET'); return $this; } - /** * Users who have liked a Tweet. * @param string $tweet_id * @return TweetLikes */ - public function getUsersWhoLiked(string $tweet_id): TweetLikes + public function getUsersWhoLiked(string $tweet_id) : TweetLikes { $this->setEndpoint('tweets/' . $tweet_id . '/liking_users'); $this->setHttpRequestMethod('GET'); return $this; } - /** * Allows a user ID to like a Tweet * @return TweetLikes */ - public function like(): TweetLikes + public function like() : TweetLikes { - $this->setEndpoint('users/'.$this->account_id.'/likes'); + $this->setEndpoint('users/' . $this->account_id . '/likes'); $this->setHttpRequestMethod('POST'); return $this; } - /** * Allows a user ID to unlike a Tweet * @param int $tweet_id * @return TweetLikes */ - public function unlike(int $tweet_id): TweetLikes + public function unlike(int $tweet_id) : TweetLikes { - $this->setEndpoint('users/'.$this->account_id.'/likes/' . $tweet_id); + $this->setEndpoint('users/' . $this->account_id . '/likes/' . $tweet_id); $this->setHttpRequestMethod('DELETE'); return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { if (!empty($this->maxResults)) { $this->query_string['max_results'] = $this->maxResults; } - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; } $endpoint = parent::constructEndpoint(); - if (count($this->query_string) > 0) { - $endpoint .= '?' . http_build_query($this->query_string); + if (\count($this->query_string) > 0) { + $endpoint .= '?' . \http_build_query($this->query_string); } return $endpoint; } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php similarity index 77% rename from src/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php index 7968194..3375d76 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetLookup.php @@ -1,6 +1,6 @@ 'OR', - 'AND' => '' - ]; - + public const OPERATORS = ['OR' => 'OR', 'AND' => '']; /** @var array $filteredUsernamesFrom */ private array $filteredUsernamesFrom = []; - /** @var string $operatorOnFilteredUsernamesFrom */ private string $operatorOnFilteredUsernamesFrom = self::OPERATORS['OR']; - - /** @var array $filteredUsernamesTo */ + /** @var array $filteredUsernamesTo */ private array $filteredUsernamesTo = []; - /** @var string $operatorOnFilteredUsernamesTo */ private string $operatorOnFilteredUsernamesTo = self::OPERATORS['OR']; - /** @var array $filteredKeywords */ private array $filteredKeywords = []; - /** @var string $operatorOnFilteredKeywords */ private string $operatorOnFilteredKeywords = self::OPERATORS['OR']; - /** @var string $filteredConversationId */ private string $filteredConversationId; - /** @var array $filteredLocales */ private array $filteredLocales = []; - /** @var bool $addMetrics */ - private bool $addMetrics = false; - + private bool $addMetrics = \false; /** @var bool $addUserDetails */ - private bool $addUserDetails = false; - + private bool $addUserDetails = \false; /** @var bool $hasMedias */ - private bool $hasMedias = false; - + private bool $hasMedias = \false; /** @var int $maxResults */ private int $maxResults; - /** * @param array $settings * @throws \Exception @@ -59,7 +43,6 @@ public function __construct(array $settings) parent::__construct($settings); $this->setEndpoint('tweets/search/recent'); } - /** * Matches any Tweet from a specific user. * The value can be either the username (excluding the @ character) or the user’s numeric user ID. @@ -67,15 +50,14 @@ public function __construct(array $settings) * @param string|null $operator * @return TweetLookup */ - public function addFilterOnUsernamesFrom(array $usernames, string $operator = null): TweetLookup + public function addFilterOnUsernamesFrom(array $usernames, string $operator = null) : TweetLookup { $this->filteredUsernamesFrom = $usernames; - if (in_array($operator, self::OPERATORS, true)) { + if (\in_array($operator, self::OPERATORS, \true)) { $this->operatorOnFilteredUsernamesFrom = $operator; } return $this; } - /** * Matches any Tweet that is in reply to a particular user. * The value can be either the username (excluding the @ character) or the user’s numeric user ID. @@ -83,42 +65,39 @@ public function addFilterOnUsernamesFrom(array $usernames, string $operator = nu * @param string|null $operator * @return TweetLookup */ - public function addFilterOnUsernamesTo(array $usernames, string $operator = null): TweetLookup + public function addFilterOnUsernamesTo(array $usernames, string $operator = null) : TweetLookup { $this->filteredUsernamesTo = $usernames; - if (in_array($operator, self::OPERATORS, true)) { + if (\in_array($operator, self::OPERATORS, \true)) { $this->operatorOnFilteredUsernamesTo = $operator; } return $this; } - /** * Matches the exact phrase or a hashtag within the body of a Tweet. * @param array $keywords * @param string|null $operator * @return TweetLookup */ - public function addFilterOnKeywordOrPhrase(array $keywords, string $operator = null): TweetLookup + public function addFilterOnKeywordOrPhrase(array $keywords, string $operator = null) : TweetLookup { $this->filteredKeywords = $keywords; - if (in_array($operator, self::OPERATORS, true)) { + if (\in_array($operator, self::OPERATORS, \true)) { $this->operatorOnFilteredKeywords = $operator; } return $this; } - /** * Matches any Tweet that is in reply to a particular conversation ID. * The value can be either the username (excluding the @ character) or the user’s numeric user ID. * @param string $conversationId * @return TweetLookup */ - public function addFilterOnConversationId(string $conversationId): TweetLookup + public function addFilterOnConversationId(string $conversationId) : TweetLookup { $this->filteredConversationId = $conversationId; return $this; } - /** * Matches Tweets that have been classified by Twitter as being of a particular language * (if, and only if, the Tweet has been classified). @@ -127,12 +106,11 @@ public function addFilterOnConversationId(string $conversationId): TweetLookup * @param array $locales * @return TweetLookup */ - public function addFilterOnLocales(array $locales): TweetLookup + public function addFilterOnLocales(array $locales) : TweetLookup { $this->filteredLocales = $locales; return $this; } - /** * The maximum number of search results to be returned by a request. * A number between 10 and 100. @@ -140,73 +118,61 @@ public function addFilterOnLocales(array $locales): TweetLookup * @param int $number * @return $this */ - public function addMaxResults(int $number): TweetLookup + public function addMaxResults(int $number) : TweetLookup { $this->maxResults = $number; return $this; } - /** * Show Metrics in response * @return TweetLookup */ - public function showMetrics(): TweetLookup + public function showMetrics() : TweetLookup { - $this->addMetrics = true; + $this->addMetrics = \true; return $this; } - /** * Show UserDetails in response * @return TweetLookup */ - public function showUserDetails(): TweetLookup + public function showUserDetails() : TweetLookup { - $this->addUserDetails = true; + $this->addUserDetails = \true; return $this; } - /** * Matches Tweets that contain a media object, such as a photo, GIF, or video, as determined by Twitter. * This will not match on media created with Periscope, or Tweets with links to other media hosting sites. * @return TweetLookup */ - public function onlyWithMedias(): TweetLookup + public function onlyWithMedias() : TweetLookup { - $this->hasMedias = true; + $this->hasMedias = \true; return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \JsonException * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { $endpoint = parent::constructEndpoint(); - - if (empty($this->filteredKeywords) && - empty($this->filteredUsernamesFrom) && - empty($this->filteredUsernamesTo) && - empty($this->filteredConversationId) - ) { + if (empty($this->filteredKeywords) && empty($this->filteredUsernamesFrom) && empty($this->filteredUsernamesTo) && empty($this->filteredConversationId)) { $error = new \stdClass(); $error->message = 'cURL error'; $error->details = 'A filter on keyword or user is required'; - throw new \Exception(json_encode($error, JSON_THROW_ON_ERROR), 403); + throw new \Exception(\json_encode($error, \JSON_THROW_ON_ERROR), 403); } - $endpoint .= '?query='; - if (!empty($this->filteredKeywords)) { $loop = 0; $endpoint .= '('; foreach ($this->filteredKeywords as $keyword) { ++$loop; - $qtyKeywords = count($this->filteredKeywords); - + $qtyKeywords = \count($this->filteredKeywords); $endpoint .= '("' . $keyword . '"%20OR%20%23' . $keyword . ')'; if ($qtyKeywords > 1 && $loop < $qtyKeywords) { $endpoint .= '%20' . $this->operatorOnFilteredKeywords . '%20'; @@ -214,50 +180,36 @@ protected function constructEndpoint(): string } $endpoint .= ')'; } - if (!empty($this->filteredUsernamesFrom)) { - $endpoint .= '%20(from:' . - implode('%20' . $this->operatorOnFilteredUsernamesFrom . '%20from:', $this->filteredUsernamesFrom) . ')'; + $endpoint .= '%20(from:' . \implode('%20' . $this->operatorOnFilteredUsernamesFrom . '%20from:', $this->filteredUsernamesFrom) . ')'; } - if (!empty($this->filteredUsernamesTo)) { - $endpoint .= '%20(to:' . - implode('%20' . $this->operatorOnFilteredUsernamesTo . '%20to:', $this->filteredUsernamesTo) . ')'; + $endpoint .= '%20(to:' . \implode('%20' . $this->operatorOnFilteredUsernamesTo . '%20to:', $this->filteredUsernamesTo) . ')'; } - if (!empty($this->filteredConversationId)) { $endpoint .= '%20conversation_id:' . $this->filteredConversationId; } - if (!empty($this->filteredLocales)) { - $endpoint .= '%20(lang:' . implode('%20OR%20lang:', $this->filteredLocales) . ')'; + $endpoint .= '%20(lang:' . \implode('%20OR%20lang:', $this->filteredLocales) . ')'; } - if ($this->hasMedias) { $endpoint .= '%20has:media'; } - if (!empty($this->maxResults)) { $endpoint .= '&max_results=' . $this->maxResults; } - if ($this->addMetrics) { $endpoint .= '&tweet.fields=public_metrics'; } - $endpoint .= '&expansions=attachments.media_keys'; - if ($this->addUserDetails) { $endpoint .= ',author_id&user.fields=description'; } - $endpoint .= '&media.fields=duration_ms,height,media_key,preview_image_url,public_metrics,type,url,width,alt_text'; - // Pagination - if (! is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $endpoint .= '&pagination_token=' . $this->next_page_token; } - return $endpoint; } } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php similarity index 87% rename from src/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php index 482101b..42cbe8f 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetQuotes.php @@ -1,6 +1,6 @@ setAuthMode(1); } - /** * Returns Quote Tweets for a Tweet specified by the requested Tweet ID. * @param int $tweet_id Unique identifier of the Tweet to request. * @return TweetQuotes */ - public function getQuoteTweets(int $tweet_id): TweetQuotes + public function getQuoteTweets(int $tweet_id) : TweetQuotes { $this->setEndpoint('tweets/' . $tweet_id . '/quote_tweets'); return $this; diff --git a/src/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php similarity index 89% rename from src/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php index a5cc3e1..895b5f8 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/TweetReplies.php @@ -1,6 +1,6 @@ setAuthMode(1); } - /** * Hides or unhides a reply to a Tweet. * The Tweet must belong to a conversation initiated by the authenticating user. * @param int $tweet_id Unique identifier of the Tweet to hide or unhide. * @return TweetReplies */ - public function hideReply(int $tweet_id): TweetReplies + public function hideReply(int $tweet_id) : TweetReplies { $this->setEndpoint('tweets/' . $tweet_id . '/hidden'); $this->setHttpRequestMethod('PUT'); diff --git a/src/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php similarity index 68% rename from src/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php index 6ca8543..bc44637 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserBlocks.php @@ -1,6 +1,6 @@ setAuthMode(1); } - /** * Look up blocked users. * @return UserBlocks */ - public function lookup(): UserBlocks + public function lookup() : UserBlocks { - $this->setEndpoint('users/'.$this->account_id.'/blocking'); + $this->setEndpoint('users/' . $this->account_id . '/blocking'); return $this; } - /** * Block user by username or ID. * @return UserBlocks */ - public function block(): UserBlocks + public function block() : UserBlocks { $this->setHttpRequestMethod('POST'); - $this->setEndpoint('users/'.$this->account_id.'/blocking'); + $this->setEndpoint('users/' . $this->account_id . '/blocking'); return $this; } - /** * Unblock user by username or ID. * * @param int $user_id * @return UserBlocks */ - public function unblock(int $user_id): UserBlocks + public function unblock(int $user_id) : UserBlocks { - $this->setEndpoint('users/'.$this->account_id.'/blocking/' . $user_id); + $this->setEndpoint('users/' . $this->account_id . '/blocking/' . $user_id); $this->setHttpRequestMethod('DELETE'); return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { $endpoint = parent::constructEndpoint(); - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; - $endpoint .= '?' . http_build_query($this->query_string); + $endpoint .= '?' . \http_build_query($this->query_string); } return $endpoint; } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/UserFollows.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserFollows.php similarity index 66% rename from src/vendor/noweh/twitter-api-v2-php/src/UserFollows.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserFollows.php index bd8d1d9..83df774 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/UserFollows.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserFollows.php @@ -1,6 +1,6 @@ $settings * @throws \Exception @@ -19,53 +18,48 @@ class UserFollows extends AbstractController public function __construct(array $settings) { parent::__construct($settings); - $this->setEndpoint('users/'.$this->account_id); + $this->setEndpoint('users/' . $this->account_id); $this->setAuthMode(1); } - /** * Followers of user ID. * @return UserFollows */ - public function getFollowers(): UserFollows + public function getFollowers() : UserFollows { - $this->setEndpoint('users/'.$this->account_id.'/followers'); + $this->setEndpoint('users/' . $this->account_id . '/followers'); return $this; } - /** * Users a user ID is following. * @return UserFollows */ - public function getFollowing(): UserFollows + public function getFollowing() : UserFollows { - $this->setEndpoint('users/'.$this->account_id.'/following'); + $this->setEndpoint('users/' . $this->account_id . '/following'); return $this; } - /** * Follow a user ID * @return UserFollows */ - public function follow(): UserFollows + public function follow() : UserFollows { $this->setHttpRequestMethod('POST'); - $this->setEndpoint('users/'.$this->account_id.'/following'); + $this->setEndpoint('users/' . $this->account_id . '/following'); return $this; } - /** * Unfollow a user ID * @param int $target_user_id * @return UserFollows */ - public function unfollow(int $target_user_id): UserFollows + public function unfollow(int $target_user_id) : UserFollows { $this->setHttpRequestMethod('DELETE'); - $this->setEndpoint('users/'.$this->account_id.'/following/'.$target_user_id); + $this->setEndpoint('users/' . $this->account_id . '/following/' . $target_user_id); return $this; } - /** * The maximum number of search results to be returned by a request. * A number between 1 and 1000. @@ -73,39 +67,33 @@ public function unfollow(int $target_user_id): UserFollows * @param int $number * @return $this */ - public function addMaxResults(int $number): UserFollows + public function addMaxResults(int $number) : UserFollows { $this->maxResults = $number; return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { $endpoint = parent::constructEndpoint(); - if (!empty($this->maxResults)) { $this->query_string['max_results'] = $this->maxResults; } - - if (! is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; } - - if (!empty($this->maxResults) || !is_null($this->next_page_token)) { - $endpoint .= '?' . http_build_query($this->query_string); + if (!empty($this->maxResults) || !\is_null($this->next_page_token)) { + $endpoint .= '?' . \http_build_query($this->query_string); } - - if(preg_match('/\?/', $endpoint)) { + if (\preg_match('/\\?/', $endpoint)) { $endpoint .= '&user.fields=description'; } else { $endpoint .= '?user.fields=description'; } - return $endpoint; } } diff --git a/src/vendor/noweh/twitter-api-v2-php/src/UserLookup.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserLookup.php similarity index 71% rename from src/vendor/noweh/twitter-api-v2-php/src/UserLookup.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserLookup.php index 6e3566c..74aaafe 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/UserLookup.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserLookup.php @@ -1,6 +1,6 @@ 'id', - 'USERNAME' => 'username' - ]; - + public const MODES = ['ID' => 'id', 'USERNAME' => 'username']; /** @var ?string $mode mode of operation */ protected ?string $mode = null; - /** @var int|string|array $idOrUsername */ private $idOrUsername; - /** * @param array $settings * @throws \Exception @@ -29,47 +23,46 @@ public function __construct(array $settings) parent::__construct($settings); $this->setEndpoint('users'); } - /** * Returns details about up to 100 users by ID or Username * @param int|string|array $idOrUsername * @return UserLookup */ - public function findByIdOrUsername($idOrUsername): UserLookup + public function findByIdOrUsername($idOrUsername) : UserLookup { $this->idOrUsername = $idOrUsername; - if (is_int($this->idOrUsername) || (is_array($this->idOrUsername) && is_numeric($this->idOrUsername[0]))) { + if (\is_int($this->idOrUsername) || \is_array($this->idOrUsername) && \is_numeric($this->idOrUsername[0])) { $this->mode = self::MODES['ID']; - } else if (is_string($this->idOrUsername) || is_string($this->idOrUsername[0])) { - $this->mode = self::MODES['USERNAME']; + } else { + if (\is_string($this->idOrUsername) || \is_string($this->idOrUsername[0])) { + $this->mode = self::MODES['USERNAME']; + } } return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \JsonException | \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { if (empty($this->idOrUsername)) { $error = new \stdClass(); $error->message = 'cURL error'; $error->details = 'An id or username is required'; - throw new \Exception(json_encode($error, JSON_THROW_ON_ERROR), 403); + throw new \Exception(\json_encode($error, \JSON_THROW_ON_ERROR), 403); } - $endpoint = parent::constructEndpoint(); - if (is_array($this->idOrUsername)) { + if (\is_array($this->idOrUsername)) { if ($this->mode === self::MODES['USERNAME']) { $endpoint .= '/by?usernames='; } else { $endpoint .= '?ids='; } - $endpoint .= implode(',', $this->idOrUsername); + $endpoint .= \implode(',', $this->idOrUsername); // Pagination - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $endpoint .= '&pagination_token=' . $this->next_page_token; } } else { @@ -77,18 +70,16 @@ protected function constructEndpoint(): string $endpoint .= '/by/username'; } $endpoint .= '/' . $this->idOrUsername; - // Pagination - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $endpoint .= '?pagination_token=' . $this->next_page_token; } } - if (preg_match('/\?/', $endpoint)) { + if (\preg_match('/\\?/', $endpoint)) { $endpoint .= '&user.fields=description'; } else { $endpoint .= '?user.fields=description'; } - return $endpoint; } } diff --git a/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php new file mode 100644 index 0000000..c90d26f --- /dev/null +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMeLookup.php @@ -0,0 +1,31 @@ +Users Lookup + * @author Julien Schmitt + */ +class UserMeLookup extends AbstractController +{ + /** + * @param array $settings + * @throws \Exception + */ + public function __construct(array $settings) + { + parent::__construct($settings); + $this->setEndpoint('users/me'); + $this->setAuthMode(1); + } + /** + * Retrieve Endpoint value and rebuilt it with the expected parameters + * @return string the URL for the request. + * @throws \JsonException | \Exception + */ + protected function constructEndpoint() : string + { + return parent::constructEndpoint() . '?user.fields=created_at,description,entities,id,location,name,' . 'profile_image_url,protected,public_metrics,url,username,verified,verified_type,withheld' . '&tweet.fields=attachments,author_id,context_annotations,conversation_id,created_at,edit_controls,' . 'edit_history_tweet_ids,entities,geo,id,in_reply_to_user_id,lang,non_public_metrics,note_tweet,' . 'organic_metrics,possibly_sensitive,public_metrics,referenced_tweets,reply_settings,source,text,withheld' . '&expansions=pinned_tweet_id'; + } +} diff --git a/src/vendor/noweh/twitter-api-v2-php/src/UserMutes.php b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMutes.php similarity index 68% rename from src/vendor/noweh/twitter-api-v2-php/src/UserMutes.php rename to src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMutes.php index 102b1f5..565ee92 100644 --- a/src/vendor/noweh/twitter-api-v2-php/src/UserMutes.php +++ b/src/vendor_prefixed/vendor/noweh/twitter-api-v2-php/src/UserMutes.php @@ -1,6 +1,6 @@ setAuthMode(1); } - /** * Look up muted users. * @return UserMutes */ - public function lookup(): UserMutes + public function lookup() : UserMutes { - $this->setEndpoint('users/'.$this->account_id.'/muting'); + $this->setEndpoint('users/' . $this->account_id . '/muting'); $this->setHttpRequestMethod('GET'); return $this; } - /** * Mute user by username or ID. * @return UserMutes */ - public function mute(): UserMutes + public function mute() : UserMutes { - $this->setEndpoint('users/'.$this->account_id.'/muting'); + $this->setEndpoint('users/' . $this->account_id . '/muting'); $this->setHttpRequestMethod('POST'); return $this; } - /** * Mute user by username or ID. * @param int $user_id * @return UserMutes */ - public function unmute(int $user_id): UserMutes + public function unmute(int $user_id) : UserMutes { - $this->setEndpoint('users/'.$this->account_id.'/muting/'.$user_id); + $this->setEndpoint('users/' . $this->account_id . '/muting/' . $user_id); $this->setHttpRequestMethod('DELETE'); return $this; } - /** * Retrieve Endpoint value and rebuilt it with the expected parameters * @return string the URL for the request. * @throws \Exception */ - protected function constructEndpoint(): string + protected function constructEndpoint() : string { $endpoint = parent::constructEndpoint(); - if (!is_null($this->next_page_token)) { + if (!\is_null($this->next_page_token)) { $this->query_string['pagination_token'] = $this->next_page_token; - $endpoint .= '?' . http_build_query($this->query_string); + $endpoint .= '?' . \http_build_query($this->query_string); } return $endpoint; } diff --git a/src/vendor/psr/http-client/src/ClientExceptionInterface.php b/src/vendor_prefixed/vendor/psr/http-client/src/ClientExceptionInterface.php similarity index 75% rename from src/vendor/psr/http-client/src/ClientExceptionInterface.php rename to src/vendor_prefixed/vendor/psr/http-client/src/ClientExceptionInterface.php index aa0b9cf..9641d4e 100644 --- a/src/vendor/psr/http-client/src/ClientExceptionInterface.php +++ b/src/vendor_prefixed/vendor/psr/http-client/src/ClientExceptionInterface.php @@ -1,6 +1,6 @@ 'Content-Type', - 'CONTENT_LENGTH' => 'Content-Length', - 'CONTENT_MD5' => 'Content-Md5', - ); - + $copy_server = array('CONTENT_TYPE' => 'Content-Type', 'CONTENT_LENGTH' => 'Content-Length', 'CONTENT_MD5' => 'Content-Md5'); foreach ($_SERVER as $key => $value) { - if (substr($key, 0, 5) === 'HTTP_') { - $key = substr($key, 5); + if (\substr($key, 0, 5) === 'HTTP_') { + $key = \substr($key, 5); if (!isset($copy_server[$key]) || !isset($_SERVER[$key])) { - $key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $key)))); + $key = \str_replace(' ', '-', \ucwords(\strtolower(\str_replace('_', ' ', $key)))); $headers[$key] = $value; } } elseif (isset($copy_server[$key])) { $headers[$copy_server[$key]] = $value; } } - if (!isset($headers['Authorization'])) { if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION']; } elseif (isset($_SERVER['PHP_AUTH_USER'])) { $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; - $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass); + $headers['Authorization'] = 'Basic ' . \base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass); } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) { $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST']; } } - return $headers; } - } diff --git a/src/vendor_prefixed/vendor/scoper-autoload.php b/src/vendor_prefixed/vendor/scoper-autoload.php new file mode 100644 index 0000000..c0fd045 --- /dev/null +++ b/src/vendor_prefixed/vendor/scoper-autoload.php @@ -0,0 +1,21 @@ + */ - function trigger_deprecation(string $package, string $version, string $message, ...$args): void + function trigger_deprecation(string $package, string $version, string $message, ...$args) : void { - @trigger_error(($package || $version ? "Since $package $version: " : '').($args ? vsprintf($message, $args) : $message), \E_USER_DEPRECATED); + @\trigger_error(($package || $version ? "Since {$package} {$version}: " : '') . ($args ? \vsprintf($message, $args) : $message), \E_USER_DEPRECATED); } } diff --git a/src/wp-to-twitter-oauth.php b/src/wp-to-twitter-oauth.php index 1649b5e..80cdd55 100644 --- a/src/wp-to-twitter-oauth.php +++ b/src/wp-to-twitter-oauth.php @@ -9,12 +9,12 @@ * @link https://www.joedolson.com/wp-to-twitter/ */ +use WpToTwitter_Vendor\Noweh\TwitterApi\Client; + if ( ! defined( 'ABSPATH' ) ) { exit; } -use Noweh\TwitterApi\Client; - /** * Function to test validity of credentials * diff --git a/src/wp-to-twitter.php b/src/wp-to-twitter.php index 546b6ee..0e89fc6 100644 --- a/src/wp-to-twitter.php +++ b/src/wp-to-twitter.php @@ -37,6 +37,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +use WpToTwitter_Vendor\GuzzleHttp\Exception\RequestException; + if ( ! defined( 'ABSPATH' ) ) { exit; } @@ -54,7 +57,7 @@ } } -require_once( plugin_dir_path( __FILE__ ) . 'vendor/autoload.php' ); +require_once( plugin_dir_path( __FILE__ ) . 'vendor_prefixed/vendor/scoper-autoload.php' ); require_once( plugin_dir_path( __FILE__ ) . 'wpt-functions.php' ); require_once( plugin_dir_path( __FILE__ ) . 'wp-to-twitter-oauth.php' ); require_once( plugin_dir_path( __FILE__ ) . 'wp-to-twitter-shorteners.php' ); @@ -451,7 +454,7 @@ function wpt_post_to_twitter( $twit, $auth = false, $id = false, $media = false 'rate-24-reset' => $headers['x-app-limit-24hour-reset'], ); update_option( 'wpt_app_limit', $rate_limit ); - } catch ( \GuzzleHttp\Exception\RequestException $e ) { + } catch ( RequestException $e ) { // Get Guzzle exception response. if ( method_exists( $e, 'getResponse' ) ) { $response = $e->getResponse();