Commit 26972301 authored by cuiweifeng's avatar cuiweifeng

update : composer update

parent 831ef95d
[26-Jun-2021 14:46:09 Asia/Shanghai] daemon:GoodsToEs 6245 [INFO]: process start now
[26-Jun-2021 14:46:09 Asia/Shanghai] daemon:GoodsToEs 6297 [INFO]: master process pid:6298
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP Warning: Use of undefined constant ROOT_PATH - assumed 'ROOT_PATH' (this will throw an Error in a future version of PHP) in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 139
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:33
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:33
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
......@@ -6,8 +6,8 @@
"require": {
"php": "7.2.*",
"ext-json": "*",
"api/php_utils":"1.0.10",
"api/php_services":"1.0.1",
"api/php_utils":"1.0.12",
"api/php_services":"1.0.9",
"ext-openssl": "*"
},
"minimum-stability": "dev",
......
This diff is collapsed.
{
"name": "xxx",
"version": "0.0.0",
}
\ No newline at end of file
......@@ -232,4 +232,23 @@ class JwUser
}
return !empty($ret['response']) ? $ret['response'] : [];
}
/**
* 是否关注公众号
*/
public static function isSubscribe($params)
{
$url = config('interface', 'service.jw_user.is_subscribe');
if (!$url) {
throw new CodeSpecialException("failed");
}
//$ret = (new TimeOut())->runPost($url, $params);
$ret = (new Request())->post($url, $params, 0, '', '', 0, true, 'jw_user');
FileLog::info('getWechatOpenid', json_encode($ret));
if (!$ret) {
throw new CodeSpecialException("timeout");
}
return !empty($ret['response']) ? $ret['response'] : [];
}
}
......@@ -39,6 +39,11 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
*/
private const API_PRINTER_STATUS = "Open_queryPrinterStatus";
/**
* 添加打印机
*/
private const API_ADD_PRINTER = "Open_printerAddlist";
/**
* @param string $apiName api 名字
......@@ -74,10 +79,20 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
/**
* @inheritDoc
* @throws \Exception
*/
public function addPrinter(array $param): bool
{
// TODO: Implement addPrinter() method.
$res = $this->request(self::API_ADD_PRINTER, [
'printerContent' => "{$param['printer_sn']} # {$param['printer_key']} # {$param['ota_name']}",
]);
if ($res['code'] == 0 && isset($res['response'])) {
if ($res['response']['ret'] == 0) {
return $res['response']['data'];
}
throw new \Exception($res['response']['msg']);
}
throw new \Exception("接口调用异常");
}
/**
......@@ -90,24 +105,26 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
/**
* @inheritDoc
* @throws \Exception
*/
public function getPrinterStatus(string $printerId): string
{
$res = $this->request(self::API_PRINTER_STATUS, [
'sn' => $printerId,
'sn' => $printerId,
]);
if ($res['code'] == 0 && isset($res['response'])) {
if ($res['response']['ret'] == 0) {
return $res['response']['data'];
}
throw new Exception($res['response']['msg']);
throw new \Exception($res['response']['msg']);
}
throw new Exception("接口调用异常");
throw new \Exception("接口调用异常");
}
/**
* @inheritDoc
* @throws \Exception
*/
public function printContent(string $printerId, array $content):string
{
......@@ -133,13 +150,14 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
if ($res['response']['ret'] == 0) {
return $res['response']['data'];
}
throw new Exception($res['response']['msg']);
throw new \Exception($res['response']['msg']);
}
throw new Exception("接口调用异常");
throw new \Exception("接口调用异常");
}
/**
* @inheritDoc
* @throws \Exception
*/
public function getOrderStatus(string $orderId): bool
{
......@@ -150,8 +168,8 @@ class FeiPrinter extends \Api\PhpServices\Printer\Printer
if ($res['response']['ret'] == 0) {
return (bool) $res['response']['data'];
}
throw new Exception($res['response']['msg']);
throw new \Exception($res['response']['msg']);
}
throw new Exception("接口调用异常");
throw new \Exception("接口调用异常");
}
}
\ No newline at end of file
......@@ -3,6 +3,9 @@
namespace Api\PhpServices\ShopImage;
use Api\PhpServices\Ksy\Ksyun;
use Api\PhpUtils\Ksy\Ks3Util;
use Api\PhpUtils\Log\FileLog;
use Endroid\QrCode\ErrorCorrectionLevel;
use Endroid\QrCode\QrCode;
......@@ -203,7 +206,7 @@ class GetImage
// 老价格
if($old_price){
$color = ImageColorAllocate ($im, 187, 187, 187);
imagettftext($im, 13,0, 173, 957, $color ,$this->font_h, "¥".$price);
imagettftext($im, 13,0, 173, 957, $color ,$this->font_h, "¥".$old_price);
$del_path = __DIR__.'/images/3_del.png';
list($del_w,$del_h) = getimagesize($del_path);
......@@ -247,7 +250,9 @@ class GetImage
imagedestroy($tuijian_img);
imagedestroy($qr_img);
imagedestroy($logo_im);
imagedestroy($del_im);
if($old_price){
imagedestroy($del_im);
}
imagedestroy($user_im);
}
......@@ -391,4 +396,75 @@ class GetImage
}
return $res;
}
public function buildShareImgByGoodsAvatarSrc($goodsAvatarSrc){
$tmpImg = '/tmp/'.md5($goodsAvatarSrc);
file_put_contents($tmpImg,file_get_contents($goodsAvatarSrc));
if(!is_file($tmpImg)){
return '';
}
$imgType = getimagesize($tmpImg);
$descW = 500;
$descH = $imgType[1]/$imgType[0] * $descW;
if($descH > 280){
$descH = 280;
}
$baseRS = imagecreatefrompng(__DIR__.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'goods_share_bg.png');
if(!$baseRS){
unlink($tmpImg);
return '';
}
switch ($imgType[2]){
case IMG_PNG:
$srcRS = imagecreatefrompng($tmpImg);
break;
case 3:
$srcRS = imagecreatefrompng($tmpImg);
break;
case IMG_JPEG:
$srcRS = imagecreatefromjpeg($tmpImg);
break;
case IMG_GIF:
$srcRS = imagecreatefromgif($tmpImg);
break;
}
if(!isset($srcRS) || !$srcRS){
unlink($tmpImg);
return '';
}
unlink($tmpImg);
$res = imagecopyresized($baseRS,$srcRS,0,0,0,0,$descW,$descH,$imgType[0],$imgType[1] );
if(!$res){
imagedestroy($srcRS);
imagedestroy($baseRS);
return '';
}
ob_start();
//header('Content-type:Images/png');
$ret = imagepng($baseRS,null,9);
// $imgContent = file_get_contents($tmpImg);
$imgContent = ob_get_clean();
if($ret){
imagedestroy($srcRS);
imagedestroy($baseRS);
if($imgContent){
return $this->uploadImage($imgContent);
}
return '';
}else{
imagedestroy($srcRS);
imagedestroy($baseRS);
}
return '';
}
private function uploadImage($fileContent){
$appid = 'merchant-b';
$scenario = 'id_card';
$object = Ksyun::getObjectAndBucket($appid,$scenario);
$bucket = $object['bucket'];
$objectKey = $object['objectId'].'.jpeg';
$str = Ks3Util::put_object($fileContent,$bucket,$objectKey, $timeout = 5000);
$url = Ksyun::getUrlFromKsyn($bucket.'/'.$objectKey, $appid);
return $url;
}
}
<?php
namespace Api\PhpServices\User;
use Api\PhpUtils\Http\Request;
use Api\PhpUtils\Log\FileLog;
class WechatBind
{
/**
* 获取微信绑定用户信息
*
* @param array $params
* $params['openid'=> 'openid', 'user_id'=> 123],非必填,至少一个
* @return array
*/
public static function getUserWechatBind($params)
{
$url = config('interface', 'goods.public.user_wechat_bind');
$res = (new Request())->get($url, $params);
if ($res['code'] == 0 && isset($res['response'])) {
return !empty($res['response']['result']) ? $res['response']['result'] : [];
}
return [];
}
/**
* 是否是新微信用户, 默认注册时间24小时以内算是新用户
*
* @param string $openid
* @return array
*/
public static function isNewWechatUser($openid, int $timeInterval = 86400)
{
$url = config('interface', 'goods.public.user_wechat_bind');
$res = (new Request())->get($url, ['openid'=> $openid]);
if ($res['code'] == 0 && isset($res['response'])) {
if(empty($res['response']['result'])) {
return true;//没有查到数据暂时先认定为新用户
}
$userInfo = $res['response']['result'];
$userInfo = current($userInfo);
if ((strtotime($userInfo['create_time']) + $timeInterval) > time()) {
return true;
}
}
// 没有查询到对应的openid数据
FileLog::error("调用isNewWechatUser方法未获取到数据:", json_encode(['openid' => $openid, 'timeInterval' => $timeInterval, 'res' => $res]));
return false;
}
}
......@@ -393,7 +393,7 @@ class IP
foreach ($ip as $one)
{
if (!self::is_intranet($one) && $one !== '')
if ($one !== '' && !self::is_intranet($one) && !self::is_shq($one))
{
$internet_ips[] = $one;
}
......@@ -417,4 +417,76 @@ class IP
($long >= 2886729728 && $long <= 2887778303) || //172.15.0.0 ~ 172.31.255.255
($long >= 3232235520 && $long <= 3232301055); //192.168.0.0 ~ 192.168.255.255
}
/**
* 判断是否简网生活圈优客云ip
*
* @param $ip
* @return bool
*/
public static function is_shq($ip)
{
$ipIgnoreArray = ['123.59.135.125',
'106.75.78.45',
'106.75.106.72',
'106.75.24.149',
'106.75.90.178',
'106.75.25.238',
'106.75.7.123',
'117.50.10.4',
'117.50.13.14',
'106.75.70.11',
'106.75.120.33',
'106.75.103.119',
'106.75.126.234',
'106.75.8.17',
'106.75.66.217',
'106.75.26.98',
'117.50.101.102',
'106.75.28.8',
'123.59.137.102',
'106.75.72.206',
'106.75.27.141',
'106.75.49.133',
'117.50.107.175',
'106.75.95.163',
'106.75.21.36',
'106.75.99.29',
'106.75.7.229',
'106.75.27.151',
'106.75.115.25',
'117.50.105.119',
'106.75.110.215',
'106.75.26.223',
'106.75.122.185',
'117.50.59.107',
'117.50.4.46',
'117.50.82.165',
'106.75.109.124',
'117.50.95.34',
'123.59.53.82',
'117.50.90.239',
'106.75.25.179',
'106.75.126.16',
'106.75.50.87',
'106.75.30.181',
'106.75.126.121',
'106.75.61.99',
'106.75.93.183',
'117.50.90.105',
'106.75.6.131',
'106.75.24.77',
'106.75.78.10',
'106.75.18.203',
'117.50.100.125',
'106.75.32.125',
'117.50.95.3',
'117.50.13.104',
'117.50.39.114',
'117.50.1.29',
'117.50.39.93',
'117.50.0.170'
];
return in_array($ip, $ipIgnoreArray);
}
}
......@@ -26,7 +26,7 @@ class Email
return false;
}
if (empty($from)) {
$from = 'noreply@yidian-inc.com';
$from = 'bp-noreply@yidian-inc.com';
}
try {
$email = explode('@', $from);
......
......@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5::getLoader();
return ComposerAutoloaderInit14d712e6ba9ca61e9e636d6cf65f43bf::getLoader();
......@@ -338,7 +338,7 @@ class ClassLoader
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True if loaded, null otherwise
* @return true|null True if loaded, null otherwise
*/
public function loadClass($class)
{
......@@ -347,6 +347,8 @@ class ClassLoader
return true;
}
return null;
}
/**
......
This diff is collapsed.
......@@ -38,6 +38,7 @@ return array(
'Api\\PhpServices\\Sms\\Sms' => $vendorDir . '/api/php_services/src/Sms/Sms.php',
'Api\\PhpServices\\Towerpro\\Towerpro' => $vendorDir . '/api/php_services/src/Towerpro/Towerpro.php',
'Api\\PhpServices\\Tuffy\\TuffyService' => $vendorDir . '/api/php_services/src/Tuffy/TuffyService.php',
'Api\\PhpServices\\User\\WechatBind' => $vendorDir . '/api/php_services/src/User/WechatBind.php',
'Api\\PhpServices\\Wechat\\Msg' => $vendorDir . '/api/php_services/src/Wechat/Msg.php',
'Api\\PhpServices\\XhProfiler\\XhMongo' => $vendorDir . '/api/php_services/src/XhProfiler/XhMongo.php',
'Api\\PhpServices\\XhProfiler\\XhProfilerService' => $vendorDir . '/api/php_services/src/XhProfiler/XhProfilerService.php',
......
......@@ -8,18 +8,18 @@ $baseDir = dirname($vendorDir);
return array(
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.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',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'3a37ebac017bc098e9a86b35401e7a68' => $vendorDir . '/mongodb/mongodb/src/functions.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
);
......@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5
class ComposerAutoloaderInit14d712e6ba9ca61e9e636d6cf65f43bf
{
private static $loader;
......@@ -24,15 +24,15 @@ class ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5
require __DIR__ . '/platform_check.php';
spl_autoload_register(array('ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit14d712e6ba9ca61e9e636d6cf65f43bf', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit14d712e6ba9ca61e9e636d6cf65f43bf', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
......@@ -53,19 +53,19 @@ class ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire5871a7b0b10b793d91ef1c8029b23ea5($fileIdentifier, $file);
composerRequire14d712e6ba9ca61e9e636d6cf65f43bf($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire5871a7b0b10b793d91ef1c8029b23ea5($fileIdentifier, $file)
function composerRequire14d712e6ba9ca61e9e636d6cf65f43bf($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
......
......@@ -4,25 +4,25 @@
namespace Composer\Autoload;
class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
class ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.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',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'3a37ebac017bc098e9a86b35401e7a68' => __DIR__ . '/..' . '/mongodb/mongodb/src/functions.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
);
public static $prefixLengthsPsr4 = array (
......@@ -267,6 +267,7 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
'Api\\PhpServices\\Sms\\Sms' => __DIR__ . '/..' . '/api/php_services/src/Sms/Sms.php',
'Api\\PhpServices\\Towerpro\\Towerpro' => __DIR__ . '/..' . '/api/php_services/src/Towerpro/Towerpro.php',
'Api\\PhpServices\\Tuffy\\TuffyService' => __DIR__ . '/..' . '/api/php_services/src/Tuffy/TuffyService.php',
'Api\\PhpServices\\User\\WechatBind' => __DIR__ . '/..' . '/api/php_services/src/User/WechatBind.php',
'Api\\PhpServices\\Wechat\\Msg' => __DIR__ . '/..' . '/api/php_services/src/Wechat/Msg.php',
'Api\\PhpServices\\XhProfiler\\XhMongo' => __DIR__ . '/..' . '/api/php_services/src/XhProfiler/XhMongo.php',
'Api\\PhpServices\\XhProfiler\\XhProfilerService' => __DIR__ . '/..' . '/api/php_services/src/XhProfiler/XhProfilerService.php',
......@@ -1300,9 +1301,9 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit14d712e6ba9ca61e9e636d6cf65f43bf::$classMap;
}, null, ClassLoader::class);
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -280,7 +280,7 @@ 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.
*
* @return bool Whether a default value is set
* @return bool
*/
public function hasDefault(string $option)
{
......@@ -315,7 +315,7 @@ class OptionsResolver implements Options
*
* An option is required if it was passed to {@link setRequired()}.
*
* @return bool Whether the option is required
* @return bool
*/
public function isRequired(string $option)
{
......@@ -325,7 +325,7 @@ class OptionsResolver implements Options
/**
* Returns the names of all required options.
*
* @return string[] The names of the required options
* @return string[]
*
* @see isRequired()
*/
......@@ -341,7 +341,7 @@ class OptionsResolver implements Options
* to {@link setDefault()}. This option must be passed explicitly to
* {@link resolve()}, otherwise an exception will be thrown.
*
* @return bool Whether the option is missing
* @return bool
*/
public function isMissing(string $option)
{
......@@ -351,9 +351,7 @@ class OptionsResolver implements Options
/**
* Returns the names of all options missing a default value.
*
* @return string[] The names of the missing options
*
* @see isMissing()
* @return string[]
*/
public function getMissingOptions()
{
......@@ -392,7 +390,7 @@ class OptionsResolver implements Options
* Returns true for any option passed to {@link setDefault()},
* {@link setRequired()} or {@link setDefined()}.
*
* @return bool Whether the option is defined
* @return bool
*/
public function isDefined(string $option)
{
......@@ -402,7 +400,7 @@ class OptionsResolver implements Options
/**
* Returns the names of all defined options.
*
* @return string[] The names of the defined options
* @return string[]
*
* @see isDefined()
*/
......@@ -869,7 +867,7 @@ class OptionsResolver implements Options
* - Options have invalid types;
* - Options have invalid values.
*
* @return array The merged and validated options
* @return array
*
* @throws UndefinedOptionsException If an option name is undefined
* @throws InvalidOptionsException If an option doesn't fulfill the
......@@ -932,7 +930,7 @@ class OptionsResolver implements Options
*
* @param bool $triggerDeprecation Whether to trigger the deprecation or not (true by default)
*
* @return mixed The option value
* @return mixed
*
* @throws AccessException If accessing this method outside of
* {@link resolve()}
......@@ -1194,7 +1192,7 @@ class OptionsResolver implements Options
*
* @param string $option The option name
*
* @return bool Whether the option is set
* @return bool
*
* @throws AccessException If accessing this method outside of {@link resolve()}
*
......@@ -1241,7 +1239,7 @@ class OptionsResolver implements Options
*
* This may be only a subset of the defined options.
*
* @return int Number of options
* @return int
*
* @throws AccessException If accessing this method outside of {@link resolve()}
*
......
......@@ -227,7 +227,7 @@ class PropertyAccessorBuilder
/**
* Sets a cache system.
*
* @return PropertyAccessorBuilder The builder object
* @return PropertyAccessorBuilder
*/
public function setCacheItemPool(CacheItemPoolInterface $cacheItemPool = null)
{
......@@ -279,7 +279,7 @@ class PropertyAccessorBuilder
/**
* Builds and returns a new PropertyAccessor object.
*
* @return PropertyAccessorInterface The built PropertyAccessor
* @return PropertyAccessorInterface
*/
public function getPropertyAccessor()
{
......
......@@ -73,7 +73,7 @@ interface PropertyAccessorInterface
* @param object|array $objectOrArray The object or array to traverse
* @param string|PropertyPathInterface $propertyPath The property path to read
*
* @return mixed The value at the end of the property path
* @return mixed
*
* @throws Exception\InvalidArgumentException If the property path is invalid
* @throws Exception\AccessException If a property/index does not exist or is not public
......@@ -91,7 +91,7 @@ interface PropertyAccessorInterface
* @param object|array $objectOrArray The object or array to check
* @param string|PropertyPathInterface $propertyPath The property path to check
*
* @return bool Whether the value can be set
* @return bool
*
* @throws Exception\InvalidArgumentException If the property path is invalid
*/
......@@ -106,7 +106,7 @@ interface PropertyAccessorInterface
* @param object|array $objectOrArray The object or array to check
* @param string|PropertyPathInterface $propertyPath The property path to check
*
* @return bool Whether the property path can be read
* @return bool
*
* @throws Exception\InvalidArgumentException If the property path is invalid
*/
......
......@@ -170,7 +170,7 @@ class PropertyPathBuilder
/**
* Returns the length of the current path.
*
* @return int The path length
* @return int
*/
public function getLength()
{
......@@ -180,7 +180,7 @@ class PropertyPathBuilder
/**
* Returns the current property path.
*
* @return PropertyPathInterface|null The constructed property path
* @return PropertyPathInterface|null
*/
public function getPropertyPath()
{
......@@ -192,7 +192,7 @@ class PropertyPathBuilder
/**
* Returns the current property path as string.
*
* @return string The property path as string
* @return string
*/
public function __toString()
{
......
......@@ -21,14 +21,14 @@ interface PropertyPathInterface extends \Traversable
/**
* Returns the string representation of the property path.
*
* @return string The path as string
* @return string
*/
public function __toString();
/**
* Returns the length of the property path, i.e. the number of elements.
*
* @return int The path length
* @return int
*/
public function getLength();
......@@ -40,14 +40,14 @@ interface PropertyPathInterface extends \Traversable
*
* If this property path only contains one item, null is returned.
*
* @return self|null The parent path or null
* @return self|null
*/
public function getParent();
/**
* Returns the elements of the property path as array.
*
* @return array An array of property/index names
* @return array
*/
public function getElements();
......@@ -56,7 +56,7 @@ interface PropertyPathInterface extends \Traversable
*
* @param int $index The index key
*
* @return string A property or index name
* @return string
*
* @throws Exception\OutOfBoundsException If the offset is invalid
*/
......@@ -67,7 +67,7 @@ interface PropertyPathInterface extends \Traversable
*
* @param int $index The index in the property path
*
* @return bool Whether the element at this index is a property
* @return bool
*
* @throws Exception\OutOfBoundsException If the offset is invalid
*/
......@@ -78,7 +78,7 @@ interface PropertyPathInterface extends \Traversable
*
* @param int $index The index in the property path
*
* @return bool Whether the element at this index is an array index
* @return bool
*
* @throws Exception\OutOfBoundsException If the offset is invalid
*/
......
......@@ -34,7 +34,7 @@ final class ConstructorExtractor implements PropertyTypeExtractorInterface
/**
* {@inheritdoc}
*/
public function getTypes(string $class, string $property, array $context = [])
public function getTypes(string $class, string $property, array $context = []): ?array
{
foreach ($this->extractors as $extractor) {
$value = $extractor->getTypesFromConstructor($class, $property);
......
......@@ -554,7 +554,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
$phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass) {
if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
continue;
}
......
......@@ -18,7 +18,7 @@ interface InflectorInterface
*
* If the method can't determine the form with certainty, several possible singulars are returned.
*
* @return string[] An array of possible singular forms
* @return string[]
*/
public function singularize(string $plural): array;
......@@ -27,7 +27,7 @@ interface InflectorInterface
*
* If the method can't determine the form with certainty, several possible plurals are returned.
*
* @return string[] An array of possible plural forms
* @return string[]
*/
public function pluralize(string $singular): array;
}
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