提交下载pdf

application/api/controller/Approveinfo.php

@@ -445,8 +445,8 @@ class Approveinfo extends Base
     {
         $id = input('id') ?: 0;
         $user = $this->user;
-        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'detail');
-        $this->success('详情', $info);
+        $data = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'detail');
+        $this->success('详情', $data);
     }
 
     /**
@@ -510,8 +510,8 @@ class Approveinfo extends Base
     {
         $id = input('id') ?: 0;
         $user = $this->user;
-        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'info');
-        $this->success('信息', $info);
+        $data = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'info');
+        $this->success('信息', $data);
     }
 
     /**
@@ -563,14 +563,15 @@ class Approveinfo extends Base
     }
 
     /**
-     * 下载文件
+     * 下载文件pdf
      *
      * @Apidoc\Method("POST")
      * @Apidoc\Param("id", type="integer",require=true, desc="申请ID")
      **/
     public function download(){
         $id = input('id') ?: 0;
-        ApproveInfoService::download($id);
+        $data = ApproveInfoService::download($id);
+        $this->success('success',$data);
     }
 
 }

application/api/controller/Common.php

@@ -5,6 +5,7 @@ namespace app\api\controller;
 use app\common\constant\CommonConstant;
 use app\common\constant\MaintainConstant;
 use app\common\model\Goods;
+use app\common\service\ApproveInfoService;
 use app\common\service\CommonService;
 use app\common\service\GoodsCategoryService;
 use app\common\service\UserService;
@@ -17,19 +18,6 @@ use think\db\exception\BindParamException;
 use think\Exception;
 use think\exception\PDOException;
 
-Use Jsyqw\PdfTable\DrawContent;
-Use Jsyqw\PdfTable\DrawContentTitle;
-Use Jsyqw\PdfTable\DrawTable;
-use Jsyqw\PdfTable\DrawTables;
-use Jsyqw\PdfTable\data\ContentData;
-Use Jsyqw\PdfTable\data\ContentTitleData;
-Use Jsyqw\PdfTable\data\TableData;
-Use Jsyqw\PdfTable\data\TableRowData;
-Use Jsyqw\PdfTable\data\TableTitleData;
-Use Jsyqw\PdfTable\models\ImageModel;
-Use Jsyqw\PdfTable\models\TextModel;
-
-
 /**
  * @Apidoc\Title("公用")
  * @Apidoc\Group("api")
@@ -40,170 +28,12 @@ class Common extends Base
     // 需要登录
     protected $need_login = ['get_user_list'];
 
-    protected $pdf;
     public function initialize()
     {
         parent::initialize();
     }
 
     /**
-     * 测试
-     *
-     * @Apidoc\Method("POST")
-     * @Apidoc\Param("id", type="integer",require=true, desc="ID")
-     */
-    public function test()
-    {
-        //保存文件
-        $subPath = date('Ymd');
-        $savePath = './upload/pdf/' . $subPath;
-        // 检查上传目录
-        if (!is_dir($savePath)) {
-            // 检查目录是否编码后的
-            if (is_dir(base64_decode($savePath))) {
-                $savePath = base64_decode($savePath);
-            } else {
-                // 尝试创建目录
-                if (!mkdir($savePath, 0755, true)) {
-                    $this->error = '上传目录' . $savePath . '不存在';
-                    return false;
-                }
-            }
-        } else {
-            if (!is_writeable($savePath)) {
-                $this->error = '上传目录' . $savePath . '不可写';
-                return false;
-            }
-        }
-        $filename = date('Ymd') . sha1(date('YmdHis', time()) . uniqid());
-        $filename = date('Ymd') . date('YmdHis', time()).time();
-        $suffix = '.pdf';
-        $realpath = substr($savePath, 1) . '/' . $filename . $suffix;
-        $this->pdf = new \TCPDF();
-
-//        p($_SERVER['DOCUMENT_ROOT']);
-//        p(app()->getRootPath());
-//        exit;
-        self::exportPdf($_SERVER['DOCUMENT_ROOT'] . $realpath);
-//        self::tablePdf('测试文件',$_SERVER['DOCUMENT_ROOT'] . $realpath);
-
-        $this->success('测试');
-    }
-
-    // 设置PDF参数
-    protected function setPdfAttr()
-    {
-        $this->pdf->setCreator(PDF_CREATOR);
-        $this->pdf->setAuthor('Dya');
-        $this->pdf->SetSubject('TCPDF Tutorial');
-        $this->pdf->SetKeywords('TCPDF, PDF, example, test, guide');
-
-        //页眉页脚
-        $this->pdf->setPrintHeader(false);
-        $this->pdf->setPrintFooter(false);
-        // 页脚信息
-//        $this->pdf->setFooterData(array(0,64,0), array(0,64,128));
-//        $this->pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-//        $this->pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
-        // 自动分页 (第二个参数可以设置距离底部多少距离时分页)
-        $this->pdf->setAutoPageBreak(true,15);
-
-        // 设置边距(左 上 右 下) 右边距默认左侧值 下边距是bool值(是否覆盖默认页边距)
-//        $this->pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-        // 定义默认的单间距字体 (设置为等宽字体)
-        $this->pdf->SetDefaultMonospacedFont('courier');
-        // 设置图像比例因子
-        $this->pdf->setImageScale(1.25);
-    }
-
-    public function exportPdf($fileName)
-    {
-        $this->setPdfAttr();
-        $this->pdf->SetFont('stsongstdlight', '', 10, '', true);
-        $this->pdf->AddPage();
-
-// 随便写HTML
-        $htmlUrl=app()->getRootPath() . 'public/upload/1.html';
-
-        $html=file_get_contents($htmlUrl);
-// output the HTML content
-        $this->pdf->writeHTML($html, true, false, true, false, '');
-
-// reset pointer to the last page
-//        $this->pdf->lastPage();
-        //D是下载，I是在线写入
-        $this->pdf->Output($fileName, 'F');
-    }
-
-    /**
-     * 绘制表格
-     * @param $title
-     * @param $fileName
-     */
-    public function tablePdf($title, $fileName)
-    {
-        $this->setPdfAttr();
-        $this->pdf->setTitle($title);
-        // 新增页面
-        $this->pdf->AddPage();
-
-        // 设置字体
-        $this->pdf->SetFont('stsongstdlight', 'B', 24, '', true);
-        // 参数 1:w 2:h 3:内容 4:边框 5:是否换行 6:内容居中等
-        $this->pdf->Cell(0, 0, '财务收款收据', '0', 1, 'C');
-
-        $this->pdf->SetFont('stsongstdlight', '', 18, '', true);
-        $this->pdf->Cell(90, 30, 'TEL:888888', '0', 0, 'L');
-        // 颜色 RGB颜色代码
-        $this->pdf->setTextColor(255, 0, 0);
-        $this->pdf->Cell(90, 30, 'NO.20221215', '0', 0, 'R');
-
-        // 换行
-        $this->pdf->Ln();
-
-        // 重置颜色
-        $this->pdf->setTextColor();
-        $this->pdf->SetFont('stsongstdlight', '', 16, '', true);
-        $this->pdf->Cell(90, 15, '     客户名称:张三', '0', 0, 'L');
-        $this->pdf->Cell(90, 15, '日期:   2022年12月15日     ', '0', 1, 'R');
-
-        $h = 15;
-        // 绘表  表头
-        $this->pdf->Cell(40, $h, '规格及名称', '1', 0, 'C');
-        $this->pdf->Cell(15, $h, '单位', '1', 0, 'C');
-        $this->pdf->Cell(20, $h, '数量', '1', 0, 'C');
-        $this->pdf->Cell(25, $h, '单价', '1', 0, 'C');
-        $this->pdf->Cell(45, $h, '金额', '1', 0, 'C');
-        $this->pdf->Cell(35, $h, '备注', '1', 1, 'C');
-
-        $data = [
-            ['name'=>'项目一','unit'=>'件','num'=>13,'price'=>55.00,'money'=>'715.00','remark'=>''],
-            ['name'=>'项目二','unit'=>'件','num'=>13,'price'=>54.00,'money'=>'702.00','remark'=>''],
-            ['name'=>'项目三','unit'=>'件','num'=>19,'price'=>54.00,'money'=>'1026.00','remark'=>''],
-            ['name'=>'项目四','unit'=>'件','num'=>24,'price'=>54.00,'money'=>'1296.00','remark'=>''],
-        ];
-        // 内容
-        foreach ($data as $item) {
-            $this->pdf->Cell(40, $h, $item['name'], '1', 0, 'C');
-            $this->pdf->Cell(15, $h, $item['unit'], '1', 0, 'C');
-            $this->pdf->Cell(20, $h, $item['num'], '1', 0, 'C');
-            $this->pdf->Cell(25, $h, $item['price'], '1', 0, 'C');
-            $this->pdf->Cell(45, $h, $item['money'], '1', 0, 'C');
-            $this->pdf->Cell(35, $h, $item['remark'], '1', 1, 'C');
-        }
-        $total = sprintf('%.2F', array_sum(array_column($data, 'money')));
-        $this->pdf->Cell(100, $h, '合计金额:', 'LTB', 0, 'L');
-        $this->pdf->Cell(45, $h, $total, 'TBR', 0, 'R');
-        $this->pdf->Cell(35, $h, '', '1', 0, 'C');
-
-        $this->pdf->Output($fileName, 'F');
-
-    }
-
-
-
-
-    /**
      * 类型数据
      *
      * @Apidoc\Method("POST")
@@ -515,4 +345,22 @@ class Common extends Base
         $error_data ? $this->success('领用物品提示', $data) : $this->success('导入成功', $data);
     }
 
+    /**
+     * 测试
+     *
+     * @Apidoc\Method("POST")
+     * @Apidoc\Param("id", type="integer",require=true, desc="ID")
+     */
+    public function test()
+    {
+        $id = input('id') ?: 0;
+        $html = ApproveInfoService::get_html($id);
+//        p($html);exit;
+        $realpath = self::getPath();
+        $pdf = new \TCPDF();
+        $pdf = self::setPdfAttr($pdf);
+        self::exportPdf($pdf,$html,$realpath);
+        $this->success('测试');
+    }
+
 }

application/api/view/common/index.html

@@ -0,0 +1,108 @@
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left; /* 文本左对齐 */
+        /*border: 1px solid black; !* 设置单元格边框 *!*/
+    }
+    .content {
+        border: 1px solid black;
+        /*line-height: 1.6em;*/
+        /*text-indent: 5px;*/
+    }
+    .content1 {
+        border: 1px solid black;
+        /*line-height: 1.6em;*/
+        /*text-indent: 5px;*/
+        /*padding: 10px;*/
+        /*box-sizing: border-box;*/
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .border-0{
+        border: none;
+    }
+    .line-height-30{
+        line-height: 30px;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">出差审批单</div>
+<table cellpadding="8">
+    <tr>
+        <td class="content">附件</td>
+        <td class="content1">深圳市食药安办 深圳市教育局 深圳市市场监督管理局关于开展2022年“护苗促食安”校园食品安全专项行动的通知(深食药安办〔2022〕23号).pdf</td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content" rowspan="3">审批流程</td>
+        <td class="content" style="line-height: 100%;">
+            <div style="line-height: 100%;">拟由总务处（安全办）阅办。请校长审批。</div>
+            <div style="line-height: 100%;">范静 已同意 create-time</div>
+            <table>
+                <tr>
+                    <td><img src="https://static-legacy.dingtalk.com/media/lADPDgQ9rIaigmHMs8yz_179_179.jpg" with="20px"
+                             height="20px"></td>
+                    <td align="right">createtime</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td class="content" style="line-height: 100%;">
+            <div style="line-height: 100%;">拟由总务处（安全办）阅办。请校长审批。</div>
+            <div style="line-height: 100%;">范静 已同意 create-time</div>
+            <table>
+                <tr>
+                    <td><img src="https://static-legacy.dingtalk.com/media/lADPDgQ9rIaigmHMs8yz_179_179.jpg" with="20px"
+                             height="20px"></td>
+                    <td align="right">createtime</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td class="content" style="line-height: 100%;">
+            <div style="line-height: 100%;">拟由总务处（安全办）阅办。请校长审批。</div>
+            <div style="line-height: 100%;">范静 已同意 create-time</div>
+            <table>
+                <tr>
+                    <td><img src="https://static-legacy.dingtalk.com/media/lADPDgQ9rIaigmHMs8yz_179_179.jpg" with="20px"
+                             height="20px"></td>
+                    <td align="right">createtime</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+<!--<table cellpadding="8">-->
+<!--    <tr>-->
+<!--        <td class="content" rowspan="3">审批流程</td>-->
+<!--        <td colspan="2" class="content">拟由总务处（安全办）阅办。请校长审批。</td>-->
+<!--    </tr>-->
+<!--    <tr>-->
+<!--        <td class="content">范静 已同意</td>-->
+<!--        <td class="content" align="right">create-time</td>-->
+<!--    </tr>-->
+<!--    <tr>-->
+<!--        <td class="content" align="left" colspan="2" >-->
+<!--            <img src="https://static-legacy.dingtalk.com/media/lADPDgQ9rIaigmHMs8yz_179_179.jpg" with="20px"-->
+<!--                 height="20px">-->
+<!--        </td>-->
+<!--    </tr>-->
+<!--</table>-->

application/api/view/common/index_1.html

@@ -0,0 +1,40 @@
+{include file='approve_info/index_search_1'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>申请事由</th>
+        <th class='text-left nowrap'>申购类型</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_10.html

@@ -0,0 +1,40 @@
+{include file='approve_info/index_search_10'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>来文单位</th>
+        <th class='text-left nowrap'>文件名称</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.desc}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_11.html

@@ -0,0 +1,111 @@
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}
+        </td>
+    </tr>
+    <tr>
+        <td class="content">拟稿部门</td>
+        <td class="content">{$vo.module_info.department|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">文件名称</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">落款</td>
+        <td class="content">{$vo.module_info.department_sign|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">上会情况</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">缓急程度</td>
+        <td class="content">{$get_degree_list[$vo.module_info.desc]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">拟发文时间</td>
+        <td class="content">{$vo.module_info.start_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">文件号</td>
+        <td class="content">{$vo.module_info.serial_number|default='--'}</td>
+    </tr>
+</table>
+{notempty name='vo.approve'}
+<table cellpadding="8">
+    {foreach $vo.approve as $k=>$v}
+    <tr>
+        {if ($k eq 1)}<td class="content with-30" rowspan="{$vo.approve_count}">审批流程</td>{/if}
+        <td class="content with-70" style="line-height: 100%;">
+            <div style="line-height: 100%;">{$v.remark}</div>
+            <table cellpadding="0">
+                <tr>
+                    <td>{$v.user.name|default='--'}&nbsp;{$get_approve_status_list_admin[$v.status]|default='--'}</td>
+                    <td align="right">{$v.approve_time|default='--'}</td>
+                </tr>
+            </table>
+            {if ($v.user.signature_status eq 3)}
+            <div style="line-height: 100%;"><img src="{$v.user.signature}" with="20px" height="20px"></div>
+            {/if}
+        </td>
+    </tr>
+    {/foreach}
+    {notempty name='vo.approve_copy'}
+    <tr>
+        <td class="content">抄送 {foreach $vo.approve_copy as $k=>$v}{$v.user.name|default='--'}&nbsp;{/foreach}</td>
+    </tr>
+    {/notempty}
+</table>
+{/notempty}

application/api/view/common/index_2.html

@@ -0,0 +1,42 @@
+{include file='approve_info/index_search_2'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>申请标题</th>
+        <th class='text-left nowrap'>呈批类型</th>
+        <th class='text-left nowrap'>缓急程度</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_3.html

@@ -0,0 +1,36 @@
+{include file='approve_info/index_search_3'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_4.html

@@ -0,0 +1,38 @@
+{include file='approve_info/index_search_4'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>物品用途</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_5.html

@@ -0,0 +1,42 @@
+{include file='approve_info/index_search_5'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>出差事由</th>
+        <th class='text-left nowrap'>出差类型</th>
+        <th class='text-left nowrap'>出差时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_6.html

@@ -0,0 +1,42 @@
+{include file='approve_info/index_search_6'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>请假原因</th>
+        <th class='text-left nowrap'>请假类型</th>
+        <th class='text-left nowrap'>请假时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_7.html

@@ -0,0 +1,42 @@
+{include file='approve_info/index_search_7'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>出发地点</th>
+        <th class='text-left nowrap'>出发时间</th>
+        <th class='text-left nowrap'>返回时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$vo.start_time}</td>
+        <td class='text-left nowrap'>{$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_8.html

@@ -0,0 +1,42 @@
+{include file='approve_info/index_search_8'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>维修地点</th>
+        <th class='text-left nowrap'>维修类型</th>
+        <th class='text-left nowrap'>具体内容</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.desc}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/api/view/common/index_9.html

@@ -0,0 +1,40 @@
+{include file='approve_info/index_search_9'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='text-left nowrap'>申请ID</th>
+        <th class='text-left nowrap'>提交人</th>
+        <th class='text-left nowrap'>审批状态</th>
+        <th class='text-left nowrap'>创建时间</th>
+        <th class='text-left nowrap'>审批编号</th>
+        <th class='text-left nowrap'>申请日期</th>
+        <th class='text-left nowrap'>合同编号</th>
+        <th class='text-left nowrap'>缓急程度</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>{$vo.id}</td>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/form_1.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -16,24 +16,7 @@
                         </p>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批状态</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
@@ -54,6 +37,14 @@
                 </div>
                 {/notempty}
                 <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
+                               class="layui-input border-0" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_10.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_11.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -16,14 +16,13 @@
                         </p>
                     </div>
                 </div>
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +34,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_2.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_3.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_4.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_5.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -27,17 +27,17 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_6.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -27,17 +27,17 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_7.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -27,17 +27,17 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
                                class="layui-input border-0" disabled>
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_8.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_9.html

@@ -7,7 +7,7 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <label class="layui-form-label color-green font-w7">创建人</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
                                class="layui-input border-0" disabled>
@@ -17,13 +17,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
                                class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('/user/member/edit')}?id={$vo.apply_user.id}" target="_blank">查看</a>
-                        </p>
+                        <p class="help-block"></p>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -35,14 +33,6 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">审批编号</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申请日期</label>
                     <div class="layui-input-block">
                         <input name="" placeholder="" value="{$vo.apply_date|default='--'}"

application/approve/view/approve_info/form_approve.html

@@ -17,7 +17,7 @@
                             <i class="layui-icon layui-timeline-axis"></i>
                             <div class="layui-timeline-content layui-text">
                                 <h4 class="layui-timeline-title">{if ($v.group == 1)}发起申请{else/}审批人{/if}</h4>
-                                <h3 class="layui-timeline-title">{$v.user.name}<span>({if ($v.group == 1)}提交人{else/}{$get_approve_status_list_admin[$v.status]}{/if})</span></h3>
+                                <h3 class="layui-timeline-title">{$v.user.name}<span>({if ($v.group ==1)}创建人{else/}{$get_approve_status_list_admin[$v.status]}{/if})</span></h3>
                                 {if ($v.status gt 2)}
                                 <ul>
                                     <li>本次审批时长：{$v.time_text}</li>

application/common/service/ApproveInfoService.php

@@ -4,6 +4,7 @@ namespace app\common\service;
 
 use app\common\constant\ApplyConstant;
 use app\common\constant\CommonConstant;
+use app\common\constant\OfferConstant;
 use app\common\model\Approve;
 use app\common\model\ApproveCopy;
 use app\common\model\ApproveApplyGoods;
@@ -52,7 +53,6 @@ class ApproveInfoService
                     except('申请人信息不存在或已删除');
                 }
                 $apply_user_id = $apply_user['userid'];
-                $department = $apply_user['department'];
             }
         }
 
@@ -393,16 +393,16 @@ class ApproveInfoService
                 break;
             case CommonConstant::MODULE_4:
                 $model = ApproveUseGoods::class;
-                if($type == 'edit'){
+                if ($type == 'edit') {
                     $old_goods_data = [];
                     $old_goods_freeze_stock_data = []; // 旧数据的冻结库存
-                    foreach ($info['data'] as $key=>$val){
+                    foreach ($info['data'] as $key => $val) {
                         $old_goods_data[$val['goods_id']] = $val;
                         $goods_stock = $val['goods_stock_text'];
                         foreach ($goods_stock as $k => $v) {
                             $old_goods_freeze_stock_data[$v['id']] = [
-                                'id'=>$v['id'],
-                                'stock'=>$v['stock'],
+                                'id' => $v['id'],
+                                'stock' => $v['stock'],
                             ];
                         }
                     }
@@ -435,7 +435,7 @@ class ApproveInfoService
                                     $total_stock = $goods_stock_info['stock'];
                                     $stock = isset($val['stock']) && $val['stock'] > 0 ? $val['stock'] : 0;
                                     $price = isset($val['price']) && $val['price'] > 0 ? $val['price'] : 0;
-                                    $freeze_stock = array_key_exists($val['id'],$old_goods_freeze_stock_data) ? $old_goods_freeze_stock_data[$val['id']]['stock'] : 0;
+                                    $freeze_stock = array_key_exists($val['id'], $old_goods_freeze_stock_data) ? $old_goods_freeze_stock_data[$val['id']]['stock'] : 0;
                                     if ($stock > ($total_stock + $freeze_stock)) {
                                         // 商品规格库存不足
                                         $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' . "\n";
@@ -449,39 +449,39 @@ class ApproveInfoService
                                         'stock' => $stock,
                                     ];
 
-                                    if($freeze_stock > 0){
-                                        if($stock>$freeze_stock){
+                                    if ($freeze_stock > 0) {
+                                        if ($stock > $freeze_stock) {
                                             // 扣除剩余库存 增加冻结库存
-                                            $save_stock = $stock-$freeze_stock;
+                                            $save_stock = $stock - $freeze_stock;
                                             $goodsStockSave[] = [
-                                                'id'=>$val['id'],
-                                                'stock'=>['dec',$save_stock],
-                                                'freeze_stock'=>['inc',$save_stock],
+                                                'id' => $val['id'],
+                                                'stock' => ['dec', $save_stock],
+                                                'freeze_stock' => ['inc', $save_stock],
                                             ];
                                             $redisStock[] = [
                                                 'id' => 'dingtalk_stock_' . $info_id . '_' . $value['goods_id'] . '_' . $val['id'],
-                                                'exp'=> 'inc',
+                                                'exp' => 'inc',
                                                 'stock' => $save_stock,
                                             ];
                                         }
-                                        if($stock<$freeze_stock){
+                                        if ($stock < $freeze_stock) {
                                             // 增加剩余库存 扣除冻结库存
                                             $save_stock = $freeze_stock - $stock;
                                             $goodsStockSave[] = [
-                                                'id'=>$val['id'],
-                                                'stock'=>['inc',$save_stock],
-                                                'freeze_stock'=>['dec',$save_stock],
+                                                'id' => $val['id'],
+                                                'stock' => ['inc', $save_stock],
+                                                'freeze_stock' => ['dec', $save_stock],
                                             ];
                                             $redisStock[] = [
                                                 'id' => 'dingtalk_stock_' . $info_id . '_' . $value['goods_id'] . '_' . $val['id'],
-                                                'exp'=> 'dec',
+                                                'exp' => 'dec',
                                                 'stock' => $save_stock,
                                             ];
                                         }
                                     }
                                 } else {
                                     // 商品库里没有该商品规格
-                                    $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在'."\n";
+                                    $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在' . "\n";
                                 }
                             }
 
@@ -499,16 +499,16 @@ class ApproveInfoService
                             ];
                             $data[] = $goods_data;
                             $goods_data['goods_stock'] = json_encode($goods_stock_data, JSON_UNESCAPED_UNICODE);
-                            if(array_key_exists($value['goods_id'],$old_goods_data)){
+                            if (array_key_exists($value['goods_id'], $old_goods_data)) {
                                 // 修改
                                 $apply_goods_data[$value['goods_id']] = $goods_data;
-                            } else{
+                            } else {
                                 // 添加
                                 $add_data[] = $goods_data;
                             }
                         } else {
                             // 商品库里没有该商品
-                            $error_data .= $value['goods_name'] . '商品库不存在'."\n";
+                            $error_data .= $value['goods_name'] . '商品库不存在' . "\n";
                         }
                     }
                     if ($error_data) {
@@ -516,7 +516,7 @@ class ApproveInfoService
                         except($error_data);
                     }
 
-                    foreach ($info['data'] as $index){
+                    foreach ($info['data'] as $index) {
                         if (array_key_exists($index['goods_id'], $apply_goods_data)) {
                             // 更新
                             $save_data = $apply_goods_data[$index['goods_id']];
@@ -532,7 +532,7 @@ class ApproveInfoService
                     if ($del_ids) {
                         $model::where(['id' => ['IN', $del_ids]])->delete();
                     }
-                    return compact("total_amount", "data","goodsStockSave","redisStock");
+                    return compact("total_amount", "data", "goodsStockSave", "redisStock");
                 }
                 break;
         }
@@ -569,7 +569,7 @@ class ApproveInfoService
                             $price = isset($val['price']) && $val['price'] > 0 ? $val['price'] : 0;
                             if ($stock > $total_stock) {
                                 // 商品规格库存不足
-                                $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' ."\n";
+                                $error_data .= $value['goods_name'] . '-' . $val['name'] . '的库存不足' . "\n";
                             }
                             $total_price = bcadd($total_price, $stock * $price, 2);
                             $goods_stock_data[] = [
@@ -581,7 +581,7 @@ class ApproveInfoService
                             ];
                         } else {
                             // 商品库里没有该商品规格
-                            $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在'."\n";
+                            $error_data .= $value['goods_name'] . '-' . $val['name'] . '规格商品库不存在' . "\n";
                         }
                     }
 
@@ -602,7 +602,7 @@ class ApproveInfoService
                     $total_amount = bcadd($total_amount, $total_price, 2);
                 } else {
                     // 商品库里没有该商品
-                    $error_data .= $value['goods_name'] . '商品库不存在'."\n";
+                    $error_data .= $value['goods_name'] . '商品库不存在' . "\n";
                 }
             }
             if ($error_data) {
@@ -1038,7 +1038,7 @@ class ApproveInfoService
                         ->where('state', 'in', [CommonConstant::IS_WHO_0, CommonConstant::IS_WHO_1])
                         ->with([
                             'user' => function ($query) {
-                                $query->field('userid,name,avatar');
+                                $query->field('userid,name,avatar,signature,signature_status');
                             }
                         ]);
                 },
@@ -1462,11 +1462,110 @@ class ApproveInfoService
     }
 
     /**
-     * 下载文件
+     * 下载文件pdf
+     *
+     * @param integer $id 申请ID
      **/
     public static function download($id)
     {
+        $data = self::get_detail($id ?: 0, [], CommonConstant::IS_WHO_0, 'detail');
+        if (!$data) {
+            except('申请记录不存在或已删除');
+        }
+        $data = $data->toArray();
+        unset($data['approve'][0]);// 去掉审批流程里面的创建人
+        $data['approve_count'] = count($data['approve']) + count($data['approve_copy']);
+        $data['subject'] = sysconf('subject');
+        $vo = $data;
+        $template = 'index_' . $data['module'];
+        $get_module_list = CommonConstant::get_module_list();
+        $get_approve_status_list = CommonConstant::get_approve_status_list();
+        $get_approve_status_list_admin = CommonConstant::get_approve_status_list_admin();
+        $get_is_who_list = CommonConstant::get_is_who_list();
+        $get_pay_type_list = ApplyConstant::get_pay_type_list();
+        $get_degree_list = OfferConstant::get_degree_list();
+        $get_type_list = CommonService::get_type_list($data['module']);
+        $data = compact('vo','template','get_module_list','get_approve_status_list','get_approve_status_list_admin','get_is_who_list','get_pay_type_list','get_degree_list','get_type_list');
+
+        $html = self::get_html($data);
+        $realpath = self::getPath();
+        $pdf = new \TCPDF();
+        $pdf = self::setPdfAttr($pdf);
+        self::exportPdf($pdf,$html,$realpath);
+        return ['url' => $realpath, 'fullurl' => 'http://'.$_SERVER['HTTP_HOST'].$realpath];
+    }
+
+    // 获取html
+    public static function get_html($data){
+//        $htmlUrl=app()->getRootPath() . 'public/upload/1.html';
+//        $html=file_get_contents($htmlUrl);
+        $html = view('common/'.$data['template'],$data)->getContent();
+        return $html;
+    }
+
+    // 获取路径
+    public static  function getPath(){
+        //保存文件
+        $subPath = date('Ymd');
+        $savePath = './upload/pdf/' . $subPath;
+        // 检查上传目录
+        if (!is_dir($savePath)) {
+            // 检查目录是否编码后的
+            if (is_dir(base64_decode($savePath))) {
+                $savePath = base64_decode($savePath);
+            } else {
+                // 尝试创建目录
+                if (!mkdir($savePath, 0755, true)) {
+                    except('上传目录' . $savePath . '不存在');
+                    return false;
+                }
+            }
+        } else {
+            if (!is_writeable($savePath)) {
+                except('上传目录' . $savePath . '不可写');
+                return false;
+            }
+        }
+        $filename = date('Ymd') . sha1(date('YmdHis', time()) . uniqid());
+        $filename = date('Ymd') . date('YmdHis', time()).time();
+        $suffix = '.pdf';
+        $realpath = substr($savePath, 1) . '/' . $filename . $suffix;
+        return $realpath;
+    }
+
+    // 设置PDF参数
+    public static  function setPdfAttr($pdf)
+    {
+        // 设置页面信息
+        $pdf->SetTitle("简历文件");
+        $pdf->setAuthor('Dya');
+        $pdf->setCreator(PDF_CREATOR);
+        $pdf->SetSubject('TCPDF Tutorial');
+        $pdf->SetKeywords('TCPDF, PDF, example, test, guide');
+        //页眉页脚
+        $pdf->setPrintHeader(false);
+        $pdf->setPrintFooter(false);
+        // 自动分页 (第二个参数可以设置距离底部多少距离时分页)
+        $pdf->setAutoPageBreak(true,15);
+        // 设置边距(左 上 右 下) 右边距默认左侧值 下边距是bool值(是否覆盖默认页边距)
+        $pdf->setMargins(26, 18, 26);
+        // 定义默认的单间距字体 (设置为等宽字体)
+        $pdf->SetDefaultMonospacedFont('courier');
+        // 设置图像比例因子
+        $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
+        // 设置默认字体
+        $pdf->SetFont('stsongstdlight', '', 10, '', true);
+        return $pdf;
+    }
 
+    // 生成下载pdf
+    public static  function exportPdf($pdf,$html,$realpath)
+    {
+        // 新增页面
+        $pdf->AddPage();
+        $pdf->writeHTML($html, true, false, true, false, '');
+//        $pdf->lastPage();
+        $pdf->Output($_SERVER['DOCUMENT_ROOT'] . $realpath, 'F');
     }
 
 }

composer.json

@@ -28,7 +28,9 @@
     "alibabacloud/dingtalk": "^1.4",
     "hg/apidoc": "^4.1",
     "phpoffice/phpspreadsheet": "^1.19",
-    "phpoffice/phpexcel": "^1.8"
+    "phpoffice/phpexcel": "^1.8",
+    "jsyqw/tcpdf-table": "^0.1.2",
+    "tecnickcom/tcpdf": "^6.6"
   },
   "repositories": {
     "packagist": {

vendor/alibabacloud/darabonba-openapi/composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">5.5",
-    "alibabacloud/tea-utils": "^0.2.17",
+    "alibabacloud/tea-utils": "^0.2.19",
     "alibabacloud/credentials": "^1.1",
     "alibabacloud/openapi-util": "^0.1.10|^0.2.1",
     "alibabacloud/gateway-spi": "^1",

vendor/alibabacloud/darabonba-openapi/phpunit.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false"
+         convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true"
+         testSuiteLoaderFile="phpunit/src/Runner/StandardTestSuiteLoader.php">
+
+    <testsuites>
+        <testsuite name="All">
+            <directory>tests</directory>
+        </testsuite>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <exclude>
+            <group>integration</group>
+        </exclude>
+    </groups>
+
+    <logging>
+        <log type="coverage-html" target="cache/coverage" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="cache/coverage.clover"/>
+    </logging>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

vendor/alibabacloud/darabonba-openapi/src/OpenApiClient.php

@@ -773,7 +773,11 @@ class OpenApiClient
                     $_request->headers["content-type"] = "application/octet-stream";
                 } else {
                     if (!Utils::isUnset($request->body)) {
-                        if (Utils::equalString($params->reqBodyType, "json")) {
+                        if (Utils::equalString($params->reqBodyType, "byte")) {
+                            $byteObj = Utils::assertAsBytes($request->body);
+                            $hashedRequestPayload = OpenApiUtilClient::hexEncode(OpenApiUtilClient::hash($byteObj, $signatureAlgorithm));
+                            $_request->body = $byteObj;
+                        } else if (Utils::equalString($params->reqBodyType, "json")) {
                             $jsonObj = Utils::toJSONString($request->body);
                             $hashedRequestPayload = OpenApiUtilClient::hexEncode(OpenApiUtilClient::hash(Utils::toBytes($jsonObj), $signatureAlgorithm));
                             $_request->body = $jsonObj;
@@ -855,7 +859,9 @@ class OpenApiClient
                         "statusCode" => $_response->statusCode
                     ];
                 } else {
+                    $anything = Utils::readAsString($_response->body);
                     return [
+                        "body" => $anything,
                         "headers" => $_response->headers,
                         "statusCode" => $_response->statusCode
                     ];

vendor/alibabacloud/darabonba-openapi/tests/OpenApiClientTest.php

@@ -0,0 +1,328 @@
+<?php
+
+namespace Darabonba\OpenApi\Tests;
+
+use Darabonba\OpenApi\OpenApiClient;
+use AlibabaCloud\Tea\Model;
+use AlibabaCloud\Tea\Request;
+use AlibabaCloud\Tea\Utils\Utils;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class OpenApiClientTest extends TestCase
+{
+    public function testConfig(){
+        $globalParameters = new GlobalParameters([
+            "headers" => [
+                "global-key" => "global-value"
+            ],
+            "queries" => [
+                "global-query" => "global-value"
+            ]
+        ]);
+        $config = new Config([
+            "endpoint" => "config.endpoint",
+            "endpointType" => "regional",
+            "network" => "config.network",
+            "suffix" => "config.suffix",
+            "protocol" => "config.protocol",
+            "method" => "config.method",
+            "regionId" => "config.regionId",
+            "userAgent" => "config.userAgent",
+            "readTimeout" => 3000,
+            "connectTimeout" => 3000,
+            "httpProxy" => "config.httpProxy",
+            "httpsProxy" => "config.httpsProxy",
+            "noProxy" => "config.noProxy",
+            "socks5Proxy" => "config.socks5Proxy",
+            "socks5NetWork" => "config.socks5NetWork",
+            "maxIdleConns" => 128,
+            "signatureVersion" => "config.signatureVersion",
+            "signatureAlgorithm" => "config.signatureAlgorithm",
+            "globalParameters" => $globalParameters
+        ]);
+        $creConfig = new \AlibabaCloud\Credentials\Credential\Config([
+            "accessKeyId" => "accessKeyId",
+            "accessKeySecret" => "accessKeySecret",
+            "securityToken" => "securityToken",
+            "type" => "sts"
+        ]);
+        $credential = new Credential($creConfig);
+        $config->credential = $credential;
+        $client = new OpenApiClient($config);
+        $config->accessKeyId = "ak";
+        $config->accessKeySecret = "secret";
+        $config->securityToken = "token";
+        $config->type = "sts";
+        $client = new OpenApiClient($config);
+    }
+
+    /**
+     * @return Config
+     */
+    public static function createConfig(){
+        $globalParameters = new GlobalParameters([
+            "headers" => [
+                "global-key" => "global-value"
+            ],
+            "queries" => [
+                "global-query" => "global-value"
+            ]
+        ]);
+        $config = new Config([
+            "accessKeyId" => "ak",
+            "accessKeySecret" => "secret",
+            "securityToken" => "token",
+            "type" => "sts",
+            "userAgent" => "config.userAgent",
+            "readTimeout" => 3000,
+            "connectTimeout" => 3000,
+            "maxIdleConns" => 128,
+            "signatureVersion" => "config.signatureVersion",
+            "signatureAlgorithm" => "ACS3-HMAC-SHA256",
+            "globalParameters" => $globalParameters
+        ]);
+        return $config;
+    }
+
+    /**
+     * @return RuntimeOptions
+     */
+    public static function createRuntimeOptions(){
+        $runtime = new RuntimeOptions([
+            "readTimeout" => 4000,
+            "connectTimeout" => 4000,
+            "maxIdleConns" => 100,
+            "autoretry" => true,
+            "maxAttempts" => 1,
+            "backoffPolicy" => "no",
+            "backoffPeriod" => 1,
+            "ignoreSSL" => true
+        ]);
+        return $runtime;
+    }
+
+    /**
+     * @return OpenApiRequest
+     */
+    public static function createOpenApiRequest(){
+        $query = [];
+        $query["key1"] = "value";
+        $query["key2"] = 1;
+        $query["key3"] = true;
+        $body = [];
+        $body["key1"] = "value";
+        $body["key2"] = 1;
+        $body["key3"] = true;
+        $headers = [
+            "for-test" => "sdk"
+        ];
+        $req = new OpenApiRequest([
+            "headers" => $headers,
+            "query" => OpenApiUtilClient::query($query),
+            "body" => OpenApiUtilClient::parseToMap($body)
+        ]);
+        return $req;
+    }
+
+    public function testCallApiForRPCWithV2Sign_AK_Form(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->signatureAlgorithm = "v2";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/",
+            "method" => "POST",
+            "authType" => "AK",
+            "style" => "RPC",
+            "reqBodyType" => "formData",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForRPCWithV2Sign_Anonymous_JSON(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->signatureAlgorithm = "v2";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/",
+            "method" => "POST",
+            "authType" => "Anonymous",
+            "style" => "RPC",
+            "reqBodyType" => "json",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForROAWithV2Sign_HTTPS_AK_Form(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->signatureAlgorithm = "v2";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/test",
+            "method" => "POST",
+            "authType" => "AK",
+            "style" => "ROA",
+            "reqBodyType" => "formData",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForROAWithV2Sign_Anonymous_JSON(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->signatureAlgorithm = "v2";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/test",
+            "method" => "POST",
+            "authType" => "Anonymous",
+            "style" => "ROA",
+            "reqBodyType" => "json",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForRPCWithV3Sign_AK_Form(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/",
+            "method" => "POST",
+            "authType" => "AK",
+            "style" => "RPC",
+            "reqBodyType" => "formData",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForRPCWithV3Sign_Anonymous_JSON(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/",
+            "method" => "POST",
+            "authType" => "Anonymous",
+            "style" => "RPC",
+            "reqBodyType" => "json",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForROAWithV3Sign_AK_Form(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/test",
+            "method" => "POST",
+            "authType" => "AK",
+            "style" => "ROA",
+            "reqBodyType" => "formData",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testCallApiForROAWithV3Sign_Anonymous_JSON(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/test",
+            "method" => "POST",
+            "authType" => "Anonymous",
+            "style" => "ROA",
+            "reqBodyType" => "json",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+    }
+
+    public function testResponseBodyType(){
+        $config = self::createConfig();
+        $runtime = self::createRuntimeOptions();
+        $config->protocol = "HTTP";
+        $config->endpoint = "test.aliyuncs.com";
+        $client = new OpenApiClient($config);
+        $request = self::createOpenApiRequest();
+        $params = new Params([
+            "action" => "TestAPI",
+            "version" => "2022-06-01",
+            "protocol" => "HTTPS",
+            "pathname" => "/test",
+            "method" => "POST",
+            "authType" => "AK",
+            "style" => "ROA",
+            "reqBodyType" => "formData",
+            "bodyType" => "json"
+        ]);
+        $client->callApi($params, $request, $runtime);
+        $params->bodyType = "array";
+        $client->callApi($params, $request, $runtime);
+        $params->bodyType = "string";
+        $client->callApi($params, $request, $runtime);
+        $params->bodyType = "byte";
+        $client->callApi($params, $request, $runtime);
+    }
+}

vendor/alibabacloud/darabonba-openapi/tests/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';

vendor/autoload.php

@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

vendor/composer/ClassLoader.php

@@ -42,35 +42,37 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
-    /** @var ?string */
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
+     * @var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
+     * @var array<string, list<string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -78,8 +80,7 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var string[]
-     * @psalm-var array<string, string>
+     * @var array<string, string>
      */
     private $classMap = array();
 
@@ -87,29 +88,29 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
+     * @var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var ?string */
+    /** @var string|null */
     private $apcuPrefix;
 
     /**
-     * @var self[]
+     * @var array<string, self>
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param ?string $vendorDir
+     * @param string|null $vendorDir
      */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
-     * @return string[]
+     * @return array<string, list<string>>
      */
     public function getPrefixes()
     {
@@ -121,8 +122,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
+     * @return array<string, list<string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,8 +130,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirs()
     {
@@ -139,8 +138,7 @@ class ClassLoader
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -148,8 +146,7 @@ class ClassLoader
     }
 
     /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
+     * @return array<string, string> Array of classname => path
      */
     public function getClassMap()
     {
@@ -157,8 +154,7 @@ class ClassLoader
     }
 
     /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
+     * @param array<string, string> $classMap Class to filename map
      *
      * @return void
      */
@@ -175,24 +171,25 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -201,19 +198,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -222,9 +219,9 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -232,17 +229,18 @@ class ClassLoader
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -252,18 +250,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -272,8 +270,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -290,8 +288,8 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -425,7 +423,8 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -476,9 +475,9 @@ class ClassLoader
     }
 
     /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
      *
-     * @return self[]
+     * @return array<string, self>
      */
     public static function getRegisteredLoaders()
     {
@@ -555,18 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }

vendor/composer/InstalledVersions.php

@@ -28,7 +28,7 @@ class InstalledVersions
 {
     /**
      * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
@@ -39,7 +39,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static $installedByVendor = array();
 
@@ -98,7 +98,7 @@ class InstalledVersions
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
 
@@ -119,7 +119,7 @@ class InstalledVersions
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -243,7 +243,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
      */
     public static function getRootPackage()
     {
@@ -257,7 +257,7 @@ class InstalledVersions
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
      */
     public static function getRawData()
     {
@@ -280,7 +280,7 @@ class InstalledVersions
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     public static function getAllRawData()
     {
@@ -303,7 +303,7 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
      */
     public static function reload($data)
     {
@@ -313,7 +313,7 @@ class InstalledVersions
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static function getInstalled()
     {
@@ -328,7 +328,9 @@ class InstalledVersions
                 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';
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -340,12 +342,17 @@ class InstalledVersions
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;
     }

vendor/composer/autoload_classmap.php

@@ -8,10 +8,24 @@ $baseDir = dirname($vendorDir);
 return array(
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'Datamatrix' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
     'Ip2Region' => $vendorDir . '/zoujingli/ip2region/Ip2Region.php',
     'JsonException' => $vendorDir . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
+    'PDF417' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
     'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
-    'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
+    'QRcode' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/qrcode.php',
+    'Stringable' => $vendorDir . '/myclabs/php-enum/stubs/Stringable.php',
+    'TCPDF' => $vendorDir . '/tecnickcom/tcpdf/tcpdf.php',
+    'TCPDF2DBarcode' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_barcodes_2d.php',
+    'TCPDFBarcode' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_barcodes_1d.php',
+    'TCPDF_COLORS' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_colors.php',
+    'TCPDF_FILTERS' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_filters.php',
+    'TCPDF_FONTS' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_fonts.php',
+    'TCPDF_FONT_DATA' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_font_data.php',
+    'TCPDF_IMAGES' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_images.php',
+    'TCPDF_IMPORT' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_import.php',
+    'TCPDF_PARSER' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_parser.php',
+    'TCPDF_STATIC' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_static.php',
     'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
     'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
     'We' => $vendorDir . '/zoujingli/wechat-developer/We.php',

vendor/composer/autoload_psr4.php

@@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir);
 
 return array(
     'think\\composer\\' => array($vendorDir . '/topthink/think-installer/src'),
+    'setasign\\Fpdi\\' => array($vendorDir . '/setasign/fpdi/src'),
     'library\\' => array($vendorDir . '/zoujingli/think-library/src'),
     'hg\\apidoc\\' => array($vendorDir . '/hg/apidoc/src'),
     'clagiordano\\weblibs\\configmanager\\' => array($vendorDir . '/clagiordano/weblibs-configmanager/src'),
@@ -45,6 +46,7 @@ return array(
     'MyCLabs\\Enum\\' => array($vendorDir . '/myclabs/php-enum/src'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
     'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
+    'Jsyqw\\PdfTable\\' => array($vendorDir . '/jsyqw/tcpdf-table/src'),
     'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),

vendor/composer/autoload_real.php

@@ -33,25 +33,18 @@ class ComposerAutoloaderInit4d241e9f8bb10d006cd7432f945fdb5b
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b::$files;
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire4d241e9f8bb10d006cd7432f945fdb5b($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-/**
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequire4d241e9f8bb10d006cd7432f945fdb5b($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
-        require $file;
-    }
-}

vendor/composer/autoload_static.php

@@ -30,6 +30,10 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b
         array (
             'think\\composer\\' => 15,
         ),
+        's' => 
+        array (
+            'setasign\\Fpdi\\' => 14,
+        ),
         'l' => 
         array (
             'library\\' => 8,
@@ -100,6 +104,7 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b
         ),
         'J' => 
         array (
+            'Jsyqw\\PdfTable\\' => 15,
             'JmesPath\\' => 9,
         ),
         'G' => 
@@ -235,6 +240,10 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b
         array (
             0 => __DIR__ . '/..' . '/topthink/think-installer/src',
         ),
+        'setasign\\Fpdi\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/setasign/fpdi/src',
+        ),
         'library\\' => 
         array (
             0 => __DIR__ . '/..' . '/zoujingli/think-library/src',
@@ -390,6 +399,10 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b
         array (
             0 => __DIR__ . '/..' . '/markbaker/matrix/classes/src',
         ),
+        'Jsyqw\\PdfTable\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/jsyqw/tcpdf-table/src',
+        ),
         'JmesPath\\' => 
         array (
             0 => __DIR__ . '/..' . '/mtdowling/jmespath.php/src',
@@ -852,10 +865,24 @@ class ComposerStaticInit4d241e9f8bb10d006cd7432f945fdb5b
     public static $classMap = array (
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'Datamatrix' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
         'Ip2Region' => __DIR__ . '/..' . '/zoujingli/ip2region/Ip2Region.php',
         'JsonException' => __DIR__ . '/..' . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
+        'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
         'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
-        'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
+        'QRcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/qrcode.php',
+        'Stringable' => __DIR__ . '/..' . '/myclabs/php-enum/stubs/Stringable.php',
+        'TCPDF' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf.php',
+        'TCPDF2DBarcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_barcodes_2d.php',
+        'TCPDFBarcode' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_barcodes_1d.php',
+        'TCPDF_COLORS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_colors.php',
+        'TCPDF_FILTERS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_filters.php',
+        'TCPDF_FONTS' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_fonts.php',
+        'TCPDF_FONT_DATA' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_font_data.php',
+        'TCPDF_IMAGES' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_images.php',
+        'TCPDF_IMPORT' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_import.php',
+        'TCPDF_PARSER' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_parser.php',
+        'TCPDF_STATIC' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_static.php',
         'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
         'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
         'We' => __DIR__ . '/..' . '/zoujingli/wechat-developer/We.php',

vendor/composer/installed.json

@@ -246,17 +246,17 @@
         },
         {
             "name": "alibabacloud/darabonba-openapi",
-            "version": "0.2.9",
-            "version_normalized": "0.2.9.0",
+            "version": "0.2.10",
+            "version_normalized": "0.2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alibabacloud-sdk-php/darabonba-openapi.git",
-                "reference": "4cdfc36615f345786d668dfbaf68d9a301b6dbe2"
+                "reference": "88f42443e1b5c9d086d0444baa4a874f8636f7bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alibabacloud-sdk-php/darabonba-openapi/zipball/4cdfc36615f345786d668dfbaf68d9a301b6dbe2",
-                "reference": "4cdfc36615f345786d668dfbaf68d9a301b6dbe2",
+                "url": "https://api.github.com/repos/alibabacloud-sdk-php/darabonba-openapi/zipball/88f42443e1b5c9d086d0444baa4a874f8636f7bb",
+                "reference": "88f42443e1b5c9d086d0444baa4a874f8636f7bb",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -269,11 +269,11 @@
                 "alibabacloud/credentials": "^1.1",
                 "alibabacloud/gateway-spi": "^1",
                 "alibabacloud/openapi-util": "^0.1.10|^0.2.1",
-                "alibabacloud/tea-utils": "^0.2.17",
+                "alibabacloud/tea-utils": "^0.2.19",
                 "alibabacloud/tea-xml": "^0.2",
                 "php": ">5.5"
             },
-            "time": "2023-02-06T12:02:21+00:00",
+            "time": "2023-11-23T07:01:20+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -294,7 +294,7 @@
             "description": "Alibaba Cloud OpenApi Client",
             "support": {
                 "issues": "https://github.com/alibabacloud-sdk-php/darabonba-openapi/issues",
-                "source": "https://github.com/alibabacloud-sdk-php/darabonba-openapi/tree/0.2.9"
+                "source": "https://github.com/alibabacloud-sdk-php/darabonba-openapi/tree/0.2.10"
             },
             "install-path": "../alibabacloud/darabonba-openapi"
         },
@@ -1491,17 +1491,17 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.0",
-            "version_normalized": "7.8.0.0",
+            "version": "7.8.1",
+            "version_normalized": "7.8.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9"
+                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9",
-                "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
+                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1522,11 +1522,11 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1534,7 +1534,7 @@
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
-            "time": "2023-08-27T10:20:53+00:00",
+            "time": "2023-12-03T20:35:24+00:00",
             "type": "library",
             "extra": {
                 "bamarni-bin": {
@@ -1606,7 +1606,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
             },
             "funding": [
                 {
@@ -1718,17 +1718,17 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.1",
-            "version_normalized": "2.6.1.0",
+            "version": "2.6.2",
+            "version_normalized": "2.6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727"
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
-                "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1748,14 +1748,14 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
-            "time": "2023-08-27T10:13:57+00:00",
+            "time": "2023-12-03T20:05:35+00:00",
             "type": "library",
             "extra": {
                 "bamarni-bin": {
@@ -1823,7 +1823,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
             },
             "funding": [
                 {
@@ -1920,6 +1920,55 @@
             "install-path": "../hg/apidoc"
         },
         {
+            "name": "jsyqw/tcpdf-table",
+            "version": "v0.1.2",
+            "version_normalized": "0.1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jasonyqwang/tcpdf-table.git",
+                "reference": "cf7c69fb43ffbd6b7d313fb8c20691ac70d43e63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jasonyqwang/tcpdf-table/zipball/cf7c69fb43ffbd6b7d313fb8c20691ac70d43e63",
+                "reference": "cf7c69fb43ffbd6b7d313fb8c20691ac70d43e63",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "setasign/fpdi": "^2.2"
+            },
+            "time": "2022-03-29T05:50:18+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Jsyqw\\PdfTable\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jason wang",
+                    "email": "1045643440@qq.com"
+                }
+            ],
+            "description": "基于 tcpdf 生成 pdf 表格",
+            "support": {
+                "issues": "https://github.com/jasonyqwang/tcpdf-table/issues",
+                "source": "https://github.com/jasonyqwang/tcpdf-table/tree/v0.1.2"
+            },
+            "install-path": "../jsyqw/tcpdf-table"
+        },
+        {
             "name": "lizhichao/one-sm",
             "version": "1.10",
             "version_normalized": "1.10.0.0",
@@ -2193,17 +2242,17 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.9.1",
-            "version_normalized": "2.9.1.0",
+            "version": "2.9.2",
+            "version_normalized": "2.9.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2255,7 +2304,7 @@
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
-            "time": "2023-02-06T13:44:46+00:00",
+            "time": "2023-10-27T15:25:26+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2288,7 +2337,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.1"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
             },
             "funding": [
                 {
@@ -2379,17 +2428,17 @@
         },
         {
             "name": "myclabs/php-enum",
-            "version": "1.7.7",
-            "version_normalized": "1.7.7.0",
+            "version": "1.8.4",
+            "version_normalized": "1.8.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7"
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7",
-                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7",
+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2400,20 +2449,23 @@
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=7.1"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7",
+                "phpunit/phpunit": "^9.5",
                 "squizlabs/php_codesniffer": "1.*",
-                "vimeo/psalm": "^3.8"
+                "vimeo/psalm": "^4.6.2"
             },
-            "time": "2020-11-14T18:14:52+00:00",
+            "time": "2022-08-04T09:53:51+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "MyCLabs\\Enum\\": "src/"
-                }
+                },
+                "classmap": [
+                    "stubs/Stringable.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2432,7 +2484,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.7.7"
+                "source": "https://github.com/myclabs/php-enum/tree/1.8.4"
             },
             "funding": [
                 {
@@ -2681,17 +2733,17 @@
         },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.19.0",
-            "version_normalized": "1.19.0.0",
+            "version": "1.25.2",
+            "version_normalized": "1.25.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf"
+                "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
-                "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5",
+                "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2714,35 +2766,36 @@
                 "ext-xmlwriter": "*",
                 "ext-zip": "*",
                 "ext-zlib": "*",
-                "ezyang/htmlpurifier": "^4.13",
+                "ezyang/htmlpurifier": "^4.15",
                 "maennchen/zipstream-php": "^2.1",
                 "markbaker/complex": "^3.0",
                 "markbaker/matrix": "^3.0",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.3 || ^8.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "psr/simple-cache": "^1.0"
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "dompdf/dompdf": "^1.0",
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^8.0",
+                "dompdf/dompdf": "^1.0 || ^2.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "10.2.4",
+                "mpdf/mpdf": "8.1.1",
                 "phpcompatibility/php-compatibility": "^9.3",
-                "phpstan/phpstan": "^0.12.82",
-                "phpstan/phpstan-phpunit": "^0.12.18",
-                "phpunit/phpunit": "^8.5",
-                "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "^6.3"
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^8.5 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "6.5"
             },
             "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-                "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
                 "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
             },
-            "time": "2021-10-31T15:09:20+00:00",
+            "time": "2022-09-25T17:21:01+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2788,7 +2841,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2"
             },
             "install-path": "../phpoffice/phpspreadsheet"
         },
@@ -3331,17 +3384,17 @@
         },
         {
             "name": "qiniu/php-sdk",
-            "version": "v7.11.0",
-            "version_normalized": "7.11.0.0",
+            "version": "v7.12.0",
+            "version_normalized": "7.12.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/qiniu/php-sdk.git",
-                "reference": "9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b"
+                "reference": "96971af3cc6151b32e4a9d61001e126624100538"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b",
-                "reference": "9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b",
+                "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/96971af3cc6151b32e4a9d61001e126624100538",
+                "reference": "96971af3cc6151b32e4a9d61001e126624100538",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3359,7 +3412,7 @@
                 "phpunit/phpunit": "^4.8 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4",
                 "squizlabs/php_codesniffer": "^2.3 || ~3.6"
             },
-            "time": "2023-09-05T12:33:39+00:00",
+            "time": "2023-12-25T08:30:40+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3392,7 +3445,7 @@
             ],
             "support": {
                 "issues": "https://github.com/qiniu/php-sdk/issues",
-                "source": "https://github.com/qiniu/php-sdk/tree/v7.11.0"
+                "source": "https://github.com/qiniu/php-sdk/tree/v7.12.0"
             },
             "install-path": "../qiniu/php-sdk"
         },
@@ -3446,18 +3499,99 @@
             "install-path": "../ralouphie/getallheaders"
         },
         {
+            "name": "setasign/fpdi",
+            "version": "v2.6.0",
+            "version_normalized": "2.6.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI.git",
+                "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6db878129ec6c7e141316ee71872923e7f1b7ad",
+                "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-zlib": "*",
+                "php": "^5.6 || ^7.0 || ^8.0"
+            },
+            "conflict": {
+                "setasign/tfpdf": "<1.31"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.7",
+                "setasign/fpdf": "~1.8.6",
+                "setasign/tfpdf": "~1.33",
+                "squizlabs/php_codesniffer": "^3.5",
+                "tecnickcom/tcpdf": "~6.2"
+            },
+            "suggest": {
+                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured."
+            },
+            "time": "2023-12-11T16:03:32+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "setasign\\Fpdi\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                },
+                {
+                    "name": "Maximilian Kresse",
+                    "email": "maximilian.kresse@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "support": {
+                "issues": "https://github.com/Setasign/FPDI/issues",
+                "source": "https://github.com/Setasign/FPDI/tree/v2.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../setasign/fpdi"
+        },
+        {
             "name": "symfony/cache",
-            "version": "v5.4.29",
-            "version_normalized": "5.4.29.0",
+            "version": "v5.4.34",
+            "version_normalized": "5.4.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151"
+                "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151",
-                "reference": "e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/b17f28169f7a2f2c0cddf2b044d729f5b75efe5a",
+                "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3491,7 +3625,7 @@
             "require-dev": {
                 "cache/integration-tests": "dev-master",
                 "doctrine/cache": "^1.6|^2.0",
-                "doctrine/dbal": "^2.13.1|^3.0",
+                "doctrine/dbal": "^2.13.1|^3|^4",
                 "predis/predis": "^1.1",
                 "psr/simple-cache": "^1.0|^2.0",
                 "symfony/config": "^4.4|^5.0|^6.0",
@@ -3501,7 +3635,7 @@
                 "symfony/messenger": "^4.4|^5.0|^6.0",
                 "symfony/var-dumper": "^4.4|^5.0|^6.0"
             },
-            "time": "2023-09-19T13:25:51+00:00",
+            "time": "2023-12-18T14:56:06+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3533,7 +3667,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.29"
+                "source": "https://github.com/symfony/cache/tree/v5.4.34"
             },
             "funding": [
                 {
@@ -3717,17 +3851,17 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.26",
-            "version_normalized": "5.4.26.0",
+            "version": "v5.4.34",
+            "version_normalized": "5.4.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac"
+                "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac",
-                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e3bca343efeb613f843c254e7718ef17c9bdf7a3",
+                "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3763,7 +3897,7 @@
                 "symfony/dependency-injection": "",
                 "symfony/http-kernel": ""
             },
-            "time": "2023-07-06T06:34:20+00:00",
+            "time": "2023-12-27T21:12:56+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3791,7 +3925,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.34"
             },
             "funding": [
                 {
@@ -3899,17 +4033,17 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.4.28",
-            "version_normalized": "5.4.28.0",
+            "version": "v5.4.34",
+            "version_normalized": "5.4.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "365992c83a836dfe635f1e903ccca43ee03d3dd2"
+                "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/365992c83a836dfe635f1e903ccca43ee03d3dd2",
-                "reference": "365992c83a836dfe635f1e903ccca43ee03d3dd2",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4da1713e88cf9c44bd4bf65f54772681222fcbec",
+                "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3936,7 +4070,7 @@
             "suggest": {
                 "symfony/mime": "To use the file extension guesser"
             },
-            "time": "2023-08-21T07:23:18+00:00",
+            "time": "2023-12-27T11:45:35+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3964,7 +4098,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.28"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.34"
             },
             "funding": [
                 {
@@ -4590,17 +4724,17 @@
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v5.4.26",
-            "version_normalized": "5.4.26.0",
+            "version": "v5.4.32",
+            "version_normalized": "5.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a"
+                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a",
-                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add",
+                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4616,7 +4750,7 @@
             "require-dev": {
                 "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
             },
-            "time": "2023-07-20T07:21:16+00:00",
+            "time": "2023-11-16T19:33:05+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4652,7 +4786,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v5.4.26"
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.32"
             },
             "funding": [
                 {
@@ -4730,6 +4864,87 @@
             "install-path": "../symfony/yaml"
         },
         {
+            "name": "tecnickcom/tcpdf",
+            "version": "6.6.5",
+            "version_normalized": "6.6.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5fce932fcee4371865314ab7f6c0d85423c5c7ce",
+                "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "time": "2023-09-06T15:09:26+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "config",
+                    "include",
+                    "tcpdf.php",
+                    "tcpdf_parser.php",
+                    "tcpdf_import.php",
+                    "tcpdf_barcodes_1d.php",
+                    "tcpdf_barcodes_2d.php",
+                    "include/tcpdf_colors.php",
+                    "include/tcpdf_filters.php",
+                    "include/tcpdf_font_data.php",
+                    "include/tcpdf_fonts.php",
+                    "include/tcpdf_images.php",
+                    "include/tcpdf_static.php",
+                    "include/barcodes/datamatrix.php",
+                    "include/barcodes/pdf417.php",
+                    "include/barcodes/qrcode.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Nicola Asuni",
+                    "email": "info@tecnick.com",
+                    "role": "lead"
+                }
+            ],
+            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
+            "homepage": "http://www.tcpdf.org/",
+            "keywords": [
+                "PDFD32000-2008",
+                "TCPDF",
+                "barcodes",
+                "datamatrix",
+                "pdf",
+                "pdf417",
+                "qrcode"
+            ],
+            "support": {
+                "issues": "https://github.com/tecnickcom/TCPDF/issues",
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.5"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
+                    "type": "custom"
+                }
+            ],
+            "install-path": "../tecnickcom/tcpdf"
+        },
+        {
             "name": "topthink/framework",
             "version": "v5.1.42",
             "version_normalized": "5.1.42.0",
@@ -4958,17 +5173,17 @@
         },
         {
             "name": "zoujingli/wechat-developer",
-            "version": "v1.2.49",
-            "version_normalized": "1.2.49.0",
+            "version": "v1.2.53",
+            "version_normalized": "1.2.53.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/WeChatDeveloper.git",
-                "reference": "9becf988c98a2b3cff72dac0dc21b32cb61c66ef"
+                "reference": "cd5ff0228e8bc31e76c2ef753b1313008d8c520f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9becf988c98a2b3cff72dac0dc21b32cb61c66ef",
-                "reference": "9becf988c98a2b3cff72dac0dc21b32cb61c66ef",
+                "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/cd5ff0228e8bc31e76c2ef753b1313008d8c520f",
+                "reference": "cd5ff0228e8bc31e76c2ef753b1313008d8c520f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4988,7 +5203,7 @@
                 "ext-xml": "*",
                 "php": ">=5.4"
             },
-            "time": "2023-10-10T09:40:17+00:00",
+            "time": "2024-01-02T09:59:49+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5025,7 +5240,7 @@
             ],
             "support": {
                 "issues": "https://github.com/zoujingli/WeChatDeveloper/issues",
-                "source": "https://github.com/zoujingli/WeChatDeveloper/tree/v1.2.49"
+                "source": "https://github.com/zoujingli/WeChatDeveloper/tree/v1.2.53"
             },
             "install-path": "../zoujingli/wechat-developer"
         },

vendor/composer/installed.php

@@ -1,364 +1,373 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => 'dev-master',
-        'version' => 'dev-master',
+        'name' => 'zoujingli/thinkadmin',
+        'pretty_version' => '1.0.0+no-version-set',
+        'version' => '1.0.0.0',
+        'reference' => NULL,
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '0979d0b5931f7d8fb1d045e79b742882ce0d458f',
-        'name' => 'zoujingli/thinkadmin',
         'dev' => true,
     ),
     'versions' => array(
         'adbario/php-dot-notation' => array(
             'pretty_version' => '2.5.0',
             'version' => '2.5.0.0',
+            'reference' => '081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae',
             'type' => 'library',
             'install_path' => __DIR__ . '/../adbario/php-dot-notation',
             'aliases' => array(),
-            'reference' => '081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae',
             'dev_requirement' => false,
         ),
         'alibabacloud/client' => array(
             'pretty_version' => '1.5.32',
             'version' => '1.5.32.0',
+            'reference' => '5bc6f6d660797dcee2c3aef29700ab41ee764f4d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/client',
             'aliases' => array(),
-            'reference' => '5bc6f6d660797dcee2c3aef29700ab41ee764f4d',
             'dev_requirement' => false,
         ),
         'alibabacloud/credentials' => array(
             'pretty_version' => '1.1.5',
             'version' => '1.1.5.0',
+            'reference' => '1d8383ceef695974a88a3859c42e235fd2e3981a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/credentials',
             'aliases' => array(),
-            'reference' => '1d8383ceef695974a88a3859c42e235fd2e3981a',
             'dev_requirement' => false,
         ),
         'alibabacloud/darabonba-openapi' => array(
-            'pretty_version' => '0.2.9',
-            'version' => '0.2.9.0',
+            'pretty_version' => '0.2.10',
+            'version' => '0.2.10.0',
+            'reference' => '88f42443e1b5c9d086d0444baa4a874f8636f7bb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/darabonba-openapi',
             'aliases' => array(),
-            'reference' => '4cdfc36615f345786d668dfbaf68d9a301b6dbe2',
             'dev_requirement' => false,
         ),
         'alibabacloud/dingtalk' => array(
             'pretty_version' => '1.5.65',
             'version' => '1.5.65.0',
+            'reference' => '97053c7aabd1f5ddca51dd89416256757e2df87f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/dingtalk',
             'aliases' => array(),
-            'reference' => '97053c7aabd1f5ddca51dd89416256757e2df87f',
             'dev_requirement' => false,
         ),
         'alibabacloud/endpoint-util' => array(
             'pretty_version' => '0.1.1',
             'version' => '0.1.1.0',
+            'reference' => 'f3fe88a25d8df4faa3b0ae14ff202a9cc094e6c5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/endpoint-util',
             'aliases' => array(),
-            'reference' => 'f3fe88a25d8df4faa3b0ae14ff202a9cc094e6c5',
             'dev_requirement' => false,
         ),
         'alibabacloud/gateway-spi' => array(
             'pretty_version' => '1.0.0',
             'version' => '1.0.0.0',
+            'reference' => '7440f77750c329d8ab252db1d1d967314ccd1fcb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/gateway-spi',
             'aliases' => array(),
-            'reference' => '7440f77750c329d8ab252db1d1d967314ccd1fcb',
             'dev_requirement' => false,
         ),
         'alibabacloud/openapi-util' => array(
             'pretty_version' => '0.2.1',
             'version' => '0.2.1.0',
+            'reference' => 'f31f7bcd835e08ca24b6b8ba33637eb4eceb093a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/openapi-util',
             'aliases' => array(),
-            'reference' => 'f31f7bcd835e08ca24b6b8ba33637eb4eceb093a',
             'dev_requirement' => false,
         ),
         'alibabacloud/tea' => array(
             'pretty_version' => '3.2.1',
             'version' => '3.2.1.0',
+            'reference' => '1619cb96c158384f72b873e1f85de8b299c9c367',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/tea',
             'aliases' => array(),
-            'reference' => '1619cb96c158384f72b873e1f85de8b299c9c367',
             'dev_requirement' => false,
         ),
         'alibabacloud/tea-fileform' => array(
             'pretty_version' => '0.3.4',
             'version' => '0.3.4.0',
+            'reference' => '4bf0c75a045c8115aa8cb1a394bd08d8bb833181',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/tea-fileform',
             'aliases' => array(),
-            'reference' => '4bf0c75a045c8115aa8cb1a394bd08d8bb833181',
             'dev_requirement' => false,
         ),
         'alibabacloud/tea-utils' => array(
             'pretty_version' => '0.2.19',
             'version' => '0.2.19.0',
+            'reference' => '8dfc1a93e9415818e93a621b644abbb84981aea4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/tea-utils',
             'aliases' => array(),
-            'reference' => '8dfc1a93e9415818e93a621b644abbb84981aea4',
             'dev_requirement' => false,
         ),
         'alibabacloud/tea-xml' => array(
             'pretty_version' => '0.2.4',
             'version' => '0.2.4.0',
+            'reference' => '3e0c000bf536224eebbac913c371bef174c0a16a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alibabacloud/tea-xml',
             'aliases' => array(),
-            'reference' => '3e0c000bf536224eebbac913c371bef174c0a16a',
             'dev_requirement' => false,
         ),
         'alipaysdk/easysdk' => array(
             'pretty_version' => '2.2.3',
             'version' => '2.2.3.0',
+            'reference' => 'c6008839a22a5fca08e9f8536730f7abfed522d5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../alipaysdk/easysdk',
             'aliases' => array(),
-            'reference' => 'c6008839a22a5fca08e9f8536730f7abfed522d5',
             'dev_requirement' => false,
         ),
         'aliyuncs/oss-sdk-php' => array(
             'pretty_version' => 'v2.6.0',
             'version' => '2.6.0.0',
+            'reference' => '572d0f8e099e8630ae7139ed3fdedb926c7a760f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../aliyuncs/oss-sdk-php',
             'aliases' => array(),
-            'reference' => '572d0f8e099e8630ae7139ed3fdedb926c7a760f',
             'dev_requirement' => false,
         ),
         'clagiordano/weblibs-configmanager' => array(
             'pretty_version' => 'v1.5.0',
             'version' => '1.5.0.0',
+            'reference' => '8802c7396d61a923c9a73e37ead062b24bb1b273',
             'type' => 'library',
             'install_path' => __DIR__ . '/../clagiordano/weblibs-configmanager',
             'aliases' => array(),
-            'reference' => '8802c7396d61a923c9a73e37ead062b24bb1b273',
             'dev_requirement' => false,
         ),
         'doctrine/annotations' => array(
             'pretty_version' => '1.14.3',
             'version' => '1.14.3.0',
+            'reference' => 'fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/annotations',
             'aliases' => array(),
-            'reference' => 'fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af',
             'dev_requirement' => false,
         ),
         'doctrine/deprecations' => array(
             'pretty_version' => 'v1.1.1',
             'version' => '1.1.1.0',
+            'reference' => '612a3ee5ab0d5dd97b7cf3874a6efe24325efac3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/deprecations',
             'aliases' => array(),
-            'reference' => '612a3ee5ab0d5dd97b7cf3874a6efe24325efac3',
             'dev_requirement' => false,
         ),
         'doctrine/lexer' => array(
             'pretty_version' => '2.1.0',
             'version' => '2.1.0.0',
+            'reference' => '39ab8fcf5a51ce4b85ca97c7a7d033eb12831124',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/lexer',
             'aliases' => array(),
-            'reference' => '39ab8fcf5a51ce4b85ca97c7a7d033eb12831124',
             'dev_requirement' => false,
         ),
         'easywechat-composer/easywechat-composer' => array(
             'pretty_version' => '1.4.1',
             'version' => '1.4.1.0',
+            'reference' => '3fc6a7ab6d3853c0f4e2922539b56cc37ef361cd',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../easywechat-composer/easywechat-composer',
             'aliases' => array(),
-            'reference' => '3fc6a7ab6d3853c0f4e2922539b56cc37ef361cd',
             'dev_requirement' => false,
         ),
         'endroid/qr-code' => array(
             'pretty_version' => '1.9.3',
             'version' => '1.9.3.0',
+            'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93',
             'type' => 'library',
             'install_path' => __DIR__ . '/../endroid/qr-code',
             'aliases' => array(),
-            'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93',
             'dev_requirement' => false,
         ),
         'ezyang/htmlpurifier' => array(
             'pretty_version' => 'v4.16.0',
             'version' => '4.16.0.0',
+            'reference' => '523407fb06eb9e5f3d59889b3978d5bfe94299c8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ezyang/htmlpurifier',
             'aliases' => array(),
-            'reference' => '523407fb06eb9e5f3d59889b3978d5bfe94299c8',
             'dev_requirement' => false,
         ),
         'firebase/php-jwt' => array(
             'pretty_version' => 'v5.5.1',
             'version' => '5.5.1.0',
+            'reference' => '83b609028194aa042ea33b5af2d41a7427de80e6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',
             'aliases' => array(),
-            'reference' => '83b609028194aa042ea33b5af2d41a7427de80e6',
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
-            'pretty_version' => '7.8.0',
-            'version' => '7.8.0.0',
+            'pretty_version' => '7.8.1',
+            'version' => '7.8.1.0',
+            'reference' => '41042bc7ab002487b876a0683fc8dce04ddce104',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
-            'reference' => '1110f66a6530a40fe7aea0378fe608ee2b2248f9',
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
             'pretty_version' => '2.0.1',
             'version' => '2.0.1.0',
+            'reference' => '111166291a0f8130081195ac4556a5587d7f1b5d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
-            'reference' => '111166291a0f8130081195ac4556a5587d7f1b5d',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
-            'pretty_version' => '2.6.1',
-            'version' => '2.6.1.0',
+            'pretty_version' => '2.6.2',
+            'version' => '2.6.2.0',
+            'reference' => '45b30f99ac27b5ca93cb4831afe16285f57b8221',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => 'be45764272e8873c72dbe3d2edcfdfcc3bc9f727',
             'dev_requirement' => false,
         ),
         'hg/apidoc' => array(
             'pretty_version' => 'v4.2.2',
             'version' => '4.2.2.0',
+            'reference' => '28860189a4369c4f81ae7d0d1ff8fd2dd0251895',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hg/apidoc',
             'aliases' => array(),
-            'reference' => '28860189a4369c4f81ae7d0d1ff8fd2dd0251895',
+            'dev_requirement' => false,
+        ),
+        'jsyqw/tcpdf-table' => array(
+            'pretty_version' => 'v0.1.2',
+            'version' => '0.1.2.0',
+            'reference' => 'cf7c69fb43ffbd6b7d313fb8c20691ac70d43e63',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../jsyqw/tcpdf-table',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'lizhichao/one-sm' => array(
             'pretty_version' => '1.10',
             'version' => '1.10.0.0',
+            'reference' => '687a012a44a5bfd4d9143a0234e1060543be455a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../lizhichao/one-sm',
             'aliases' => array(),
-            'reference' => '687a012a44a5bfd4d9143a0234e1060543be455a',
             'dev_requirement' => false,
         ),
         'maennchen/zipstream-php' => array(
             'pretty_version' => '2.1.0',
             'version' => '2.1.0.0',
+            'reference' => 'c4c5803cc1f93df3d2448478ef79394a5981cc58',
             'type' => 'library',
             'install_path' => __DIR__ . '/../maennchen/zipstream-php',
             'aliases' => array(),
-            'reference' => 'c4c5803cc1f93df3d2448478ef79394a5981cc58',
             'dev_requirement' => false,
         ),
         'markbaker/complex' => array(
             'pretty_version' => '3.0.2',
             'version' => '3.0.2.0',
+            'reference' => '95c56caa1cf5c766ad6d65b6344b807c1e8405b9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../markbaker/complex',
             'aliases' => array(),
-            'reference' => '95c56caa1cf5c766ad6d65b6344b807c1e8405b9',
             'dev_requirement' => false,
         ),
         'markbaker/matrix' => array(
             'pretty_version' => '3.0.1',
             'version' => '3.0.1.0',
+            'reference' => '728434227fe21be27ff6d86621a1b13107a2562c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../markbaker/matrix',
             'aliases' => array(),
-            'reference' => '728434227fe21be27ff6d86621a1b13107a2562c',
             'dev_requirement' => false,
         ),
         'monolog/monolog' => array(
-            'pretty_version' => '2.9.1',
-            'version' => '2.9.1.0',
+            'pretty_version' => '2.9.2',
+            'version' => '2.9.2.0',
+            'reference' => '437cb3628f4cf6042cc10ae97fc2b8472e48ca1f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../monolog/monolog',
             'aliases' => array(),
-            'reference' => 'f259e2b15fb95494c83f52d3caad003bbf5ffaa1',
             'dev_requirement' => false,
         ),
         'mtdowling/jmespath.php' => array(
             'pretty_version' => '2.7.0',
             'version' => '2.7.0.0',
+            'reference' => 'bbb69a935c2cbb0c03d7f481a238027430f6440b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../mtdowling/jmespath.php',
             'aliases' => array(),
-            'reference' => 'bbb69a935c2cbb0c03d7f481a238027430f6440b',
             'dev_requirement' => false,
         ),
         'myclabs/php-enum' => array(
-            'pretty_version' => '1.7.7',
-            'version' => '1.7.7.0',
+            'pretty_version' => '1.8.4',
+            'version' => '1.8.4.0',
+            'reference' => 'a867478eae49c9f59ece437ae7f9506bfaa27483',
             'type' => 'library',
             'install_path' => __DIR__ . '/../myclabs/php-enum',
             'aliases' => array(),
-            'reference' => 'd178027d1e679832db9f38248fcc7200647dc2b7',
             'dev_requirement' => false,
         ),
         'overtrue/socialite' => array(
             'pretty_version' => '2.0.24',
             'version' => '2.0.24.0',
+            'reference' => 'ee7e7b000ec7d64f2b8aba1f6a2eec5cdf3f8bec',
             'type' => 'library',
             'install_path' => __DIR__ . '/../overtrue/socialite',
             'aliases' => array(),
-            'reference' => 'ee7e7b000ec7d64f2b8aba1f6a2eec5cdf3f8bec',
             'dev_requirement' => false,
         ),
         'overtrue/wechat' => array(
             'pretty_version' => '4.6.0',
             'version' => '4.6.0.0',
+            'reference' => '52af4cbe777cd4aea307beafa0a4518c347467b1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../overtrue/wechat',
             'aliases' => array(),
-            'reference' => '52af4cbe777cd4aea307beafa0a4518c347467b1',
             'dev_requirement' => false,
         ),
         'phpoffice/phpexcel' => array(
             'pretty_version' => '1.8.2',
             'version' => '1.8.2.0',
+            'reference' => '1441011fb7ecdd8cc689878f54f8b58a6805f870',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpoffice/phpexcel',
             'aliases' => array(),
-            'reference' => '1441011fb7ecdd8cc689878f54f8b58a6805f870',
             'dev_requirement' => false,
         ),
         'phpoffice/phpspreadsheet' => array(
-            'pretty_version' => '1.19.0',
-            'version' => '1.19.0.0',
+            'pretty_version' => '1.25.2',
+            'version' => '1.25.2.0',
+            'reference' => 'a317a09e7def49852400a4b3eca4a4b0790ceeb5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpoffice/phpspreadsheet',
             'aliases' => array(),
-            'reference' => 'a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf',
             'dev_requirement' => false,
         ),
         'pimple/pimple' => array(
             'pretty_version' => 'v3.5.0',
             'version' => '3.5.0.0',
+            'reference' => 'a94b3a4db7fb774b3d78dad2315ddc07629e1bed',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pimple/pimple',
             'aliases' => array(),
-            'reference' => 'a94b3a4db7fb774b3d78dad2315ddc07629e1bed',
             'dev_requirement' => false,
         ),
         'psr/cache' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/cache',
             'aliases' => array(),
-            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'dev_requirement' => false,
         ),
         'psr/cache-implementation' => array(
@@ -370,19 +379,19 @@
         'psr/container' => array(
             'pretty_version' => '2.0.1',
             'version' => '2.0.1.0',
+            'reference' => '2ae37329ee82f91efadc282cc2d527fd6065a5ef',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/container',
             'aliases' => array(),
-            'reference' => '2ae37329ee82f91efadc282cc2d527fd6065a5ef',
             'dev_requirement' => false,
         ),
         'psr/event-dispatcher' => array(
             'pretty_version' => '1.0.0',
             'version' => '1.0.0.0',
+            'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/event-dispatcher',
             'aliases' => array(),
-            'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0',
             'dev_requirement' => false,
         ),
         'psr/event-dispatcher-implementation' => array(
@@ -394,10 +403,10 @@
         'psr/http-client' => array(
             'pretty_version' => '1.0.3',
             'version' => '1.0.3.0',
+            'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-client',
             'aliases' => array(),
-            'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90',
             'dev_requirement' => false,
         ),
         'psr/http-client-implementation' => array(
@@ -409,10 +418,10 @@
         'psr/http-factory' => array(
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-factory',
             'aliases' => array(),
-            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
             'dev_requirement' => false,
         ),
         'psr/http-factory-implementation' => array(
@@ -424,10 +433,10 @@
         'psr/http-message' => array(
             'pretty_version' => '1.1',
             'version' => '1.1.0.0',
+            'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
-            'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba',
             'dev_requirement' => false,
         ),
         'psr/http-message-implementation' => array(
@@ -439,10 +448,10 @@
         'psr/log' => array(
             'pretty_version' => '1.1.4',
             'version' => '1.1.4.0',
+            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
-            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'dev_requirement' => false,
         ),
         'psr/log-implementation' => array(
@@ -454,10 +463,10 @@
         'psr/simple-cache' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/simple-cache',
             'aliases' => array(),
-            'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
             'dev_requirement' => false,
         ),
         'psr/simple-cache-implementation' => array(
@@ -467,39 +476,48 @@
             ),
         ),
         'qiniu/php-sdk' => array(
-            'pretty_version' => 'v7.11.0',
-            'version' => '7.11.0.0',
+            'pretty_version' => 'v7.12.0',
+            'version' => '7.12.0.0',
+            'reference' => '96971af3cc6151b32e4a9d61001e126624100538',
             'type' => 'library',
             'install_path' => __DIR__ . '/../qiniu/php-sdk',
             'aliases' => array(),
-            'reference' => '9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b',
             'dev_requirement' => false,
         ),
         'ralouphie/getallheaders' => array(
             'pretty_version' => '3.0.3',
             'version' => '3.0.3.0',
+            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ralouphie/getallheaders',
             'aliases' => array(),
-            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
+            'dev_requirement' => false,
+        ),
+        'setasign/fpdi' => array(
+            'pretty_version' => 'v2.6.0',
+            'version' => '2.6.0.0',
+            'reference' => 'a6db878129ec6c7e141316ee71872923e7f1b7ad',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../setasign/fpdi',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
-            'pretty_version' => 'v5.4.29',
-            'version' => '5.4.29.0',
+            'pretty_version' => 'v5.4.34',
+            'version' => '5.4.34.0',
+            'reference' => 'b17f28169f7a2f2c0cddf2b044d729f5b75efe5a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache',
             'aliases' => array(),
-            'reference' => 'e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151',
             'dev_requirement' => false,
         ),
         'symfony/cache-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => '64be4a7acb83b6f2bf6de9a02cee6dad41277ebc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache-contracts',
             'aliases' => array(),
-            'reference' => '64be4a7acb83b6f2bf6de9a02cee6dad41277ebc',
             'dev_requirement' => false,
         ),
         'symfony/cache-implementation' => array(
@@ -511,28 +529,28 @@
         'symfony/deprecation-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
             'aliases' => array(),
-            'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher' => array(
-            'pretty_version' => 'v5.4.26',
-            'version' => '5.4.26.0',
+            'pretty_version' => 'v5.4.34',
+            'version' => '5.4.34.0',
+            'reference' => 'e3bca343efeb613f843c254e7718ef17c9bdf7a3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher',
             'aliases' => array(),
-            'reference' => '5dcc00e03413f05c1e7900090927bb7247cb0aac',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher-contracts' => array(
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher-contracts',
             'aliases' => array(),
-            'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher-implementation' => array(
@@ -542,158 +560,167 @@
             ),
         ),
         'symfony/http-foundation' => array(
-            'pretty_version' => 'v5.4.28',
-            'version' => '5.4.28.0',
+            'pretty_version' => 'v5.4.34',
+            'version' => '5.4.34.0',
+            'reference' => '4da1713e88cf9c44bd4bf65f54772681222fcbec',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-foundation',
             'aliases' => array(),
-            'reference' => '365992c83a836dfe635f1e903ccca43ee03d3dd2',
             'dev_requirement' => false,
         ),
         'symfony/options-resolver' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/options-resolver',
             'aliases' => array(),
-            'reference' => 'c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-ctype' => array(
             'pretty_version' => 'v1.28.0',
             'version' => '1.28.0.0',
+            'reference' => 'ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'reference' => 'ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.28.0',
             'version' => '1.28.0.0',
+            'reference' => '42292d99c55abe617799667f454222c54c60e229',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
             'aliases' => array(),
-            'reference' => '42292d99c55abe617799667f454222c54c60e229',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php73' => array(
             'pretty_version' => 'v1.28.0',
             'version' => '1.28.0.0',
+            'reference' => 'fe2f306d1d9d346a7fee353d0d5012e401e984b5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php73',
             'aliases' => array(),
-            'reference' => 'fe2f306d1d9d346a7fee353d0d5012e401e984b5',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php80' => array(
             'pretty_version' => 'v1.28.0',
             'version' => '1.28.0.0',
+            'reference' => '6caa57379c4aec19c0a12a38b59b26487dcfe4b5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php80',
             'aliases' => array(),
-            'reference' => '6caa57379c4aec19c0a12a38b59b26487dcfe4b5',
             'dev_requirement' => false,
         ),
         'symfony/psr-http-message-bridge' => array(
             'pretty_version' => 'v2.3.1',
             'version' => '2.3.1.0',
+            'reference' => '581ca6067eb62640de5ff08ee1ba6850a0ee472e',
             'type' => 'symfony-bridge',
             'install_path' => __DIR__ . '/../symfony/psr-http-message-bridge',
             'aliases' => array(),
-            'reference' => '581ca6067eb62640de5ff08ee1ba6850a0ee472e',
             'dev_requirement' => false,
         ),
         'symfony/service-contracts' => array(
             'pretty_version' => 'v1.1.2',
             'version' => '1.1.2.0',
+            'reference' => '191afdcb5804db960d26d8566b7e9a2843cab3a0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/service-contracts',
             'aliases' => array(),
-            'reference' => '191afdcb5804db960d26d8566b7e9a2843cab3a0',
             'dev_requirement' => false,
         ),
         'symfony/var-exporter' => array(
-            'pretty_version' => 'v5.4.26',
-            'version' => '5.4.26.0',
+            'pretty_version' => 'v5.4.32',
+            'version' => '5.4.32.0',
+            'reference' => 'fdb022f0d3d41df240c18e2eb9a117c430f06add',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/var-exporter',
             'aliases' => array(),
-            'reference' => '11401fe94f960249b3c63a488c63ba73091c1e4a',
             'dev_requirement' => false,
         ),
         'symfony/yaml' => array(
             'pretty_version' => 'v2.8.52',
             'version' => '2.8.52.0',
+            'reference' => '02c1859112aa779d9ab394ae4f3381911d84052b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/yaml',
             'aliases' => array(),
-            'reference' => '02c1859112aa779d9ab394ae4f3381911d84052b',
+            'dev_requirement' => false,
+        ),
+        'tecnickcom/tcpdf' => array(
+            'pretty_version' => '6.6.5',
+            'version' => '6.6.5.0',
+            'reference' => '5fce932fcee4371865314ab7f6c0d85423c5c7ce',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../tecnickcom/tcpdf',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'topthink/framework' => array(
             'pretty_version' => 'v5.1.42',
             'version' => '5.1.42.0',
+            'reference' => 'ecf1a90d397d821ce2df58f7d47e798c17eba3ad',
             'type' => 'think-framework',
             'install_path' => __DIR__ . '/../../thinkphp',
             'aliases' => array(),
-            'reference' => 'ecf1a90d397d821ce2df58f7d47e798c17eba3ad',
             'dev_requirement' => false,
         ),
         'topthink/think-installer' => array(
             'pretty_version' => 'v2.0.5',
             'version' => '2.0.5.0',
+            'reference' => '38ba647706e35d6704b5d370c06f8a160b635f88',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../topthink/think-installer',
             'aliases' => array(),
-            'reference' => '38ba647706e35d6704b5d370c06f8a160b635f88',
             'dev_requirement' => false,
         ),
         'zoujingli/ip2region' => array(
             'pretty_version' => 'v1.0.13',
             'version' => '1.0.13.0',
+            'reference' => 'c02c74571ad665745e57db5d04efa165e543fade',
             'type' => 'library',
             'install_path' => __DIR__ . '/../zoujingli/ip2region',
             'aliases' => array(),
-            'reference' => 'c02c74571ad665745e57db5d04efa165e543fade',
             'dev_requirement' => false,
         ),
         'zoujingli/think-library' => array(
             'pretty_version' => 'v5.1.x-dev',
             'version' => '5.1.9999999.9999999-dev',
+            'reference' => '6a5c8b7ad40d19664494522dcf9388a48df43447',
             'type' => 'library',
             'install_path' => __DIR__ . '/../zoujingli/think-library',
             'aliases' => array(),
-            'reference' => '6a5c8b7ad40d19664494522dcf9388a48df43447',
             'dev_requirement' => false,
         ),
         'zoujingli/thinkadmin' => array(
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
+            'pretty_version' => '1.0.0+no-version-set',
+            'version' => '1.0.0.0',
+            'reference' => NULL,
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '0979d0b5931f7d8fb1d045e79b742882ce0d458f',
             'dev_requirement' => false,
         ),
         'zoujingli/wechat-developer' => array(
-            'pretty_version' => 'v1.2.49',
-            'version' => '1.2.49.0',
+            'pretty_version' => 'v1.2.53',
+            'version' => '1.2.53.0',
+            'reference' => 'cd5ff0228e8bc31e76c2ef753b1313008d8c520f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../zoujingli/wechat-developer',
             'aliases' => array(),
-            'reference' => '9becf988c98a2b3cff72dac0dc21b32cb61c66ef',
             'dev_requirement' => false,
         ),
         'zoujingli/weopen-developer' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+            'reference' => '85b50a1424de564080b9f17875482af8062e67a3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../zoujingli/weopen-developer',
             'aliases' => array(
                 0 => '9999999-dev',
             ),
-            'reference' => '85b50a1424de564080b9f17875482af8062e67a3',
             'dev_requirement' => false,
         ),
     ),

vendor/composer/platform_check.php

@@ -4,8 +4,8 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 70205)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70300)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {

vendor/guzzlehttp/guzzle/CHANGELOG.md

@@ -3,6 +3,14 @@
 Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
 
 
+## 7.8.1 - 2023-12-03
+
+### Changed
+
+- Updated links in docs to their canonical versions
+- Replaced `call_user_func*` with native calls
+
+
 ## 7.8.0 - 2023-08-27
 
 ### Added
@@ -643,7 +651,8 @@ object).
   * Note: This has been changed in 5.0.3 to now encode query string values by
     default unless the `rawString` argument is provided when setting the query
     string on a URL: Now allowing many more characters to be present in the
-    query string without being percent encoded. See https://tools.ietf.org/html/rfc3986#appendix-A
+    query string without being percent encoded. See
+    https://datatracker.ietf.org/doc/html/rfc3986#appendix-A
 
 
 ## 5.0.1 - 2014-10-16
@@ -1182,7 +1191,7 @@ interfaces.
 
 ## 3.4.0 - 2013-04-11
 
-* Bug fix: URLs are now resolved correctly based on https://tools.ietf.org/html/rfc3986#section-5.2. #289
+* Bug fix: URLs are now resolved correctly based on https://datatracker.ietf.org/doc/html/rfc3986#section-5.2. #289
 * Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
 * Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
 * Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.

vendor/guzzlehttp/guzzle/README.md

@@ -3,7 +3,7 @@
 # Guzzle, PHP HTTP client
 
 [![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases)
-[![Build Status](https://img.shields.io/github/workflow/status/guzzle/guzzle/CI?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/guzzle/guzzle/ci.yml?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI)
 [![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle)
 
 Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
@@ -66,7 +66,7 @@ composer require guzzlehttp/guzzle
 | 4.x     | EOL                 | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >=5.4,<7.0   |
 | 5.x     | EOL                 | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >=5.4,<7.4   |
 | 6.x     | Security fixes only | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >=5.5,<8.0   |
-| 7.x     | Latest              | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.3 |
+| 7.x     | Latest              | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.4 |
 
 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
 [guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x

vendor/guzzlehttp/guzzle/UPGRADING.md

@@ -189,11 +189,11 @@ $client = new GuzzleHttp\Client(['handler' => $handler]);
 
 ## POST Requests
 
-This version added the [`form_params`](http://guzzle.readthedocs.org/en/latest/request-options.html#form_params)
+This version added the [`form_params`](https://docs.guzzlephp.org/en/latest/request-options.html#form_params)
 and `multipart` request options. `form_params` is an associative array of
 strings or array of strings and is used to serialize an
 `application/x-www-form-urlencoded` POST request. The
-[`multipart`](http://guzzle.readthedocs.org/en/latest/request-options.html#multipart)
+[`multipart`](https://docs.guzzlephp.org/en/latest/request-options.html#multipart)
 option is now used to send a multipart/form-data POST request.
 
 `GuzzleHttp\Post\PostFile` has been removed. Use the `multipart` option to add
@@ -209,7 +209,7 @@ The `base_url` option has been renamed to `base_uri`.
 
 ## Rewritten Adapter Layer
 
-Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send
+Guzzle now uses [RingPHP](https://ringphp.readthedocs.org/en/latest) to send
 HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor
 is still supported, but it has now been renamed to `handler`. Instead of
 passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
@@ -575,7 +575,7 @@ You can intercept a request and inject a response using the `intercept()` event
 of a `GuzzleHttp\Event\BeforeEvent`, `GuzzleHttp\Event\CompleteEvent`, and
 `GuzzleHttp\Event\ErrorEvent` event.
 
-See: http://docs.guzzlephp.org/en/latest/events.html
+See: https://docs.guzzlephp.org/en/latest/events.html
 
 ## Inflection
 
@@ -668,9 +668,9 @@ in separate repositories:
 
 The service description layer of Guzzle has moved into two separate packages:
 
-- http://github.com/guzzle/command Provides a high level abstraction over web
+- https://github.com/guzzle/command Provides a high level abstraction over web
   services by representing web service operations using commands.
-- http://github.com/guzzle/guzzle-services Provides an implementation of
+- https://github.com/guzzle/guzzle-services Provides an implementation of
   guzzle/command that provides request serialization and response parsing using
   Guzzle service descriptions.
 
@@ -870,7 +870,7 @@ HeaderInterface (e.g. toArray(), getAll(), etc.).
 3.3 to 3.4
 ----------
 
-Base URLs of a client now follow the rules of https://tools.ietf.org/html/rfc3986#section-5.2.2 when merging URLs.
+Base URLs of a client now follow the rules of https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.2 when merging URLs.
 
 3.2 to 3.3
 ----------

vendor/guzzlehttp/guzzle/composer.json

@@ -63,10 +63,10 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "bamarni/composer-bin-plugin": "^1.8.1",
+        "bamarni/composer-bin-plugin": "^1.8.2",
         "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
         "php-http/message-factory": "^1.1",
-        "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+        "phpunit/phpunit": "^8.5.36 || ^9.6.15",
         "psr/log": "^1.1 || ^2.0 || ^3.0"
     },
     "suggest": {

vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php

@@ -243,7 +243,7 @@ class CookieJar implements CookieJarInterface
     /**
      * Computes cookie path following RFC 6265 section 5.1.4
      *
-     * @see https://tools.ietf.org/html/rfc6265#section-5.1.4
+     * @see https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.4
      */
     private function getCookiePathFromRequest(RequestInterface $request): string
     {

vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php

@@ -420,7 +420,7 @@ class SetCookie
         }
 
         // Remove the leading '.' as per spec in RFC 6265.
-        // https://tools.ietf.org/html/rfc6265#section-5.2.3
+        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.3
         $cookieDomain = \ltrim(\strtolower($cookieDomain), '.');
 
         $domain = \strtolower($domain);
@@ -431,7 +431,7 @@ class SetCookie
         }
 
         // Matching the subdomain according to RFC 6265.
-        // https://tools.ietf.org/html/rfc6265#section-5.1.3
+        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3
         if (\filter_var($domain, \FILTER_VALIDATE_IP)) {
             return false;
         }

vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php

@@ -256,7 +256,7 @@ class CurlFactory implements CurlFactoryInterface
 
         $method = $easy->request->getMethod();
         if ($method === 'PUT' || $method === 'POST') {
-            // See https://tools.ietf.org/html/rfc7230#section-3.3.2
+            // See https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.2
             if (!$easy->request->hasHeader('Content-Length')) {
                 $conf[\CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
             }

vendor/guzzlehttp/guzzle/src/RequestOptions.php

@@ -5,9 +5,7 @@ namespace GuzzleHttp;
 /**
  * This class contains a list of built-in Guzzle request options.
  *
- * More documentation for each option can be found at http://guzzlephp.org/.
- *
- * @see http://docs.guzzlephp.org/en/v6/request-options.html
+ * @see https://docs.guzzlephp.org/en/latest/request-options.html
  */
 final class RequestOptions
 {

vendor/guzzlehttp/guzzle/src/Utils.php

@@ -176,14 +176,13 @@ No system CA bundle could be found in any of the the common system locations.
 PHP versions earlier than 5.6 are not properly configured to use the system's
 CA bundle by default. In order to verify peer certificates, you will need to
 supply the path on disk to a certificate bundle to the 'verify' request
-option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
-need a specific certificate bundle, then Mozilla provides a commonly used CA
-bundle which can be downloaded here (provided by the maintainer of cURL):
-https://curl.haxx.se/ca/cacert.pem. Once
-you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
-ini setting to point to the path to the file, allowing you to omit the 'verify'
-request option. See https://curl.haxx.se/docs/sslcerts.html for more
-information.
+option: https://docs.guzzlephp.org/en/latest/request-options.html#verify. If
+you do not need a specific certificate bundle, then Mozilla provides a commonly
+used CA bundle which can be downloaded here (provided by the maintainer of
+cURL): https://curl.haxx.se/ca/cacert.pem. Once you have a CA bundle available
+on disk, you can set the 'openssl.cafile' PHP ini setting to point to the path
+to the file, allowing you to omit the 'verify' request option. See
+https://curl.haxx.se/docs/sslcerts.html for more information.
 EOT
         );
     }

vendor/guzzlehttp/psr7/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.6.2 - 2023-12-03
+
+### Fixed
+
+- Fixed another issue with the fact that PHP transforms numeric strings in array keys to ints
+
+### Changed
+
+- Updated links in docs to their canonical versions
+- Replaced `call_user_func*` with native calls
+
 ## 2.6.1 - 2023-08-27
 
 ### Fixed

vendor/guzzlehttp/psr7/README.md

@@ -273,7 +273,7 @@ class EofCallbackStream implements StreamInterface
 
         // Invoke the callback when EOF is hit.
         if ($this->eof()) {
-            call_user_func($this->callback);
+            ($this->callback)();
         }
 
         return $result;
@@ -637,7 +637,7 @@ this library also provides additional functionality when working with URIs as st
 An instance of `Psr\Http\Message\UriInterface` can either be an absolute URI or a relative reference.
 An absolute URI has a scheme. A relative reference is used to express a URI relative to another URI,
 the base URI. Relative references can be divided into several forms according to
-[RFC 3986 Section 4.2](https://tools.ietf.org/html/rfc3986#section-4.2):
+[RFC 3986 Section 4.2](https://datatracker.ietf.org/doc/html/rfc3986#section-4.2):
 
 - network-path references, e.g. `//example.com/path`
 - absolute-path references, e.g. `/path`
@@ -696,8 +696,8 @@ or the standard port. This method can be used independently of the implementatio
 `public static function composeComponents($scheme, $authority, $path, $query, $fragment): string`
 
 Composes a URI reference string from its various components according to
-[RFC 3986 Section 5.3](https://tools.ietf.org/html/rfc3986#section-5.3). Usually this method does not need to be called
-manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__toString`.
+[RFC 3986 Section 5.3](https://datatracker.ietf.org/doc/html/rfc3986#section-5.3). Usually this method does not need
+to be called manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__toString`.
 
 ### `GuzzleHttp\Psr7\Uri::fromParts`
 
@@ -741,8 +741,8 @@ Determines if a modified URL should be considered cross-origin with respect to a
 ## Reference Resolution
 
 `GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
-to [RFC 3986 Section 5](https://tools.ietf.org/html/rfc3986#section-5). This is for example also what web browsers
-do when resolving a link in a website based on the current request URI.
+to [RFC 3986 Section 5](https://datatracker.ietf.org/doc/html/rfc3986#section-5). This is for example also what web
+browsers do when resolving a link in a website based on the current request URI.
 
 ### `GuzzleHttp\Psr7\UriResolver::resolve`
 
@@ -755,7 +755,7 @@ Converts the relative URI into a new URI that is resolved against the base URI.
 `public static function removeDotSegments(string $path): string`
 
 Removes dot segments from a path and returns the new path according to
-[RFC 3986 Section 5.2.4](https://tools.ietf.org/html/rfc3986#section-5.2.4).
+[RFC 3986 Section 5.2.4](https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4).
 
 ### `GuzzleHttp\Psr7\UriResolver::relativize`
 
@@ -781,7 +781,7 @@ echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // pr
 ## Normalization and Comparison
 
 `GuzzleHttp\Psr7\UriNormalizer` provides methods to normalize and compare URIs according to
-[RFC 3986 Section 6](https://tools.ietf.org/html/rfc3986#section-6).
+[RFC 3986 Section 6](https://datatracker.ietf.org/doc/html/rfc3986#section-6).
 
 ### `GuzzleHttp\Psr7\UriNormalizer::normalize`
 

vendor/guzzlehttp/psr7/composer.json

@@ -60,9 +60,9 @@
         "psr/http-message-implementation": "1.0"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.8.1",
+        "bamarni/composer-bin-plugin": "^1.8.2",
         "http-interop/http-factory-tests": "^0.9",
-        "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+        "phpunit/phpunit": "^8.5.36 || ^9.6.15"
     },
     "suggest": {
         "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"

vendor/guzzlehttp/psr7/src/FnStream.php

@@ -54,7 +54,7 @@ final class FnStream implements StreamInterface
     public function __destruct()
     {
         if (isset($this->_fn_close)) {
-            call_user_func($this->_fn_close);
+            ($this->_fn_close)();
         }
     }
 
@@ -93,7 +93,8 @@ final class FnStream implements StreamInterface
     public function __toString(): string
     {
         try {
-            return call_user_func($this->_fn___toString);
+            /** @var string */
+            return ($this->_fn___toString)();
         } catch (\Throwable $e) {
             if (\PHP_VERSION_ID >= 70400) {
                 throw $e;
@@ -106,67 +107,67 @@ final class FnStream implements StreamInterface
 
     public function close(): void
     {
-        call_user_func($this->_fn_close);
+        ($this->_fn_close)();
     }
 
     public function detach()
     {
-        return call_user_func($this->_fn_detach);
+        return ($this->_fn_detach)();
     }
 
     public function getSize(): ?int
     {
-        return call_user_func($this->_fn_getSize);
+        return ($this->_fn_getSize)();
     }
 
     public function tell(): int
     {
-        return call_user_func($this->_fn_tell);
+        return ($this->_fn_tell)();
     }
 
     public function eof(): bool
     {
-        return call_user_func($this->_fn_eof);
+        return ($this->_fn_eof)();
     }
 
     public function isSeekable(): bool
     {
-        return call_user_func($this->_fn_isSeekable);
+        return ($this->_fn_isSeekable)();
     }
 
     public function rewind(): void
     {
-        call_user_func($this->_fn_rewind);
+        ($this->_fn_rewind)();
     }
 
     public function seek($offset, $whence = SEEK_SET): void
     {
-        call_user_func($this->_fn_seek, $offset, $whence);
+        ($this->_fn_seek)($offset, $whence);
     }
 
     public function isWritable(): bool
     {
-        return call_user_func($this->_fn_isWritable);
+        return ($this->_fn_isWritable)();
     }
 
     public function write($string): int
     {
-        return call_user_func($this->_fn_write, $string);
+        return ($this->_fn_write)($string);
     }
 
     public function isReadable(): bool
     {
-        return call_user_func($this->_fn_isReadable);
+        return ($this->_fn_isReadable)();
     }
 
     public function read($length): string
     {
-        return call_user_func($this->_fn_read, $length);
+        return ($this->_fn_read)($length);
     }
 
     public function getContents(): string
     {
-        return call_user_func($this->_fn_getContents);
+        return ($this->_fn_getContents)();
     }
 
     /**
@@ -174,6 +175,6 @@ final class FnStream implements StreamInterface
      */
     public function getMetadata($key = null)
     {
-        return call_user_func($this->_fn_getMetadata, $key);
+        return ($this->_fn_getMetadata)($key);
     }
 }

vendor/guzzlehttp/psr7/src/Header.php

@@ -22,7 +22,7 @@ final class Header
         foreach ((array) $header as $value) {
             foreach (self::splitList($value) as $val) {
                 $part = [];
-                foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
+                foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) ?: [] as $kvp) {
                     if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
                         $m = $matches[0];
                         if (isset($m[1])) {

vendor/guzzlehttp/psr7/src/InflateStream.php

@@ -13,9 +13,9 @@ use Psr\Http\Message\StreamInterface;
  * then appends the zlib.inflate filter. The stream is then converted back
  * to a Guzzle stream resource to be used as a Guzzle stream.
  *
- * @see http://tools.ietf.org/html/rfc1950
- * @see http://tools.ietf.org/html/rfc1952
- * @see http://php.net/manual/en/filters.compression.php
+ * @see https://datatracker.ietf.org/doc/html/rfc1950
+ * @see https://datatracker.ietf.org/doc/html/rfc1952
+ * @see https://www.php.net/manual/en/filters.compression.php
  */
 final class InflateStream implements StreamInterface
 {
@@ -28,7 +28,7 @@ final class InflateStream implements StreamInterface
     {
         $resource = StreamWrapper::getResource($stream);
         // Specify window=15+32, so zlib will use header detection to both gzip (with header) and zlib data
-        // See http://www.zlib.net/manual.html#Advanced definition of inflateInit2
+        // See https://www.zlib.net/manual.html#Advanced definition of inflateInit2
         // "Add 32 to windowBits to enable zlib and gzip decoding with automatic header detection"
         // Default window size is 15.
         stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ, ['window' => 15 + 32]);

vendor/guzzlehttp/psr7/src/Message.php

@@ -146,7 +146,7 @@ final class Message
 
         // If these aren't the same, then one line didn't match and there's an invalid header.
         if ($count !== substr_count($rawHeaders, "\n")) {
-            // Folding is deprecated, see https://tools.ietf.org/html/rfc7230#section-3.2.4
+            // Folding is deprecated, see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.4
             if (preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) {
                 throw new \InvalidArgumentException('Invalid header syntax: Obsolete line folding');
             }
@@ -227,9 +227,9 @@ final class Message
     public static function parseResponse(string $message): ResponseInterface
     {
         $data = self::parseMessage($message);
-        // According to https://tools.ietf.org/html/rfc7230#section-3.1.2 the space
-        // between status-code and reason-phrase is required. But browsers accept
-        // responses without space and reason as well.
+        // According to https://datatracker.ietf.org/doc/html/rfc7230#section-3.1.2
+        // the space between status-code and reason-phrase is required. But
+        // browsers accept responses without space and reason as well.
         if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
             throw new \InvalidArgumentException('Invalid response string: '.$data['start-line']);
         }

vendor/guzzlehttp/psr7/src/MessageTrait.php

@@ -141,7 +141,7 @@ trait MessageTrait
     }
 
     /**
-     * @param array<string|int, string|string[]> $headers
+     * @param (string|string[])[] $headers
      */
     private function setHeaders(array $headers): void
     {
@@ -193,7 +193,7 @@ trait MessageTrait
      *
      * @return string[] Trimmed header values
      *
-     * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
+     * @see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.4
      */
     private function trimAndValidateHeaderValues(array $values): array
     {
@@ -213,7 +213,7 @@ trait MessageTrait
     }
 
     /**
-     * @see https://tools.ietf.org/html/rfc7230#section-3.2
+     * @see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
      *
      * @param mixed $header
      */
@@ -234,7 +234,7 @@ trait MessageTrait
     }
 
     /**
-     * @see https://tools.ietf.org/html/rfc7230#section-3.2
+     * @see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
      *
      * field-value    = *( field-content / obs-fold )
      * field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]

vendor/guzzlehttp/psr7/src/MultipartStream.php

@@ -51,7 +51,7 @@ final class MultipartStream implements StreamInterface
     /**
      * Get the headers needed before transferring the content of a POST file
      *
-     * @param array<string, string> $headers
+     * @param string[] $headers
      */
     private function getHeaders(array $headers): string
     {
@@ -112,10 +112,15 @@ final class MultipartStream implements StreamInterface
         $stream->addStream(Utils::streamFor("\r\n"));
     }
 
+    /**
+     * @param string[] $headers
+     *
+     * @return array{0: StreamInterface, 1: string[]}
+     */
     private function createElement(string $name, StreamInterface $stream, ?string $filename, array $headers): array
     {
         // Set a default content-disposition header if one was no provided
-        $disposition = $this->getHeader($headers, 'content-disposition');
+        $disposition = self::getHeader($headers, 'content-disposition');
         if (!$disposition) {
             $headers['Content-Disposition'] = ($filename === '0' || $filename)
                 ? sprintf(
@@ -127,7 +132,7 @@ final class MultipartStream implements StreamInterface
         }
 
         // Set a default content-length header if one was no provided
-        $length = $this->getHeader($headers, 'content-length');
+        $length = self::getHeader($headers, 'content-length');
         if (!$length) {
             if ($length = $stream->getSize()) {
                 $headers['Content-Length'] = (string) $length;
@@ -135,7 +140,7 @@ final class MultipartStream implements StreamInterface
         }
 
         // Set a default Content-Type if one was not supplied
-        $type = $this->getHeader($headers, 'content-type');
+        $type = self::getHeader($headers, 'content-type');
         if (!$type && ($filename === '0' || $filename)) {
             $headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream';
         }
@@ -143,11 +148,14 @@ final class MultipartStream implements StreamInterface
         return [$stream, $headers];
     }
 
-    private function getHeader(array $headers, string $key)
+    /**
+     * @param string[] $headers
+     */
+    private static function getHeader(array $headers, string $key): ?string
     {
         $lowercaseHeader = strtolower($key);
         foreach ($headers as $k => $v) {
-            if (strtolower($k) === $lowercaseHeader) {
+            if (strtolower((string) $k) === $lowercaseHeader) {
                 return $v;
             }
         }

vendor/guzzlehttp/psr7/src/PumpStream.php

@@ -18,7 +18,7 @@ use Psr\Http\Message\StreamInterface;
  */
 final class PumpStream implements StreamInterface
 {
-    /** @var callable|null */
+    /** @var callable(int): (string|false|null)|null */
     private $source;
 
     /** @var int|null */
@@ -163,9 +163,9 @@ final class PumpStream implements StreamInterface
 
     private function pump(int $length): void
     {
-        if ($this->source) {
+        if ($this->source !== null) {
             do {
-                $data = call_user_func($this->source, $length);
+                $data = ($this->source)($length);
                 if ($data === false || $data === null) {
                     $this->source = null;
 

vendor/guzzlehttp/psr7/src/Request.php

@@ -28,7 +28,7 @@ class Request implements RequestInterface
     /**
      * @param string                               $method  HTTP method
      * @param string|UriInterface                  $uri     URI
-     * @param array<string, string|string[]>       $headers Request headers
+     * @param (string|string[])[]                  $headers Request headers
      * @param string|resource|StreamInterface|null $body    Request body
      * @param string                               $version Protocol version
      */
@@ -143,7 +143,7 @@ class Request implements RequestInterface
             $this->headerNames['host'] = 'Host';
         }
         // Ensure Host is the first header.
-        // See: http://tools.ietf.org/html/rfc7230#section-5.4
+        // See: https://datatracker.ietf.org/doc/html/rfc7230#section-5.4
         $this->headers = [$header => [$host]] + $this->headers;
     }
 

vendor/guzzlehttp/psr7/src/Response.php

@@ -86,7 +86,7 @@ class Response implements ResponseInterface
 
     /**
      * @param int                                  $status  Status code
-     * @param array<string, string|string[]>       $headers Response headers
+     * @param (string|string[])[]                  $headers Response headers
      * @param string|resource|StreamInterface|null $body    Response body
      * @param string                               $version Protocol version
      * @param string|null                          $reason  Reason phrase (when empty a default will be used based on the status code)

vendor/guzzlehttp/psr7/src/ServerRequest.php

@@ -59,7 +59,7 @@ class ServerRequest extends Request implements ServerRequestInterface
     /**
      * @param string                               $method       HTTP method
      * @param string|UriInterface                  $uri          URI
-     * @param array<string, string|string[]>       $headers      Request headers
+     * @param (string|string[])[]                  $headers      Request headers
      * @param string|resource|StreamInterface|null $body         Request body
      * @param string                               $version      Protocol version
      * @param array                                $serverParams Typically the $_SERVER superglobal

vendor/guzzlehttp/psr7/src/Stream.php

@@ -12,8 +12,8 @@ use Psr\Http\Message\StreamInterface;
 class Stream implements StreamInterface
 {
     /**
-     * @see http://php.net/manual/function.fopen.php
-     * @see http://php.net/manual/en/function.gzopen.php
+     * @see https://www.php.net/manual/en/function.fopen.php
+     * @see https://www.php.net/manual/en/function.gzopen.php
      */
     private const READABLE_MODES = '/r|a\+|ab\+|w\+|wb\+|x\+|xb\+|c\+|cb\+/';
     private const WRITABLE_MODES = '/a|w|r\+|rb\+|rw|x|c/';

vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php

@@ -70,7 +70,7 @@ trait StreamDecoratorTrait
     {
         /** @var callable $callable */
         $callable = [$this->stream, $method];
-        $result = call_user_func_array($callable, $args);
+        $result = ($callable)(...$args);
 
         // Always return the wrapped object if the result is a return $this
         return $result === $this->stream ? $this : $result;

vendor/guzzlehttp/psr7/src/StreamWrapper.php

@@ -122,7 +122,21 @@ final class StreamWrapper
     }
 
     /**
-     * @return array<int|string, int>
+     * @return array{
+     *   dev: int,
+     *   ino: int,
+     *   mode: int,
+     *   nlink: int,
+     *   uid: int,
+     *   gid: int,
+     *   rdev: int,
+     *   size: int,
+     *   atime: int,
+     *   mtime: int,
+     *   ctime: int,
+     *   blksize: int,
+     *   blocks: int
+     * }
      */
     public function stream_stat(): array
     {
@@ -152,7 +166,21 @@ final class StreamWrapper
     }
 
     /**
-     * @return array<int|string, int>
+     * @return array{
+     *   dev: int,
+     *   ino: int,
+     *   mode: int,
+     *   nlink: int,
+     *   uid: int,
+     *   gid: int,
+     *   rdev: int,
+     *   size: int,
+     *   atime: int,
+     *   mtime: int,
+     *   ctime: int,
+     *   blksize: int,
+     *   blocks: int
+     * }
      */
     public function url_stat(string $path, int $flags): array
     {

vendor/guzzlehttp/psr7/src/UploadedFile.php

@@ -113,7 +113,7 @@ class UploadedFile implements UploadedFileInterface
         $this->error = $error;
     }
 
-    private function isStringNotEmpty($param): bool
+    private static function isStringNotEmpty($param): bool
     {
         return is_string($param) && false === empty($param);
     }
@@ -163,7 +163,7 @@ class UploadedFile implements UploadedFileInterface
     {
         $this->validateActive();
 
-        if (false === $this->isStringNotEmpty($targetPath)) {
+        if (false === self::isStringNotEmpty($targetPath)) {
             throw new InvalidArgumentException(
                 'Invalid path provided for move operation; must be a non-empty string'
             );

vendor/guzzlehttp/psr7/src/Uri.php

@@ -41,14 +41,14 @@ class Uri implements UriInterface, \JsonSerializable
     /**
      * Unreserved characters for use in a regex.
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-2.3
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-2.3
      */
     private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
 
     /**
      * Sub-delims for use in a regex.
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-2.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-2.2
      */
     private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
     private const QUERY_SEPARATORS_REPLACEMENT = ['=' => '%3D', '&' => '%26'];
@@ -162,7 +162,7 @@ class Uri implements UriInterface, \JsonSerializable
      * `file:///` is the more common syntax for the file scheme anyway (Chrome for example redirects to
      * that format).
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-5.3
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.3
      */
     public static function composeComponents(?string $scheme, ?string $authority, string $path, ?string $query, ?string $fragment): string
     {
@@ -219,7 +219,7 @@ class Uri implements UriInterface, \JsonSerializable
      * @see Uri::isNetworkPathReference
      * @see Uri::isAbsolutePathReference
      * @see Uri::isRelativePathReference
-     * @see https://tools.ietf.org/html/rfc3986#section-4
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4
      */
     public static function isAbsolute(UriInterface $uri): bool
     {
@@ -231,7 +231,7 @@ class Uri implements UriInterface, \JsonSerializable
      *
      * A relative reference that begins with two slash characters is termed an network-path reference.
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.2
      */
     public static function isNetworkPathReference(UriInterface $uri): bool
     {
@@ -243,7 +243,7 @@ class Uri implements UriInterface, \JsonSerializable
      *
      * A relative reference that begins with a single slash character is termed an absolute-path reference.
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.2
      */
     public static function isAbsolutePathReference(UriInterface $uri): bool
     {
@@ -258,7 +258,7 @@ class Uri implements UriInterface, \JsonSerializable
      *
      * A relative reference that does not begin with a slash character is termed a relative-path reference.
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.2
      */
     public static function isRelativePathReference(UriInterface $uri): bool
     {
@@ -277,7 +277,7 @@ class Uri implements UriInterface, \JsonSerializable
      * @param UriInterface      $uri  The URI to check
      * @param UriInterface|null $base An optional base URI to compare against
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-4.4
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.4
      */
     public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool
     {
@@ -336,8 +336,8 @@ class Uri implements UriInterface, \JsonSerializable
      *
      * It has the same behavior as withQueryValue() but for an associative array of key => value.
      *
-     * @param UriInterface               $uri           URI to use as a base.
-     * @param array<string, string|null> $keyValueArray Associative array of key and values
+     * @param UriInterface    $uri           URI to use as a base.
+     * @param (string|null)[] $keyValueArray Associative array of key and values
      */
     public static function withQueryValues(UriInterface $uri, array $keyValueArray): UriInterface
     {
@@ -353,7 +353,7 @@ class Uri implements UriInterface, \JsonSerializable
     /**
      * Creates a URI from a hash of `parse_url` components.
      *
-     * @see http://php.net/manual/en/function.parse-url.php
+     * @see https://www.php.net/manual/en/function.parse-url.php
      *
      * @throws MalformedUriException If the components do not form a valid URI.
      */
@@ -638,7 +638,7 @@ class Uri implements UriInterface, \JsonSerializable
     }
 
     /**
-     * @param string[] $keys
+     * @param (string|int)[] $keys
      *
      * @return string[]
      */
@@ -650,7 +650,9 @@ class Uri implements UriInterface, \JsonSerializable
             return [];
         }
 
-        $decodedKeys = array_map('rawurldecode', $keys);
+        $decodedKeys = array_map(function ($k): string {
+            return rawurldecode((string) $k);
+        }, $keys);
 
         return array_filter(explode('&', $current), function ($part) use ($decodedKeys) {
             return !in_array(rawurldecode(explode('=', $part)[0]), $decodedKeys, true);

vendor/guzzlehttp/psr7/src/UriNormalizer.php

@@ -11,7 +11,7 @@ use Psr\Http\Message\UriInterface;
  *
  * @author Tobias Schultze
  *
- * @see https://tools.ietf.org/html/rfc3986#section-6
+ * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6
  */
 final class UriNormalizer
 {
@@ -119,7 +119,7 @@ final class UriNormalizer
      * @param UriInterface $uri   The URI to normalize
      * @param int          $flags A bitmask of normalizations to apply, see constants
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-6.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.2
      */
     public static function normalize(UriInterface $uri, int $flags = self::PRESERVING_NORMALIZATIONS): UriInterface
     {
@@ -174,7 +174,7 @@ final class UriNormalizer
      * @param UriInterface $uri2           An URI to compare
      * @param int          $normalizations A bitmask of normalizations to apply, see constants
      *
-     * @see https://tools.ietf.org/html/rfc3986#section-6.1
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.1
      */
     public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool
     {
@@ -185,7 +185,7 @@ final class UriNormalizer
     {
         $regex = '/(?:%[A-Fa-f0-9]{2})++/';
 
-        $callback = function (array $match) {
+        $callback = function (array $match): string {
             return strtoupper($match[0]);
         };
 
@@ -201,7 +201,7 @@ final class UriNormalizer
     {
         $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
 
-        $callback = function (array $match) {
+        $callback = function (array $match): string {
             return rawurldecode($match[0]);
         };
 

vendor/guzzlehttp/psr7/src/UriResolver.php

@@ -11,14 +11,14 @@ use Psr\Http\Message\UriInterface;
  *
  * @author Tobias Schultze
  *
- * @see https://tools.ietf.org/html/rfc3986#section-5
+ * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5
  */
 final class UriResolver
 {
     /**
      * Removes dot segments from a path and returns the new path.
      *
-     * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4
      */
     public static function removeDotSegments(string $path): string
     {
@@ -53,7 +53,7 @@ final class UriResolver
     /**
      * Converts the relative URI into a new URI that is resolved against the base URI.
      *
-     * @see http://tools.ietf.org/html/rfc3986#section-5.2
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2
      */
     public static function resolve(UriInterface $base, UriInterface $rel): UriInterface
     {

vendor/guzzlehttp/psr7/src/Utils.php

@@ -14,18 +14,18 @@ final class Utils
     /**
      * Remove the items given by the keys, case insensitively from the data.
      *
-     * @param string[] $keys
+     * @param (string|int)[] $keys
      */
     public static function caselessRemove(array $keys, array $data): array
     {
         $result = [];
 
         foreach ($keys as &$key) {
-            $key = strtolower($key);
+            $key = strtolower((string) $key);
         }
 
         foreach ($data as $k => $v) {
-            if (!is_string($k) || !in_array(strtolower($k), $keys)) {
+            if (!in_array(strtolower((string) $k), $keys)) {
                 $result[$k] = $v;
             }
         }

vendor/monolog/monolog/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.9.2 (2023-10-27)
+
+  * Fixed display_errors parsing in ErrorHandler which did not support string values (#1804)
+  * Fixed bug where the previous error handler would not be restored in some cases where StreamHandler fails (#1815)
+  * Fixed normalization error when normalizing incomplete classes (#1833)
+
 ### 2.9.1 (2023-02-06)
 
   * Fixed Logger not being serializable anymore (#1792)

vendor/monolog/monolog/src/Monolog/ErrorHandler.php

@@ -198,7 +198,7 @@ class ErrorHandler
             ($this->previousExceptionHandler)($e);
         }
 
-        if (!headers_sent() && !ini_get('display_errors')) {
+        if (!headers_sent() && in_array(strtolower((string) ini_get('display_errors')), ['0', '', 'false', 'off', 'none', 'no'], true)) {
             http_response_code(500);
         }
 

vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php

@@ -155,7 +155,7 @@ class LineFormatter extends NormalizerFormatter
             do {
                 $depth++;
                 if ($depth > $this->maxNormalizeDepth) {
-                    $str .= '\n[previous exception] Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
+                    $str .= "\n[previous exception] Over " . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
                     break;
                 }
 

vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php

@@ -174,6 +174,9 @@ class NormalizerFormatter implements FormatterInterface
             if ($data instanceof \JsonSerializable) {
                 /** @var null|scalar|array<array|scalar|null> $value */
                 $value = $data->jsonSerialize();
+            } elseif (\get_class($data) === '__PHP_Incomplete_Class') {
+                $accessor = new \ArrayObject($data);
+                $value = (string) $accessor['__PHP_Incomplete_Class_Name'];
             } elseif (method_exists($data, '__toString')) {
                 /** @var string $value */
                 $value = $data->__toString();

vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php

@@ -135,11 +135,14 @@ class StreamHandler extends AbstractProcessingHandler
             $this->createDir($url);
             $this->errorMessage = null;
             set_error_handler([$this, 'customErrorHandler']);
-            $stream = fopen($url, 'a');
-            if ($this->filePermission !== null) {
-                @chmod($url, $this->filePermission);
+            try {
+                $stream = fopen($url, 'a');
+                if ($this->filePermission !== null) {
+                    @chmod($url, $this->filePermission);
+                }
+            } finally {
+                restore_error_handler();
             }
-            restore_error_handler();
             if (!is_resource($stream)) {
                 $this->stream = null;
 

vendor/myclabs/php-enum/README.md

@@ -1,9 +1,9 @@
 # PHP Enum implementation inspired from SplEnum
 
-[![Build Status](https://travis-ci.org/myclabs/php-enum.png?branch=master)](https://travis-ci.org/myclabs/php-enum)
+[![GitHub Actions][GA Image]][GA Link]
 [![Latest Stable Version](https://poser.pugx.org/myclabs/php-enum/version.png)](https://packagist.org/packages/myclabs/php-enum)
 [![Total Downloads](https://poser.pugx.org/myclabs/php-enum/downloads.png)](https://packagist.org/packages/myclabs/php-enum)
-[![psalm](https://shepherd.dev/github/myclabs/php-enum/coverage.svg)](https://shepherd.dev/github/myclabs/php-enum)
+[![Psalm Shepherd][Shepherd Image]][Shepherd Link]
 
 Maintenance for this project is [supported via Tidelift](https://tidelift.com/subscription/pkg/packagist-myclabs-php-enum?utm_source=packagist-myclabs-php-enum&utm_medium=referral&utm_campaign=readme).
 
@@ -35,7 +35,7 @@ use MyCLabs\Enum\Enum;
 /**
  * Action enum
  */
-class Action extends Enum
+final class Action extends Enum
 {
     private const VIEW = 'view';
     private const EDIT = 'edit';
@@ -50,6 +50,8 @@ $action = Action::VIEW();
 // or with a dynamic key:
 $action = Action::$key();
 // or with a dynamic value:
+$action = Action::from($value);
+// or
 $action = new Action($value);
 ```
 
@@ -73,17 +75,19 @@ function setAction(Action $action) {
 
 Static methods:
 
+- `from()` Creates an Enum instance, checking that the value exist in the enum
 - `toArray()` method Returns all possible values as an array (constant name in key, constant value in value)
 - `keys()` Returns the names (keys) of all constants in the Enum class
 - `values()` Returns instances of the Enum class of all Enum constants (constant name in key, Enum instance in value)
 - `isValid()` Check if tested value is valid on enum set
 - `isValidKey()` Check if tested key is valid on enum set
+- `assertValidValue()` Assert the value is valid on enum set, throwing exception otherwise
 - `search()` Return key for searched value
 
 ### Static methods
 
 ```php
-class Action extends Enum
+final class Action extends Enum
 {
     private const VIEW = 'view';
     private const EDIT = 'edit';
@@ -99,7 +103,7 @@ Static method helpers are implemented using [`__callStatic()`](http://www.php.ne
 If you care about IDE autocompletion, you can either implement the static methods yourself:
 
 ```php
-class Action extends Enum
+final class Action extends Enum
 {
     private const VIEW = 'view';
 
@@ -119,16 +123,72 @@ or you can use phpdoc (this is supported in PhpStorm for example):
  * @method static Action VIEW()
  * @method static Action EDIT()
  */
-class Action extends Enum
+final class Action extends Enum
 {
     private const VIEW = 'view';
     private const EDIT = 'edit';
 }
 ```
 
+## Native enums and migration
+Native enum arrived to PHP in version 8.1: https://www.php.net/enumerations  
+If your project is running PHP 8.1+ or your library has it as a minimum requirement you should use it instead of this library.
+
+When migrating from `myclabs/php-enum`, the effort should be small if the usage was in the recommended way:
+- private constants
+- final classes
+- no method overridden
+
+Changes for migration:
+- Class definition should be changed from
+```php
+/**
+ * @method static Action VIEW()
+ * @method static Action EDIT()
+ */
+final class Action extends Enum
+{
+    private const VIEW = 'view';
+    private const EDIT = 'edit';
+}
+```
+ to
+```php
+enum Action: string
+{
+    case VIEW = 'view';
+    case EDIT = 'edit';
+}
+```
+All places where the class was used as a type will continue to work.
+
+Usages and the change needed:
+
+| Operation                                                      | myclabs/php-enum                                                           | native enum                                                                                                                                                                                                                              |
+|----------------------------------------------------------------|----------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Obtain an instance will change from                            | `$enumCase = Action::VIEW()`                                               | `$enumCase = Action::VIEW`                                                                                                                                                                                                               |
+| Create an enum from a backed value                             | `$enumCase = new Action('view')`                                           | `$enumCase = Action::from('view')`                                                                                                                                                                                                       |
+| Get the backed value of the enum instance                      | `$enumCase->getValue()`                                                    | `$enumCase->value`                                                                                                                                                                                                                       |
+| Compare two enum instances                                     | `$enumCase1 == $enumCase2` <br/> or <br/> `$enumCase1->equals($enumCase2)` | `$enumCase1 === $enumCase2`                                                                                                                                                                                                              |
+| Get the key/name of the enum instance                          | `$enumCase->getKey()`                                                      | `$enumCase->name`                                                                                                                                                                                                                        |
+| Get a list of all the possible instances of the enum           | `Action::values()`                                                         | `Action::cases()`                                                                                                                                                                                                                        |
+| Get a map of possible instances of the enum mapped by name     | `Action::values()`                                                         | `array_combine(array_map(fn($case) => $case->name, Action::cases()), Action::cases())` <br/> or <br/> `(new ReflectionEnum(Action::class))->getConstants()`                                                                              |
+| Get a list of all possible names of the enum                   | `Action::keys()`                                                           | `array_map(fn($case) => $case->name, Action::cases())`                                                                                                                                                                                   |
+| Get a list of all possible backed values of the enum           | `Action::toArray()`                                                        | `array_map(fn($case) => $case->value, Action::cases())`                                                                                                                                                                                  |
+| Get a map of possible backed values of the enum mapped by name | `Action::toArray()`                                                        | `array_combine(array_map(fn($case) => $case->name, Action::cases()), array_map(fn($case) => $case->value, Action::cases()))` <br/> or <br/> `array_map(fn($case) => $case->value, (new ReflectionEnum(Action::class))->getConstants()))` |
+
 ## Related projects
 
+- [PHP 8.1+ native enum](https://www.php.net/enumerations)
 - [Doctrine enum mapping](https://github.com/acelaya/doctrine-enum-type)
 - [Symfony ParamConverter integration](https://github.com/Ex3v/MyCLabsEnumParamConverter)
 - [PHPStan integration](https://github.com/timeweb/phpstan-enum)
-- [Yii2 enum mapping](https://github.com/KartaviK/yii2-enum)
+
+
+[GA Image]: https://github.com/myclabs/php-enum/workflows/CI/badge.svg
+
+[GA Link]: https://github.com/myclabs/php-enum/actions?query=workflow%3A%22CI%22+branch%3Amaster
+
+[Shepherd Image]: https://shepherd.dev/github/myclabs/php-enum/coverage.svg
+
+[Shepherd Link]: https://shepherd.dev/github/myclabs/php-enum

vendor/myclabs/php-enum/composer.json

@@ -14,7 +14,10 @@
     "autoload": {
         "psr-4": {
             "MyCLabs\\Enum\\": "src/"
-        }
+        },
+        "classmap": [
+            "stubs/Stringable.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -22,12 +25,12 @@
         }
     },
     "require": {
-        "php": ">=7.1",
+        "php": "^7.3 || ^8.0",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "1.*",
-        "vimeo/psalm": "^3.8"
+        "vimeo/psalm": "^4.6.2"
     }
 }

vendor/myclabs/php-enum/psalm.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    totallyTyped="true"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-            <directory name="src/PHPUnit" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <MixedAssignment errorLevel="info" />
-    </issueHandlers>
-</psalm>

vendor/myclabs/php-enum/src/Enum.php

@@ -17,8 +17,9 @@ namespace MyCLabs\Enum;
  *
  * @psalm-template T
  * @psalm-immutable
+ * @psalm-consistent-constructor
  */
-abstract class Enum implements \JsonSerializable
+abstract class Enum implements \JsonSerializable, \Stringable
 {
     /**
      * Enum value
@@ -29,6 +30,13 @@ abstract class Enum implements \JsonSerializable
     protected $value;
 
     /**
+     * Enum key, the constant name
+     *
+     * @var string
+     */
+    private $key;
+
+    /**
      * Store existing constants in a static cache per object.
      *
      *
@@ -51,7 +59,7 @@ abstract class Enum implements \JsonSerializable
      * @psalm-pure
      * @param mixed $value
      *
-     * @psalm-param static<T>|T $value
+     * @psalm-param T $value
      * @throws \UnexpectedValueException if incompatible type is given.
      */
     public function __construct($value)
@@ -61,16 +69,41 @@ abstract class Enum implements \JsonSerializable
             $value = $value->getValue();
         }
 
-        if (!$this->isValid($value)) {
-            /** @psalm-suppress InvalidCast */
-            throw new \UnexpectedValueException("Value '$value' is not part of the enum " . static::class);
-        }
+        /** @psalm-suppress ImplicitToStringCast assertValidValueReturningKey returns always a string but psalm has currently an issue here */
+        $this->key = static::assertValidValueReturningKey($value);
 
         /** @psalm-var T */
         $this->value = $value;
     }
 
     /**
+     * This method exists only for the compatibility reason when deserializing a previously serialized version
+     * that didn't had the key property
+     */
+    public function __wakeup()
+    {
+        /** @psalm-suppress DocblockTypeContradiction key can be null when deserializing an enum without the key */
+        if ($this->key === null) {
+            /**
+             * @psalm-suppress InaccessibleProperty key is not readonly as marked by psalm
+             * @psalm-suppress PossiblyFalsePropertyAssignmentValue deserializing a case that was removed
+             */
+            $this->key = static::search($this->value);
+        }
+    }
+
+    /**
+     * @param mixed $value
+     * @return static
+     */
+    public static function from($value): self
+    {
+        $key = static::assertValidValueReturningKey($value);
+
+        return self::__callStatic($key, []);
+    }
+
+    /**
      * @psalm-pure
      * @return mixed
      * @psalm-return T
@@ -84,11 +117,11 @@ abstract class Enum implements \JsonSerializable
      * Returns the enum key (i.e. the constant name).
      *
      * @psalm-pure
-     * @return mixed
+     * @return string
      */
     public function getKey()
     {
-        return static::search($this->value);
+        return $this->key;
     }
 
     /**
@@ -163,7 +196,9 @@ abstract class Enum implements \JsonSerializable
         $class = static::class;
 
         if (!isset(static::$cache[$class])) {
+            /** @psalm-suppress ImpureMethodCall this reflection API usage has no side-effects here */
             $reflection            = new \ReflectionClass($class);
+            /** @psalm-suppress ImpureMethodCall this reflection API usage has no side-effects here */
             static::$cache[$class] = $reflection->getConstants();
         }
 
@@ -176,6 +211,7 @@ abstract class Enum implements \JsonSerializable
      * @param $value
      * @psalm-param mixed $value
      * @psalm-pure
+     * @psalm-assert-if-true T $value
      * @return bool
      */
     public static function isValid($value)
@@ -184,6 +220,35 @@ abstract class Enum implements \JsonSerializable
     }
 
     /**
+     * Asserts valid enum value
+     *
+     * @psalm-pure
+     * @psalm-assert T $value
+     * @param mixed $value
+     */
+    public static function assertValidValue($value): void
+    {
+        self::assertValidValueReturningKey($value);
+    }
+
+    /**
+     * Asserts valid enum value
+     *
+     * @psalm-pure
+     * @psalm-assert T $value
+     * @param mixed $value
+     * @return string
+     */
+    private static function assertValidValueReturningKey($value): string
+    {
+        if (false === ($key = static::search($value))) {
+            throw new \UnexpectedValueException("Value '$value' is not part of the enum " . static::class);
+        }
+
+        return $key;
+    }
+
+    /**
      * Check if is valid enum key
      *
      * @param $key
@@ -201,11 +266,11 @@ abstract class Enum implements \JsonSerializable
     /**
      * Return key for value
      *
-     * @param $value
+     * @param mixed $value
      *
      * @psalm-param mixed $value
      * @psalm-pure
-     * @return mixed
+     * @return string|false
      */
     public static function search($value)
     {
@@ -220,6 +285,8 @@ abstract class Enum implements \JsonSerializable
      *
      * @return static
      * @throws \BadMethodCallException
+     *
+     * @psalm-pure
      */
     public static function __callStatic($name, $arguments)
     {
@@ -243,6 +310,7 @@ abstract class Enum implements \JsonSerializable
      * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
      * @psalm-pure
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getValue();

vendor/myclabs/php-enum/stubs/Stringable.php

@@ -0,0 +1,11 @@
+<?php
+
+if (\PHP_VERSION_ID < 80000 && !interface_exists('Stringable')) {
+    interface Stringable
+    {
+        /**
+         * @return string
+         */
+        public function __toString();
+    }
+}

vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php

@@ -0,0 +1,226 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer' . preg_replace('~\W~', '-', __DIR__))
+    ->setRules([
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'backtick_to_shell_exec' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_after_namespace' => true,
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => true,
+        'braces' => true,
+        'cast_spaces' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
+        'class_definition' => false,
+        'class_keyword_remove' => false, // ::class keyword gives us better support in IDE
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'combine_nested_dirname' => true,
+        'comment_to_phpdoc' => false, // interferes with annotations
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'constant_case' => true,
+        'date_time_immutable' => false, // Break our unit tests
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false, // Too early to adopt strict types
+        'dir_constant' => true,
+        'doctrine_annotation_array_assignment' => true,
+        'doctrine_annotation_braces' => true,
+        'doctrine_annotation_indentation' => true,
+        'doctrine_annotation_spaces' => true,
+        'elseif' => true,
+        'encoding' => true,
+        'ereg_to_preg' => true,
+        'escape_implicit_backslashes' => true,
+        'explicit_indirect_variable' => false, // I feel it makes the code actually harder to read
+        'explicit_string_variable' => false, // I feel it makes the code actually harder to read
+        'final_class' => false, // We need non-final classes
+        'final_internal_class' => true,
+        'final_public_method_for_abstract_class' => false, // We need non-final methods
+        'self_static_accessor' => true,
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'full_opening_tag' => true,
+        'fully_qualified_strict_types' => true,
+        'function_declaration' => true,
+        'function_to_constant' => true,
+        'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright']],
+        'global_namespace_import' => true,
+        'header_comment' => false, // We don't use common header in all our files
+        'heredoc_indentation' => false, // Requires PHP >= 7.3
+        'heredoc_to_nowdoc' => false, // Not sure about this one
+        'implode_call' => true,
+        'include' => true,
+        'increment_style' => true,
+        'indentation_type' => true,
+        'is_null' => true,
+        'line_ending' => true,
+        'linebreak_after_opening_tag' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'logical_operators' => true,
+        'lowercase_cast' => true,
+        'lowercase_keywords' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
+        'mb_str_functions' => false, // No, too dangerous to change that
+        'method_argument_space' => true,
+        'method_chaining_indentation' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'native_constant_invocation' => false, // Micro optimization that look messy
+        'native_function_casing' => true,
+        'native_function_invocation' => false, // I suppose this would be best, but I am still unconvinced about the visual aspect of it
+        'native_function_type_declaration_casing' => true,
+        'new_with_braces' => true,
+        'no_alias_functions' => true,
+        'no_alternative_syntax' => true,
+        'no_binary_string' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_blank_lines_before_namespace' => false, // we want 1 blank line before namespace
+        'no_break_comment' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => true,
+        'no_homoglyph_names' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_short_bool_cast' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_around_offset' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_superfluous_elseif' => false, // Might be risky on a huge code base
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unneeded_curly_braces' => true,
+        'no_unneeded_final_method' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unset_cast' => true,
+        'no_unset_on_property' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'non_printable_character' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
+        'not_operator_with_successor_space' => false, // idem
+        'nullable_type_declaration_for_default_null_value' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => false, // We prefer to keep some freedom
+        'ordered_imports' => true,
+        'ordered_interfaces' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_expectation' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_internal_class' => false, // Because tests are excluded from package
+        'php_unit_method_casing' => true,
+        'php_unit_mock' => true,
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_namespaced' => true,
+        'php_unit_no_expectation_annotation' => true,
+        'phpdoc_order_by_value' => ['annotations' => ['covers']],
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_size_class' => false, // That seems extra work to maintain for little benefits
+        'php_unit_strict' => false, // We sometime actually need assertEquals
+        'php_unit_test_annotation' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'php_unit_test_class_requires_covers' => false, // We don't care as much as we should about coverage
+        'phpdoc_add_missing_param_annotation' => false, // Don't add things that bring no value
+        'phpdoc_align' => false, // Waste of time
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        //'phpdoc_inline_tag' => true,
+        'phpdoc_line_span' => false, // Unfortunately our old comments turn even uglier with this
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_to_comment' => false, // interferes with annotations
+        'phpdoc_to_param_type' => false, // Because experimental, but interesting for one shot use
+        'phpdoc_to_return_type' => false, // idem
+        'phpdoc_trim' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => true,
+        'phpdoc_var_annotation_correct_order' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+        'protected_to_private' => true,
+        //'psr0' => true,
+        //'psr4' => true,
+        'random_api_migration' => true,
+        'return_assignment' => false, // Sometimes useful for clarity or debug
+        'return_type_declaration' => true,
+        'self_accessor' => true,
+        'self_static_accessor' => true,
+        'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
+        'set_type_to_cast' => true,
+        'short_scalar_cast' => true,
+        'simple_to_complex_string_variable' => false, // Would differ from TypeScript without obvious advantages
+        'simplified_null_return' => false, // Even if technically correct we prefer to be explicit
+        'single_blank_line_at_eof' => true,
+        'single_blank_line_before_namespace' => true,
+        'single_class_element_per_statement' => true,
+        'single_import_per_statement' => true,
+        'single_line_after_imports' => true,
+        'single_line_comment_style' => true,
+        'single_line_throw' => false, // I don't see any reason for having a special case for Exception
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'space_after_semicolon' => true,
+        'standardize_increment' => true,
+        'standardize_not_equals' => true,
+        'static_lambda' => false, // Risky if we can't guarantee nobody use `bindTo()`
+        'strict_comparison' => false, // No, too dangerous to change that
+        'strict_param' => false, // No, too dangerous to change that
+        'string_line_ending' => true,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'visibility_required' => ['elements' => ['property', 'method']], // not const
+        'void_return' => true,
+        'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
+    ]);
+
+return $config;

vendor/phpoffice/phpspreadsheet/CHANGELOG.md

@@ -5,6 +5,401 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 1.25.2 - 2022-09-25
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Composer dependency clash with ezyang/htmlpurifier
+
+
+## 1.25.0 - 2022-09-25
+
+### Added
+
+- Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
+- Implementation of the `ARRAYTOTEXT()` and `VALUETOTEXT()` Excel Functions
+- Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
+  JpGraph library to render charts added.
+- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines, Date Axes.
+
+### Changed
+
+- Allow variant behaviour when merging cells [Issue #3065](https://github.com/PHPOffice/PhpSpreadsheet/issues/3065)
+  - Merge methods now allow an additional `$behaviour` argument. Permitted values are:
+    - Worksheet::MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells (the default behaviour)
+    - Worksheet::MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+    - Worksheet::MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
+
+### Deprecated
+
+- Axis getLineProperty deprecated in favor of getLineColorProperty.
+- Moved majorGridlines and minorGridlines from Chart to Axis. Setting either in Chart constructor or through Chart methods, or getting either using Chart methods is deprecated.
+- Chart::EXCEL_COLOR_TYPE_* copied from Properties to ChartColor; use in Properties is deprecated.
+- ChartColor::EXCEL_COLOR_TYPE_ARGB deprecated in favor of EXCEL_COLOR_TYPE_RGB ("A" component was never allowed).
+- Misspelled Properties::LINE_STYLE_DASH_SQUERE_DOT deprecated in favor of LINE_STYLE_DASH_SQUARE_DOT.
+- Clone not permitted for Spreadsheet. Spreadsheet->copy() can be used instead.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix update to defined names when inserting/deleting rows/columns [Issue #3076](https://github.com/PHPOffice/PhpSpreadsheet/issues/3076) [PR #3077](https://github.com/PHPOffice/PhpSpreadsheet/pull/3077) 
+- Fix DataValidation sqRef when inserting/deleting rows/columns [Issue #3056](https://github.com/PHPOffice/PhpSpreadsheet/issues/3056) [PR #3074](https://github.com/PHPOffice/PhpSpreadsheet/pull/3074)
+- Named ranges not usable as anchors in OFFSET function [Issue #3013](https://github.com/PHPOffice/PhpSpreadsheet/issues/3013)
+- Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
+- cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
+- Spreadsheet copy fixed, clone disabled. [PR #2951](https://github.com/PHPOffice/PhpSpreadsheet/pull/2951)
+- Fix PDF problems with text rotation and paper size. [Issue #1747](https://github.com/PHPOffice/PhpSpreadsheet/issues/1747) [Issue #1713](https://github.com/PHPOffice/PhpSpreadsheet/issues/1713) [PR #2960](https://github.com/PHPOffice/PhpSpreadsheet/pull/2960)
+- Limited support for chart titles as formulas [Issue #2965](https://github.com/PHPOffice/PhpSpreadsheet/issues/2965) [Issue #749](https://github.com/PHPOffice/PhpSpreadsheet/issues/749) [PR #2971](https://github.com/PHPOffice/PhpSpreadsheet/pull/2971)
+- Add Gradients, Transparency, and Hidden Axes to Chart [Issue #2257](https://github.com/PHPOffice/PhpSpreadsheet/issues/2257) [Issue #2229](https://github.com/PHPOffice/PhpSpreadsheet/issues/2929) [Issue #2935](https://github.com/PHPOffice/PhpSpreadsheet/issues/2935) [PR #2950](https://github.com/PHPOffice/PhpSpreadsheet/pull/2950)
+- Chart Support for Rounded Corners and Trendlines [Issue #2968](https://github.com/PHPOffice/PhpSpreadsheet/issues/2968) [Issue #2815](https://github.com/PHPOffice/PhpSpreadsheet/issues/2815) [PR #2976](https://github.com/PHPOffice/PhpSpreadsheet/pull/2976)
+- Add setName Method for Chart [Issue #2991](https://github.com/PHPOffice/PhpSpreadsheet/issues/2991) [PR #3001](https://github.com/PHPOffice/PhpSpreadsheet/pull/3001)
+- Eliminate partial dependency on php-intl in StringHelper [Issue #2982](https://github.com/PHPOffice/PhpSpreadsheet/issues/2982) [PR #2994](https://github.com/PHPOffice/PhpSpreadsheet/pull/2994)
+- Minor changes for Pdf [Issue #2999](https://github.com/PHPOffice/PhpSpreadsheet/issues/2999) [PR #3002](https://github.com/PHPOffice/PhpSpreadsheet/pull/3002) [PR #3006](https://github.com/PHPOffice/PhpSpreadsheet/pull/3006)
+- Html/Pdf Do net set background color for cells using (default) nofill [PR #3016](https://github.com/PHPOffice/PhpSpreadsheet/pull/3016)
+- Add support for Date Axis to Chart [Issue #2967](https://github.com/PHPOffice/PhpSpreadsheet/issues/2967) [PR #3018](https://github.com/PHPOffice/PhpSpreadsheet/pull/3018)
+- Reconcile Differences Between Css and Excel for Cell Alignment [PR #3048](https://github.com/PHPOffice/PhpSpreadsheet/pull/3048)
+- R1C1 Format Internationalization and Better Support for Relative Offsets [Issue #1704](https://github.com/PHPOffice/PhpSpreadsheet/issues/1704) [PR #3052](https://github.com/PHPOffice/PhpSpreadsheet/pull/3052)
+- Minor Fix for Percentage Formatting [Issue #1929](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #3053](https://github.com/PHPOffice/PhpSpreadsheet/pull/3053)
+
+## 1.24.1 - 2022-07-18
+
+### Added
+
+- Support for SimpleCache Interface versions 1.0, 2.0 and 3.0
+- Add Chart Axis Option textRotation [Issue #2705](https://github.com/PHPOffice/PhpSpreadsheet/issues/2705) [PR #2940](https://github.com/PHPOffice/PhpSpreadsheet/pull/2940)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix Encoding issue with Html reader (PHP 8.2 deprecation for mb_convert_encoding) [Issue #2942](https://github.com/PHPOffice/PhpSpreadsheet/issues/2942) [PR #2943](https://github.com/PHPOffice/PhpSpreadsheet/pull/2943)
+- Additional Chart fixes
+  - Pie chart with part separated unwantedly [Issue #2506](https://github.com/PHPOffice/PhpSpreadsheet/issues/2506) [PR #2928](https://github.com/PHPOffice/PhpSpreadsheet/pull/2928)
+  - Chart styling is lost on simple load / save process [Issue #1797](https://github.com/PHPOffice/PhpSpreadsheet/issues/1797) [Issue #2077](https://github.com/PHPOffice/PhpSpreadsheet/issues/2077) [PR #2930](https://github.com/PHPOffice/PhpSpreadsheet/pull/2930)
+  - Can't create contour chart (surface 2d) [Issue #2931](https://github.com/PHPOffice/PhpSpreadsheet/issues/2931) [PR #2933](https://github.com/PHPOffice/PhpSpreadsheet/pull/2933)
+- VLOOKUP Breaks When Array Contains Null Cells [Issue #2934](https://github.com/PHPOffice/PhpSpreadsheet/issues/2934) [PR #2939](https://github.com/PHPOffice/PhpSpreadsheet/pull/2939)
+
+## 1.24.0 - 2022-07-09
+
+Note that this will be the last 1.x branch release before the 2.x release. We will maintain both branches in parallel for a time; but users are requested to update to version 2.0 once that is fully available.
+
+### Added
+
+- Added `removeComment()` method for Worksheet [PR #2875](https://github.com/PHPOffice/PhpSpreadsheet/pull/2875/files)
+- Add point size option for scatter charts [Issue #2298](https://github.com/PHPOffice/PhpSpreadsheet/issues/2298) [PR #2801](https://github.com/PHPOffice/PhpSpreadsheet/pull/2801)
+- Basic support for Xlsx reading/writing Chart Sheets [PR #2830](https://github.com/PHPOffice/PhpSpreadsheet/pull/2830)
+
+  Note that a ChartSheet is still only written as a normal Worksheet containing a single chart, not as an actual ChartSheet.
+
+- Added Worksheet visibility in Ods Reader [PR #2851](https://github.com/PHPOffice/PhpSpreadsheet/pull/2851) and Gnumeric Reader [PR #2853](https://github.com/PHPOffice/PhpSpreadsheet/pull/2853)
+- Added Worksheet visibility in Ods Writer [PR #2850](https://github.com/PHPOffice/PhpSpreadsheet/pull/2850)
+- Allow Csv Reader to treat string as contents of file [Issue #1285](https://github.com/PHPOffice/PhpSpreadsheet/issues/1285) [PR #2792](https://github.com/PHPOffice/PhpSpreadsheet/pull/2792)
+- Allow Csv Reader to store null string rather than leave cell empty [Issue #2840](https://github.com/PHPOffice/PhpSpreadsheet/issues/2840) [PR #2842](https://github.com/PHPOffice/PhpSpreadsheet/pull/2842)
+- Provide new Worksheet methods to identify if a row or column is "empty", making allowance for different definitions of "empty":
+  - Treat rows/columns containing no cell records as empty (default)
+  - Treat cells containing a null value as empty
+  - Treat cells containing an empty string as empty
+
+### Changed
+
+- Modify `rangeBoundaries()`, `rangeDimension()` and `getRangeBoundaries()` Coordinate methods to work with row/column ranges as well as with cell ranges and cells [PR #2926](https://github.com/PHPOffice/PhpSpreadsheet/pull/2926)
+- Better enforcement of value modification to match specified datatype when using `setValueExplicit()`
+- Relax validation of merge cells to allow merge for a single cell reference [Issue #2776](https://github.com/PHPOffice/PhpSpreadsheet/issues/2776)
+- Memory and speed improvements, particularly for the Cell Collection, and the Writers.
+
+  See [the Discussion section on github](https://github.com/PHPOffice/PhpSpreadsheet/discussions/2821) for details of performance across versions
+- Improved performance for removing rows/columns from a worksheet
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Xls Reader resolving absolute named ranges to relative ranges [Issue #2826](https://github.com/PHPOffice/PhpSpreadsheet/issues/2826) [PR #2827](https://github.com/PHPOffice/PhpSpreadsheet/pull/2827)
+- Null value handling in the Excel Math/Trig PRODUCT() function [Issue #2833](https://github.com/PHPOffice/PhpSpreadsheet/issues/2833) [PR #2834](https://github.com/PHPOffice/PhpSpreadsheet/pull/2834)
+- Invalid Print Area defined in Xlsx corrupts internal storage of print area [Issue #2848](https://github.com/PHPOffice/PhpSpreadsheet/issues/2848) [PR #2849](https://github.com/PHPOffice/PhpSpreadsheet/pull/2849)
+- Time interval formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+- Copy from Xls(x) to Html/Pdf loses drawings [PR #2788](https://github.com/PHPOffice/PhpSpreadsheet/pull/2788)
+- Html Reader converting cell containing 0 to null string [Issue #2810](https://github.com/PHPOffice/PhpSpreadsheet/issues/2810) [PR #2813](https://github.com/PHPOffice/PhpSpreadsheet/pull/2813)
+- Many fixes for Charts, especially, but not limited to, Scatter, Bubble, and Surface charts. [Issue #2762](https://github.com/PHPOffice/PhpSpreadsheet/issues/2762) [Issue #2299](https://github.com/PHPOffice/PhpSpreadsheet/issues/2299) [Issue #2700](https://github.com/PHPOffice/PhpSpreadsheet/issues/2700) [Issue #2817](https://github.com/PHPOffice/PhpSpreadsheet/issues/2817) [Issue #2763](https://github.com/PHPOffice/PhpSpreadsheet/issues/2763) [Issue #2219](https://github.com/PHPOffice/PhpSpreadsheet/issues/2219) [Issue #2863](https://github.com/PHPOffice/PhpSpreadsheet/issues/2863) [PR #2828](https://github.com/PHPOffice/PhpSpreadsheet/pull/2828) [PR #2841](https://github.com/PHPOffice/PhpSpreadsheet/pull/2841) [PR #2846](https://github.com/PHPOffice/PhpSpreadsheet/pull/2846) [PR #2852](https://github.com/PHPOffice/PhpSpreadsheet/pull/2852) [PR #2856](https://github.com/PHPOffice/PhpSpreadsheet/pull/2856) [PR #2865](https://github.com/PHPOffice/PhpSpreadsheet/pull/2865) [PR #2872](https://github.com/PHPOffice/PhpSpreadsheet/pull/2872) [PR #2879](https://github.com/PHPOffice/PhpSpreadsheet/pull/2879) [PR #2898](https://github.com/PHPOffice/PhpSpreadsheet/pull/2898) [PR #2906](https://github.com/PHPOffice/PhpSpreadsheet/pull/2906) [PR #2922](https://github.com/PHPOffice/PhpSpreadsheet/pull/2922) [PR #2923](https://github.com/PHPOffice/PhpSpreadsheet/pull/2923)
+- Adjust both coordinates for two-cell anchors when rows/columns are added/deleted. [Issue #2908](https://github.com/PHPOffice/PhpSpreadsheet/issues/2908) [PR #2909](https://github.com/PHPOffice/PhpSpreadsheet/pull/2909)
+- Keep calculated string results below 32K. [PR #2921](https://github.com/PHPOffice/PhpSpreadsheet/pull/2921)
+- Filter out illegal Unicode char values FFFE/FFFF. [Issue #2897](https://github.com/PHPOffice/PhpSpreadsheet/issues/2897) [PR #2910](https://github.com/PHPOffice/PhpSpreadsheet/pull/2910)
+- Better handling of REF errors and propagation of all errors in Calculation engine. [PR #2902](https://github.com/PHPOffice/PhpSpreadsheet/pull/2902)
+- Calculating Engine regexp for Column/Row references when there are multiple quoted worksheet references in the formula [Issue #2874](https://github.com/PHPOffice/PhpSpreadsheet/issues/2874) [PR #2899](https://github.com/PHPOffice/PhpSpreadsheet/pull/2899)
+
+## 1.23.0 - 2022-04-24
+
+### Added
+
+- Ods Writer support for Freeze Pane [Issue #2013](https://github.com/PHPOffice/PhpSpreadsheet/issues/2013) [PR #2755](https://github.com/PHPOffice/PhpSpreadsheet/pull/2755)
+- Ods Writer support for setting column width/row height (including the use of AutoSize) [Issue #2346](https://github.com/PHPOffice/PhpSpreadsheet/issues/2346) [PR #2753](https://github.com/PHPOffice/PhpSpreadsheet/pull/2753)
+- Introduced CellAddress, CellRange, RowRange and ColumnRange value objects that can be used as an alternative to a string value (e.g. `'C5'`, `'B2:D4'`, `'2:2'` or `'B:C'`) in appropriate contexts.
+- Implementation of the FILTER(), SORT(), SORTBY() and UNIQUE() Lookup/Reference (array) functions.
+- Implementation of the ISREF() Information function.
+- Added support for reading "formatted" numeric values from Csv files; although default behaviour of reading these values as strings is preserved.
+
+  (i.e a value of "12,345.67" can be read as numeric `12345.67`, not simply as a string `"12,345.67"`, if the `castFormattedNumberToNumeric()` setting is enabled.
+
+  This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators.
+
+- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532) [#2674](https://github.com/PHPOffice/PhpSpreadsheet/pull/2674)
+- Limited support for Xls Reader to handle Conditional Formatting:
+
+  Ranges and Rules are read, but style is currently limited to font size, weight and color; and to fill style and color.
+
+- Add ability to suppress Mac line ending check for CSV [#2623](https://github.com/PHPOffice/PhpSpreadsheet/pull/2623)
+- Initial support for creating and writing Tables (Xlsx Writer only) [PR #2671](https://github.com/PHPOffice/PhpSpreadsheet/pull/2671)
+
+  See `/samples/Table` for examples of use.
+
+  Note that PreCalculateFormulas needs to be disabled when saving spreadsheets containing tables with formulae (totals or column formulae).
+
+### Changed
+
+- Gnumeric Reader now loads number formatting for cells.
+- Gnumeric Reader now correctly identifies selected worksheet and selected cells in a worksheet.
+- Some Refactoring of the Ods Reader, moving all formula and address translation from Ods to Excel into a separate class to eliminate code duplication and ensure consistency.
+- Make Boolean Conversion in Csv Reader locale-aware when using the String Value Binder.
+
+  This is determined by the Calculation Engine locale setting.
+
+  (i.e. `"Vrai"` wil be converted to a boolean `true` if the Locale is set to `fr`.)
+- Allow `psr/simple-cache` 2.x
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Functions` (including the Error functions) have been moved to dedicated classes for groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+- Worksheet methods that reference cells "byColumnandRow". All such methods have an equivalent that references the cell by its address (e.g. '`E3'` rather than `5, 3`).
+
+  These functions now accept either a cell address string (`'E3')` or an array with columnId and rowId (`[5, 3]`) or a new `CellAddress` object as their `cellAddress`/`coordinate` argument.
+  This includes the methods:
+  - `setCellValueByColumnAndRow()` use the equivalent `setCellValue()`
+  - `setCellValueExplicitByColumnAndRow()` use the equivalent `setCellValueExplicit()`
+  - `getCellByColumnAndRow()` use the equivalent `getCell()`
+  - `cellExistsByColumnAndRow()` use the equivalent `cellExists()`
+  - `getStyleByColumnAndRow()` use the equivalent `getStyle()`
+  - `setBreakByColumnAndRow()` use the equivalent `setBreak()`
+  - `mergeCellsByColumnAndRow()` use the equivalent `mergeCells()`
+  - `unmergeCellsByColumnAndRow()` use the equivalent `unmergeCells()`
+  - `protectCellsByColumnAndRow()` use the equivalent `protectCells()`
+  - `unprotectCellsByColumnAndRow()` use the equivalent `unprotectCells()`
+  - `setAutoFilterByColumnAndRow()` use the equivalent `setAutoFilter()`
+  - `freezePaneByColumnAndRow()` use the equivalent `freezePane()`
+  - `getCommentByColumnAndRow()` use the equivalent `getComment()`
+  - `setSelectedCellByColumnAndRow()` use the equivalent `setSelectedCells()`
+
+  This change provides more consistency in the methods (not every "by cell address" method has an equivalent "byColumnAndRow" method);
+  and the "by cell address" methods often provide more flexibility, such as allowing a range of cells, or referencing them by passing the defined name of a named range as the argument.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Make allowance for the AutoFilter dropdown icon in the first row of an Autofilter range when using Autosize columns. [Issue #2413](https://github.com/PHPOffice/PhpSpreadsheet/issues/2413) [PR #2754](https://github.com/PHPOffice/PhpSpreadsheet/pull/2754)
+- Support for "chained" ranges (e.g. `A5:C10:C20:F1`) in the Calculation Engine; and also support for using named ranges with the Range operator (e.g. `NamedRange1:NamedRange2`) [Issue #2730](https://github.com/PHPOffice/PhpSpreadsheet/issues/2730) [PR #2746](https://github.com/PHPOffice/PhpSpreadsheet/pull/2746)
+- Update Conditional Formatting ranges and rule conditions when inserting/deleting rows/columns [Issue #2678](https://github.com/PHPOffice/PhpSpreadsheet/issues/2678) [PR #2689](https://github.com/PHPOffice/PhpSpreadsheet/pull/2689)
+- Allow `INDIRECT()` to accept row/column ranges as well as cell ranges [PR #2687](https://github.com/PHPOffice/PhpSpreadsheet/pull/2687)
+- Fix bug when deleting cells with hyperlinks, where the hyperlink was then being "inherited" by whatever cell moved to that cell address.
+- Fix bug in Conditional Formatting in the Xls Writer that resulted in a broken file when there were multiple conditional ranges in a worksheet.
+- Fix Conditional Formatting in the Xls Writer to work with rules that contain string literals, cell references and formulae.
+- Fix for setting Active Sheet to the first loaded worksheet when bookViews element isn't defined [Issue #2666](https://github.com/PHPOffice/PhpSpreadsheet/issues/2666) [PR #2669](https://github.com/PHPOffice/PhpSpreadsheet/pull/2669)
+- Fixed behaviour of XLSX font style vertical align settings [PR #2619](https://github.com/PHPOffice/PhpSpreadsheet/pull/2619)
+- Resolved formula translations to handle separators (row and column) for array functions as well as for function argument separators; and cleanly handle nesting levels.
+
+  Note that this method is used when translating Excel functions between `en_us` and other locale languages, as well as when converting formulae between different spreadsheet formats (e.g. Ods to Excel).
+
+  Nor is this a perfect solution, as there may still be issues when function calls have array arguments that themselves contain function calls; but it's still better than the current logic.
+- Fix for escaping double quotes within a formula [Issue #1971](https://github.com/PHPOffice/PhpSpreadsheet/issues/1971) [PR #2651](https://github.com/PHPOffice/PhpSpreadsheet/pull/2651)
+- Change open mode for output from `wb+` to `wb` [Issue #2372](https://github.com/PHPOffice/PhpSpreadsheet/issues/2372) [PR #2657](https://github.com/PHPOffice/PhpSpreadsheet/pull/2657)
+- Use color palette if supplied [Issue #2499](https://github.com/PHPOffice/PhpSpreadsheet/issues/2499) [PR #2595](https://github.com/PHPOffice/PhpSpreadsheet/pull/2595)
+- Xls reader treat drawing offsets as int rather than float [PR #2648](https://github.com/PHPOffice/PhpSpreadsheet/pull/2648)
+- Handle booleans in conditional styles properly [PR #2654](https://github.com/PHPOffice/PhpSpreadsheet/pull/2654)
+- Fix for reading files in the root directory of a ZipFile, which should not be prefixed by relative paths ("./") as dirname($filename) does by default. 
+- Fix invalid style of cells in empty columns with columnDimensions and rows with rowDimensions in added external sheet. [PR #2739](https://github.com/PHPOffice/PhpSpreadsheet/pull/2739)
+- Time Interval Formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+
+## 1.22.0 - 2022-02-18
+
+### Added
+
+- Namespacing phase 2 - styles.
+[PR #2471](https://github.com/PHPOffice/PhpSpreadsheet/pull/2471)
+
+- Improved support for passing of array arguments to Excel function implementations to return array results (where appropriate). [Issue #2551](https://github.com/PHPOffice/PhpSpreadsheet/issues/2551)
+
+  This is the first stage in an ongoing process of adding array support to all appropriate function implementations, 
+- Support for the Excel365 Math/Trig SEQUENCE() function [PR #2536](https://github.com/PHPOffice/PhpSpreadsheet/pull/2536)
+- Support for the Excel365 Math/Trig RANDARRAY() function [PR #2540](https://github.com/PHPOffice/PhpSpreadsheet/pull/2540) 
+
+  Note that the Spill Operator is not yet supported in the Calculation Engine; but this can still be useful for defining array constants.
+- Improved support for Conditional Formatting Rules [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+  - Provide support for a wider range of Conditional Formatting Rules for Xlsx Reader/Writer:
+    - Cells Containing (cellIs)
+    - Specific Text (containing, notContaining, beginsWith, endsWith)
+    - Dates Occurring (all supported timePeriods)
+    - Blanks/NoBlanks
+    - Errors/NoErrors
+    - Duplicates/Unique
+    - Expression
+  - Provision of CF Wizards (for all the above listed rule types) to help create/modify CF Rules without having to manage all the combinations of types/operators, and the complexities of formula expressions, or the text/timePeriod attributes.
+
+    See [documentation](https://phpspreadsheet.readthedocs.io/en/latest/topics/conditional-formatting/) for details 
+
+  - Full support of the above CF Rules for the Xlsx Reader and Writer; even when the file being loaded has CF rules listed in the `<extLst><ext><ConditionalFormattings>` element for the worksheet rather than the `<ConditionalFormatting>` element.
+  - Provision of a CellMatcher to identify if rules are matched for a cell, and which matching style will be applied.
+  - Improved documentation and examples, covering all supported CF rule types.
+  - Add support for one digit decimals (FORMAT_NUMBER_0, FORMAT_PERCENTAGE_0). [PR #2525](https://github.com/PHPOffice/PhpSpreadsheet/pull/2525)
+  - Initial work enabling Excel function implementations for handling arrays as arguments when used in "array formulae" [#2562](https://github.com/PHPOffice/PhpSpreadsheet/issues/2562)
+  - Enable most of the Date/Time functions to accept array arguments [#2573](https://github.com/PHPOffice/PhpSpreadsheet/issues/2573)
+  - Array ready functions - Text, Math/Trig, Statistical, Engineering and Logical [#2580](https://github.com/PHPOffice/PhpSpreadsheet/issues/2580)
+
+### Changed
+
+- Additional Russian translations for Excel Functions (courtesy of aleks-samurai).
+- Improved code coverage for NumberFormat. [PR #2556](https://github.com/PHPOffice/PhpSpreadsheet/pull/2556)
+- Extract some methods from the Calculation Engine into dedicated classes [#2537](https://github.com/PHPOffice/PhpSpreadsheet/issues/2537)
+- Eliminate calls to `flattenSingleValue()` that are no longer required when we're checking for array values as arguments [#2590](https://github.com/PHPOffice/PhpSpreadsheet/issues/2590)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed `ReferenceHelper@insertNewBefore` behavior when removing column before last column with null value [PR #2541](https://github.com/PHPOffice/PhpSpreadsheet/pull/2541)
+- Fix bug with `DOLLARDE()` and `DOLLARFR()` functions when the dollar value is negative [Issue #2578](https://github.com/PHPOffice/PhpSpreadsheet/issues/2578) [PR #2579](https://github.com/PHPOffice/PhpSpreadsheet/pull/2579)
+- Fix partial function name matching when translating formulae from Russian to English [Issue #2533](https://github.com/PHPOffice/PhpSpreadsheet/issues/2533) [PR #2534](https://github.com/PHPOffice/PhpSpreadsheet/pull/2534)
+- Various bugs related to Conditional Formatting Rules, and errors in the Xlsx Writer for Conditional Formatting [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+- Xlsx Reader merge range fixes. [Issue #2501](https://github.com/PHPOffice/PhpSpreadsheet/issues/2501) [PR #2504](https://github.com/PHPOffice/PhpSpreadsheet/pull/2504)
+- Handle explicit "date" type for Cell in Xlsx Reader. [Issue #2373](https://github.com/PHPOffice/PhpSpreadsheet/issues/2373) [PR #2485](https://github.com/PHPOffice/PhpSpreadsheet/pull/2485)
+- Recalibrate Row/Column Dimensions after removeRow/Column. [Issue #2442](https://github.com/PHPOffice/PhpSpreadsheet/issues/2442) [PR #2486](https://github.com/PHPOffice/PhpSpreadsheet/pull/2486)
+- Refinement for XIRR. [Issue #2469](https://github.com/PHPOffice/PhpSpreadsheet/issues/2469) [PR #2487](https://github.com/PHPOffice/PhpSpreadsheet/pull/2487)
+- Xlsx Reader handle cell with non-null explicit type but null value. [Issue #2488](https://github.com/PHPOffice/PhpSpreadsheet/issues/2488) [PR #2489](https://github.com/PHPOffice/PhpSpreadsheet/pull/2489)
+- Xlsx Reader fix height and width for oneCellAnchorDrawings. [PR #2492](https://github.com/PHPOffice/PhpSpreadsheet/pull/2492)
+- Fix rounding error in NumberFormat::NUMBER_PERCENTAGE, NumberFormat::NUMBER_PERCENTAGE_00. [PR #2555](https://github.com/PHPOffice/PhpSpreadsheet/pull/2555)
+- Don't treat thumbnail file as xml. [Issue #2516](https://github.com/PHPOffice/PhpSpreadsheet/issues/2516) [PR #2517](https://github.com/PHPOffice/PhpSpreadsheet/pull/2517)
+- Eliminating Xlsx Reader warning when no sz tag for RichText. [Issue #2542](https://github.com/PHPOffice/PhpSpreadsheet/issues/2542) [PR #2550](https://github.com/PHPOffice/PhpSpreadsheet/pull/2550)
+- Fix Xlsx/Xls Writer handling of inline strings. [Issue #353](https://github.com/PHPOffice/PhpSpreadsheet/issues/353) [PR #2569](https://github.com/PHPOffice/PhpSpreadsheet/pull/2569)
+- Richtext colors were not being read correctly after namespace change [#2458](https://github.com/PHPOffice/PhpSpreadsheet/issues/2458)
+- Fix discrepancy between the way markdown tables are rendered in ReadTheDocs and in PHPStorm [#2520](https://github.com/PHPOffice/PhpSpreadsheet/issues/2520)
+- Update Russian Functions Text File [#2557](https://github.com/PHPOffice/PhpSpreadsheet/issues/2557)
+- Fix documentation, instantiation example [#2564](https://github.com/PHPOffice/PhpSpreadsheet/issues/2564)
+
+
+## 1.21.0 - 2022-01-06
+
+### Added
+
+- Ability to add a picture to the background of the comment. Supports four image formats: png, jpeg, gif, bmp. New `Comment::setSizeAsBackgroundImage()` to change the size of a comment to the size of a background image. [Issue #1547](https://github.com/PHPOffice/PhpSpreadsheet/issues/1547) [PR #2422](https://github.com/PHPOffice/PhpSpreadsheet/pull/2422)
+- Ability to set default paper size and orientation [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Ability to extend AutoFilter to Maximum Row [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Changed
+
+- Xlsx Writer will evaluate AutoFilter only if it is as yet unevaluated, or has changed since it was last evaluated [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Rounding in `NumberFormatter` [Issue #2385](https://github.com/PHPOffice/PhpSpreadsheet/issues/2385) [PR #2399](https://github.com/PHPOffice/PhpSpreadsheet/pull/2399)
+- Support for themes [Issue #2075](https://github.com/PHPOffice/PhpSpreadsheet/issues/2075) [Issue #2387](https://github.com/PHPOffice/PhpSpreadsheet/issues/2387) [PR #2403](https://github.com/PHPOffice/PhpSpreadsheet/pull/2403)
+- Read spreadsheet with `#` in name [Issue #2405](https://github.com/PHPOffice/PhpSpreadsheet/issues/2405) [PR #2409](https://github.com/PHPOffice/PhpSpreadsheet/pull/2409)
+- Improve PDF support for page size and orientation [Issue #1691](https://github.com/PHPOffice/PhpSpreadsheet/issues/1691) [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Wildcard handling issues in text match [Issue #2430](https://github.com/PHPOffice/PhpSpreadsheet/issues/2430) [PR #2431](https://github.com/PHPOffice/PhpSpreadsheet/pull/2431)
+- Respect DataType in `insertNewBefore` [PR #2433](https://github.com/PHPOffice/PhpSpreadsheet/pull/2433)
+- Handle rows explicitly hidden after AutoFilter [Issue #1641](https://github.com/PHPOffice/PhpSpreadsheet/issues/1641) [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+- Special characters in image file name [Issue #1470](https://github.com/PHPOffice/PhpSpreadsheet/issues/1470) [Issue #2415](https://github.com/PHPOffice/PhpSpreadsheet/issues/2415) [PR #2416](https://github.com/PHPOffice/PhpSpreadsheet/pull/2416)
+- Mpdf with very many styles [Issue #2432](https://github.com/PHPOffice/PhpSpreadsheet/issues/2432) [PR #2434](https://github.com/PHPOffice/PhpSpreadsheet/pull/2434)
+- Name clashes between parsed and unparsed drawings [Issue #1767](https://github.com/PHPOffice/PhpSpreadsheet/issues/1767) [Issue #2396](https://github.com/PHPOffice/PhpSpreadsheet/issues/2396) [PR #2423](https://github.com/PHPOffice/PhpSpreadsheet/pull/2423)
+- Fill pattern start and end colors [Issue #2441](https://github.com/PHPOffice/PhpSpreadsheet/issues/2441) [PR #2444](https://github.com/PHPOffice/PhpSpreadsheet/pull/2444)
+- General style specified in wrong case [Issue #2450](https://github.com/PHPOffice/PhpSpreadsheet/issues/2450) [PR #2451](https://github.com/PHPOffice/PhpSpreadsheet/pull/2451)
+- Null passed to `AutoFilter::setRange()` [Issue #2281](https://github.com/PHPOffice/PhpSpreadsheet/issues/2281) [PR #2454](https://github.com/PHPOffice/PhpSpreadsheet/pull/2454)
+- Another undefined index in Xls reader (#2470) [Issue #2463](https://github.com/PHPOffice/PhpSpreadsheet/issues/2463) [PR #2470](https://github.com/PHPOffice/PhpSpreadsheet/pull/2470)
+- Allow single-cell checks on conditional styles, even when the style is configured for a range of cells (#) [PR #2483](https://github.com/PHPOffice/PhpSpreadsheet/pull/2483)
+
+## 1.20.0 - 2021-11-23
+
+### Added
+
+- Xlsx Writer Support for WMF Files [#2339](https://github.com/PHPOffice/PhpSpreadsheet/issues/2339)
+- Use standard temporary file for internal use of HTMLPurifier [#2383](https://github.com/PHPOffice/PhpSpreadsheet/issues/2383)
+
+### Changed
+
+- Drop support for PHP 7.2, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+- Use native typing for objects that were already documented as such
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed null conversation for strToUpper [#2292](https://github.com/PHPOffice/PhpSpreadsheet/issues/2292)
+- Fixed Trying to access array offset on value of type null (Xls Reader) [#2315](https://github.com/PHPOffice/PhpSpreadsheet/issues/2315)
+- Don't corrupt XLSX files containing data validation [#2377](https://github.com/PHPOffice/PhpSpreadsheet/issues/2377)
+- Non-fixed cells were not updated if shared formula has a fixed cell [#2354](https://github.com/PHPOffice/PhpSpreadsheet/issues/2354)
+- Declare key of generic ArrayObject
+- CSV reader better support for boolean values [#2374](https://github.com/PHPOffice/PhpSpreadsheet/pull/2374)
+- Some ZIP file could not be read [#2376](https://github.com/PHPOffice/PhpSpreadsheet/pull/2376)
+- Fix regression were hyperlinks could not be read [#2391](https://github.com/PHPOffice/PhpSpreadsheet/pull/2391)
+- AutoFilter Improvements [#2393](https://github.com/PHPOffice/PhpSpreadsheet/pull/2393)
+- Don't corrupt file when using chart with fill color [#589](https://github.com/PHPOffice/PhpSpreadsheet/pull/589)
+- Restore imperfect array formula values in xlsx writer [#2343](https://github.com/PHPOffice/PhpSpreadsheet/pull/2343)
+- Restore explicit list of changes to PHPExcel migration document [#1546](https://github.com/PHPOffice/PhpSpreadsheet/issues/1546)
+
 ## 1.19.0 - 2021-10-31
 
 ### Added
@@ -29,7 +424,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Deprecated
 
-- PHP 8.1 will deprecate auto_detect_line_endings. As a result of this change, Csv Reader using PHP8.1+ will no longer be able to handle a Csv with Mac line endings.
+- PHP 8.1 will deprecate auto_detect_line_endings. As a result of this change, Csv Reader using some release after PHP8.1 will no longer be able to handle a Csv with Mac line endings.
 
 ### Removed
 
@@ -82,6 +477,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ## 1.18.0 - 2021-05-31
 
 ### Added
+
 - Enhancements to CSV Reader, allowing options to be set when using `IOFactory::load()` with a callback to set delimiter, enclosure, charset etc [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103) - See [documentation](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/docs/topics/reading-and-writing-to-file.md#csv-comma-separated-values) for details.
 - Implemented basic AutoFiltering for Ods Reader and Writer [PR #2053](https://github.com/PHPOffice/PhpSpreadsheet/pull/2053)
 - Implemented basic AutoFiltering for Gnumeric Reader [PR #2055](https://github.com/PHPOffice/PhpSpreadsheet/pull/2055)
@@ -104,6 +500,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Use of `nb` rather than `no` as the locale language code for Norsk Bokmål.
 
 ### Fixed
+
 - Fixed error in COUPNCD() calculation for end of month [Issue #2116](https://github.com/PHPOffice/PhpSpreadsheet/issues/2116) - [PR #2119](https://github.com/PHPOffice/PhpSpreadsheet/pull/2119)
 - Resolve default values when a null argument is passed for HLOOKUP(), VLOOKUP() and ADDRESS() functions [Issue #2120](https://github.com/PHPOffice/PhpSpreadsheet/issues/2120) - [PR #2121](https://github.com/PHPOffice/PhpSpreadsheet/pull/2121)
 - Fixed incorrect R1C1 to A1 subtraction formula conversion (`R[-2]C-R[2]C`) [Issue #2076](https://github.com/PHPOffice/PhpSpreadsheet/pull/2076) [PR #2086](https://github.com/PHPOffice/PhpSpreadsheet/pull/2086)

vendor/phpoffice/phpspreadsheet/README.md

@@ -11,6 +11,80 @@
 PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
 allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
+## PHP version support
+
+LTS: Support for PHP versions will only be maintained for a period of six months beyond the
+[end of life of that PHP version](https://www.php.net/eol.php).
+
+Currently the required PHP minimum version is PHP __7.3__.
+
+See the `composer.json` for other requirements.
+
+## Installation
+
+Use [composer](https://getcomposer.org) to install PhpSpreadsheet into your project:
+
+```sh
+composer require phpoffice/phpspreadsheet
+```
+
+If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
+```json
+{
+    "require": {
+        "phpoffice/phpspreadsheet": "^1.23"
+    },
+    "config": {
+        "platform": {
+            "php": "7.3"
+        }
+    }
+}
+```
+and then run
+```sh
+composer install
+```
+to ensure that the correct dependencies are retrieved to match your deployment environment.
+
+See [CLI vs Application run-time](https://php.watch/articles/composer-platform-check) for more details.
+
+### Additional Installation Options
+
+If you want to write to PDF, or to include Charts when you write to HTML or PDF, then you will need to install additional libraries:
+
+#### PDF
+
+For PDF Generation, you can install any of the following, and then configure PhpSpreadsheet to indicate which library you are going to use:
+ - mpdf/mpdf
+ - dompdf/dompdf
+ - tecnickcom/tcpdf
+
+and configure PhpSpreadsheet using:
+
+```php
+// Dompdf, Mpdf or Tcpdf (as appropriate)
+$className = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class;
+IOFactory::registerWriter('Pdf', $className);
+```
+or the appropriate PDF Writer wrapper for the library that you have chosen to install.
+
+#### Chart Export
+
+For Chart export, we support following packages, which you will also need to install yourself using `composer require`
+ - [jpgraph/jpgraph](https://packagist.org/packages/jpgraph/jpgraph) (this package was abandoned at version 4.0. 
+   You can manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/))
+ - [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) (fork with php 8.1 support)
+
+and then configure PhpSpreadsheet using:
+```php
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class); // to use jpgraph/jpgraph
+//or
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class); // to use mitoteam/jpgraph
+```
+
+One or the other of these libraries is necessary if you want to generate HTML or PDF files that include charts.
+
 ## Documentation
 
 Read more about it, including install instructions, in the [official documentation](https://phpspreadsheet.readthedocs.io). Or check out the [API documentation](https://phpoffice.github.io/PhpSpreadsheet).

vendor/phpoffice/phpspreadsheet/composer.json

@@ -12,7 +12,10 @@
         "spreadsheet"
     ],
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
     "type": "library",
@@ -48,11 +51,11 @@
             "php-cs-fixer fix --ansi"
         ],
         "versions": [
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.2- -n"
+            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.3- -n"
         ]
     },
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.3 || ^8.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -66,32 +69,33 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "ezyang/htmlpurifier": "^4.13",
+        "ezyang/htmlpurifier": "^4.15",
         "maennchen/zipstream-php": "^2.1",
         "markbaker/complex": "^3.0",
         "markbaker/matrix": "^3.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/simple-cache": "^1.0"
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-        "dompdf/dompdf": "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "jpgraph/jpgraph": "^4.0",
-        "mpdf/mpdf": "^8.0",
+        "dompdf/dompdf": "^1.0 || ^2.0",
+        "friendsofphp/php-cs-fixer": "^3.2",
+        "mitoteam/jpgraph": "10.2.4",
+        "mpdf/mpdf": "8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpstan/phpstan": "^0.12.82",
-        "phpstan/phpstan-phpunit": "^0.12.18",
-        "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "tecnickcom/tcpdf": "^6.3"
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^8.5 || ^9.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "tecnickcom/tcpdf": "6.5"
     },
     "suggest": {
+        "ext-intl": "PHP Internationalization Functions",
         "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-        "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
+        "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",
+        "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
     },
     "autoload": {
         "psr-4": {

vendor/phpoffice/phpspreadsheet/phpstan-conditional.php

@@ -0,0 +1,58 @@
+<?php
+
+$config = [];
+
+if (PHP_VERSION_ID < 80000) {
+    // GdImage not available before PHP8
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Method .* has invalid return type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Shared/Drawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Property .* has unknown class GdImage as its type\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Method .* has invalid return type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Parameter .* of method .* has invalid type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Class GdImage not found\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Parameter .* of method .* has invalid type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
+        'count' => 1,
+    ];
+    // Erroneous analysis by Phpstan before PHP8 - 3rd parameter is nullable
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#3 \\$namespace of method XMLWriter\\:\\:startElementNs\\(\\) expects string, null given\\.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php',
+        'count' => 8,
+    ];
+    // Erroneous analysis by Phpstan before PHP8 - mb_strlen does not return false
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:countCharacters\\(\\) should return int but returns int(<0, max>)?\\|false\\.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Shared/StringHelper.php',
+        'count' => 1,
+    ];
+} else {
+    // Flagged in Php8+ - unsure how to correct code
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Binary operation "/" between float and array[|]float[|]int[|]string results in an error.#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php',
+        'count' => 2,
+    ];
+}
+
+return $config;

vendor/phpoffice/phpspreadsheet/phpstan.neon.dist

@@ -1,29 +1,23 @@
 includes:
     - phpstan-baseline.neon
+    - phpstan-conditional.php
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    level: max
+    level: 8
     paths:
         - src/
         - tests/
+    excludePaths:
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
     parallel:
         processTimeout: 300.0
     checkMissingIterableValueType: false
     ignoreErrors:
-        - '~^Class GdImage not found\.$~'
-        - '~^Return typehint of method .* has invalid type GdImage\.$~'
-        - '~^Property .* has unknown class GdImage as its type\.$~'
-        - '~^Parameter .* of method .* has invalid typehint type GdImage\.$~'
-        - '~^Parameter \#1 \$im of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy) expects resource, GdImage\|resource given\.$~'
-        - '~^Parameter \#2 \$src_im of function imagecopy expects resource, GdImage\|resource given\.$~'
+        - '~^Parameter \#1 \$im(age)? of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy|imagepng) expects (GdImage|resource), GdImage\|resource given\.$~'
+        - '~^Parameter \#2 \$src_im(age)? of function imagecopy expects (GdImage|resource), GdImage\|resource given\.$~'
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
-        - '~^Method PhpOffice\\PhpSpreadsheetTests\\.*\:\:test.*\(\) has parameter \$args with no typehint specified\.$~'
-
-        # Ignore all JpGraph issues
-        - '~^Constant (MARK_CIRCLE|MARK_CROSS|MARK_DIAMOND|MARK_DTRIANGLE|MARK_FILLEDCIRCLE|MARK_SQUARE|MARK_STAR|MARK_UTRIANGLE|MARK_X|SIDE_RIGHT) not found\.$~'
-        - '~^Instantiated class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot) not found\.$~'
-        - '~^Call to method .*\(\) on an unknown class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot)\.$~'
-        - '~^Access to property .* on an unknown class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot)\.$~'
+        - '~^Method PhpOffice\\PhpSpreadsheetTests\\.*\:\:test.*\(\) has parameter \$args with no type specified\.$~'

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentHelper;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentProcessor;
+
+trait ArrayEnabled
+{
+    /**
+     * @var ArrayArgumentHelper
+     */
+    private static $arrayArgumentHelper;
+
+    /**
+     * @param array|false $arguments Can be changed to array for Php8.1+
+     */
+    private static function initialiseHelper($arguments): void
+    {
+        if (self::$arrayArgumentHelper === null) {
+            self::$arrayArgumentHelper = new ArrayArgumentHelper();
+        }
+        self::$arrayArgumentHelper->initialise(($arguments === false) ? [] : $arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts a single argument that can be an array argument.
+     * Example use for:
+     *         DAYOFMONTH() or FACT().
+     */
+    protected static function evaluateSingleArgumentArray(callable $method, array $values): array
+    {
+        $result = [];
+        foreach ($values as $value) {
+            $result[] = $method($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument.
+     * Example use for:
+     *         ROUND() or DATE().
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArguments(callable $method, ...$arguments): array
+    {
+        self::initialiseHelper($arguments);
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the first few (up to limit) can be an array arguments.
+     * Example use for:
+     *         NETWORKDAYS() or CONCATENATE(), where the last argument is a matrix (or a series of values) that need
+     *                                         to be treated as a such rather than as an array arguments.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsSubset(callable $method, int $limit, ...$arguments): array
+    {
+        self::initialiseHelper(array_slice($arguments, 0, $limit));
+        $trailingArguments = array_slice($arguments, $limit);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($arguments, $trailingArguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function testFalse($value): bool
+    {
+        return $value === false;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the last few (from start) can be an array arguments.
+     * Example use for:
+     *         Z.TEST() or INDEX(), where the first argument 1 is a matrix that needs to be treated as a dataset
+     *                   rather than as an array argument.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsSubsetFrom(callable $method, int $start, ...$arguments): array
+    {
+        $arrayArgumentsSubset = array_combine(
+            range($start, count($arguments) - $start),
+            array_slice($arguments, $start)
+        );
+        if (self::testFalse($arrayArgumentsSubset)) {
+            return ['#VALUE!'];
+        }
+
+        self::initialiseHelper($arrayArgumentsSubset);
+        $leadingArguments = array_slice($arguments, 0, $start);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($leadingArguments, $arguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument except for the one specified by ignore.
+     * Example use for:
+     *         HLOOKUP() and VLOOKUP(), where argument 1 is a matrix that needs to be treated as a database
+     *                                  rather than as an array argument.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsIgnore(callable $method, int $ignore, ...$arguments): array
+    {
+        $leadingArguments = array_slice($arguments, 0, $ignore);
+        $ignoreArgument = array_slice($arguments, $ignore, 1);
+        $trailingArguments = array_slice($arguments, $ignore + 1);
+
+        self::initialiseHelper(array_merge($leadingArguments, [[null]], $trailingArguments));
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        array_splice($arguments, $ignore, 1, $ignoreArgument);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+}

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php

@@ -0,0 +1,181 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class BinaryComparison
+{
+    /**
+     * Epsilon Precision used for comparisons in calculations.
+     */
+    private const DELTA = 0.1e-12;
+
+    /**
+     * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpLowercaseFirst($str1, $str2): int
+    {
+        $inversedStr1 = StringHelper::strCaseReverse($str1 ?? '');
+        $inversedStr2 = StringHelper::strCaseReverse($str2 ?? '');
+
+        return strcmp($inversedStr1, $inversedStr2);
+    }
+
+    /**
+     * PHP8.1 deprecates passing null to strcmp.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpAllowNull($str1, $str2): int
+    {
+        return strcmp($str1 ?? '', $str2 ?? '');
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    public static function compare($operand1, $operand2, string $operator): bool
+    {
+        //    Simple validate the two operands if they are string values
+        if (is_string($operand1) && $operand1 > '' && $operand1[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand1 = Calculation::unwrapResult($operand1);
+        }
+        if (is_string($operand2) && $operand2 > '' && $operand2[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand2 = Calculation::unwrapResult($operand2);
+        }
+
+        // Use case insensitive comparaison if not OpenOffice mode
+        if (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) {
+            if (is_string($operand1)) {
+                $operand1 = StringHelper::strToUpper($operand1);
+            }
+            if (is_string($operand2)) {
+                $operand2 = StringHelper::strToUpper($operand2);
+            }
+        }
+
+        $useLowercaseFirstComparison = is_string($operand1) &&
+            is_string($operand2) &&
+            Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE;
+
+        return self::evaluateComparison($operand1, $operand2, $operator, $useLowercaseFirstComparison);
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function evaluateComparison($operand1, $operand2, string $operator, bool $useLowercaseFirstComparison): bool
+    {
+        switch ($operator) {
+            //    Equality
+            case '=':
+                return self::equal($operand1, $operand2);
+            //    Greater than
+            case '>':
+                return self::greaterThan($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Less than
+            case '<':
+                return self::lessThan($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Greater than or equal
+            case '>=':
+                return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Less than or equal
+            case '<=':
+                return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Inequality
+            case '<>':
+                return self::notEqual($operand1, $operand2);
+            default:
+                throw new Exception('Unsupported binary comparison operator');
+        }
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function equal($operand1, $operand2): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = (abs($operand1 - $operand2) < self::DELTA);
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 == $operand2;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) == 0;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function greaterThanOrEqual($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 > $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 >= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) >= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) >= 0;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function lessThanOrEqual($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 < $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 <= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) <= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) <= 0;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function greaterThan($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function lessThan($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function notEqual($operand1, $operand2): bool
+    {
+        return self::equal($operand1, $operand2) !== true;
+    }
+}

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php

@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class DGet extends DatabaseAbstract
 {
@@ -41,7 +41,7 @@ class DGet extends DatabaseAbstract
 
         $columnData = self::getFilteredColumn($database, $field, $criteria);
         if (count($columnData) > 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $row = array_pop($columnData);

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php

@@ -278,9 +278,9 @@ class DateTime
      *                                    or a standard date string
      * @param mixed $endDate Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
-     * @param string $unit
+     * @param array|string $unit
      *
-     * @return int|string Interval between the dates
+     * @return array|int|string Interval between the dates
      */
     public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D')
     {
@@ -300,12 +300,12 @@ class DateTime
      * @See DateTimeExcel\Days::between()
      *      Use the between method in the DateTimeExcel\Days class instead
      *
-     * @param DateTimeInterface|float|int|string $endDate Excel date serial value (float),
+     * @param array|DateTimeInterface|float|int|string $endDate Excel date serial value (float),
      * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     * @param DateTimeInterface|float|int|string $startDate Excel date serial value (float),
+     * @param array|DateTimeInterface|float|int|string $startDate Excel date serial value (float),
      * PHP date timestamp (integer), PHP DateTime object, or a standard date string
      *
-     * @return int|string Number of days between start date and end date or an error
+     * @return array|int|string Number of days between start date and end date or an error
      */
     public static function DAYS($endDate = 0, $startDate = 0)
     {
@@ -331,7 +331,7 @@ class DateTime
      *                                        PHP DateTime object, or a standard date string
      * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param bool $method US or European Method
+     * @param array|bool $method US or European Method
      *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
      *                                        the last day of a month, it becomes equal to the 30th of the
      *                                        same month. If the ending date is the last day of a month and
@@ -343,7 +343,7 @@ class DateTime
      *                                        occur on the 31st of a month become equal to the 30th of the
      *                                        same month.
      *
-     * @return int|string Number of days between start date and end date
+     * @return array|int|string Number of days between start date and end date
      */
     public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
     {
@@ -373,14 +373,14 @@ class DateTime
      *                                    PHP DateTime object, or a standard date string
      * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param int $method Method used for the calculation
+     * @param array|int $method Method used for the calculation
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
      *
-     * @return float|string fraction of the year, or a string containing an error
+     * @return array|float|string fraction of the year, or a string containing an error
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {
@@ -409,7 +409,7 @@ class DateTime
      *                                            PHP DateTime object, or a standard date string
      * @param mixed $dateArgs
      *
-     * @return int|string Interval between the dates
+     * @return array|int|string Interval between the dates
      */
     public static function NETWORKDAYS($startDate, $endDate, ...$dateArgs)
     {
@@ -464,7 +464,7 @@ class DateTime
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      *
-     * @return int|string Day of the month
+     * @return array|int|string Day of the month
      */
     public static function DAYOFMONTH($dateValue = 1)
     {
@@ -492,7 +492,7 @@ class DateTime
      *                                        2                Numbers 1 (Monday) through 7 (Sunday).
      *                                        3                Numbers 0 (Monday) through 6 (Sunday).
      *
-     * @return int|string Day of the week value
+     * @return array|int|string Day of the week value
      */
     public static function WEEKDAY($dateValue = 1, $style = 1)
     {
@@ -704,7 +704,7 @@ class DateTime
      *                                        17               Week begins on Sunday.
      *                                        21               ISO (Jan. 4 is week 1, begins on Monday).
      *
-     * @return int|string Week Number
+     * @return array|int|string Week Number
      */
     public static function WEEKNUM($dateValue = 1, $method = self::STARTWEEK_SUNDAY)
     {
@@ -727,7 +727,7 @@ class DateTime
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      *
-     * @return int|string Week Number
+     * @return array|int|string Week Number
      */
     public static function ISOWEEKNUM($dateValue = 1)
     {
@@ -751,7 +751,7 @@ class DateTime
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      *
-     * @return int|string Month of the year
+     * @return array|int|string Month of the year
      */
     public static function MONTHOFYEAR($dateValue = 1)
     {
@@ -775,7 +775,7 @@ class DateTime
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      *
-     * @return int|string Year
+     * @return array|int|string Year
      */
     public static function YEAR($dateValue = 1)
     {
@@ -799,7 +799,7 @@ class DateTime
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Hour
+     * @return array|int|string Hour
      */
     public static function HOUROFDAY($timeValue = 0)
     {
@@ -823,7 +823,7 @@ class DateTime
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Minute
+     * @return array|int|string Minute
      */
     public static function MINUTE($timeValue = 0)
     {
@@ -847,7 +847,7 @@ class DateTime
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Second
+     * @return array|int|string Second
      */
     public static function SECOND($timeValue = 0)
     {

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php

@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Current
 {
@@ -27,9 +27,9 @@ class Current
     public static function today()
     {
         $dti = new DateTimeImmutable();
-        $dateArray = date_parse($dti->format('c'));
+        $dateArray = Helpers::dateParse($dti->format('c'));
 
-        return is_array($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : Functions::VALUE();
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : ExcelError::VALUE();
     }
 
     /**
@@ -52,8 +52,8 @@ class Current
     public static function now()
     {
         $dti = new DateTimeImmutable();
-        $dateArray = date_parse($dti->format('c'));
+        $dateArray = Helpers::dateParse($dti->format('c'));
 
-        return is_array($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : Functions::VALUE();
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : ExcelError::VALUE();
     }
 }

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php

@@ -2,13 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Date
 {
+    use ArrayEnabled;
+
     /**
      * DATE.
      *
@@ -24,7 +27,7 @@ class Date
      * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
      *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
      *
-     * @param int $year The value of the year argument can include one to four digits.
+     * @param array|int $year The value of the year argument can include one to four digits.
      *                                Excel interprets the year argument according to the configured
      *                                date system: 1900 or 1904.
      *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
@@ -35,7 +38,7 @@ class Date
      *                                2008.
      *                                If year is less than 0 or is 10000 or greater, Excel returns the
      *                                #NUM! error value.
-     * @param int $month A positive or negative integer representing the month of the year
+     * @param array|int $month A positive or negative integer representing the month of the year
      *                                from 1 to 12 (January to December).
      *                                If month is greater than 12, month adds that number of months to
      *                                the first month in the year specified. For example, DATE(2008,14,2)
@@ -44,7 +47,7 @@ class Date
      *                                number of months, plus 1, from the first month in the year
      *                                specified. For example, DATE(2008,-3,2) returns the serial number
      *                                representing September 2, 2007.
-     * @param int $day A positive or negative integer representing the day of the month
+     * @param array|int $day A positive or negative integer representing the day of the month
      *                                from 1 to 31.
      *                                If day is greater than the number of days in the month specified,
      *                                day adds that number of days to the first day in the month. For
@@ -57,9 +60,15 @@ class Date
      *
      * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function fromYMD($year, $month, $day)
     {
+        if (is_array($year) || is_array($month) || is_array($day)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $year, $month, $day);
+        }
+
         $baseYear = SharedDateHelper::getExcelCalendar();
 
         try {
@@ -84,18 +93,17 @@ class Date
      */
     private static function getYear($year, int $baseYear): int
     {
-        $year = Functions::flattenSingleValue($year);
         $year = ($year !== null) ? StringHelper::testStringAsNumeric((string) $year) : 0;
         if (!is_numeric($year)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
         $year = (int) $year;
 
         if ($year < ($baseYear - 1900)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
         if ((($baseYear - 1900) !== 0) && ($year < $baseYear) && ($year >= 1900)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
@@ -112,15 +120,13 @@ class Date
      */
     private static function getMonth($month): int
     {
-        $month = Functions::flattenSingleValue($month);
-
         if (($month !== null) && (!is_numeric($month))) {
             $month = SharedDateHelper::monthStringToNumber($month);
         }
 
         $month = ($month !== null) ? StringHelper::testStringAsNumeric((string) $month) : 0;
         if (!is_numeric($month)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) $month;
@@ -133,15 +139,13 @@ class Date
      */
     private static function getDay($day): int
     {
-        $day = Functions::flattenSingleValue($day);
-
         if (($day !== null) && (!is_numeric($day))) {
             $day = SharedDateHelper::dayStringToNumber($day);
         }
 
         $day = ($day !== null) ? StringHelper::testStringAsNumeric((string) $day) : 0;
         if (!is_numeric($day)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) $day;
@@ -162,7 +166,7 @@ class Date
 
         // Re-validate the year parameter after adjustments
         if (($year < $baseYear) || ($year >= 10000)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
     }
 }

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php

@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class DateParts
 {
+    use ArrayEnabled;
+
     /**
      * DAYOFMONTH.
      *
@@ -19,11 +22,18 @@ class DateParts
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Day of the month
+     * @return array|int|string Day of the month
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function day($dateValue)
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         $weirdResult = self::weirdCondition($dateValue);
         if ($weirdResult >= 0) {
             return $weirdResult;
@@ -52,11 +62,18 @@ class DateParts
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Month of the year
+     * @return array|int|string Month of the year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function month($dateValue)
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue);
         } catch (Exception $e) {
@@ -83,11 +100,18 @@ class DateParts
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Year
+     * @return array|int|string Year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function year($dateValue)
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue);
         } catch (Exception $e) {

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php

@@ -3,11 +3,14 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class DateValue
 {
+    use ArrayEnabled;
+
     /**
      * DATEVALUE.
      *
@@ -21,7 +24,7 @@ class DateValue
      * Excel Function:
      *        DATEVALUE(dateValue)
      *
-     * @param string $dateValue Text that represents a date in a Microsoft Excel date format.
+     * @param array|string $dateValue Text that represents a date in a Microsoft Excel date format.
      *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
      *                                    quotation marks that represent dates. Using the default date
      *                                    system in Excel for Windows, date_text must represent a date from
@@ -29,17 +32,24 @@ class DateValue
      *                                    system in Excel for the Macintosh, date_text must represent a date
      *                                    from January 1, 1904, to December 31, 9999. DATEVALUE returns the
      *                                    #VALUE! error value if date_text is out of this range.
+     *                         Or can be an array of date values
      *
      * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function fromString($dateValue)
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         $dti = new DateTimeImmutable();
         $baseYear = SharedDateHelper::getExcelCalendar();
-        $dateValue = trim(Functions::flattenSingleValue($dateValue ?? ''), '"');
+        $dateValue = trim($dateValue ?? '', '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
-        $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue) ?? '';
+        $dateValue = (string) preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
         //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
         $dateValue = str_replace(['/', '.', '-', '  '], ' ', $dateValue);
 
@@ -49,7 +59,7 @@ class DateValue
         foreach ($t1 as &$t) {
             if ((is_numeric($t)) && ($t > 31)) {
                 if ($yearFound) {
-                    return Functions::VALUE();
+                    return ExcelError::VALUE();
                 }
                 if ($t < 100) {
                     $t += 1900;
@@ -59,7 +69,7 @@ class DateValue
         }
         if (count($t1) === 1) {
             //    We've been fed a time value without any date
-            return ((strpos((string) $t, ':') === false)) ? Functions::Value() : 0.0;
+            return ((strpos((string) $t, ':') === false)) ? ExcelError::Value() : 0.0;
         }
         unset($t);
 
@@ -92,13 +102,11 @@ class DateValue
 
     /**
      * Parse date.
-     *
-     * @return array|bool
      */
-    private static function setUpArray(string $dateValue, DateTimeImmutable $dti)
+    private static function setUpArray(string $dateValue, DateTimeImmutable $dti): array
     {
-        $PHPDateArray = date_parse($dateValue);
-        if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
+        $PHPDateArray = Helpers::dateParse($dateValue);
+        if (!Helpers::dateParseSucceeded($PHPDateArray)) {
             // If original count was 1, we've already returned.
             // If it was 2, we added another.
             // Therefore, neither of the first 2 stroks below can fail.
@@ -106,9 +114,9 @@ class DateValue
             $testVal2 = strtok('- ');
             $testVal3 = strtok('- ') ?: $dti->format('Y');
             Helpers::adjustYear((string) $testVal1, (string) $testVal2, $testVal3);
-            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
-            if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
+            $PHPDateArray = Helpers::dateParse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
+            if (!Helpers::dateParseSucceeded($PHPDateArray)) {
+                $PHPDateArray = Helpers::dateParse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
             }
         }
 
@@ -118,19 +126,17 @@ class DateValue
     /**
      * Final results.
      *
-     * @param array|bool $PHPDateArray
-     *
      * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-    private static function finalResults($PHPDateArray, DateTimeImmutable $dti, int $baseYear)
+    private static function finalResults(array $PHPDateArray, DateTimeImmutable $dti, int $baseYear)
     {
-        $retValue = Functions::Value();
-        if (is_array($PHPDateArray) && $PHPDateArray['error_count'] == 0) {
+        $retValue = ExcelError::Value();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
             // Execute function
             Helpers::replaceIfEmpty($PHPDateArray['year'], $dti->format('Y'));
             if ($PHPDateArray['year'] < $baseYear) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
             Helpers::replaceIfEmpty($PHPDateArray['month'], $dti->format('m'));
             Helpers::replaceIfEmpty($PHPDateArray['day'], $dti->format('d'));
@@ -141,7 +147,7 @@ class DateValue
             $day = (int) $PHPDateArray['day'];
             $year = (int) $PHPDateArray['year'];
             if (!checkdate($month, $day, $year)) {
-                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : Functions::VALUE();
+                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : ExcelError::VALUE();
             }
             $retValue = Helpers::returnIn3FormatsArray($PHPDateArray, true);
         }

vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php

@@ -3,12 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Days
 {
+    use ArrayEnabled;
+
     /**
      * DAYS.
      *
@@ -17,15 +20,23 @@ class Days
      * Excel Function:
      *        DAYS(endDate, startDate)
      *
-     * @param DateTimeInterface|float|int|string $endDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     * @param DateTimeInterface|float|int|string $startDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     * @param array|DateTimeInterface|float|int|string $endDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|DateTimeInterface|float|int|string $startDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Number of days between start date and end date or an error
+     * @return array|int|string Number of days between start date and end date or an error
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
     public static function between($endDate, $startDate)
     {
+        if (is_array($endDate) || is_array($startDate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $endDate, $startDate);
+        }
+
         try {
             $startDate = Helpers::getDateValue($startDate);
             $endDate = Helpers::getDateValue($endDate);
@@ -37,7 +48,7 @@ class Days
         $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
         $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
 
-        $days = Functions::VALUE();
+        $days = ExcelError::VALUE();
         $diff = $PHPStartDateObject->diff($PHPEndDateObject);
         if ($diff !== false && !is_bool($diff->days)) {
             $days = $diff->days;