Merge branch 'hotfix-phoenix' into develop

# Conflicts:
#	app/Admin/routes.php

app/Admin/Actions/Grid/v3/GoodsImage.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Admin\Actions\Grid\v3;
+
+use Dcat\Admin\Grid\RowAction;
+use Dcat\Admin\Widgets\Modal;
+use App\Admin\Forms\v3\GoodsImageForm;
+
+class GoodsImage extends RowAction
+{
+    /**
+     * @return string
+     */
+    protected $title = '上传图片';
+
+    public function render()
+    {
+        $id = $this->getKey();
+
+        $modal = Modal::make()
+            ->xl()
+            ->title($this->title)
+            ->body(GoodsImageForm::make()->setKey($id))
+            ->button($this->title);
+
+        return $modal;
+    }
+
+    public function parameters()
+    {
+       
+        return [
+             
+        ];
+    }
+}

app/Admin/Controllers/v3/GoodsController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers\v3;
 
 use App\Admin\Actions\Grid\v3\GoodsCopy;
+use App\Admin\Actions\Grid\v3\GoodsImage;
 use App\Admin\Repositories\v3\Goods;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -25,34 +26,60 @@ class GoodsController extends AdminController
     protected function grid()
     {
         return Grid::make(new  Goods(), function (Grid $grid) {
+            // 二级分类
+            $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
+            // 店铺
+            $storeList = StoreModel::getStoreArray();
+            // 商品类目
+            $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]);
+            //市场
+            $marketList = MarketModel::getMarketArray();
+
             $grid->id->sortable();
             $grid->cover_img_url->image('',50);
-            $grid->name;
-            $grid->price;
-            $grid->column('market_id')->display(function($marketId){
-                $item = MarketModel::getMarketInfo($marketId,'name');
-                return empty($item) ? '' : $item->name;
+            $grid->name->editable();
+            $grid->price->editable();
+            $grid->column('goods_unit','单位')->editable();
+            $grid->column('spec','规格')->display(function($spec){
+                $item = '';
+                if(!empty($spec)){
+                    foreach($spec as $key => $value){
+                        $specKey = isset($value['spec_key'])?$value['spec_key']:'';
+                        $specValue = isset($value['spec_value'])?$value['spec_value']:'';
+                        $item .= $specKey.'：'.$specValue.'</br>';
+                    }
+                }
+               
+                return $item;
             });
-            $grid->store_id->display(function ($storeId){
-                $store = StoreModel::getStoreInfo($storeId,'name');
-                return empty($store) ? '' : $store->name;
+            $grid->column('market_id')->display(function($marketId) use($marketList){
+                return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
             });
-            $grid->category_id->display(function ($categoryId){
-                $item = CategoryModel::getInfo($categoryId,'title');
-                return empty($item) ? '' : $item->title;
+            $grid->store_id->display(function ($storeId) use($storeList){
+                return isset($storeList[$storeId]) ? $storeList[$storeId] : '';
             });
-            $grid->goods_category_id->display(function ($goodsCategoryId){
-                $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
-                return empty($item) ? '' : $item->title;
+            $grid->category_id->display(function ($categoryId) use($categoryList){
+                return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
+            });
+            $grid->goods_category_id->display(function ($goodsCategoryId) use($goodsCategoryList){
+                return isset($goodsCategoryList[$goodsCategoryId]) ? $goodsCategoryList[$goodsCategoryId] : '';
             });
-            
 
             $grid->sort->sortable();
             $grid->on_sale->switch();
 
-            $grid->actions([new GoodsCopy()]);
-            $grid->filter(function (Grid\Filter $filter) {
+            $grid->actions([new GoodsCopy(),new GoodsImage()]);
+            $grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){
+                $filter->like('name');
+                $filter->equal('id');
                 $filter->like('name');
+                $filter->equal('store_id')->select($storeList);
+                $filter->equal('category_id')->select($categoryList);
+                $filter->equal('goods_category_id')->select($goodsCategoryList);
+                $filter->equal('market_id')->select($marketList);
+                $filter->equal('on_sale')->select(GoodsModel::$_ONSALE);
+                $filter->equal('price');
+                $filter->equal('goods_unit');
             });
 
             $grid->model()->orderBy('id', 'desc');

app/Admin/Forms/v3/GoodsImageForm.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Admin\Forms\v3;
+
+use App\Models\v3\GoodsBanners;
+use Dcat\Admin\Widgets\Form;
+use Symfony\Component\HttpFoundation\Response;
+use App\Models\v3\Goods as GoodsModel;
+use App\Models\v3\GoodsBanners as GoodsBannerModel;
+use Illuminate\Support\Facades\DB;
+
+class GoodsImageForm extends Form
+{
+
+    /**
+     * Handle the form request.
+     *
+     * @param array $input
+     *
+     * @return Response
+     */
+    public function handle(array $input)
+    {
+        // 获取外部传递参数
+        $goodsId = $input['goods_id'];
+        $coverImg= $input['cover_img'];
+        $bannerImg= $input['img_banner'];
+        
+        if($goodsId > 0 && !empty($coverImg)){
+            $data = ['cover_img' => $coverImg];
+            GoodsModel::where('id',$goodsId)->update($data); 
+        }
+        if($goodsId > 0 && !empty($bannerImg)){
+            $banner = GoodsBannerModel::where('goods_id',$goodsId)->first();
+            if(empty($banner)){
+                $banner = new GoodsBanners();
+                $banner->goods_id = $goodsId;
+                $banner->type = 1;
+                $banner->created_at = time();
+            }
+            $banner->path = $bannerImg;
+            $banner->updated_at = time();
+            $banner->save();
+        }
+        
+        return $this->error('修改成功');
+    }
+
+    /**
+     * Build a form here.
+     */
+    public function form()
+    {
+        $id = $this->getKey();
+        $goods = GoodsModel::select('name')->find($id);
+        $goodName = empty($goods->name)?'':$goods->name;
+        $this->hidden('goods_id')->value($id);
+        $this->display('name','商品名称')->value($goodName);
+        $this->image('cover_img','封面图')->autoUpload();
+        $this->image('img_banner','轮播图')->autoUpload();
+    }
+
+    /**
+     * The data of the form.
+     *
+     * @return array
+     */
+    public function default()
+    {
+        return [];
+    }
+
+}

app/Admin/routes.php

@@ -36,7 +36,7 @@ Route::group([
     $router->get('/coupon/TieForm', 'CouponTieController@CouponTieForm');
     $router->get('/couponTie', 'CouponTieController@CouponTieList');
     $router->resource('/coupon_setting', 'v3\CouponSettingController');
-    $router->resource('/coupon', 'v3\couponController');
+    $router->resource('/coupon', 'v3\CouponController');
     //获取所有市场
     $router->any('/api/getAllMarket', 'LanzuServiceSpeakerController@getAllMarkets');
 

composer.lock

@@ -303,6 +303,12 @@
                 "brick",
                 "math"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-18T23:57:15+00:00"
         },
         {
@@ -719,6 +725,20 @@
                 "sqlserver",
                 "sqlsrv"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-12T21:20:41+00:00"
         },
         {
@@ -2280,6 +2300,32 @@
                 "md",
                 "parser"
             ],
+            "funding": [
+                {
+                    "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/colinodell",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-13T14:44:46+00:00"
         },
         {
@@ -2371,6 +2417,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-08-23T07:39:11+00:00"
         },
         {
@@ -2418,6 +2470,16 @@
                 }
             ],
             "description": "Mime-type detection for Flysystem",
+            "funding": [
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-09T10:34:01+00:00"
         },
         {
@@ -2484,6 +2546,12 @@
                 "scout",
                 "search"
             ],
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/matchish",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-03-26T04:06:20+00:00"
         },
         {
@@ -2719,6 +2787,16 @@
                 "datetime",
                 "time"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-10T12:16:42+00:00"
         },
         {
@@ -3021,6 +3099,12 @@
                 "wechat",
                 "weibo"
             ],
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/overtrue",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-09-14T08:34:23+00:00"
         },
         {
@@ -3094,6 +3178,20 @@
                 "weixin",
                 "weixin-sdk"
             ],
+            "funding": [
+                {
+                    "url": "https://www.easywechat.com/img/pay/wechat.jpg",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/overtrue",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/overtrue",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-09-09T09:07:36+00:00"
         },
         {
@@ -3777,6 +3875,12 @@
                 "queue",
                 "set"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-10T20:58:17+00:00"
         },
         {
@@ -3864,6 +3968,12 @@
                 "identifier",
                 "uuid"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                }
+            ],
             "time": "2020-08-18T17:17:46+00:00"
         },
         {
@@ -3981,6 +4091,12 @@
                 "sort",
                 "sortable"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-15T06:48:07+00:00"
         },
         {
@@ -4135,6 +4251,20 @@
                 "caching",
                 "psr6"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-01T05:52:18+00:00"
         },
         {
@@ -4203,6 +4333,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4288,6 +4432,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-02T07:07:40+00:00"
         },
         {
@@ -4347,6 +4505,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
@@ -4403,6 +4575,20 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4471,6 +4657,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-12T08:45:47+00:00"
         },
         {
@@ -4534,6 +4734,20 @@
             ],
             "description": "Symfony ErrorHandler Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T10:01:29+00:00"
         },
         {
@@ -4612,6 +4826,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-13T14:19:42+00:00"
         },
         {
@@ -4680,6 +4908,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4735,6 +4977,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T10:01:29+00:00"
         },
         {
@@ -4802,6 +5058,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T07:48:54+00:00"
         },
         {
@@ -4907,6 +5177,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-02T08:15:18+00:00"
         },
         {
@@ -4976,6 +5260,20 @@
                 "mime",
                 "mime-type"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T10:01:29+00:00"
         },
         {
@@ -5732,6 +6030,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-23T08:36:24+00:00"
         },
         {
@@ -5802,6 +6114,20 @@
                 "psr-17",
                 "psr-7"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-06-25T08:21:47+00:00"
         },
         {
@@ -5886,6 +6212,20 @@
                 "uri",
                 "url"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-10T08:03:57+00:00"
         },
         {
@@ -5975,6 +6315,20 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-01T05:52:18+00:00"
         },
         {
@@ -6043,6 +6397,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -6120,6 +6488,20 @@
                 "utf-8",
                 "utf8"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T07:48:54+00:00"
         },
         {
@@ -6204,6 +6586,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T10:01:29+00:00"
         },
         {
@@ -6271,6 +6667,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -6353,6 +6763,20 @@
                 "debug",
                 "dump"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-17T07:42:30+00:00"
         },
         {
@@ -6420,6 +6844,20 @@
                 "instantiate",
                 "serialize"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-06-07T15:42:22+00:00"
         },
         {
@@ -6725,6 +7163,12 @@
                 "flare",
                 "reporting"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
             "time": "2020-08-26T18:06:23+00:00"
         },
         {
@@ -8032,6 +8476,12 @@
                 "highlight.php",
                 "syntax"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/allejo",
+                    "type": "github"
+                }
+            ],
             "time": "2020-08-27T03:24:44+00:00"
         },
         {
@@ -8831,5 +9281,6 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }