Skip to content

G
goods
Commit 15b38fc0 authored by pengfei's avatar pengfei
Browse files
Options

Merge branch 'colonel' into test 

# Conflicts:
#	vendor/composer/installed.json
parents ea0796ea 78770a51
Show whitespace changes
Inline Side-by-side
Showing with 914 additions and 854 deletions
application/services/marketing/ColonelService.php
View file @ 15b38fc0
...@@ -159,8 +159,11 @@ class ColonelService ...@@ -159,8 +159,11 @@ class ColonelService
try { try {
ColonelDistributorColonelApply::beginTransaction(); ColonelDistributorColonelApply::beginTransaction();
// 修改申请状态 // 修改申请状态
$updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus], $updateStatus = ColonelDistributorColonelApply::updateRecord([
['colonel_apply_id' => $applyId, 'audit_status' => [ColonelDistributorColonelApply::STATUS_AUDIT,ColonelDistributorColonelApply::STATUS_REJECT]] 'audit_status' => $auditStatus,
'update_time' => date('Y-m-d H:i:s')
],
['colonel_apply_id' => $applyId, 'audit_status[!]' => ColonelDistributorColonelApply::STATUS_PASS]
); );
if (empty($updateStatus)) { if (empty($updateStatus)) {
throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED); throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
......
composer.lock
View file @ 15b38fc0
...@@ -67,13 +67,7 @@ ...@@ -67,13 +67,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09", "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09",
"reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09", "reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"dasprid/enum": "^1.0.3", "dasprid/enum": "^1.0.3",
...@@ -126,13 +120,7 @@ ...@@ -126,13 +120,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2",
"reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7 | ^8 | ^9", "phpunit/phpunit": "^7 | ^8 | ^9",
...@@ -179,13 +167,7 @@ ...@@ -179,13 +167,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/8d08050fef9d89004702b1428b8c1f7f4f6162cf", "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/8d08050fef9d89004702b1428b8c1f7f4f6162cf",
"reference": "8d08050fef9d89004702b1428b8c1f7f4f6162cf", "reference": "8d08050fef9d89004702b1428b8c1f7f4f6162cf",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"ext-json": ">=1.3.7", "ext-json": ">=1.3.7",
...@@ -254,13 +236,7 @@ ...@@ -254,13 +236,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/endroid/qr-code/zipball/9cdd4f5d609bfc8811ca4a62b4d23eb16976242f", "url": "https://api.github.com/repos/endroid/qr-code/zipball/9cdd4f5d609bfc8811ca4a62b4d23eb16976242f",
"reference": "9cdd4f5d609bfc8811ca4a62b4d23eb16976242f", "reference": "9cdd4f5d609bfc8811ca4a62b4d23eb16976242f",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"bacon/bacon-qr-code": "^2.0", "bacon/bacon-qr-code": "^2.0",
...@@ -335,13 +311,7 @@ ...@@ -335,13 +311,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8", "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
"reference": "abe3791d231167f14eb80d413420d1eab91163a8", "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.4.0" "php": ">=5.4.0"
...@@ -395,13 +365,7 @@ ...@@ -395,13 +365,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b", "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
"reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b", "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"ezimuel/guzzlestreams": "^3.0.1", "ezimuel/guzzlestreams": "^3.0.1",
...@@ -456,13 +420,7 @@ ...@@ -456,13 +420,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"guzzlehttp/promises": "^1.0", "guzzlehttp/promises": "^1.0",
...@@ -531,13 +489,7 @@ ...@@ -531,13 +489,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/c1dd809c8f51a477701052f4b9e5b4bb5c1061aa", "url": "https://api.github.com/repos/guzzle/promises/zipball/c1dd809c8f51a477701052f4b9e5b4bb5c1061aa",
"reference": "c1dd809c8f51a477701052f4b9e5b4bb5c1061aa", "reference": "c1dd809c8f51a477701052f4b9e5b4bb5c1061aa",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.5" "php": ">=5.5"
...@@ -622,13 +574,7 @@ ...@@ -622,13 +574,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/9d006741ba865a45adccfac45d8e1053086a5a3f", "url": "https://api.github.com/repos/guzzle/psr7/zipball/9d006741ba865a45adccfac45d8e1053086a5a3f",
"reference": "9d006741ba865a45adccfac45d8e1053086a5a3f", "reference": "9d006741ba865a45adccfac45d8e1053086a5a3f",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
...@@ -724,13 +670,7 @@ ...@@ -724,13 +670,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/04fdd58d86a387065f707dc6d3cc304c719910c1", "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/04fdd58d86a387065f707dc6d3cc304c719910c1",
"reference": "04fdd58d86a387065f707dc6d3cc304c719910c1", "reference": "04fdd58d86a387065f707dc6d3cc304c719910c1",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.6" "php": ">=5.6"
...@@ -785,13 +725,7 @@ ...@@ -785,13 +725,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/18fca8cc8d0c2cc07f76605760d20632bb3dab96", "url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/18fca8cc8d0c2cc07f76605760d20632bb3dab96",
"reference": "18fca8cc8d0c2cc07f76605760d20632bb3dab96", "reference": "18fca8cc8d0c2cc07f76605760d20632bb3dab96",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"ext-hash": "*", "ext-hash": "*",
...@@ -855,13 +789,7 @@ ...@@ -855,13 +789,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7", "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7",
"reference": "d178027d1e679832db9f38248fcc7200647dc2b7", "reference": "d178027d1e679832db9f38248fcc7200647dc2b7",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
...@@ -921,13 +849,7 @@ ...@@ -921,13 +849,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/perftools/php-profiler/zipball/794c435f615ab9ca4347e386b4d8c6524fe9e3ae", "url": "https://api.github.com/repos/perftools/php-profiler/zipball/794c435f615ab9ca4347e386b4d8c6524fe9e3ae",
"reference": "794c435f615ab9ca4347e386b4d8c6524fe9e3ae", "reference": "794c435f615ab9ca4347e386b4d8c6524fe9e3ae",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
...@@ -989,13 +911,7 @@ ...@@ -989,13 +911,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", "url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"
...@@ -1049,13 +965,7 @@ ...@@ -1049,13 +965,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
"reference": "d49695b909c3b7628b6289db5479a1c204601f11", "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"
...@@ -1105,13 +1015,7 @@ ...@@ -1105,13 +1015,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
"reference": "120b605dfeb996808c31b6477290a714d356e822", "reference": "120b605dfeb996808c31b6477290a714d356e822",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.6" "php": ">=5.6"
...@@ -1155,13 +1059,7 @@ ...@@ -1155,13 +1059,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/a9752a861e21c0fe0b380c9f9e55beddc0ed7d31", "url": "https://api.github.com/repos/reactphp/promise/zipball/a9752a861e21c0fe0b380c9f9e55beddc0ed7d31",
"reference": "a9752a861e21c0fe0b380c9f9e55beddc0ed7d31", "reference": "a9752a861e21c0fe0b380c9f9e55beddc0ed7d31",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=5.4.0" "php": ">=5.4.0"
...@@ -1221,13 +1119,7 @@ ...@@ -1221,13 +1119,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1295,13 +1187,7 @@ ...@@ -1295,13 +1187,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/f1b99f10ea04aa9d0aafddcd8ba3d65545403bab", "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f1b99f10ea04aa9d0aafddcd8ba3d65545403bab",
"reference": "f1b99f10ea04aa9d0aafddcd8ba3d65545403bab", "reference": "f1b99f10ea04aa9d0aafddcd8ba3d65545403bab",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
...@@ -1370,13 +1256,7 @@ ...@@ -1370,13 +1256,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1456,13 +1336,7 @@ ...@@ -1456,13 +1336,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
"reference": "16880ba9c5ebe3642d1995ab866db29270b36535", "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1544,13 +1418,7 @@ ...@@ -1544,13 +1418,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1635,13 +1503,7 @@ ...@@ -1635,13 +1503,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
"reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1722,13 +1584,7 @@ ...@@ -1722,13 +1584,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
"reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1808,13 +1664,7 @@ ...@@ -1808,13 +1664,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
"reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
...@@ -1898,13 +1748,7 @@ ...@@ -1898,13 +1748,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/7831b0331b786db39026d190faa4914f94adb212", "url": "https://api.github.com/repos/symfony/property-access/zipball/7831b0331b786db39026d190faa4914f94adb212",
"reference": "7831b0331b786db39026d190faa4914f94adb212", "reference": "7831b0331b786db39026d190faa4914f94adb212",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
...@@ -1979,19 +1823,13 @@ ...@@ -1979,19 +1823,13 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/property-info.git", "url": "https://github.com/symfony/property-info.git",
"reference": "3565216f9640b26b646855e39e7bfafc550c75db" "reference": "903f3f3f6a360bc4739f8390e5031acc70d9cd9f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/property-info/zipball/3565216f9640b26b646855e39e7bfafc550c75db", "url": "https://api.github.com/repos/symfony/property-info/zipball/903f3f3f6a360bc4739f8390e5031acc70d9cd9f",
"reference": "3565216f9640b26b646855e39e7bfafc550c75db", "reference": "903f3f3f6a360bc4739f8390e5031acc70d9cd9f",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
...@@ -2067,7 +1905,7 @@ ...@@ -2067,7 +1905,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-08-23T12:58:54+00:00" "time": "2021-09-07T15:45:17+00:00"
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
...@@ -2081,13 +1919,7 @@ ...@@ -2081,13 +1919,7 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b", "url": "https://api.github.com/repos/symfony/string/zipball/fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b",
"reference": "fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b", "reference": "fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b",
"shasum": "", "shasum": ""
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
}, },
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
...@@ -2171,5 +2003,5 @@ ...@@ -2171,5 +2003,5 @@
"ext-openssl": "*" "ext-openssl": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.1.0" "plugin-api-version": "2.0.0"
} }
vendor/composer/ClassLoader.php
View file @ 15b38fc0
...@@ -338,7 +338,7 @@ class ClassLoader ...@@ -338,7 +338,7 @@ class ClassLoader
* Loads the given class or interface. * Loads the given class or interface.
* *
* @param string $class The name of the class * @param string $class The name of the class
* @return true|null True if loaded, null otherwise * @return bool|null True if loaded, null otherwise
*/ */
public function loadClass($class) public function loadClass($class)
{ {
...@@ -347,8 +347,6 @@ class ClassLoader ...@@ -347,8 +347,6 @@ class ClassLoader
return true; return true;
} }
return null;
} }
/** /**
......
vendor/composer/InstalledVersions.php
View file @ 15b38fc0
<?php <?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer; namespace Composer;
use Composer\Autoload\ClassLoader; use Composer\Autoload\ClassLoader;
use Composer\Semver\VersionParser; use 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 it's presence, you can require `composer-runtime-api ^2.0`
*/
class InstalledVersions class InstalledVersions
{ {
private static $installed; private static $installed = array (
private static $canGetVendors; 'root' =>
private static $installedByVendor = array(); array (
'pretty_version' => 'dev-develop',
/** 'version' => 'dev-develop',
* Returns a list of all package names which are present, either by being installed, replaced or provided 'aliases' =>
* array (
* @return string[] ),
* @psalm-return list<string> 'reference' => '64abe898e25ed52e044b6cc7ed9adef399d0239b',
*/ 'name' => 'yidian/yaf_demo',
public static function getInstalledPackages() ),
{ 'versions' =>
$packages = array(); array (
foreach (self::getInstalled() as $installed) { 'api/php_services' =>
$packages[] = array_keys($installed['versions']); array (
} 'pretty_version' => 'v1.0.13',
'version' => '1.0.13.0',
if (1 === \count($packages)) { 'aliases' =>
return $packages[0]; array (
} ),
'reference' => 'c51c248e6e7aba33fd147993b5f61f140ccd56ca',
return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); ),
} 'api/php_utils' =>
array (
/** 'pretty_version' => 'v1.0.17',
* Returns a list of all package names with a specific type e.g. 'library' 'version' => '1.0.17.0',
* 'aliases' =>
* @param string $type array (
* @return string[] ),
* @psalm-return list<string> 'reference' => 'aa70ccdd545f3e421eaf717274954990f1805b87',
*/ ),
public static function getInstalledPackagesByType($type) 'bacon/bacon-qr-code' =>
{ array (
$packagesByType = array(); 'pretty_version' => '2.0.4',
'version' => '2.0.4.0',
foreach (self::getInstalled() as $installed) { 'aliases' =>
foreach ($installed['versions'] as $name => $package) { array (
if (isset($package['type']) && $package['type'] === $type) { ),
$packagesByType[] = $name; 'reference' => 'f73543ac4e1def05f1a70bcd1525c8a157a1ad09',
} ),
} 'dasprid/enum' =>
} array (
'pretty_version' => '1.0.3',
return $packagesByType; 'version' => '1.0.3.0',
} 'aliases' =>
array (
/** ),
* Checks whether the given package is installed 'reference' => '5abf82f213618696dda8e3bf6f64dd042d8542b2',
* ),
* This also returns true if the package name is provided or replaced by another package 'elasticsearch/elasticsearch' =>
* array (
* @param string $packageName 'pretty_version' => '7.11.x-dev',
* @param bool $includeDevRequirements 'version' => '7.11.9999999.9999999-dev',
* @return bool 'aliases' =>
*/ array (
public static function isInstalled($packageName, $includeDevRequirements = true) ),
{ 'reference' => '8d08050fef9d89004702b1428b8c1f7f4f6162cf',
foreach (self::getInstalled() as $installed) { ),
if (isset($installed['versions'][$packageName])) { 'endroid/qr-code' =>
return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); array (
} 'pretty_version' => '3.9.6',
} 'version' => '3.9.6.0',
'aliases' =>
return false; array (
} ),
'reference' => '9cdd4f5d609bfc8811ca4a62b4d23eb16976242f',
/** ),
* Checks whether the given package satisfies a version constraint 'ezimuel/guzzlestreams' =>
* array (
* e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: 'pretty_version' => 'dev-master',
* 'version' => 'dev-master',
* Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') 'aliases' =>
* array (
* @param VersionParser $parser Install composer/semver to have access to this class and functionality 0 => '3.0.x-dev',
* @param string $packageName ),
* @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package 'reference' => 'abe3791d231167f14eb80d413420d1eab91163a8',
* @return bool ),
*/ 'ezimuel/ringphp' =>
public static function satisfies(VersionParser $parser, $packageName, $constraint) array (
{ 'pretty_version' => 'dev-master',
$constraint = $parser->parseConstraints($constraint); 'version' => 'dev-master',
$provided = $parser->parseConstraints(self::getVersionRanges($packageName)); 'aliases' =>
array (
return $provided->matches($constraint); 0 => '1.1.x-dev',
} ),
'reference' => '0b78f89d8e0bb9e380046c31adfa40347e9f663b',
/** ),
* Returns a version constraint representing all the range(s) which are installed for a given package 'guzzlehttp/guzzle' =>
* array (
* It is easier to use this via isInstalled() with the $constraint argument if you need to check 'pretty_version' => '6.3.0',
* whether a given version of a package is installed, and not just whether it exists 'version' => '6.3.0.0',
* 'aliases' =>
* @param string $packageName array (
* @return string Version constraint usable with composer/semver ),
*/ 'reference' => 'f4db5a78a5ea468d4831de7f0bf9d9415e348699',
public static function getVersionRanges($packageName) ),
{ 'guzzlehttp/promises' =>
foreach (self::getInstalled() as $installed) { array (
if (!isset($installed['versions'][$packageName])) { 'pretty_version' => 'dev-master',
continue; 'version' => 'dev-master',
} 'aliases' =>
array (
$ranges = array(); 0 => '1.4.x-dev',
if (isset($installed['versions'][$packageName]['pretty_version'])) { ),
$ranges[] = $installed['versions'][$packageName]['pretty_version']; 'reference' => 'c1dd809c8f51a477701052f4b9e5b4bb5c1061aa',
} ),
if (array_key_exists('aliases', $installed['versions'][$packageName])) { 'guzzlehttp/psr7' =>
$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); array (
} 'pretty_version' => '1.x-dev',
if (array_key_exists('replaced', $installed['versions'][$packageName])) { 'version' => '1.9999999.9999999.9999999-dev',
$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); 'aliases' =>
} array (
if (array_key_exists('provided', $installed['versions'][$packageName])) { ),
$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); 'reference' => '9d006741ba865a45adccfac45d8e1053086a5a3f',
} ),
'khanamiryan/qrcode-detector-decoder' =>
return implode(' || ', $ranges); array (
} 'pretty_version' => '1.0.5.2',
'version' => '1.0.5.2',
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); 'aliases' =>
} array (
),
/** 'reference' => '04fdd58d86a387065f707dc6d3cc304c719910c1',
* @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 'mongodb/mongodb' =>
*/ array (
public static function getVersion($packageName) 'pretty_version' => '1.4.3',
{ 'version' => '1.4.3.0',
foreach (self::getInstalled() as $installed) { 'aliases' =>
if (!isset($installed['versions'][$packageName])) { array (
continue; ),
} 'reference' => '18fca8cc8d0c2cc07f76605760d20632bb3dab96',
),
if (!isset($installed['versions'][$packageName]['version'])) { 'myclabs/php-enum' =>
return null; array (
} 'pretty_version' => '1.7.7',
'version' => '1.7.7.0',
return $installed['versions'][$packageName]['version']; 'aliases' =>
} array (
),
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); 'reference' => 'd178027d1e679832db9f38248fcc7200647dc2b7',
} ),
'perftools/php-profiler' =>
/** array (
* @param string $packageName 'pretty_version' => '0.18.0',
* @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 'version' => '0.18.0.0',
*/ 'aliases' =>
public static function getPrettyVersion($packageName) array (
{ ),
foreach (self::getInstalled() as $installed) { 'reference' => '794c435f615ab9ca4347e386b4d8c6524fe9e3ae',
if (!isset($installed['versions'][$packageName])) { ),
continue; 'psr/http-message' =>
} array (
'pretty_version' => 'dev-master',
if (!isset($installed['versions'][$packageName]['pretty_version'])) { 'version' => 'dev-master',
return null; 'aliases' =>
} array (
0 => '1.0.x-dev',
return $installed['versions'][$packageName]['pretty_version']; ),
} 'reference' => 'efd67d1dc14a7ef4fc4e518e7dee91c271d524e4',
),
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); 'psr/http-message-implementation' =>
} array (
'provided' =>
/** array (
* @param string $packageName 0 => '1.0',
* @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference ),
*/ ),
public static function getReference($packageName) 'psr/log' =>
{ array (
foreach (self::getInstalled() as $installed) { 'pretty_version' => '1.1.4',
if (!isset($installed['versions'][$packageName])) { 'version' => '1.1.4.0',
continue; 'aliases' =>
} array (
),
if (!isset($installed['versions'][$packageName]['reference'])) { 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
return null; ),
} 'ralouphie/getallheaders' =>
array (
return $installed['versions'][$packageName]['reference']; 'pretty_version' => '3.0.3',
} 'version' => '3.0.3.0',
'aliases' =>
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); array (
} ),
'reference' => '120b605dfeb996808c31b6477290a714d356e822',
/** ),
* @param string $packageName 'react/promise' =>
* @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. array (
*/ 'pretty_version' => '2.x-dev',
public static function getInstallPath($packageName) 'version' => '2.9999999.9999999.9999999-dev',
{ 'aliases' =>
foreach (self::getInstalled() as $installed) { array (
if (!isset($installed['versions'][$packageName])) { ),
continue; 'reference' => 'a9752a861e21c0fe0b380c9f9e55beddc0ed7d31',
} ),
'symfony/deprecation-contracts' =>
return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; array (
} 'pretty_version' => 'dev-main',
'version' => 'dev-main',
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); 'aliases' =>
} array (
0 => '2.5.x-dev',
/** ),
* @return array 'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
* @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} ),
*/ 'symfony/options-resolver' =>
public static function getRootPackage() array (
{ 'pretty_version' => '5.4.x-dev',
$installed = self::getInstalled(); 'version' => '5.4.9999999.9999999-dev',
'aliases' =>
return $installed[0]['root']; array (
} ),
'reference' => 'f1b99f10ea04aa9d0aafddcd8ba3d65545403bab',
/** ),
* Returns the raw installed.php data for custom implementations 'symfony/polyfill-ctype' =>
* array (
* @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. 'pretty_version' => 'dev-main',
* @return array[] 'version' => 'dev-main',
* @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} 'aliases' =>
*/ array (
public static function getRawData() 0 => '1.23.x-dev',
{ ),
@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); 'reference' => '46cd95797e9df938fdd2b03693b5fca5e64b01ce',
),
if (null === self::$installed) { 'symfony/polyfill-intl-grapheme' =>
// only require the installed.php file if this file is loaded from its dumped location, array (
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 'pretty_version' => 'dev-main',
if (substr(__DIR__, -8, 1) !== 'C') { 'version' => 'dev-main',
self::$installed = include __DIR__ . '/installed.php'; 'aliases' =>
} else { array (
self::$installed = array(); 0 => '1.23.x-dev',
} ),
} 'reference' => '16880ba9c5ebe3642d1995ab866db29270b36535',
),
return self::$installed; 'symfony/polyfill-intl-normalizer' =>
} array (
'pretty_version' => 'dev-main',
/** 'version' => 'dev-main',
* Returns the raw data of all installed.php which are currently loaded for custom implementations 'aliases' =>
* array (
* @return array[] 0 => '1.23.x-dev',
* @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}> ),
*/ 'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
public static function getAllRawData() ),
{ 'symfony/polyfill-mbstring' =>
return self::getInstalled(); array (
} 'pretty_version' => 'dev-main',
'version' => 'dev-main',
/** 'aliases' =>
* Lets you reload the static array from another file array (
* 0 => '1.23.x-dev',
* This is only useful for complex integrations in which a project needs to use ),
* this class but then also needs to execute another project's autoloader in process, 'reference' => '9174a3d80210dca8daa7f31fec659150bbeabfc6',
* and wants to ensure both projects have access to their version of installed.php. ),
* 'symfony/polyfill-php73' =>
* A typical case would be PHPUnit, where it would need to make sure it reads all array (
* the data it needs from this class, then call reload() with 'pretty_version' => 'dev-main',
* `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure 'version' => 'dev-main',
* the project in which it runs can then also use this class safely, without 'aliases' =>
* interference between PHPUnit's dependencies and the project's dependencies. array (
* 0 => '1.23.x-dev',
* @param array[] $data A vendor/composer/installed.php data set ),
* @return void 'reference' => 'fba8933c384d6476ab14fb7b8526e5287ca7e010',
* ),
* @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data 'symfony/polyfill-php80' =>
*/ array (
public static function reload($data) 'pretty_version' => 'dev-main',
{ 'version' => 'dev-main',
self::$installed = $data; 'aliases' =>
self::$installedByVendor = array(); array (
} 0 => '1.23.x-dev',
),
/** 'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be',
* @return array[] ),
* @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}> 'symfony/property-access' =>
*/ array (
private static function getInstalled() 'pretty_version' => '5.4.x-dev',
{ 'version' => '5.4.9999999.9999999-dev',
if (null === self::$canGetVendors) { 'aliases' =>
self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); array (
} ),
'reference' => '7831b0331b786db39026d190faa4914f94adb212',
$installed = array(); ),
'symfony/property-info' =>
if (self::$canGetVendors) { array (
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { 'pretty_version' => '5.4.x-dev',
if (isset(self::$installedByVendor[$vendorDir])) { 'version' => '5.4.9999999.9999999-dev',
$installed[] = self::$installedByVendor[$vendorDir]; 'aliases' =>
} elseif (is_file($vendorDir.'/composer/installed.php')) { array (
$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; ),
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { 'reference' => '903f3f3f6a360bc4739f8390e5031acc70d9cd9f',
self::$installed = $installed[count($installed) - 1]; ),
} 'symfony/string' =>
} array (
} 'pretty_version' => '5.4.x-dev',
} 'version' => '5.4.9999999.9999999-dev',
'aliases' =>
if (null === self::$installed) { array (
// 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 'reference' => 'fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b',
if (substr(__DIR__, -8, 1) !== 'C') { ),
self::$installed = require __DIR__ . '/installed.php'; 'yidian/yaf_demo' =>
} else { array (
self::$installed = array(); 'pretty_version' => 'dev-develop',
} 'version' => 'dev-develop',
} 'aliases' =>
$installed[] = self::$installed; array (
),
return $installed; 'reference' => '64abe898e25ed52e044b6cc7ed9adef399d0239b',
} ),
),
);
private static $canGetVendors;
private static $installedByVendor = array();
public static function getInstalledPackages()
{
$packages = array();
foreach (self::getInstalled() as $installed) {
$packages[] = array_keys($installed['versions']);
}
if (1 === \count($packages)) {
return $packages[0];
}
return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
}
public static function isInstalled($packageName)
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
return true;
}
}
return false;
}
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
$constraint = $parser->parseConstraints($constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
}
public static function getVersionRanges($packageName)
{
foreach (self::getInstalled() as $installed) {
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('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']);
}
return implode(' || ', $ranges);
}
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
}
public static function getVersion($packageName)
{
foreach (self::getInstalled() as $installed) {
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');
}
public static function getPrettyVersion($packageName)
{
foreach (self::getInstalled() as $installed) {
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');
}
public static function getReference($packageName)
{
foreach (self::getInstalled() as $installed) {
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');
}
public static function getRootPackage()
{
$installed = self::getInstalled();
return $installed[0]['root'];
}
public static function getRawData()
{
return self::$installed;
}
public static function reload($data)
{
self::$installed = $data;
self::$installedByVendor = array();
}
private static function getInstalled()
{
if (null === self::$canGetVendors) {
self::$canGetVendors = method_exists('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';
}
}
}
$installed[] = self::$installed;
return $installed;
}
} }
vendor/composer/installed.php
View file @ 15b38fc0
<?php return array( <?php return array (
'root' => array( 'root' =>
array (
'pretty_version' => 'dev-develop', 'pretty_version' => 'dev-develop',
'version' => 'dev-develop', 'version' => 'dev-develop',
'type' => 'project', 'aliases' =>
'install_path' => __DIR__ . '/../../', array (
'aliases' => array(), ),
'reference' => '26f3230dd97d1da1840255c71dd2c03ec79c3fcf', 'reference' => '64abe898e25ed52e044b6cc7ed9adef399d0239b',
'name' => 'yidian/yaf_demo', 'name' => 'yidian/yaf_demo',
'dev' => true,
), ),
'versions' => array( 'versions' =>
'api/php_services' => array( array (
'api/php_services' =>
array (
'pretty_version' => 'v1.0.13', 'pretty_version' => 'v1.0.13',
'version' => '1.0.13.0', 'version' => '1.0.13.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../api/php_services', array (
'aliases' => array(), ),
'reference' => 'c51c248e6e7aba33fd147993b5f61f140ccd56ca', 'reference' => 'c51c248e6e7aba33fd147993b5f61f140ccd56ca',
'dev_requirement' => false,
), ),
'api/php_utils' => array( 'api/php_utils' =>
array (
'pretty_version' => 'v1.0.17', 'pretty_version' => 'v1.0.17',
'version' => '1.0.17.0', 'version' => '1.0.17.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../api/php_utils', array (
'aliases' => array(), ),
'reference' => 'aa70ccdd545f3e421eaf717274954990f1805b87', 'reference' => 'aa70ccdd545f3e421eaf717274954990f1805b87',
'dev_requirement' => false,
), ),
'bacon/bacon-qr-code' => array( 'bacon/bacon-qr-code' =>
array (
'pretty_version' => '2.0.4', 'pretty_version' => '2.0.4',
'version' => '2.0.4.0', 'version' => '2.0.4.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../bacon/bacon-qr-code', array (
'aliases' => array(), ),
'reference' => 'f73543ac4e1def05f1a70bcd1525c8a157a1ad09', 'reference' => 'f73543ac4e1def05f1a70bcd1525c8a157a1ad09',
'dev_requirement' => false,
), ),
'dasprid/enum' => array( 'dasprid/enum' =>
array (
'pretty_version' => '1.0.3', 'pretty_version' => '1.0.3',
'version' => '1.0.3.0', 'version' => '1.0.3.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../dasprid/enum', array (
'aliases' => array(), ),
'reference' => '5abf82f213618696dda8e3bf6f64dd042d8542b2', 'reference' => '5abf82f213618696dda8e3bf6f64dd042d8542b2',
'dev_requirement' => false,
), ),
'elasticsearch/elasticsearch' => array( 'elasticsearch/elasticsearch' =>
array (
'pretty_version' => '7.11.x-dev', 'pretty_version' => '7.11.x-dev',
'version' => '7.11.9999999.9999999-dev', 'version' => '7.11.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../elasticsearch/elasticsearch', array (
'aliases' => array(), ),
'reference' => '8d08050fef9d89004702b1428b8c1f7f4f6162cf', 'reference' => '8d08050fef9d89004702b1428b8c1f7f4f6162cf',
'dev_requirement' => false,
), ),
'endroid/qr-code' => array( 'endroid/qr-code' =>
array (
'pretty_version' => '3.9.6', 'pretty_version' => '3.9.6',
'version' => '3.9.6.0', 'version' => '3.9.6.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../endroid/qr-code', array (
'aliases' => array(), ),
'reference' => '9cdd4f5d609bfc8811ca4a62b4d23eb16976242f', 'reference' => '9cdd4f5d609bfc8811ca4a62b4d23eb16976242f',
'dev_requirement' => false,
), ),
'ezimuel/guzzlestreams' => array( 'ezimuel/guzzlestreams' =>
array (
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../ezimuel/guzzlestreams', array (
'aliases' => array(
0 => '3.0.x-dev', 0 => '3.0.x-dev',
), ),
'reference' => 'abe3791d231167f14eb80d413420d1eab91163a8', 'reference' => 'abe3791d231167f14eb80d413420d1eab91163a8',
'dev_requirement' => false,
), ),
'ezimuel/ringphp' => array( 'ezimuel/ringphp' =>
array (
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../ezimuel/ringphp', array (
'aliases' => array(
0 => '1.1.x-dev', 0 => '1.1.x-dev',
), ),
'reference' => '0b78f89d8e0bb9e380046c31adfa40347e9f663b', 'reference' => '0b78f89d8e0bb9e380046c31adfa40347e9f663b',
'dev_requirement' => false,
), ),
'guzzlehttp/guzzle' => array( 'guzzlehttp/guzzle' =>
array (
'pretty_version' => '6.3.0', 'pretty_version' => '6.3.0',
'version' => '6.3.0.0', 'version' => '6.3.0.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../guzzlehttp/guzzle', array (
'aliases' => array(), ),
'reference' => 'f4db5a78a5ea468d4831de7f0bf9d9415e348699', 'reference' => 'f4db5a78a5ea468d4831de7f0bf9d9415e348699',
'dev_requirement' => false,
), ),
'guzzlehttp/promises' => array( 'guzzlehttp/promises' =>
array (
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../guzzlehttp/promises', array (
'aliases' => array(
0 => '1.4.x-dev', 0 => '1.4.x-dev',
), ),
'reference' => 'c1dd809c8f51a477701052f4b9e5b4bb5c1061aa', 'reference' => 'c1dd809c8f51a477701052f4b9e5b4bb5c1061aa',
'dev_requirement' => false,
), ),
'guzzlehttp/psr7' => array( 'guzzlehttp/psr7' =>
array (
'pretty_version' => '1.x-dev', 'pretty_version' => '1.x-dev',
'version' => '1.9999999.9999999.9999999-dev', 'version' => '1.9999999.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../guzzlehttp/psr7', array (
'aliases' => array(), ),
'reference' => '9d006741ba865a45adccfac45d8e1053086a5a3f', 'reference' => '9d006741ba865a45adccfac45d8e1053086a5a3f',
'dev_requirement' => false,
), ),
'khanamiryan/qrcode-detector-decoder' => array( 'khanamiryan/qrcode-detector-decoder' =>
array (
'pretty_version' => '1.0.5.2', 'pretty_version' => '1.0.5.2',
'version' => '1.0.5.2', 'version' => '1.0.5.2',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../khanamiryan/qrcode-detector-decoder', array (
'aliases' => array(), ),
'reference' => '04fdd58d86a387065f707dc6d3cc304c719910c1', 'reference' => '04fdd58d86a387065f707dc6d3cc304c719910c1',
'dev_requirement' => false,
), ),
'mongodb/mongodb' => array( 'mongodb/mongodb' =>
array (
'pretty_version' => '1.4.3', 'pretty_version' => '1.4.3',
'version' => '1.4.3.0', 'version' => '1.4.3.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../mongodb/mongodb', array (
'aliases' => array(), ),
'reference' => '18fca8cc8d0c2cc07f76605760d20632bb3dab96', 'reference' => '18fca8cc8d0c2cc07f76605760d20632bb3dab96',
'dev_requirement' => false,
), ),
'myclabs/php-enum' => array( 'myclabs/php-enum' =>
array (
'pretty_version' => '1.7.7', 'pretty_version' => '1.7.7',
'version' => '1.7.7.0', 'version' => '1.7.7.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../myclabs/php-enum', array (
'aliases' => array(), ),
'reference' => 'd178027d1e679832db9f38248fcc7200647dc2b7', 'reference' => 'd178027d1e679832db9f38248fcc7200647dc2b7',
'dev_requirement' => false,
), ),
'perftools/php-profiler' => array( 'perftools/php-profiler' =>
array (
'pretty_version' => '0.18.0', 'pretty_version' => '0.18.0',
'version' => '0.18.0.0', 'version' => '0.18.0.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../perftools/php-profiler', array (
'aliases' => array(), ),
'reference' => '794c435f615ab9ca4347e386b4d8c6524fe9e3ae', 'reference' => '794c435f615ab9ca4347e386b4d8c6524fe9e3ae',
'dev_requirement' => false,
), ),
'psr/http-message' => array( 'psr/http-message' =>
array (
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-master',
'version' => 'dev-master', 'version' => 'dev-master',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../psr/http-message', array (
'aliases' => array(
0 => '1.0.x-dev', 0 => '1.0.x-dev',
), ),
'reference' => 'efd67d1dc14a7ef4fc4e518e7dee91c271d524e4', 'reference' => 'efd67d1dc14a7ef4fc4e518e7dee91c271d524e4',
'dev_requirement' => false,
), ),
'psr/http-message-implementation' => array( 'psr/http-message-implementation' =>
'dev_requirement' => false, array (
'provided' => array( 'provided' =>
array (
0 => '1.0', 0 => '1.0',
), ),
), ),
'psr/log' => array( 'psr/log' =>
array (
'pretty_version' => '1.1.4', 'pretty_version' => '1.1.4',
'version' => '1.1.4.0', 'version' => '1.1.4.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../psr/log', array (
'aliases' => array(), ),
'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11', 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
'dev_requirement' => false,
), ),
'ralouphie/getallheaders' => array( 'ralouphie/getallheaders' =>
array (
'pretty_version' => '3.0.3', 'pretty_version' => '3.0.3',
'version' => '3.0.3.0', 'version' => '3.0.3.0',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../ralouphie/getallheaders', array (
'aliases' => array(), ),
'reference' => '120b605dfeb996808c31b6477290a714d356e822', 'reference' => '120b605dfeb996808c31b6477290a714d356e822',
'dev_requirement' => false,
), ),
'react/promise' => array( 'react/promise' =>
array (
'pretty_version' => '2.x-dev', 'pretty_version' => '2.x-dev',
'version' => '2.9999999.9999999.9999999-dev', 'version' => '2.9999999.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../react/promise', array (
'aliases' => array(), ),
'reference' => 'a9752a861e21c0fe0b380c9f9e55beddc0ed7d31', 'reference' => 'a9752a861e21c0fe0b380c9f9e55beddc0ed7d31',
'dev_requirement' => false,
), ),
'symfony/deprecation-contracts' => array( 'symfony/deprecation-contracts' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/deprecation-contracts', array (
'aliases' => array(
0 => '2.5.x-dev', 0 => '2.5.x-dev',
), ),
'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8', 'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
'dev_requirement' => false,
), ),
'symfony/options-resolver' => array( 'symfony/options-resolver' =>
array (
'pretty_version' => '5.4.x-dev', 'pretty_version' => '5.4.x-dev',
'version' => '5.4.9999999.9999999-dev', 'version' => '5.4.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/options-resolver', array (
'aliases' => array(), ),
'reference' => 'f1b99f10ea04aa9d0aafddcd8ba3d65545403bab', 'reference' => 'f1b99f10ea04aa9d0aafddcd8ba3d65545403bab',
'dev_requirement' => false,
), ),
'symfony/polyfill-ctype' => array( 'symfony/polyfill-ctype' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-ctype', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => '46cd95797e9df938fdd2b03693b5fca5e64b01ce', 'reference' => '46cd95797e9df938fdd2b03693b5fca5e64b01ce',
'dev_requirement' => false,
), ),
'symfony/polyfill-intl-grapheme' => array( 'symfony/polyfill-intl-grapheme' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => '16880ba9c5ebe3642d1995ab866db29270b36535', 'reference' => '16880ba9c5ebe3642d1995ab866db29270b36535',
'dev_requirement' => false,
), ),
'symfony/polyfill-intl-normalizer' => array( 'symfony/polyfill-intl-normalizer' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8', 'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
'dev_requirement' => false,
), ),
'symfony/polyfill-mbstring' => array( 'symfony/polyfill-mbstring' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => '9174a3d80210dca8daa7f31fec659150bbeabfc6', 'reference' => '9174a3d80210dca8daa7f31fec659150bbeabfc6',
'dev_requirement' => false,
), ),
'symfony/polyfill-php73' => array( 'symfony/polyfill-php73' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-php73', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => 'fba8933c384d6476ab14fb7b8526e5287ca7e010', 'reference' => 'fba8933c384d6476ab14fb7b8526e5287ca7e010',
'dev_requirement' => false,
), ),
'symfony/polyfill-php80' => array( 'symfony/polyfill-php80' =>
array (
'pretty_version' => 'dev-main', 'pretty_version' => 'dev-main',
'version' => 'dev-main', 'version' => 'dev-main',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/polyfill-php80', array (
'aliases' => array(
0 => '1.23.x-dev', 0 => '1.23.x-dev',
), ),
'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be', 'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be',
'dev_requirement' => false,
), ),
'symfony/property-access' => array( 'symfony/property-access' =>
array (
'pretty_version' => '5.4.x-dev', 'pretty_version' => '5.4.x-dev',
'version' => '5.4.9999999.9999999-dev', 'version' => '5.4.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/property-access', array (
'aliases' => array(), ),
'reference' => '7831b0331b786db39026d190faa4914f94adb212', 'reference' => '7831b0331b786db39026d190faa4914f94adb212',
'dev_requirement' => false,
), ),
'symfony/property-info' => array( 'symfony/property-info' =>
array (
'pretty_version' => '5.4.x-dev', 'pretty_version' => '5.4.x-dev',
'version' => '5.4.9999999.9999999-dev', 'version' => '5.4.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/property-info', array (
'aliases' => array(), ),
'reference' => '3565216f9640b26b646855e39e7bfafc550c75db', 'reference' => '903f3f3f6a360bc4739f8390e5031acc70d9cd9f',
'dev_requirement' => false,
), ),
'symfony/string' => array( 'symfony/string' =>
array (
'pretty_version' => '5.4.x-dev', 'pretty_version' => '5.4.x-dev',
'version' => '5.4.9999999.9999999-dev', 'version' => '5.4.9999999.9999999-dev',
'type' => 'library', 'aliases' =>
'install_path' => __DIR__ . '/../symfony/string', array (
'aliases' => array(), ),
'reference' => 'fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b', 'reference' => 'fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b',
'dev_requirement' => false,
), ),
'yidian/yaf_demo' => array( 'yidian/yaf_demo' =>
array (
'pretty_version' => 'dev-develop', 'pretty_version' => 'dev-develop',
'version' => 'dev-develop', 'version' => 'dev-develop',
'type' => 'project', 'aliases' =>
'install_path' => __DIR__ . '/../../', array (
'aliases' => array(), ),
'reference' => '26f3230dd97d1da1840255c71dd2c03ec79c3fcf', 'reference' => '64abe898e25ed52e044b6cc7ed9adef399d0239b',
'dev_requirement' => false,
), ),
), ),
); );
vendor/symfony/property-info/CHANGELOG.md
View file @ 15b38fc0
...@@ -10,7 +10,7 @@ CHANGELOG ...@@ -10,7 +10,7 @@ CHANGELOG
5.2.0 5.2.0
----- -----
* deprecated the `enable_magic_call_extraction` context option in `ReflectionExtractor::getWriteInfo()` and `ReflectionExtractor::getReadInfo()`. in favor of `enable_magic_methods_extraction` * deprecated the `enable_magic_call_extraction` context option in `ReflectionExtractor::getWriteInfo()` and `ReflectionExtractor::getReadInfo()` in favor of `enable_magic_methods_extraction`
5.1.0 5.1.0
----- -----
......
vendor/symfony/property-info/Extractor/ReflectionExtractor.php
View file @ 15b38fc0
...@@ -552,8 +552,8 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp ...@@ -552,8 +552,8 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
$types = []; $types = [];
$nullable = $reflectionType->allowsNull(); $nullable = $reflectionType->allowsNull();
foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) { foreach (($reflectionType instanceof \ReflectionUnionType || $reflectionType instanceof \ReflectionIntersectionType) ? $reflectionType->getTypes() : [$reflectionType] as $type) {
$phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type; $phpTypeOrClass = $type->getName();
if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) { if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment