Commit 1559231e authored by cuiweifeng's avatar cuiweifeng

update : composer update

parent 9ae25f92
......@@ -8,13 +8,19 @@ class Ksyun
private const jinshan_ak = 'AKLTnATdoXUnR72IDSGgN2WSOQ'; //AccessKey
private const jinshan_sk = 'OMw7UAOkrLVsRevuP44ctAlfzriDzUm9+JvOFoYuiSoLgaLJWi+kjUa+4G3EWXFakQ=='; //SecretKey
private const bp_bucket = 'bp-yidian';
private const bp_image_yidian = 'bp-image_yidian';
private const bp_image_yidian = 'bp-image-yidian';
private const get_down_from_ksyun = 'http://video-stream-service.int.yidian-inc.com/auth/url-get';
private const get_down_from_pic_service = 'https://ibp.go2yd.com/imagebp.php'; //来自图片服务
public const scenario_id_card = 'id_card';
public const scenario_living_data = 'living_data';
public const scenario_living_business_license = 'business_license';
public const scenario_living_goods = 'goods';
public const scenario_living_goods_temp = 'goods_temp'; //商品图片临时方案
/**
* 支持批量
* 根据 object_id 从金山云 获取下载地址
* 根据 object_id 从视频团队 获取下载地址 负责人钱昊
* @param $object_ids array ["90.mp4", "17.mp4"]
* @param $appid string 区分不同业务方
* @param $bucket string
......@@ -23,6 +29,10 @@ class Ksyun
*/
public static function getDownUrl(array $object_ids,$appid,$bucket,$expire_time=60)
{
if (empty($object_ids)) {
return [];
}
$object_ids = array_values(array_filter($object_ids));
$post_data = [
'keys' => $object_ids,
'from' => $appid,
......@@ -42,6 +52,7 @@ class Ksyun
* @param $url
* @param $appid
* @param int $expire_time
* @param string $scenario
* @return mixed|string
*/
public static function getUrlFromKsyn($url,$appid,$expire_time=60)
......@@ -49,7 +60,7 @@ class Ksyun
$del_str = explode('/',$url);
$bucket = $del_str[0] ?? '';
$objectid = $del_str[1] ?? '';
$image_url = Ksyun::getDownUrl([$objectid],$appid,$bucket,$expire_time);
$image_url = self::getDownUrl([$objectid],$appid,$bucket,$expire_time);
if (empty($image_url) || (!isset($image_url[$objectid]) )
) {
return '';
......@@ -59,7 +70,7 @@ class Ksyun
}
/**
* 返回 金山云token
* 根据金山云文档 生成token
* @param $http_method
* @param $date
* @param $resource
......@@ -113,11 +124,13 @@ class Ksyun
public static function getBucket($appid,$scenario) :string
{
if ($appid === 'merchant-b' || $appid === 'merchant-c') {
if ($scenario === 'goods') {
if ($scenario === self::scenario_living_goods) {
return self::bp_image_yidian;
}
if (in_array($scenario,[self::scenario_id_card,self::scenario_living_business_license,self::scenario_living_data])) {
return self::bp_bucket;
}
}
return '';
}
......@@ -142,7 +155,7 @@ class Ksyun
* @wiki http://ydwiki.yidian-inc.com/pages/viewpage.action?pageId=41584585
* @return string
*/
public static function getCutPicUtl($bucket,$objectid,$wideSize,$highSize,$type='jepg')
public static function getCutPicUrl($bucket,$objectid,$wideSize,$highSize,$type='jepg')
{
if ($bucket !== self::bp_image_yidian || !in_array($type,['png','webp','jpeg'])) {
//目前只有当bucket == bp-image_yidian 才支持可裁剪
......@@ -150,4 +163,36 @@ class Ksyun
}
return sprintf(self::get_down_from_pic_service.'?'.'url=%s&%s_%sx%s',$objectid,$type,$wideSize,$highSize);
}
/**
* 图片下载地址 的统一出口函数
* @param $appid
* @param $scenario
* @param $url
* @param $wideSize
* @param $highSize
* @param string $type
* @return mixed|string
*/
public static function getPicUrl($appid,$scenario,$url,$wideSize,$highSize,$type='jepg')
{
if (!in_array($appid,['merchant-b','merchant-c'])) {
return '';
}
if (in_array($appid,['merchant-b','merchant-c'])) {
if ($scenario === self::scenario_living_goods_temp) {
$del_str = explode('/',$url);
$bucket = $del_str[0] ?? '';
$objectid = $del_str[1] ?? '';
return self::getCutPicUrl($bucket,$objectid,$wideSize,$highSize,$type);
}
if (in_array($scenario, [self::scenario_living_data, self::scenario_id_card, self::scenario_living_business_license], true)) {
return self::getUrlFromKsyn($url,$appid);
}
}
return '';
}
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ class RedisSession extends Session
{
protected $redis = null;
protected $key = 'c071f6e5923a648a5ef88f32b6f738e1';
protected $from = 'bpsession';
/**
* 从cookie开启session
......@@ -146,7 +147,7 @@ class RedisSession extends Session
}
$url = $this->getUrl('delete');
$params = ['sessionid' => array_unique($sessionIds), 'key' => $this->key];
$params = ['sessionid' => array_unique($sessionIds), 'key' => $this->key, 'from' => $this->from];
$result = (new Request())->post($url, $params, 0, 'json');
if (isset($result['response']['code']) && $result['response']['code'] == 0 ) {
return true;
......@@ -182,7 +183,7 @@ class RedisSession extends Session
{
$data = [];
$url = $this->getUrl('mget');
$params = ['sessionid' => $sessionIds, 'key' => $this->key];
$params = ['sessionid' => $sessionIds, 'key' => $this->key, 'from' => $this->from];
$result = (new Request())->post($url, $params, 0, 'json');
if (isset($result['response']['code']) && $result['response']['code'] == 0
&& isset($result['response']['result']) && !empty($result['response']['result'])
......
......@@ -11,6 +11,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
{
protected $key = 'c071f6e5923a648a5ef88f32b6f738e1';
protected $expire = 0;
protected $from = 'bpsession';
/**
* open session
......@@ -31,7 +32,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
public function read($sessionId)
{
$url = $this->getUrl('get');
$query = ['sessionid' => $sessionId];
$query = ['sessionid' => $sessionId, 'from' => $this->from];
$result = (new Request())->get($url, $query);
$data = [];
if (isset($result['response']['code']) && $result['response']['code'] == 0 && isset($result['response']['result'])) {
......@@ -52,7 +53,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
return true;
}
$url = $this->getUrl('set');
$params = ['sessionid' => $sessionId, 'data' => $_SESSION, 'expire' => $this->expire, 'key' => $this->key];
$params = ['sessionid' => $sessionId, 'data' => $_SESSION, 'expire' => $this->expire, 'key' => $this->key, 'from' => $this->from];
$result = (new Request())->post($url, $params, 3000, 'json');
if (isset($result['response']['code']) && $result['response']['code'] == 0 ) {
return true;
......@@ -77,7 +78,7 @@ class RedisSessionHandler implements \SessionHandlerInterface
public function destroy($sessionId)
{
$url = $this->getUrl('delete');
$params = ['sessionid' => $sessionId, 'key' => $this->key];
$params = ['sessionid' => $sessionId, 'key' => $this->key, 'from' => $this->from];
$result = (new Request())->post($url, $params, 3000, 'json');
if (isset($result['response']['code']) && $result['response']['code'] == 0 ) {
return true;
......
......@@ -107,6 +107,16 @@ class GetImage
imagedestroy($qr_img);
}
/**
* @param string $code 二维码扫描后内容
*
*/
public function getShare(string $code){
$qrCode = new QrCode($code);
header('Content-Type: '.$qrCode->getContentType());
echo $qrCode->writeString();die;
}
/**
* @param string $head_img 头像url地址
* @param string $goods_img 商品图片url地址
......
......@@ -31,7 +31,7 @@ class Sms
'appid' => !empty($params['appid']) ? $params['appid'] : '',
'code' => !empty($params['code']) ? $params['code'] : '',
'key' => 'f16bdd46292480b4b82c841d90a6ba02',
'partner' => 'merchant-b'
'partner' => !empty($params['appid']) ? $params['appid'] : '',
];
$sms = (new TimeOut())->runGet($url, $params);
......@@ -75,7 +75,7 @@ class Sms
'appid' => !empty($params['appid']) ? $params['appid'] : 'hubble',
'scene' => !empty($params['scene']) ? $params['scene'] : '',
'key' => 'f16bdd46292480b4b82c841d90a6ba02',
'partner' => 'merchant-b',
'partner' => !empty($params['appid']) ? $params['appid'] : '',
'template' => !empty($params['template']) ? $params['template'] : 7,
'code_lenght' => !empty($params['code_lenght']) ? $params['code_lenght'] : 6,
'ticket_expire' => !empty($params['ticket_expire']) ? $params['ticket_expire'] : 86400,
......
......@@ -45,10 +45,17 @@ class CacheUtil
if (empty($serverName)) {
return null;
}
if (isset(self::$instances[$serverName])) {
return self::$instances[$serverName];
if (empty($options)) {
$instancesKey = $serverName;
} else {
$instancesKey = $serverName . ':' . json_encode($options);
}
if (isset(self::$instances[$instancesKey])) {
return self::$instances[$instancesKey];
}
return self::$instances[$serverName] = new Self($serverName, $options);
return self::$instances[$instancesKey] = new Self($serverName, $options);
}
private function __construct($serverName = '', array $options = [])
......
<?php
namespace Api\PhpUtils\Lock;
/**
* Redis 频率锁
*/
use Api\PhpUtils\Redis\RedisUtil;
class FrequencyLockUtil
{
const MIN_FREQUENCY_SECONDS = 30; // 频率锁默认最小间隔秒数
const MIN_FREQUENCY_TIMES = 1; // 频率锁默认最小间隔秒数内最大访问次数
const PREFIX_FREQUENCY_LOCK = 'flk:';
private static $handler = null;
private static function initCache()
{
if (empty(self::$handler)){
//获取连接句柄, 使用gateway的codis
self::$handler = RedisUtil::getInstance('cache', ['serializer' => 'none']);
}
}
/**
* 频率锁, 每$expire秒钟允许$times次$key访问
*
* @param string $key 锁定的key
* @param int $times 允许访问次数
* @param int $expire 锁定时长,秒数
* @return boolean
*/
public static function isLocked($key, $times = self::MIN_FREQUENCY_TIMES, $expire = self::MIN_FREQUENCY_SECONDS)
{
$key = self::PREFIX_FREQUENCY_LOCK . $key;
self::initCache();
$current_times = self::$handler->incr($key);
if ($current_times == 1) {
self::$handler->expire($key, $expire);
}
return ($current_times > $times) ? false : true;
}
/**
* 频次减少
* @param string $key 锁定的key
* @param int $number 减少的值
* @return void
*/
public static function decr($key, $number = 1)
{
$key = self::PREFIX_FREQUENCY_LOCK . $key;
self::initCache();
return self::$handler->decrby($key, $number);
}
/**
* 频次重置(测试用)
* @param string $key
*/
public static function reset($key)
{
$key = self::PREFIX_FREQUENCY_LOCK . $key;
self::initCache();
return self::$handler->del($key);
}
/**
* 已经使用次数
* @param string $key
* @return int
*/
public static function get($key)
{
$key = self::PREFIX_FREQUENCY_LOCK . $key;
self::initCache();
$times = self::$handler->get($key);
return intval($times);
}
}
......@@ -19,7 +19,7 @@ class FileLog
if ($with_access_log) {
$log .= ' [request info:] ' . self::accessLog();
}
self::writeInfoLog($log);
error_log($log);
}
/**
......@@ -36,7 +36,7 @@ class FileLog
$exception_info = 'In ' . $exception->getFile() . ' on line ' . $exception->getLine() . ' ' . $exception->getCode() . ': ' . $exception->getMessage();
$log .= ' [exception info: ]' . $exception_info;
}
self::writeWarningLog($log);
error_log($log);
}
/**
......
......@@ -65,7 +65,7 @@ class MonUtil{
$request_module = str_replace(array(".", ":", "/"),array("_", "_", "-"), $host);
if (empty($module)) {
//默认取url 中的域名作为module
$domain = $_SERVER['SERVER_NAME'] ?? 'unknow_domain';
$domain = str_replace(array(".", ":", "/"),array("_", "_", "-"), $_SERVER['SERVER_NAME'] ?? 'unknow_domain');
$module = $domain.'.'.($request_module ?? 'other_depent');
}
......
......@@ -27,12 +27,12 @@ class InstalledVersions
private static $installed = array (
'root' =>
array (
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'aliases' =>
array (
),
'reference' => '440ba7061544d26ad0ed8947550bbb324fd82486',
'reference' => '9ae25f92abf61649d1910edca7d4207e33749f5e',
'name' => 'bp/pay',
),
'versions' =>
......@@ -45,7 +45,7 @@ private static $installed = array (
array (
0 => '9999999-dev',
),
'reference' => 'd97dbc9073709d51ee448492163a532980e05fec',
'reference' => '58888c4a083e384080d78606f362809a89b8c672',
),
'api/php_utils' =>
array (
......@@ -55,7 +55,7 @@ private static $installed = array (
array (
0 => '9999999-dev',
),
'reference' => 'a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec',
'reference' => '6495e3a31134e644072208c19610924912f4683a',
),
'bacon/bacon-qr-code' =>
array (
......@@ -68,12 +68,12 @@ private static $installed = array (
),
'bp/pay' =>
array (
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'aliases' =>
array (
),
'reference' => '440ba7061544d26ad0ed8947550bbb324fd82486',
'reference' => '9ae25f92abf61649d1910edca7d4207e33749f5e',
),
'dasprid/enum' =>
array (
......@@ -257,7 +257,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '162e886ca035869866d233a2bfef70cc28f9bbe5',
'reference' => '05b35d6cc6227dc22fc053d0cfcd9f41000e2c80',
),
'symfony/polyfill-ctype' =>
array (
......@@ -326,7 +326,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '401339856144dd876034b5df480e8f4f36355d09',
'reference' => '13c33f29a76bd99976ba7ee20297fa16d5a53a59',
),
'symfony/property-info' =>
array (
......@@ -335,7 +335,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => 'a45839949b03e1437837000ce8319a9214974501',
'reference' => '718f093ae4cac054db2bbb39ebf86fd898583ac8',
),
'symfony/string' =>
array (
......
......@@ -56,6 +56,7 @@ return array(
'Api\\PhpUtils\\Hystrix\\Hystrix' => $vendorDir . '/api/php_utils/src/Hystrix/Hystrix.php',
'Api\\PhpUtils\\Kafka\\KafkaUtil' => $vendorDir . '/api/php_utils/src/Kafka/KafkaUtil.php',
'Api\\PhpUtils\\Ksy\\Ks3Util' => $vendorDir . '/api/php_utils/src/Ksy/Ks3Util.php',
'Api\\PhpUtils\\Lock\\FrequencyLockUtil' => $vendorDir . '/api/php_utils/src/Lock/FrequencyLockUtil.php',
'Api\\PhpUtils\\Log\\DaemonLog' => $vendorDir . '/api/php_utils/src/Log/DaemonLog.php',
'Api\\PhpUtils\\Log\\FileLog' => $vendorDir . '/api/php_utils/src/Log/FileLog.php',
'Api\\PhpUtils\\Message\\Email' => $vendorDir . '/api/php_utils/src/Message/Email.php',
......@@ -77,21 +78,25 @@ return array(
'App\\Exception\\ExceptionErrorCatch' => $baseDir . '/application/exception/ExceptionErrorCatch.php',
'App\\Exception\\ExceptionHandler' => $baseDir . '/application/exception/ExceptionHandler.php',
'App\\Exception\\custom\\Code' => $baseDir . '/application/exception/custom/Code.php',
'App\\Exception\\custom\\CodeSpecialException' => $baseDir . '/application/exception/custom/CodeSpecialException.php',
'App\\Exception\\custom\\OrderException' => $baseDir . '/application/exception/custom/OrderException.php',
'App\\Exception\\custom\\PayException' => $baseDir . '/application/exception/custom/PayException.php',
'App\\Exception\\custom\\RefundException' => $baseDir . '/application/exception/custom/RefundException.php',
'App\\Exception\\custom\\SdkException' => $baseDir . '/application/exception/custom/SdkException.php',
'App\\Exception\\custom\\WalletException' => $baseDir . '/application/exception/custom/WalletException.php',
'App\\Models\\Dictionary' => $baseDir . '/application/models/Dictionary.php',
'App\\Models\\demo\\mongo\\Test' => $baseDir . '/application/models/demo/mongo/Test.php',
'App\\Models\\demo\\mongo\\User' => $baseDir . '/application/models/demo/mongo/User.php',
'App\\Models\\demo\\mysql\\TestMysql' => $baseDir . '/application/models/demo/mysql/TestMysql.php',
'App\\Models\\demo\\mysql\\User' => $baseDir . '/application/models/demo/mysql/User.php',
'App\\Models\\order\\mysql\\CallbackLog' => $baseDir . '/application/models/order/mysql/CallbackLog.php',
'App\\Models\\order\\mysql\\PayOrder' => $baseDir . '/application/models/order/mysql/PayOrder.php',
'App\\Models\\order\\mysql\\PayOrderClearing' => $baseDir . '/application/models/order/mysql/PayOrderClearing.php',
'App\\Models\\order\\mysql\\PayOrderClearingItem' => $baseDir . '/application/models/order/mysql/PayOrderClearingItem.php',
'App\\Models\\order\\mysql\\PayOrderItem' => $baseDir . '/application/models/order/mysql/PayOrderItem.php',
'App\\Models\\order\\mysql\\RefundOrder' => $baseDir . '/application/models/order/mysql/RefundOrder.php',
'App\\Plugins\\Hook' => $baseDir . '/application/plugins/Hook.php',
'App\\Services\\demo\\MongoService' => $baseDir . '/application/services/demo/MongoService.php',
'App\\Services\\demo\\MysqlService' => $baseDir . '/application/services/demo/MysqlService.php',
'App\\Services\\order\\OrderService' => $baseDir . '/application/services/order/OrderService.php',
'App\\Services\\pay\\PayService' => $baseDir . '/application/services/pay/PayService.php',
'App\\Services\\pingxx\\PingxxService' => $baseDir . '/application/services/pingxx/PingxxService.php',
'App\\Services\\refund\\RefundService' => $baseDir . '/application/services/refund/RefundService.php',
'App\\Services\\wallet\\WalletService' => $baseDir . '/application/services/wallet/WalletService.php',
'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
'BaconQrCode\\Common\\BitArray' => $vendorDir . '/bacon/bacon-qr-code/src/Common/BitArray.php',
'BaconQrCode\\Common\\BitMatrix' => $vendorDir . '/bacon/bacon-qr-code/src/Common/BitMatrix.php',
......@@ -165,6 +170,7 @@ return array(
'DASPRiD\\Enum\\Exception\\UnserializeNotSupportedException' => $vendorDir . '/dasprid/enum/src/Exception/UnserializeNotSupportedException.php',
'DASPRiD\\Enum\\NullValue' => $vendorDir . '/dasprid/enum/src/NullValue.php',
'Daemon\\Test' => $baseDir . '/daemon/Test.php',
'Daemon\\Wallet' => $baseDir . '/daemon/Wallet.php',
'Elasticsearch\\Client' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
'Elasticsearch\\ClientBuilder' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',
'Elasticsearch\\Common\\EmptyLogger' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/Common/EmptyLogger.php',
......
......@@ -8,18 +8,18 @@ $baseDir = dirname($vendorDir);
return array(
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'3a37ebac017bc098e9a86b35401e7a68' => $vendorDir . '/mongodb/mongodb/src/functions.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
);
......@@ -9,20 +9,20 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
'8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'3a37ebac017bc098e9a86b35401e7a68' => __DIR__ . '/..' . '/mongodb/mongodb/src/functions.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
);
public static $prefixLengthsPsr4 = array (
......@@ -290,6 +290,7 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
'Api\\PhpUtils\\Hystrix\\Hystrix' => __DIR__ . '/..' . '/api/php_utils/src/Hystrix/Hystrix.php',
'Api\\PhpUtils\\Kafka\\KafkaUtil' => __DIR__ . '/..' . '/api/php_utils/src/Kafka/KafkaUtil.php',
'Api\\PhpUtils\\Ksy\\Ks3Util' => __DIR__ . '/..' . '/api/php_utils/src/Ksy/Ks3Util.php',
'Api\\PhpUtils\\Lock\\FrequencyLockUtil' => __DIR__ . '/..' . '/api/php_utils/src/Lock/FrequencyLockUtil.php',
'Api\\PhpUtils\\Log\\DaemonLog' => __DIR__ . '/..' . '/api/php_utils/src/Log/DaemonLog.php',
'Api\\PhpUtils\\Log\\FileLog' => __DIR__ . '/..' . '/api/php_utils/src/Log/FileLog.php',
'Api\\PhpUtils\\Message\\Email' => __DIR__ . '/..' . '/api/php_utils/src/Message/Email.php',
......@@ -311,21 +312,25 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
'App\\Exception\\ExceptionErrorCatch' => __DIR__ . '/../..' . '/application/exception/ExceptionErrorCatch.php',
'App\\Exception\\ExceptionHandler' => __DIR__ . '/../..' . '/application/exception/ExceptionHandler.php',
'App\\Exception\\custom\\Code' => __DIR__ . '/../..' . '/application/exception/custom/Code.php',
'App\\Exception\\custom\\CodeSpecialException' => __DIR__ . '/../..' . '/application/exception/custom/CodeSpecialException.php',
'App\\Exception\\custom\\OrderException' => __DIR__ . '/../..' . '/application/exception/custom/OrderException.php',
'App\\Exception\\custom\\PayException' => __DIR__ . '/../..' . '/application/exception/custom/PayException.php',
'App\\Exception\\custom\\RefundException' => __DIR__ . '/../..' . '/application/exception/custom/RefundException.php',
'App\\Exception\\custom\\SdkException' => __DIR__ . '/../..' . '/application/exception/custom/SdkException.php',
'App\\Exception\\custom\\WalletException' => __DIR__ . '/../..' . '/application/exception/custom/WalletException.php',
'App\\Models\\Dictionary' => __DIR__ . '/../..' . '/application/models/Dictionary.php',
'App\\Models\\demo\\mongo\\Test' => __DIR__ . '/../..' . '/application/models/demo/mongo/Test.php',
'App\\Models\\demo\\mongo\\User' => __DIR__ . '/../..' . '/application/models/demo/mongo/User.php',
'App\\Models\\demo\\mysql\\TestMysql' => __DIR__ . '/../..' . '/application/models/demo/mysql/TestMysql.php',
'App\\Models\\demo\\mysql\\User' => __DIR__ . '/../..' . '/application/models/demo/mysql/User.php',
'App\\Models\\order\\mysql\\CallbackLog' => __DIR__ . '/../..' . '/application/models/order/mysql/CallbackLog.php',
'App\\Models\\order\\mysql\\PayOrder' => __DIR__ . '/../..' . '/application/models/order/mysql/PayOrder.php',
'App\\Models\\order\\mysql\\PayOrderClearing' => __DIR__ . '/../..' . '/application/models/order/mysql/PayOrderClearing.php',
'App\\Models\\order\\mysql\\PayOrderClearingItem' => __DIR__ . '/../..' . '/application/models/order/mysql/PayOrderClearingItem.php',
'App\\Models\\order\\mysql\\PayOrderItem' => __DIR__ . '/../..' . '/application/models/order/mysql/PayOrderItem.php',
'App\\Models\\order\\mysql\\RefundOrder' => __DIR__ . '/../..' . '/application/models/order/mysql/RefundOrder.php',
'App\\Plugins\\Hook' => __DIR__ . '/../..' . '/application/plugins/Hook.php',
'App\\Services\\demo\\MongoService' => __DIR__ . '/../..' . '/application/services/demo/MongoService.php',
'App\\Services\\demo\\MysqlService' => __DIR__ . '/../..' . '/application/services/demo/MysqlService.php',
'App\\Services\\order\\OrderService' => __DIR__ . '/../..' . '/application/services/order/OrderService.php',
'App\\Services\\pay\\PayService' => __DIR__ . '/../..' . '/application/services/pay/PayService.php',
'App\\Services\\pingxx\\PingxxService' => __DIR__ . '/../..' . '/application/services/pingxx/PingxxService.php',
'App\\Services\\refund\\RefundService' => __DIR__ . '/../..' . '/application/services/refund/RefundService.php',
'App\\Services\\wallet\\WalletService' => __DIR__ . '/../..' . '/application/services/wallet/WalletService.php',
'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
'BaconQrCode\\Common\\BitArray' => __DIR__ . '/..' . '/bacon/bacon-qr-code/src/Common/BitArray.php',
'BaconQrCode\\Common\\BitMatrix' => __DIR__ . '/..' . '/bacon/bacon-qr-code/src/Common/BitMatrix.php',
......@@ -399,6 +404,7 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
'DASPRiD\\Enum\\Exception\\UnserializeNotSupportedException' => __DIR__ . '/..' . '/dasprid/enum/src/Exception/UnserializeNotSupportedException.php',
'DASPRiD\\Enum\\NullValue' => __DIR__ . '/..' . '/dasprid/enum/src/NullValue.php',
'Daemon\\Test' => __DIR__ . '/../..' . '/daemon/Test.php',
'Daemon\\Wallet' => __DIR__ . '/../..' . '/daemon/Wallet.php',
'Elasticsearch\\Client' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
'Elasticsearch\\ClientBuilder' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',
'Elasticsearch\\Common\\EmptyLogger' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/Common/EmptyLogger.php',
......
......@@ -7,7 +7,7 @@
"source": {
"type": "git",
"url": "https://gitlab.yidian-inc.com/bp/php_services.git",
"reference": "d97dbc9073709d51ee448492163a532980e05fec"
"reference": "58888c4a083e384080d78606f362809a89b8c672"
},
"require": {
"api/php_utils": "dev-master",
......@@ -15,7 +15,7 @@
"perftools/php-profiler": "^0.18.0",
"php": "7.2.*"
},
"time": "2021-06-29T10:41:52+00:00",
"time": "2021-07-09T13:44:16+00:00",
"default-branch": true,
"type": "library",
"installation-source": "source",
......@@ -34,7 +34,7 @@
"source": {
"type": "git",
"url": "https://gitlab.yidian-inc.com/bp/php_utils.git",
"reference": "a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec"
"reference": "6495e3a31134e644072208c19610924912f4683a"
},
"require": {
"elasticsearch/elasticsearch": "~7.0",
......@@ -46,7 +46,7 @@
"mongodb/mongodb": "1.4.3",
"php": "7.2.*"
},
"time": "2021-06-28T03:25:55+00:00",
"time": "2021-07-10T12:30:06+00:00",
"default-branch": true,
"type": "library",
"installation-source": "source",
......@@ -1359,12 +1359,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "162e886ca035869866d233a2bfef70cc28f9bbe5"
"reference": "05b35d6cc6227dc22fc053d0cfcd9f41000e2c80"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5",
"reference": "162e886ca035869866d233a2bfef70cc28f9bbe5",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/05b35d6cc6227dc22fc053d0cfcd9f41000e2c80",
"reference": "05b35d6cc6227dc22fc053d0cfcd9f41000e2c80",
"shasum": "",
"mirrors": [
{
......@@ -1379,8 +1379,7 @@
"symfony/polyfill-php73": "~1.0",
"symfony/polyfill-php80": "^1.15"
},
"time": "2021-05-26T17:43:10+00:00",
"default-branch": true,
"time": "2021-07-02T16:38:59+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......@@ -1413,7 +1412,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v5.3.0"
"source": "https://github.com/symfony/options-resolver/tree/5.3"
},
"funding": [
{
......@@ -1984,12 +1983,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
"reference": "401339856144dd876034b5df480e8f4f36355d09"
"reference": "13c33f29a76bd99976ba7ee20297fa16d5a53a59"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/401339856144dd876034b5df480e8f4f36355d09",
"reference": "401339856144dd876034b5df480e8f4f36355d09",
"url": "https://api.github.com/repos/symfony/property-access/zipball/13c33f29a76bd99976ba7ee20297fa16d5a53a59",
"reference": "13c33f29a76bd99976ba7ee20297fa16d5a53a59",
"shasum": "",
"mirrors": [
{
......@@ -2010,7 +2009,7 @@
"suggest": {
"psr/cache-implementation": "To cache access methods."
},
"time": "2021-06-30T13:58:03+00:00",
"time": "2021-07-03T09:16:21+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......@@ -2074,12 +2073,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/property-info.git",
"reference": "a45839949b03e1437837000ce8319a9214974501"
"reference": "718f093ae4cac054db2bbb39ebf86fd898583ac8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-info/zipball/a45839949b03e1437837000ce8319a9214974501",
"reference": "a45839949b03e1437837000ce8319a9214974501",
"url": "https://api.github.com/repos/symfony/property-info/zipball/718f093ae4cac054db2bbb39ebf86fd898583ac8",
"reference": "718f093ae4cac054db2bbb39ebf86fd898583ac8",
"shasum": "",
"mirrors": [
{
......@@ -2112,7 +2111,7 @@
"symfony/doctrine-bridge": "To use Doctrine metadata",
"symfony/serializer": "To use Serializer metadata"
},
"time": "2021-06-03T14:00:26+00:00",
"time": "2021-07-03T09:16:21+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......
<?php return array (
'root' =>
array (
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'aliases' =>
array (
),
'reference' => '440ba7061544d26ad0ed8947550bbb324fd82486',
'reference' => '9ae25f92abf61649d1910edca7d4207e33749f5e',
'name' => 'bp/pay',
),
'versions' =>
......@@ -19,7 +19,7 @@
array (
0 => '9999999-dev',
),
'reference' => 'd97dbc9073709d51ee448492163a532980e05fec',
'reference' => '58888c4a083e384080d78606f362809a89b8c672',
),
'api/php_utils' =>
array (
......@@ -29,7 +29,7 @@
array (
0 => '9999999-dev',
),
'reference' => 'a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec',
'reference' => '6495e3a31134e644072208c19610924912f4683a',
),
'bacon/bacon-qr-code' =>
array (
......@@ -42,12 +42,12 @@
),
'bp/pay' =>
array (
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'aliases' =>
array (
),
'reference' => '440ba7061544d26ad0ed8947550bbb324fd82486',
'reference' => '9ae25f92abf61649d1910edca7d4207e33749f5e',
),
'dasprid/enum' =>
array (
......@@ -231,7 +231,7 @@
'aliases' =>
array (
),
'reference' => '162e886ca035869866d233a2bfef70cc28f9bbe5',
'reference' => '05b35d6cc6227dc22fc053d0cfcd9f41000e2c80',
),
'symfony/polyfill-ctype' =>
array (
......@@ -300,7 +300,7 @@
'aliases' =>
array (
),
'reference' => '401339856144dd876034b5df480e8f4f36355d09',
'reference' => '13c33f29a76bd99976ba7ee20297fa16d5a53a59',
),
'symfony/property-info' =>
array (
......@@ -309,7 +309,7 @@
'aliases' =>
array (
),
'reference' => 'a45839949b03e1437837000ce8319a9214974501',
'reference' => '718f093ae4cac054db2bbb39ebf86fd898583ac8',
),
'symfony/string' =>
array (
......
......@@ -28,8 +28,6 @@ final class OptionConfigurator
/**
* Adds allowed types for this option.
*
* @param string ...$types One or more accepted types
*
* @return $this
*
* @throws AccessException If called from a lazy option or normalizer
......@@ -100,8 +98,6 @@ final class OptionConfigurator
/**
* Sets the normalizer for this option.
*
* @param \Closure $normalizer The normalizer
*
* @return $this
*
* @throws AccessException If called from a lazy option or normalizer
......
......@@ -261,10 +261,6 @@ class OptionsResolver implements Options
}
/**
* Sets a list of default values.
*
* @param array $defaults The default values to set
*
* @return $this
*
* @throws AccessException If called from a lazy option or normalizer
......@@ -284,8 +280,6 @@ class OptionsResolver implements Options
* Returns true if {@link setDefault()} was called for this option.
* An option is also considered set if it was set to null.
*
* @param string $option The option name
*
* @return bool Whether a default value is set
*/
public function hasDefault(string $option)
......@@ -321,8 +315,6 @@ class OptionsResolver implements Options
*
* An option is required if it was passed to {@link setRequired()}.
*
* @param string $option The name of the option
*
* @return bool Whether the option is required
*/
public function isRequired(string $option)
......@@ -349,8 +341,6 @@ class OptionsResolver implements Options
* to {@link setDefault()}. This option must be passed explicitly to
* {@link resolve()}, otherwise an exception will be thrown.
*
* @param string $option The name of the option
*
* @return bool Whether the option is missing
*/
public function isMissing(string $option)
......@@ -402,8 +392,6 @@ class OptionsResolver implements Options
* Returns true for any option passed to {@link setDefault()},
* {@link setRequired()} or {@link setDefined()}.
*
* @param string $option The option name
*
* @return bool Whether the option is defined
*/
public function isDefined(string $option)
......@@ -516,9 +504,6 @@ class OptionsResolver implements Options
*
* The resolved option value is set to the return value of the closure.
*
* @param string $option The option name
* @param \Closure $normalizer The normalizer
*
* @return $this
*
* @throws UndefinedOptionsException If the option is undefined
......@@ -560,10 +545,6 @@ class OptionsResolver implements Options
*
* The resolved option value is set to the return value of the closure.
*
* @param string $option The option name
* @param \Closure $normalizer The normalizer
* @param bool $forcePrepend If set to true, prepend instead of appending
*
* @return $this
*
* @throws UndefinedOptionsException If the option is undefined
......@@ -687,7 +668,6 @@ class OptionsResolver implements Options
* acceptable. Additionally, fully-qualified class or interface names may
* be passed.
*
* @param string $option The option name
* @param string|string[] $allowedTypes One or more accepted types
*
* @return $this
......@@ -722,7 +702,6 @@ class OptionsResolver implements Options
* acceptable. Additionally, fully-qualified class or interface names may
* be passed.
*
* @param string $option The option name
* @param string|string[] $allowedTypes One or more accepted types
*
* @return $this
......@@ -890,8 +869,6 @@ class OptionsResolver implements Options
* - Options have invalid types;
* - Options have invalid values.
*
* @param array $options A map of option names to values
*
* @return array The merged and validated options
*
* @throws UndefinedOptionsException If an option name is undefined
......@@ -953,7 +930,6 @@ class OptionsResolver implements Options
/**
* Returns the resolved value of an option.
*
* @param string $option The option name
* @param bool $triggerDeprecation Whether to trigger the deprecation or not (true by default)
*
* @return mixed The option value
......
......@@ -660,10 +660,8 @@ class PropertyAccessor implements PropertyAccessorInterface
/**
* Returns whether a property is writable in the given object.
*
* @param object $object The object to write to
*/
private function isPropertyWritable($object, string $property): bool
private function isPropertyWritable(object $object, string $property): bool
{
if (!\is_object($object)) {
return false;
......
......@@ -63,8 +63,6 @@ class PropertyPathBuilder
/**
* Appends an index element to the current path.
*
* @param string $name The name of the appended index
*/
public function appendIndex(string $name)
{
......@@ -74,8 +72,6 @@ class PropertyPathBuilder
/**
* Appends a property element to the current path.
*
* @param string $name The name of the appended property
*/
public function appendProperty(string $name)
{
......@@ -86,9 +82,6 @@ class PropertyPathBuilder
/**
* Removes elements from the current path.
*
* @param int $offset The offset at which to remove
* @param int $length The length of the removed piece
*
* @throws OutOfBoundsException if offset is invalid
*/
public function remove(int $offset, int $length = 1)
......@@ -141,9 +134,6 @@ class PropertyPathBuilder
/**
* Replaces a property element by an index element.
*
* @param int $offset The offset at which to replace
* @param string $name The new name of the element. Optional
*
* @throws OutOfBoundsException If the offset is invalid
*/
public function replaceByIndex(int $offset, string $name = null)
......@@ -162,9 +152,6 @@ class PropertyPathBuilder
/**
* Replaces an index element by a property element.
*
* @param int $offset The offset at which to replace
* @param string $name The new name of the element. Optional
*
* @throws OutOfBoundsException If the offset is invalid
*/
public function replaceByProperty(int $offset, string $name = null)
......
......@@ -34,7 +34,7 @@ final class ConstructorExtractor implements PropertyTypeExtractorInterface
/**
* {@inheritdoc}
*/
public function getTypes($class, $property, array $context = [])
public function getTypes(string $class, string $property, array $context = [])
{
foreach ($this->extractors as $extractor) {
$value = $extractor->getTypesFromConstructor($class, $property);
......
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