Merge branch 'master' into develop

This commit is contained in:
Kijin Sung 2021-04-30 19:56:15 +09:00
commit f99b38192b
2 changed files with 19 additions and 12 deletions

View file

@ -34,7 +34,7 @@
"matthiasmullie/path-converter": "1.*",
"michelf/php-markdown": "1.9.*",
"michelf/php-smartypants": "1.8.*",
"rmccue/requests": "1.7.*",
"rmccue/requests": "1.8.*",
"scssphp/scssphp": "1.4.*",
"swiftmailer/swiftmailer": "6.2.*",
"symfony/polyfill-iconv": "1.19.*",

29
composer.lock generated
View file

@ -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": "59d7a35952cd705e07d7b8e3ca93983f",
"content-hash": "24cc938f5e56d40d6c7d2e484b77c5ad",
"packages": [
{
"name": "abraham/twitteroauth",
@ -1204,23 +1204,30 @@
},
{
"name": "rmccue/requests",
"version": "v1.7.0",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/rmccue/Requests.git",
"reference": "87932f52ffad70504d93f04f15690cf16a089546"
"url": "https://github.com/WordPress/Requests.git",
"reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rmccue/Requests/zipball/87932f52ffad70504d93f04f15690cf16a089546",
"reference": "87932f52ffad70504d93f04f15690cf16a089546",
"url": "https://api.github.com/repos/WordPress/Requests/zipball/afbe4790e4def03581c4a0963a1e8aa01f6030f1",
"reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1",
"shasum": ""
},
"require": {
"php": ">=5.2"
},
"require-dev": {
"requests/test-server": "dev-master"
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"php-parallel-lint/php-console-highlighter": "^0.5.0",
"php-parallel-lint/php-parallel-lint": "^1.3",
"phpcompatibility/php-compatibility": "^9.0",
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5",
"requests/test-server": "dev-master",
"squizlabs/php_codesniffer": "^3.5",
"wp-coding-standards/wpcs": "^2.0"
},
"type": "library",
"autoload": {
@ -1239,7 +1246,7 @@
}
],
"description": "A HTTP library written in PHP, for human beings.",
"homepage": "http://github.com/rmccue/Requests",
"homepage": "http://github.com/WordPress/Requests",
"keywords": [
"curl",
"fsockopen",
@ -1250,10 +1257,10 @@
"sockets"
],
"support": {
"issues": "https://github.com/rmccue/Requests/issues",
"source": "https://github.com/rmccue/Requests/tree/master"
"issues": "https://github.com/WordPress/Requests/issues",
"source": "https://github.com/WordPress/Requests/tree/v1.8.0"
},
"time": "2016-10-13T00:11:37+00:00"
"time": "2021-04-27T11:05:25+00:00"
},
{
"name": "scssphp/scssphp",