From 80d24dbc34e6beafdffce02921ba4e78a02e8e98 Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:22:16 +0800
Subject: [PATCH 01/41] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.json | 9 +-
composer.lock | 917 +++++++++++++++++++++++++++++++++++++++++++--
public/w7/jssdk.js | 102 +++++
3 files changed, 997 insertions(+), 31 deletions(-)
create mode 100644 public/w7/jssdk.js
diff --git a/composer.json b/composer.json
index 3ae87dd..96c5325 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
"jianyan74/php-excel": "^1.0",
"zhongshaofa/easy-admin": "^1.0.2",
"ext-json": "*",
- "zhongshaofa/thinkphp-log-trace": "^1.0"
+ "zhongshaofa/thinkphp-log-trace": "^1.0",
+ "w7/sdk-console-php": "^1.0"
},
"require-dev": {
"symfony/var-dumper": "^4.2",
@@ -57,6 +58,12 @@
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer/"
+ },
+ "1": {
+ "type" : "git",
+ "url" : "https://gitee.com/free-worker/console-sdk-php.git"
}
}
+
+
}
diff --git a/composer.lock b/composer.lock
index 5eb9c74..abd22ca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c6d2a0afafddc47a177c5e3a901d9ed0",
+ "content-hash": "e6f38d72106449fc439f46adc4ea1c23",
"packages": [
{
"name": "adbario/php-dot-notation",
@@ -389,6 +389,103 @@
},
"time": "2021-08-05T19:00:23+00:00"
},
+ {
+ "name": "doctrine/inflector",
+ "version": "2.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/inflector.git",
+ "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+ "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^8.2",
+ "phpstan/phpstan": "^0.12",
+ "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/phpstan-strict-rules": "^0.12",
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "vimeo/psalm": "^4.10"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
+ }
+ ],
+ "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
+ "homepage": "https://www.doctrine-project.org/projects/inflector.html",
+ "keywords": [
+ "inflection",
+ "inflector",
+ "lowercase",
+ "manipulation",
+ "php",
+ "plural",
+ "singular",
+ "strings",
+ "uppercase",
+ "words"
+ ],
+ "support": {
+ "issues": "https://github.com/doctrine/inflector/issues",
+ "source": "https://github.com/doctrine/inflector/tree/2.0.4"
+ },
+ "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%2Finflector",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-10-22T20:16:43+00:00"
+ },
{
"name": "doctrine/lexer",
"version": "1.2.1",
@@ -806,6 +903,132 @@
],
"time": "2019-07-01T23:21:34+00:00"
},
+ {
+ "name": "illuminate/contracts",
+ "version": "v7.30.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/illuminate/contracts.git",
+ "reference": "2449f2ea949ddf995a3dcffe5e21c768cf7d6478"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/illuminate/contracts/zipball/2449f2ea949ddf995a3dcffe5e21c768cf7d6478",
+ "reference": "2449f2ea949ddf995a3dcffe5e21c768cf7d6478",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^7.2.5|^8.0",
+ "psr/container": "^1.0",
+ "psr/simple-cache": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Illuminate\\Contracts\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "The Illuminate Contracts package.",
+ "homepage": "https://laravel.com",
+ "support": {
+ "issues": "https://github.com/laravel/framework/issues",
+ "source": "https://github.com/laravel/framework"
+ },
+ "time": "2021-11-17T15:00:14+00:00"
+ },
+ {
+ "name": "illuminate/support",
+ "version": "v7.30.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/illuminate/support.git",
+ "reference": "c7b42acd009c94a3f8b749a65f6835db90174d58"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/illuminate/support/zipball/c7b42acd009c94a3f8b749a65f6835db90174d58",
+ "reference": "c7b42acd009c94a3f8b749a65f6835db90174d58",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "doctrine/inflector": "^1.4|^2.0",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "illuminate/contracts": "^7.0",
+ "nesbot/carbon": "^2.31",
+ "php": "^7.2.5|^8.0",
+ "voku/portable-ascii": "^1.4.8"
+ },
+ "conflict": {
+ "tightenco/collect": "<5.5.33"
+ },
+ "suggest": {
+ "illuminate/filesystem": "Required to use the composer class (^7.0).",
+ "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+ "ramsey/uuid": "Required to use Str::uuid() (^3.7|^4.0).",
+ "symfony/process": "Required to use the composer class (^5.0).",
+ "symfony/var-dumper": "Required to use the dd function (^5.0).",
+ "vlucas/phpdotenv": "Required to use the Env class and env helper (^4.0)."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "7.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "helpers.php"
+ ],
+ "psr-4": {
+ "Illuminate\\Support\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "The Illuminate Support package.",
+ "homepage": "https://laravel.com",
+ "support": {
+ "issues": "https://github.com/laravel/framework/issues",
+ "source": "https://github.com/laravel/framework"
+ },
+ "time": "2021-12-06T19:25:06+00:00"
+ },
{
"name": "jianyan74/php-excel",
"version": "1.0.1",
@@ -1236,6 +1459,114 @@
],
"time": "2016-12-03T22:08:25+00:00"
},
+ {
+ "name": "nesbot/carbon",
+ "version": "2.64.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/briannesbitt/Carbon.git",
+ "reference": "889546413c97de2d05063b8cb7b193c2531ea211"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/889546413c97de2d05063b8cb7b193c2531ea211",
+ "reference": "889546413c97de2d05063b8cb7b193c2531ea211",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "ext-json": "*",
+ "php": "^7.1.8 || ^8.0",
+ "symfony/polyfill-mbstring": "^1.0",
+ "symfony/polyfill-php80": "^1.16",
+ "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+ },
+ "require-dev": {
+ "doctrine/dbal": "^2.0 || ^3.1.4",
+ "doctrine/orm": "^2.7",
+ "friendsofphp/php-cs-fixer": "^3.0",
+ "kylekatarnls/multi-tester": "^2.0",
+ "ondrejmirtes/better-reflection": "*",
+ "phpmd/phpmd": "^2.9",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^0.12.99 || ^1.7.14",
+ "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
+ "squizlabs/php_codesniffer": "^3.4"
+ },
+ "bin": [
+ "bin/carbon"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-3.x": "3.x-dev",
+ "dev-master": "2.x-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Carbon\\Laravel\\ServiceProvider"
+ ]
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Carbon\\": "src/Carbon/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Brian Nesbitt",
+ "email": "brian@nesbot.com",
+ "homepage": "https://markido.com"
+ },
+ {
+ "name": "kylekatarnls",
+ "homepage": "https://github.com/kylekatarnls"
+ }
+ ],
+ "description": "An API extension for DateTime that supports 281 different languages.",
+ "homepage": "https://carbon.nesbot.com",
+ "keywords": [
+ "date",
+ "datetime",
+ "time"
+ ],
+ "support": {
+ "docs": "https://carbon.nesbot.com/docs",
+ "issues": "https://github.com/briannesbitt/Carbon/issues",
+ "source": "https://github.com/briannesbitt/Carbon"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sponsors/kylekatarnls",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/Carbon#sponsor",
+ "type": "opencollective"
+ },
+ {
+ "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-11-26T17:36:00+00:00"
+ },
{
"name": "phpoffice/phpspreadsheet",
"version": "1.12.0",
@@ -1762,17 +2093,17 @@
"time": "2019-03-08T08:55:37+00:00"
},
{
- "name": "symfony/polyfill-mbstring",
- "version": "v1.16.0",
+ "name": "symfony/deprecation-contracts",
+ "version": "v2.5.2",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "a54881ec0ab3b2005c406aed0023c062879031e7"
+ "url": "https://github.com/symfony/deprecation-contracts.git",
+ "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a54881ec0ab3b2005c406aed0023c062879031e7",
- "reference": "a54881ec0ab3b2005c406aed0023c062879031e7",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+ "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"shasum": "",
"mirrors": [
{
@@ -1782,23 +2113,21 @@
]
},
"require": {
- "php": ">=5.3.3"
- },
- "suggest": {
- "ext-mbstring": "For best performance"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16-dev"
+ "dev-main": "2.5-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- },
"files": [
- "bootstrap.php"
+ "function.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -1815,29 +2144,380 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for the Mbstring extension",
+ "description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "mbstring",
- "polyfill",
- "portable",
- "shim"
+ "support": {
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+ },
+ "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-08T16:50:20+00:00"
+ "time": "2022-01-02T09:53:40+00:00"
},
{
- "name": "topthink/framework",
- "version": "v6.0.8",
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.16.0",
"source": {
"type": "git",
- "url": "https://github.com/top-think/framework.git",
- "reference": "4789343672aef06d571d556da369c0e156609bce"
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "a54881ec0ab3b2005c406aed0023c062879031e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/framework/zipball/4789343672aef06d571d556da369c0e156609bce",
- "reference": "4789343672aef06d571d556da369c0e156609bce",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a54881ec0ab3b2005c406aed0023c062879031e7",
+ "reference": "a54881ec0ab3b2005c406aed0023c062879031e7",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.16-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2020-05-08T16:50:20+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php80",
+ "version": "v1.27.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php80.git",
+ "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+ "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.27-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Php80\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ion Bazan",
+ "email": "ion.bazan@gmail.com"
+ },
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+ },
+ "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": "2022-11-03T14:55:06+00:00"
+ },
+ {
+ "name": "symfony/translation",
+ "version": "v5.4.14",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/translation.git",
+ "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab",
+ "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.1|^3",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php80": "^1.16",
+ "symfony/translation-contracts": "^2.3"
+ },
+ "conflict": {
+ "symfony/config": "<4.4",
+ "symfony/console": "<5.3",
+ "symfony/dependency-injection": "<5.0",
+ "symfony/http-kernel": "<5.0",
+ "symfony/twig-bundle": "<5.0",
+ "symfony/yaml": "<4.4"
+ },
+ "provide": {
+ "symfony/translation-implementation": "2.3"
+ },
+ "require-dev": {
+ "psr/log": "^1|^2|^3",
+ "symfony/config": "^4.4|^5.0|^6.0",
+ "symfony/console": "^5.4|^6.0",
+ "symfony/dependency-injection": "^5.0|^6.0",
+ "symfony/finder": "^4.4|^5.0|^6.0",
+ "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
+ "symfony/http-kernel": "^5.0|^6.0",
+ "symfony/intl": "^4.4|^5.0|^6.0",
+ "symfony/polyfill-intl-icu": "^1.21",
+ "symfony/service-contracts": "^1.1.2|^2|^3",
+ "symfony/yaml": "^4.4|^5.0|^6.0"
+ },
+ "suggest": {
+ "psr/log-implementation": "To use logging capability in translator",
+ "symfony/config": "",
+ "symfony/yaml": ""
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "Resources/functions.php"
+ ],
+ "psr-4": {
+ "Symfony\\Component\\Translation\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides tools to internationalize your application",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/translation/tree/v5.4.14"
+ },
+ "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": "2022-10-07T08:01:20+00:00"
+ },
+ {
+ "name": "symfony/translation-contracts",
+ "version": "v2.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/translation-contracts.git",
+ "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
+ "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.2.5"
+ },
+ "suggest": {
+ "symfony/translation-implementation": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "2.5-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Contracts\\Translation\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Generic abstractions related to translation",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2"
+ },
+ "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": "2022-06-27T16:58:25+00:00"
+ },
+ {
+ "name": "topthink/framework",
+ "version": "v6.0.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/top-think/framework.git",
+ "reference": "4789343672aef06d571d556da369c0e156609bce"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/top-think/framework/zipball/4789343672aef06d571d556da369c0e156609bce",
+ "reference": "4789343672aef06d571d556da369c0e156609bce",
"shasum": "",
"mirrors": [
{
@@ -2184,6 +2864,183 @@
"description": "thinkphp template driver",
"time": "2019-10-07T12:23:10+00:00"
},
+ {
+ "name": "voku/portable-ascii",
+ "version": "1.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/voku/portable-ascii.git",
+ "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a",
+ "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+ },
+ "suggest": {
+ "ext-intl": "Use Intl for transliterator_transliterate() support"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "voku\\": "src/voku/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Lars Moelleken",
+ "homepage": "http://www.moelleken.org/"
+ }
+ ],
+ "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
+ "homepage": "https://github.com/voku/portable-ascii",
+ "keywords": [
+ "ascii",
+ "clean",
+ "php"
+ ],
+ "support": {
+ "issues": "https://github.com/voku/portable-ascii/issues",
+ "source": "https://github.com/voku/portable-ascii/tree/1.6.1"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.me/moelleken",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/voku",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/portable-ascii",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://www.patreon.com/voku",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-01-24T18:55:24+00:00"
+ },
+ {
+ "name": "w7/sdk-console-php",
+ "version": "v1.0.6",
+ "source": {
+ "type": "git",
+ "url": "https://gitee.com/free-worker/console-sdk-php.git",
+ "reference": "aa5f88a562db9904500fdd22b9076502e03d3f8b"
+ },
+ "require": {
+ "php": "^7.2",
+ "w7corp/sdk-cloud": "^1.0"
+ },
+ "require-dev": {
+ "topthink/framework": "^6.1",
+ "w7/php-cs-fixer": "^3.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "W7\\Sdk\\Console\\Service\\ServiceProvider\\OrderServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "W7\\Sdk\\Console\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "W7\\Sdk\\Console\\Tests\\": "tests/"
+ },
+ "files": [
+ "src/Testing/helper.php"
+ ]
+ },
+ "description": "w7 console sdk",
+ "time": "2022-12-26T03:21:17+00:00"
+ },
+ {
+ "name": "w7corp/sdk-cloud",
+ "version": "1.0.25",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/w7corp/sdk-open-cloud.git",
+ "reference": "ca1ad297e96743aa6d8ba8ace056afe1e34c13dd"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/w7corp/sdk-open-cloud/zipball/ca1ad297e96743aa6d8ba8ace056afe1e34c13dd",
+ "reference": "ca1ad297e96743aa6d8ba8ace056afe1e34c13dd",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-zlib": "*",
+ "guzzlehttp/guzzle": "^6.3|^7.0",
+ "guzzlehttp/guzzle-services": "^1.1",
+ "illuminate/support": "*",
+ "league/flysystem": "*"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.18",
+ "phpunit/phpunit": "^8.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "W7\\Sdk\\OpenCloud\\": "Src/",
+ "W7\\Sdk\\OpenCloud\\Tests\\": "tests/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "we7team",
+ "email": "donknap@gmail.com"
+ }
+ ],
+ "description": "微擎云服务更新SDK",
+ "support": {
+ "issues": "https://github.com/w7corp/sdk-open-cloud/issues",
+ "source": "https://github.com/w7corp/sdk-open-cloud/tree/1.0.25"
+ },
+ "time": "2022-07-26T07:04:07+00:00"
+ },
{
"name": "zhongshaofa/easy-admin",
"version": "v1.0.2",
diff --git a/public/w7/jssdk.js b/public/w7/jssdk.js
new file mode 100644
index 0000000..f6e9e37
--- /dev/null
+++ b/public/w7/jssdk.js
@@ -0,0 +1,102 @@
+(function(){
+ msg();
+
+ window.addEventListener("load",function(){
+ setA();
+ var observe=new MutationObserver(setA);
+ observe.observe(document.body,{childList:true, subtree:true});
+ });
+
+ function setA(){
+ var a = document.querySelectorAll("a");
+ for(var i=0; i{
+ let msg = e.data;
+ if(!msg.w7 || !msg.type){return}
+ let event = new Event(msg.type);
+ event.data = msg.data;
+ window.dispatchEvent(event);
+ });
+
+ function w7Set(){
+ if(!window.w7){window.w7 = {}};
+ window.w7.setStorage = ({key, value}) => {
+ return localStorage.setItem(((window.w7.storage_key || '') + key), value)
+ }
+ window.w7.getStorage = (key) => {
+ return localStorage.getItem(((window.w7.storage_key || '') + key))
+ }
+ window.w7.removeStorage = (key) => {
+ return localStorage.removeItem(((window.w7.storage_key || '') + key))
+ }
+ window.w7.clearStorage = ()=>{
+ if(window.w7.storage_key) {
+ for(let i in localStorage) {
+ if(i.indexOf(window.w7.storage_key)>-1) {localStorage.removeItem(i)}
+ }
+ } else {
+ return localStorage.clear()
+ }
+ }
+ // 支付
+ window.w7.pay = (ticket,callback)=>{
+ window.parent.postMessage({type:"pay", ticket:ticket}, "*");
+ window.addEventListener('w7_pay',callback,{once:true});
+ }
+ window.w7.payment = (data,callback)=>{
+ // origin_appid 支付系统id, origin_pay_appid APPID, goods_ids 商品ID数组, account_id 户名id, version 版本
+ window.parent.postMessage({type:"payment", data: data}, "*");
+ window.addEventListener('w7_payment',callback,{once:true});
+ }
+ // 登录
+ window.w7.login = (callback)=>{
+ window.parent.postMessage({type:"login"}, "*");
+ window.addEventListener('w7_login',callback,{once:true});
+ }
+ // 获取ticket
+ window.w7.jsTicket = (callback)=>{
+ window.parent.postMessage({type:"jsTicket"}, "*");
+ window.addEventListener('w7_jsTicket',callback,{once:true});
+ }
+ // 获取实名
+ window.w7.realname = (callback)=>{
+ window.parent.postMessage({type:"realname"}, "*");
+ window.addEventListener('w7_realname',callback,{once:true});
+ }
+ // 模块信息
+ window.w7.getModuleInfo = (callback)=>{
+ window.parent.postMessage({type:"getModuleInfo"}, "*");
+ window.addEventListener('w7_getModuleInfo',callback,{once:true});
+ }
+ // 菜单收起展开
+ window.w7.changeMenuCollapse = (isOpen)=>{
+ window.parent.postMessage({type:"changeMenuCollapse", value:isOpen}, "*");
+ }
+ // 打开邀请界面
+ window.w7.inviteUser = ()=>{
+ window.parent.postMessage({type:"inviteUser"}, "*");
+ }
+ window.w7.loaded = ()=>{
+ window.parent.postMessage({loaded:location.href}, '*');
+ }
+ }
+ }
+})();
\ No newline at end of file
--
Gitee
From 5132ac378bb3604850ef363c35c197665e0915c0 Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:23:37 +0800
Subject: [PATCH 02/41] fix: first
---
app/admin/view/layout/default.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/admin/view/layout/default.html b/app/admin/view/layout/default.html
index 6ead6f4..8763e6d 100644
--- a/app/admin/view/layout/default.html
+++ b/app/admin/view/layout/default.html
@@ -25,6 +25,7 @@
+
{__CONTENT__}
--
Gitee
From 3dea5660bf67242a3322d748ec8660aae039c2df Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:32:03 +0800
Subject: [PATCH 03/41] fix: first
---
composer.lock | 2311 +++++++++++++++++++++++++++++----------------
config/swoole.php | 97 ++
public/index.php | 2 +-
think | 1 +
4 files changed, 1618 insertions(+), 793 deletions(-)
create mode 100644 config/swoole.php
diff --git a/composer.lock b/composer.lock
index abd22ca..da84bc5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "adbario/php-dot-notation",
- "version": "2.2.0",
+ "version": "2.4.1",
"source": {
"type": "git",
"url": "https://github.com/adbario/php-dot-notation.git",
- "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e"
+ "reference": "3bfe67895d26697d20485343499532234eeb7c08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/eee4fc81296531e6aafba4c2bbccfc5adab1676e",
- "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e",
+ "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/3bfe67895d26697d20485343499532234eeb7c08",
+ "reference": "3bfe67895d26697d20485343499532234eeb7c08",
"shasum": "",
"mirrors": [
{
@@ -28,11 +28,11 @@
},
"require": {
"ext-json": "*",
- "php": ">=5.5"
+ "php": "^5.5 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0|^5.0|^6.0",
- "squizlabs/php_codesniffer": "^3.0"
+ "phpunit/phpunit": "^4.8|^5.7|^6.6|^7.5|^8.5|^9.5",
+ "squizlabs/php_codesniffer": "^3.6"
},
"type": "library",
"autoload": {
@@ -59,20 +59,24 @@
"ArrayAccess",
"dotnotation"
],
- "time": "2019-01-01T23:59:15+00:00"
+ "support": {
+ "issues": "https://github.com/adbario/php-dot-notation/issues",
+ "source": "https://github.com/adbario/php-dot-notation/tree/2.4.1"
+ },
+ "time": "2022-08-25T19:47:20+00:00"
},
{
"name": "alibabacloud/client",
- "version": "1.5.18",
+ "version": "1.5.32",
"source": {
"type": "git",
"url": "https://github.com/aliyun/openapi-sdk-php-client.git",
- "reference": "5dcf7b8fdfa64abdae7a5ca867289baf95e8e12a"
+ "reference": "5bc6f6d660797dcee2c3aef29700ab41ee764f4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aliyun/openapi-sdk-php-client/zipball/5dcf7b8fdfa64abdae7a5ca867289baf95e8e12a",
- "reference": "5dcf7b8fdfa64abdae7a5ca867289baf95e8e12a",
+ "url": "https://api.github.com/repos/aliyun/openapi-sdk-php-client/zipball/5bc6f6d660797dcee2c3aef29700ab41ee764f4d",
+ "reference": "5bc6f6d660797dcee2c3aef29700ab41ee764f4d",
"shasum": "",
"mirrors": [
{
@@ -82,9 +86,8 @@
]
},
"require": {
- "adbario/php-dot-notation": "^2.2",
+ "adbario/php-dot-notation": "^2.4.1",
"clagiordano/weblibs-configmanager": "^1.0",
- "danielstjules/stringy": "^3.1",
"ext-curl": "*",
"ext-json": "*",
"ext-libxml": "*",
@@ -92,8 +95,8 @@
"ext-openssl": "*",
"ext-simplexml": "*",
"ext-xmlwriter": "*",
- "guzzlehttp/guzzle": "^6.3",
- "mtdowling/jmespath.php": "^2.4",
+ "guzzlehttp/guzzle": "^6.3|^7.0",
+ "mtdowling/jmespath.php": "^2.5",
"php": ">=5.5"
},
"require-dev": {
@@ -106,7 +109,7 @@
"league/climate": "^3.2.4",
"mikey179/vfsstream": "^1.6",
"monolog/monolog": "^1.24",
- "phpunit/phpunit": "^4.8.35|^5.4.3",
+ "phpunit/phpunit": "^5.7|^6.6|^7.5|^8.5|^9.5",
"psr/cache": "^1.0",
"symfony/dotenv": "^3.4",
"symfony/var-dumper": "^3.4"
@@ -116,12 +119,12 @@
},
"type": "library",
"autoload": {
- "psr-4": {
- "AlibabaCloud\\Client\\": "src"
- },
"files": [
"src/Functions.php"
- ]
+ ],
+ "psr-4": {
+ "AlibabaCloud\\Client\\": "src"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -146,20 +149,24 @@
"sdk",
"tool"
],
- "time": "2019-10-11T11:09:47+00:00"
+ "support": {
+ "issues": "https://github.com/aliyun/openapi-sdk-php-client/issues",
+ "source": "https://github.com/aliyun/openapi-sdk-php-client"
+ },
+ "time": "2022-12-09T04:05:55+00:00"
},
{
"name": "aliyuncs/oss-sdk-php",
- "version": "v2.3.0",
+ "version": "v2.6.0",
"source": {
"type": "git",
"url": "https://github.com/aliyun/aliyun-oss-php-sdk.git",
- "reference": "e69f57916678458642ac9d2fd341ae78a56996c8"
+ "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/e69f57916678458642ac9d2fd341ae78a56996c8",
- "reference": "e69f57916678458642ac9d2fd341ae78a56996c8",
+ "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/572d0f8e099e8630ae7139ed3fdedb926c7a760f",
+ "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f",
"shasum": "",
"mirrors": [
{
@@ -172,8 +179,8 @@
"php": ">=5.3"
},
"require-dev": {
- "phpunit/phpunit": "~4.0",
- "satooshi/php-coveralls": "~1.0"
+ "phpunit/phpunit": "*",
+ "satooshi/php-coveralls": "*"
},
"type": "library",
"autoload": {
@@ -193,20 +200,24 @@
],
"description": "Aliyun OSS SDK for PHP",
"homepage": "http://www.aliyun.com/product/oss/",
- "time": "2018-01-08T06:59:35+00:00"
+ "support": {
+ "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues",
+ "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.6.0"
+ },
+ "time": "2022-08-03T08:06:01+00:00"
},
{
"name": "clagiordano/weblibs-configmanager",
- "version": "v1.0.7",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/clagiordano/weblibs-configmanager.git",
- "reference": "6ef4c27354368deb2f54b39bbe06601da8c873a0"
+ "reference": "8802c7396d61a923c9a73e37ead062b24bb1b273"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/clagiordano/weblibs-configmanager/zipball/6ef4c27354368deb2f54b39bbe06601da8c873a0",
- "reference": "6ef4c27354368deb2f54b39bbe06601da8c873a0",
+ "url": "https://api.github.com/repos/clagiordano/weblibs-configmanager/zipball/8802c7396d61a923c9a73e37ead062b24bb1b273",
+ "reference": "8802c7396d61a923c9a73e37ead062b24bb1b273",
"shasum": "",
"mirrors": [
{
@@ -216,10 +227,13 @@
]
},
"require": {
- "php": ">=5.4"
+ "ext-json": "*",
+ "php": ">=5.4",
+ "symfony/yaml": "^2.8"
},
"require-dev": {
"clagiordano/phpunit-result-printer": "^1",
+ "php-coveralls/php-coveralls": "^1.1",
"phpunit/phpunit": "^4.8"
},
"type": "library",
@@ -247,82 +261,24 @@
"tool",
"weblibs"
],
- "time": "2019-09-25T22:10:10+00:00"
- },
- {
- "name": "danielstjules/stringy",
- "version": "3.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/danielstjules/Stringy.git",
- "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
- "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
- "shasum": "",
- "mirrors": [
- {
- "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
- "preferred": true
- }
- ]
- },
- "require": {
- "php": ">=5.4.0",
- "symfony/polyfill-mbstring": "~1.1"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Stringy\\": "src/"
- },
- "files": [
- "src/Create.php"
- ]
+ "support": {
+ "issues": "https://github.com/clagiordano/weblibs-configmanager/issues",
+ "source": "https://github.com/clagiordano/weblibs-configmanager/tree/v1.5.0"
},
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Daniel St. Jules",
- "email": "danielst.jules@gmail.com",
- "homepage": "http://www.danielstjules.com"
- }
- ],
- "description": "A string manipulation library with multibyte support",
- "homepage": "https://github.com/danielstjules/Stringy",
- "keywords": [
- "UTF",
- "helpers",
- "manipulation",
- "methods",
- "multibyte",
- "string",
- "utf-8",
- "utility",
- "utils"
- ],
- "time": "2017-06-12T01:10:27+00:00"
+ "time": "2021-07-12T15:27:21+00:00"
},
{
"name": "doctrine/annotations",
- "version": "1.13.2",
+ "version": "1.14.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
+ "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
- "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
+ "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
"shasum": "",
"mirrors": [
{
@@ -332,17 +288,21 @@
]
},
"require": {
- "doctrine/lexer": "1.*",
+ "doctrine/lexer": "^1 || ^2",
"ext-tokenizer": "*",
"php": "^7.1 || ^8.0",
"psr/cache": "^1 || ^2 || ^3"
},
"require-dev": {
"doctrine/cache": "^1.11 || ^2.0",
- "doctrine/coding-standard": "^6.0 || ^8.1",
- "phpstan/phpstan": "^0.12.20",
- "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
- "symfony/cache": "^4.4 || ^5.2"
+ "doctrine/coding-standard": "^9 || ^10",
+ "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "symfony/cache": "^4.4 || ^5.4 || ^6",
+ "vimeo/psalm": "^4.10"
+ },
+ "suggest": {
+ "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
},
"type": "library",
"autoload": {
@@ -385,22 +345,71 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.13.2"
+ "source": "https://github.com/doctrine/annotations/tree/1.14.2"
+ },
+ "time": "2022-12-15T06:48:22+00:00"
+ },
+ {
+ "name": "doctrine/deprecations",
+ "version": "v1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/deprecations.git",
+ "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
},
- "time": "2021-08-05T19:00:23+00:00"
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^7.1|^8.0"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^9",
+ "phpunit/phpunit": "^7.5|^8.5|^9.5",
+ "psr/log": "^1|^2|^3"
+ },
+ "suggest": {
+ "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+ "homepage": "https://www.doctrine-project.org/",
+ "support": {
+ "issues": "https://github.com/doctrine/deprecations/issues",
+ "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ },
+ "time": "2022-05-02T15:47:09+00:00"
},
{
"name": "doctrine/inflector",
- "version": "2.0.4",
+ "version": "1.4.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
+ "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
- "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9",
+ "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9",
"shasum": "",
"mirrors": [
{
@@ -410,20 +419,25 @@
]
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^8.2",
+ "doctrine/coding-standard": "^8.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
- "vimeo/psalm": "^4.10"
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+ "Doctrine\\Inflector\\": "lib/Doctrine/Inflector",
+ "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -468,7 +482,7 @@
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
- "source": "https://github.com/doctrine/inflector/tree/2.0.4"
+ "source": "https://github.com/doctrine/inflector/tree/1.4.4"
},
"funding": [
{
@@ -484,20 +498,20 @@
"type": "tidelift"
}
],
- "time": "2021-10-22T20:16:43+00:00"
+ "time": "2021-04-16T17:34:40+00:00"
},
{
"name": "doctrine/lexer",
- "version": "1.2.1",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+ "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+ "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
"shasum": "",
"mirrors": [
{
@@ -507,22 +521,20 @@
]
},
"require": {
- "php": "^7.2 || ^8.0"
+ "doctrine/deprecations": "^1.0",
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
- "phpstan/phpstan": "^0.11.8",
- "phpunit/phpunit": "^8.2"
+ "doctrine/coding-standard": "^9 || ^10",
+ "phpstan/phpstan": "^1.3",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "^0.18.3",
+ "vimeo/psalm": "^4.11 || ^5.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+ "Doctrine\\Common\\Lexer\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -554,7 +566,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ "source": "https://github.com/doctrine/lexer/tree/2.1.0"
},
"funding": [
{
@@ -570,20 +582,87 @@
"type": "tidelift"
}
],
- "time": "2020-05-25T17:44:05+00:00"
+ "time": "2022-12-14T08:49:07+00:00"
+ },
+ {
+ "name": "ezyang/htmlpurifier",
+ "version": "v4.16.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezyang/htmlpurifier.git",
+ "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+ "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+ },
+ "require-dev": {
+ "cerdic/css-tidy": "^1.7 || ^2.0",
+ "simpletest/simpletest": "dev-master"
+ },
+ "suggest": {
+ "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+ "ext-bcmath": "Used for unit conversion and imagecrash protection",
+ "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+ "ext-tidy": "Used for pretty-printing HTML"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "library/HTMLPurifier.composer.php"
+ ],
+ "psr-0": {
+ "HTMLPurifier": "library/"
+ },
+ "exclude-from-classmap": [
+ "/library/HTMLPurifier/Language/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1-or-later"
+ ],
+ "authors": [
+ {
+ "name": "Edward Z. Yang",
+ "email": "admin@htmlpurifier.org",
+ "homepage": "http://ezyang.com"
+ }
+ ],
+ "description": "Standards compliant HTML filter written in PHP",
+ "homepage": "http://htmlpurifier.org/",
+ "keywords": [
+ "html"
+ ],
+ "support": {
+ "issues": "https://github.com/ezyang/htmlpurifier/issues",
+ "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+ },
+ "time": "2022-09-18T07:06:19+00:00"
},
{
"name": "guzzlehttp/command",
- "version": "1.0.0",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/command.git",
- "reference": "2aaa2521a8f8269d6f5dfc13fe2af12c76921034"
+ "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/command/zipball/2aaa2521a8f8269d6f5dfc13fe2af12c76921034",
- "reference": "2aaa2521a8f8269d6f5dfc13fe2af12c76921034",
+ "url": "https://api.github.com/repos/guzzle/command/zipball/7883359e0ecab8a8f7c43aad2fc36360a35d21e8",
+ "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8",
"shasum": "",
"mirrors": [
{
@@ -593,18 +672,18 @@
]
},
"require": {
- "guzzlehttp/guzzle": "^6.2",
- "guzzlehttp/promises": "~1.3",
- "guzzlehttp/psr7": "~1.0",
- "php": ">=5.5.0"
+ "guzzlehttp/guzzle": "^7.4.1",
+ "guzzlehttp/promises": "^1.5.1",
+ "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "phpunit/phpunit": "^8.5.19"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.9-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -617,6 +696,11 @@
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
@@ -626,23 +710,46 @@
"name": "Jeremy Lindblom",
"email": "jeremeamia@gmail.com",
"homepage": "https://github.com/jeremeamia"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
}
],
"description": "Provides the foundation for building command-based web service clients",
- "time": "2016-11-24T13:34:15+00:00"
+ "support": {
+ "issues": "https://github.com/guzzle/command/issues",
+ "source": "https://github.com/guzzle/command/tree/1.2.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/command",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-02-08T10:21:14+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.4.1",
+ "version": "7.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
"shasum": "",
"mirrors": [
{
@@ -653,68 +760,130 @@
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.6.1",
- "php": ">=5.5"
+ "guzzlehttp/promises": "^1.5",
+ "guzzlehttp/psr7": "^1.9 || ^2.4",
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-client": "^1.0",
+ "symfony/deprecation-contracts": "^2.2 || ^3.0"
+ },
+ "provide": {
+ "psr/http-client-implementation": "1.0"
},
"require-dev": {
+ "bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
- "psr/log": "^1.1"
+ "php-http/client-integration-tests": "^3.0",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
+ "ext-curl": "Required for CURL handler support",
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
- "dev-master": "6.3-dev"
+ "dev-master": "7.5-dev"
}
},
"autoload": {
- "psr-4": {
- "GuzzleHttp\\": "src/"
- },
"files": [
"src/functions_include.php"
- ]
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Jeremy Lindblom",
+ "email": "jeremeamia@gmail.com",
+ "homepage": "https://github.com/jeremeamia"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
}
],
"description": "Guzzle is a PHP HTTP client library",
- "homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
+ "psr-18",
+ "psr-7",
"rest",
"web service"
],
- "time": "2019-10-23T15:58:00+00:00"
+ "support": {
+ "issues": "https://github.com/guzzle/guzzle/issues",
+ "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-08-28T15:39:27+00:00"
},
{
"name": "guzzlehttp/guzzle-services",
- "version": "1.1.3",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle-services.git",
- "reference": "9e3abf20161cbf662d616cbb995f2811771759f7"
+ "reference": "4989d902dd4e0411b320e851c46f3c94d652d891"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle-services/zipball/9e3abf20161cbf662d616cbb995f2811771759f7",
- "reference": "9e3abf20161cbf662d616cbb995f2811771759f7",
+ "url": "https://api.github.com/repos/guzzle/guzzle-services/zipball/4989d902dd4e0411b320e851c46f3c94d652d891",
+ "reference": "4989d902dd4e0411b320e851c46f3c94d652d891",
"shasum": "",
"mirrors": [
{
@@ -724,12 +893,14 @@
]
},
"require": {
- "guzzlehttp/command": "~1.0",
- "guzzlehttp/guzzle": "^6.2",
- "php": ">=5.5"
+ "guzzlehttp/command": "^1.2.2",
+ "guzzlehttp/guzzle": "^7.4.1",
+ "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+ "guzzlehttp/uri-template": "^1.0.1",
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "^8.5.19 || ^9.5.8"
},
"suggest": {
"gimler/guzzle-description-loader": "^0.0.4"
@@ -737,7 +908,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -750,37 +921,60 @@
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia"
- },
{
"name": "Stefano Kowalke",
"email": "blueduck@mail.org",
- "homepage": "https://github.com/konafets"
+ "homepage": "https://github.com/Konafets"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
}
],
"description": "Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures.",
- "time": "2017-10-06T14:32:02+00:00"
+ "support": {
+ "issues": "https://github.com/guzzle/guzzle-services/issues",
+ "source": "https://github.com/guzzle/guzzle-services/tree/1.3.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle-services",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-03-03T11:21:34+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "v1.3.1",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598",
"shasum": "",
"mirrors": [
{
@@ -790,54 +984,87 @@
]
},
"require": {
- "php": ">=5.5.0"
+ "php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "^4.0"
+ "symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
- "psr-4": {
- "GuzzleHttp\\Promise\\": "src/"
- },
"files": [
"src/functions_include.php"
- ]
+ ],
+ "psr-4": {
+ "GuzzleHttp\\Promise\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
}
],
"description": "Guzzle promises library",
"keywords": [
"promise"
],
- "time": "2016-12-20T10:07:11+00:00"
- },
- {
- "name": "guzzlehttp/psr7",
- "version": "1.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/psr7.git",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ "support": {
+ "issues": "https://github.com/guzzle/promises/issues",
+ "source": "https://github.com/guzzle/promises/tree/1.5.2"
},
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-08-28T14:55:35+00:00"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "2.4.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "67c26b443f348a51926030c83481b85718457d3d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+ "reference": "67c26b443f348a51926030c83481b85718457d3d",
"shasum": "",
"mirrors": [
{
@@ -847,47 +1074,77 @@
]
},
"require": {
- "php": ">=5.4.0",
- "psr/http-message": "~1.0",
- "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "ralouphie/getallheaders": "^3.0"
},
"provide": {
+ "psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "ext-zlib": "*",
- "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ "bamarni/composer-bin-plugin": "^1.8.1",
+ "http-interop/http-factory-tests": "^0.9",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23"
},
"suggest": {
- "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "2.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
- },
- "files": [
- "src/functions_include.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
{
"name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
@@ -901,20 +1158,128 @@
"uri",
"url"
],
- "time": "2019-07-01T23:21:34+00:00"
+ "support": {
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/2.4.3"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-10-26T14:07:24+00:00"
+ },
+ {
+ "name": "guzzlehttp/uri-template",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/uri-template.git",
+ "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2",
+ "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^7.2.5 || ^8.0",
+ "symfony/polyfill-php80": "^1.17"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5.19 || ^9.5.8",
+ "uri-template/tests": "1.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\UriTemplate\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ }
+ ],
+ "description": "A polyfill class for uri_template of PHP",
+ "keywords": [
+ "guzzlehttp",
+ "uri-template"
+ ],
+ "support": {
+ "issues": "https://github.com/guzzle/uri-template/issues",
+ "source": "https://github.com/guzzle/uri-template/tree/v1.0.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-10-07T12:57:01+00:00"
},
{
"name": "illuminate/contracts",
- "version": "v7.30.6",
+ "version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
- "reference": "2449f2ea949ddf995a3dcffe5e21c768cf7d6478"
+ "reference": "00fc6afee788fa07c311b0650ad276585f8aef96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/contracts/zipball/2449f2ea949ddf995a3dcffe5e21c768cf7d6478",
- "reference": "2449f2ea949ddf995a3dcffe5e21c768cf7d6478",
+ "url": "https://api.github.com/repos/illuminate/contracts/zipball/00fc6afee788fa07c311b0650ad276585f8aef96",
+ "reference": "00fc6afee788fa07c311b0650ad276585f8aef96",
"shasum": "",
"mirrors": [
{
@@ -924,14 +1289,14 @@
]
},
"require": {
- "php": "^7.2.5|^8.0",
+ "php": "^7.1.3",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.x-dev"
+ "dev-master": "5.8-dev"
}
},
"autoload": {
@@ -955,20 +1320,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-11-17T15:00:14+00:00"
+ "time": "2019-07-30T13:57:21+00:00"
},
{
"name": "illuminate/support",
- "version": "v7.30.6",
+ "version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
- "reference": "c7b42acd009c94a3f8b749a65f6835db90174d58"
+ "reference": "df4af6a32908f1d89d74348624b57e3233eea247"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/support/zipball/c7b42acd009c94a3f8b749a65f6835db90174d58",
- "reference": "c7b42acd009c94a3f8b749a65f6835db90174d58",
+ "url": "https://api.github.com/repos/illuminate/support/zipball/df4af6a32908f1d89d74348624b57e3233eea247",
+ "reference": "df4af6a32908f1d89d74348624b57e3233eea247",
"shasum": "",
"mirrors": [
{
@@ -978,29 +1343,28 @@
]
},
"require": {
- "doctrine/inflector": "^1.4|^2.0",
+ "doctrine/inflector": "^1.1",
"ext-json": "*",
"ext-mbstring": "*",
- "illuminate/contracts": "^7.0",
- "nesbot/carbon": "^2.31",
- "php": "^7.2.5|^8.0",
- "voku/portable-ascii": "^1.4.8"
+ "illuminate/contracts": "5.8.*",
+ "nesbot/carbon": "^1.26.3 || ^2.0",
+ "php": "^7.1.3"
},
"conflict": {
"tightenco/collect": "<5.5.33"
},
"suggest": {
- "illuminate/filesystem": "Required to use the composer class (^7.0).",
+ "illuminate/filesystem": "Required to use the composer class (5.8.*).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
- "ramsey/uuid": "Required to use Str::uuid() (^3.7|^4.0).",
- "symfony/process": "Required to use the composer class (^5.0).",
- "symfony/var-dumper": "Required to use the dd function (^5.0).",
- "vlucas/phpdotenv": "Required to use the Env class and env helper (^4.0)."
+ "ramsey/uuid": "Required to use Str::uuid() (^3.7).",
+ "symfony/process": "Required to use the composer class (^4.2).",
+ "symfony/var-dumper": "Required to use the dd function (^4.2).",
+ "vlucas/phpdotenv": "Required to use the env helper (^3.3)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.x-dev"
+ "dev-master": "5.8-dev"
}
},
"autoload": {
@@ -1027,20 +1391,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-12-06T19:25:06+00:00"
+ "time": "2019-12-12T14:16:47+00:00"
},
{
"name": "jianyan74/php-excel",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/jianyan74/php-excel.git",
- "reference": "5b569e16ba35fa48ff7449a7f593172f8284f66b"
+ "reference": "347e80c98a39d9743c9d7582497f891b90d5e5cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jianyan74/php-excel/zipball/5b569e16ba35fa48ff7449a7f593172f8284f66b",
- "reference": "5b569e16ba35fa48ff7449a7f593172f8284f66b",
+ "url": "https://api.github.com/repos/jianyan74/php-excel/zipball/347e80c98a39d9743c9d7582497f891b90d5e5cf",
+ "reference": "347e80c98a39d9743c9d7582497f891b90d5e5cf",
"shasum": "",
"mirrors": [
{
@@ -1077,20 +1441,93 @@
"xls",
"xlsx"
],
- "time": "2020-03-17T03:37:43+00:00"
+ "support": {
+ "issues": "https://github.com/jianyan74/php-excel/issues",
+ "source": "https://github.com/jianyan74/php-excel/tree/1.0.2"
+ },
+ "time": "2020-09-04T06:16:34+00:00"
+ },
+ {
+ "name": "kylekatarnls/update-helper",
+ "version": "1.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kylekatarnls/update-helper.git",
+ "reference": "429be50660ed8a196e0798e5939760f168ec8ce9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/429be50660ed8a196e0798e5939760f168ec8ce9",
+ "reference": "429be50660ed8a196e0798e5939760f168ec8ce9",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "composer-plugin-api": "^1.1.0 || ^2.0.0",
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "codeclimate/php-test-reporter": "dev-master",
+ "composer/composer": "2.0.x-dev || ^2.0.0-dev",
+ "phpunit/phpunit": ">=4.8.35 <6.0"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "class": "UpdateHelper\\ComposerPlugin"
+ },
+ "autoload": {
+ "psr-0": {
+ "UpdateHelper\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Kyle",
+ "email": "kylekatarnls@gmail.com"
+ }
+ ],
+ "description": "Update helper",
+ "support": {
+ "issues": "https://github.com/kylekatarnls/update-helper/issues",
+ "source": "https://github.com/kylekatarnls/update-helper/tree/1.2.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/kylekatarnls",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/Carbon",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-04-07T20:44:10+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.57",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
+ "reference": "8aaffb653c5777781b0f7f69a5d937baf7ab6cdb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
- "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8aaffb653c5777781b0f7f69a5d937baf7ab6cdb",
+ "reference": "8aaffb653c5777781b0f7f69a5d937baf7ab6cdb",
"shasum": "",
"mirrors": [
{
@@ -1100,41 +1537,31 @@
]
},
"require": {
- "ext-fileinfo": "*",
- "php": ">=5.5.9"
+ "ext-json": "*",
+ "league/mime-type-detection": "^1.0.0",
+ "php": "^7.2 || ^8.0"
},
"conflict": {
- "league/flysystem-sftp": "<1.0.6"
+ "guzzlehttp/ringphp": "<1.1.1"
},
"require-dev": {
- "phpspec/phpspec": "^3.4",
- "phpunit/phpunit": "^5.7.10"
- },
- "suggest": {
- "ext-fileinfo": "Required for MimeType",
- "ext-ftp": "Allows you to use FTP server storage",
- "ext-openssl": "Allows you to use FTPS server storage",
- "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
- "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
- "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
- "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
- "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
- "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
- "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
- "league/flysystem-webdav": "Allows you to use WebDAV storage",
- "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
- "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
- "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+ "async-aws/s3": "^1.5",
+ "async-aws/simple-s3": "^1.0",
+ "aws/aws-sdk-php": "^3.132.4",
+ "composer/semver": "^3.0",
+ "ext-fileinfo": "*",
+ "ext-ftp": "*",
+ "friendsofphp/php-cs-fixer": "^3.2",
+ "google/cloud-storage": "^1.23",
+ "phpseclib/phpseclib": "^2.0",
+ "phpstan/phpstan": "^0.12.26",
+ "phpunit/phpunit": "^8.5 || ^9.4",
+ "sabre/dav": "^4.1"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
"autoload": {
"psr-4": {
- "League\\Flysystem\\": "src/"
+ "League\\Flysystem\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1144,43 +1571,55 @@
"authors": [
{
"name": "Frank de Jonge",
- "email": "info@frenky.net"
+ "email": "info@frankdejonge.nl"
}
],
- "description": "Filesystem abstraction: Many filesystems, one API.",
+ "description": "File storage abstraction for PHP",
"keywords": [
- "Cloud Files",
"WebDAV",
- "abstraction",
"aws",
"cloud",
- "copy.com",
- "dropbox",
- "file systems",
+ "file",
"files",
"filesystem",
"filesystems",
"ftp",
- "rackspace",
- "remote",
"s3",
"sftp",
"storage"
],
- "time": "2019-10-16T21:01:05+00:00"
+ "support": {
+ "issues": "https://github.com/thephpleague/flysystem/issues",
+ "source": "https://github.com/thephpleague/flysystem/tree/2.5.0"
+ },
+ "funding": [
+ {
+ "url": "https://ecologi.com/frankdejonge",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/frankdejonge",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-09-17T21:02:32+00:00"
},
{
- "name": "league/flysystem-cached-adapter",
- "version": "1.0.9",
+ "name": "league/mime-type-detection",
+ "version": "1.11.0",
"source": {
"type": "git",
- "url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
- "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f"
+ "url": "https://github.com/thephpleague/mime-type-detection.git",
+ "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f",
- "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f",
+ "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
+ "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
"shasum": "",
"mirrors": [
{
@@ -1190,23 +1629,83 @@
]
},
"require": {
- "league/flysystem": "~1.0",
- "psr/cache": "^1.0.0"
+ "ext-fileinfo": "*",
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "mockery/mockery": "~0.9",
- "phpspec/phpspec": "^3.4",
- "phpunit/phpunit": "^5.7",
- "predis/predis": "~1.0",
- "tedivm/stash": "~0.12"
+ "friendsofphp/php-cs-fixer": "^3.2",
+ "phpstan/phpstan": "^0.12.68",
+ "phpunit/phpunit": "^8.5.8 || ^9.3"
},
- "suggest": {
- "ext-phpredis": "Pure C implemented extension for PHP"
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\MimeTypeDetection\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Frank de Jonge",
+ "email": "info@frankdejonge.nl"
+ }
+ ],
+ "description": "Mime-type detection for Flysystem",
+ "support": {
+ "issues": "https://github.com/thephpleague/mime-type-detection/issues",
+ "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/frankdejonge",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-04-17T13:12:02+00:00"
+ },
+ {
+ "name": "maennchen/zipstream-php",
+ "version": "2.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/maennchen/ZipStream-PHP.git",
+ "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
+ "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "myclabs/php-enum": "^1.5",
+ "php": ">= 7.1",
+ "psr/http-message": "^1.0",
+ "symfony/polyfill-mbstring": "^1.0"
+ },
+ "require-dev": {
+ "ext-zip": "*",
+ "guzzlehttp/guzzle": ">= 6.3",
+ "mikey179/vfsstream": "^1.6",
+ "phpunit/phpunit": ">= 7.5"
},
"type": "library",
"autoload": {
"psr-4": {
- "League\\Flysystem\\Cached\\": "src/"
+ "ZipStream\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1215,25 +1714,55 @@
],
"authors": [
{
- "name": "frankdejonge",
- "email": "info@frenky.net"
+ "name": "Paul Duncan",
+ "email": "pabs@pablotron.org"
+ },
+ {
+ "name": "Jonatan Männchen",
+ "email": "jonatan@maennchen.ch"
+ },
+ {
+ "name": "Jesse Donat",
+ "email": "donatj@gmail.com"
+ },
+ {
+ "name": "András Kolesár",
+ "email": "kolesar@kolesar.hu"
+ }
+ ],
+ "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+ "keywords": [
+ "stream",
+ "zip"
+ ],
+ "support": {
+ "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+ "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/maennchen",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/zipstream",
+ "type": "open_collective"
}
],
- "description": "An adapter decorator to enable meta-data caching.",
- "time": "2018-07-09T20:51:04+00:00"
+ "time": "2020-05-30T13:11:16+00:00"
},
{
"name": "markbaker/complex",
- "version": "1.4.8",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/MarkBaker/PHPComplex.git",
- "reference": "8eaa40cceec7bf0518187530b2e63871be661b72"
+ "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72",
- "reference": "8eaa40cceec7bf0518187530b2e63871be661b72",
+ "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+ "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
"shasum": "",
"mirrors": [
{
@@ -1243,67 +1772,19 @@
]
},
"require": {
- "php": "^5.6.0|^7.0.0"
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
- "phpcompatibility/php-compatibility": "^9.0",
- "phpdocumentor/phpdocumentor": "2.*",
- "phploc/phploc": "2.*",
- "phpmd/phpmd": "2.*",
- "phpunit/phpunit": "^4.8.35|^5.4.0",
- "sebastian/phpcpd": "2.*",
- "squizlabs/php_codesniffer": "^3.4.0"
+ "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+ "phpcompatibility/php-compatibility": "^9.3",
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "squizlabs/php_codesniffer": "^3.7"
},
"type": "library",
"autoload": {
"psr-4": {
"Complex\\": "classes/src/"
- },
- "files": [
- "classes/src/functions/abs.php",
- "classes/src/functions/acos.php",
- "classes/src/functions/acosh.php",
- "classes/src/functions/acot.php",
- "classes/src/functions/acoth.php",
- "classes/src/functions/acsc.php",
- "classes/src/functions/acsch.php",
- "classes/src/functions/argument.php",
- "classes/src/functions/asec.php",
- "classes/src/functions/asech.php",
- "classes/src/functions/asin.php",
- "classes/src/functions/asinh.php",
- "classes/src/functions/atan.php",
- "classes/src/functions/atanh.php",
- "classes/src/functions/conjugate.php",
- "classes/src/functions/cos.php",
- "classes/src/functions/cosh.php",
- "classes/src/functions/cot.php",
- "classes/src/functions/coth.php",
- "classes/src/functions/csc.php",
- "classes/src/functions/csch.php",
- "classes/src/functions/exp.php",
- "classes/src/functions/inverse.php",
- "classes/src/functions/ln.php",
- "classes/src/functions/log2.php",
- "classes/src/functions/log10.php",
- "classes/src/functions/negative.php",
- "classes/src/functions/pow.php",
- "classes/src/functions/rho.php",
- "classes/src/functions/sec.php",
- "classes/src/functions/sech.php",
- "classes/src/functions/sin.php",
- "classes/src/functions/sinh.php",
- "classes/src/functions/sqrt.php",
- "classes/src/functions/tan.php",
- "classes/src/functions/tanh.php",
- "classes/src/functions/theta.php",
- "classes/src/operations/add.php",
- "classes/src/operations/subtract.php",
- "classes/src/operations/multiply.php",
- "classes/src/operations/divideby.php",
- "classes/src/operations/divideinto.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1321,20 +1802,24 @@
"complex",
"mathematics"
],
- "time": "2020-03-11T20:15:49+00:00"
+ "support": {
+ "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+ "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
+ },
+ "time": "2022-12-06T16:21:08+00:00"
},
{
"name": "markbaker/matrix",
- "version": "1.2.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/MarkBaker/PHPMatrix.git",
- "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21"
+ "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21",
- "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21",
+ "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+ "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
"shasum": "",
"mirrors": [
{
@@ -1344,40 +1829,23 @@
]
},
"require": {
- "php": "^5.6.0|^7.0.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "dev-master",
- "phpcompatibility/php-compatibility": "dev-master",
- "phploc/phploc": "^4",
- "phpmd/phpmd": "dev-master",
- "phpunit/phpunit": "^5.7",
- "sebastian/phpcpd": "^3.0",
- "squizlabs/php_codesniffer": "^3.0@dev"
+ "phpcompatibility/php-compatibility": "^9.3",
+ "phpdocumentor/phpdocumentor": "2.*",
+ "phploc/phploc": "^4.0",
+ "phpmd/phpmd": "2.*",
+ "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "sebastian/phpcpd": "^4.0",
+ "squizlabs/php_codesniffer": "^3.7"
},
"type": "library",
"autoload": {
"psr-4": {
"Matrix\\": "classes/src/"
- },
- "files": [
- "classes/src/functions/adjoint.php",
- "classes/src/functions/antidiagonal.php",
- "classes/src/functions/cofactors.php",
- "classes/src/functions/determinant.php",
- "classes/src/functions/diagonal.php",
- "classes/src/functions/identity.php",
- "classes/src/functions/inverse.php",
- "classes/src/functions/minors.php",
- "classes/src/functions/trace.php",
- "classes/src/functions/transpose.php",
- "classes/src/operations/add.php",
- "classes/src/operations/directsum.php",
- "classes/src/operations/subtract.php",
- "classes/src/operations/multiply.php",
- "classes/src/operations/divideby.php",
- "classes/src/operations/divideinto.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1386,7 +1854,7 @@
"authors": [
{
"name": "Mark Baker",
- "email": "mark@lange.demon.co.uk"
+ "email": "mark@demon-angel.eu"
}
],
"description": "PHP Class for working with matrices",
@@ -1396,20 +1864,24 @@
"matrix",
"vector"
],
- "time": "2019-10-06T11:29:25+00:00"
+ "support": {
+ "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+ "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
+ },
+ "time": "2022-12-02T22:17:43+00:00"
},
{
"name": "mtdowling/jmespath.php",
- "version": "2.4.0",
+ "version": "2.6.1",
"source": {
"type": "git",
"url": "https://github.com/jmespath/jmespath.php.git",
- "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac"
+ "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
- "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+ "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+ "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
"shasum": "",
"mirrors": [
{
@@ -1419,10 +1891,12 @@
]
},
"require": {
- "php": ">=5.4.0"
+ "php": "^5.4 || ^7.0 || ^8.0",
+ "symfony/polyfill-mbstring": "^1.17"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "composer/xdebug-handler": "^1.4 || ^2.0",
+ "phpunit/phpunit": "^4.8.36 || ^7.5.15"
},
"bin": [
"bin/jp.php"
@@ -1430,16 +1904,72 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.6-dev"
}
},
+ "autoload": {
+ "files": [
+ "src/JmesPath.php"
+ ],
+ "psr-4": {
+ "JmesPath\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Declaratively specify how to extract elements from a JSON document",
+ "keywords": [
+ "json",
+ "jsonpath"
+ ],
+ "support": {
+ "issues": "https://github.com/jmespath/jmespath.php/issues",
+ "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
+ },
+ "time": "2021-06-14T00:11:39+00:00"
+ },
+ {
+ "name": "myclabs/php-enum",
+ "version": "1.6.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/myclabs/php-enum.git",
+ "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/myclabs/php-enum/zipball/32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
+ "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "ext-json": "*",
+ "php": ">=5.4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
+ "squizlabs/php_codesniffer": "1.*"
+ },
+ "type": "library",
"autoload": {
"psr-4": {
- "JmesPath\\": "src/"
- },
- "files": [
- "src/JmesPath.php"
- ]
+ "MyCLabs\\Enum\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1447,30 +1977,33 @@
],
"authors": [
{
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
+ "name": "PHP Enum contributors",
+ "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
}
],
- "description": "Declaratively specify how to extract elements from a JSON document",
+ "description": "PHP Enum implementation",
+ "homepage": "http://github.com/myclabs/php-enum",
"keywords": [
- "json",
- "jsonpath"
+ "enum"
],
- "time": "2016-12-03T22:08:25+00:00"
+ "support": {
+ "issues": "https://github.com/myclabs/php-enum/issues",
+ "source": "https://github.com/myclabs/php-enum/tree/master"
+ },
+ "time": "2019-02-04T21:18:49+00:00"
},
{
"name": "nesbot/carbon",
- "version": "2.64.0",
+ "version": "1.39.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "889546413c97de2d05063b8cb7b193c2531ea211"
+ "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/889546413c97de2d05063b8cb7b193c2531ea211",
- "reference": "889546413c97de2d05063b8cb7b193c2531ea211",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4be0c005164249208ce1b5ca633cd57bdd42ff33",
+ "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33",
"shasum": "",
"mirrors": [
{
@@ -1480,48 +2013,30 @@
]
},
"require": {
- "ext-json": "*",
- "php": "^7.1.8 || ^8.0",
- "symfony/polyfill-mbstring": "^1.0",
- "symfony/polyfill-php80": "^1.16",
- "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+ "kylekatarnls/update-helper": "^1.1",
+ "php": ">=5.3.9",
+ "symfony/translation": "~2.6 || ~3.0 || ~4.0"
},
"require-dev": {
- "doctrine/dbal": "^2.0 || ^3.1.4",
- "doctrine/orm": "^2.7",
- "friendsofphp/php-cs-fixer": "^3.0",
- "kylekatarnls/multi-tester": "^2.0",
- "ondrejmirtes/better-reflection": "*",
- "phpmd/phpmd": "^2.9",
- "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12.99 || ^1.7.14",
- "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
- "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
- "squizlabs/php_codesniffer": "^3.4"
+ "composer/composer": "^1.2",
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "^4.8.35 || ^5.7"
},
"bin": [
- "bin/carbon"
+ "bin/upgrade-carbon"
],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-3.x": "3.x-dev",
- "dev-master": "2.x-dev"
- },
+ "update-helper": "Carbon\\Upgrade",
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
]
- },
- "phpstan": {
- "includes": [
- "extension.neon"
- ]
}
},
"autoload": {
"psr-4": {
- "Carbon\\": "src/Carbon/"
+ "": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1532,53 +2047,34 @@
{
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
- "homepage": "https://markido.com"
- },
- {
- "name": "kylekatarnls",
- "homepage": "https://github.com/kylekatarnls"
+ "homepage": "http://nesbot.com"
}
],
- "description": "An API extension for DateTime that supports 281 different languages.",
- "homepage": "https://carbon.nesbot.com",
+ "description": "A simple API extension for DateTime.",
+ "homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
"support": {
- "docs": "https://carbon.nesbot.com/docs",
"issues": "https://github.com/briannesbitt/Carbon/issues",
"source": "https://github.com/briannesbitt/Carbon"
},
- "funding": [
- {
- "url": "https://github.com/sponsors/kylekatarnls",
- "type": "github"
- },
- {
- "url": "https://opencollective.com/Carbon#sponsor",
- "type": "opencollective"
- },
- {
- "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme",
- "type": "tidelift"
- }
- ],
- "time": "2022-11-26T17:36:00+00:00"
+ "time": "2019-10-14T05:51:36+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
- "version": "1.12.0",
+ "version": "1.19.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd"
+ "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/f79611d6dc1f6b7e8e30b738fc371b392001dbfd",
- "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd",
+ "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
+ "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
"shasum": "",
"mirrors": [
{
@@ -1601,26 +2097,33 @@
"ext-xmlwriter": "*",
"ext-zip": "*",
"ext-zlib": "*",
- "markbaker/complex": "^1.4",
- "markbaker/matrix": "^1.2",
- "php": "^7.1",
+ "ezyang/htmlpurifier": "^4.13",
+ "maennchen/zipstream-php": "^2.1",
+ "markbaker/complex": "^3.0",
+ "markbaker/matrix": "^3.0",
+ "php": "^7.2 || ^8.0",
+ "psr/http-client": "^1.0",
+ "psr/http-factory": "^1.0",
"psr/simple-cache": "^1.0"
},
"require-dev": {
- "dompdf/dompdf": "^0.8.3",
- "friendsofphp/php-cs-fixer": "^2.16",
+ "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+ "dompdf/dompdf": "^1.0",
+ "friendsofphp/php-cs-fixer": "^2.18",
"jpgraph/jpgraph": "^4.0",
"mpdf/mpdf": "^8.0",
"phpcompatibility/php-compatibility": "^9.3",
- "phpunit/phpunit": "^7.5",
+ "phpstan/phpstan": "^0.12.82",
+ "phpstan/phpstan-phpunit": "^0.12.18",
+ "phpunit/phpunit": "^8.5",
"squizlabs/php_codesniffer": "^3.5",
"tecnickcom/tcpdf": "^6.3"
},
"suggest": {
- "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+ "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",
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
- "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
+ "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
},
"type": "library",
"autoload": {
@@ -1664,7 +2167,11 @@
"xls",
"xlsx"
],
- "time": "2020-04-27T08:12:48+00:00"
+ "support": {
+ "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
+ "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0"
+ },
+ "time": "2021-10-31T15:09:20+00:00"
},
{
"name": "psr/cache",
@@ -1716,20 +2223,23 @@
"psr",
"psr-6"
],
+ "support": {
+ "source": "https://github.com/php-fig/cache/tree/master"
+ },
"time": "2016-08-06T20:24:11+00:00"
},
{
"name": "psr/container",
- "version": "1.0.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
"shasum": "",
"mirrors": [
{
@@ -1739,14 +2249,9 @@
]
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.2.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
@@ -1759,7 +2264,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1771,7 +2276,130 @@
"container-interop",
"psr"
],
- "time": "2017-02-14T16:28:37+00:00"
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/1.1.1"
+ },
+ "time": "2021-03-05T17:36:06+00:00"
+ },
+ {
+ "name": "psr/http-client",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-client.git",
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^7.0 || ^8.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP clients",
+ "homepage": "https://github.com/php-fig/http-client",
+ "keywords": [
+ "http",
+ "http-client",
+ "psr",
+ "psr-18"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-client/tree/master"
+ },
+ "time": "2020-06-29T06:28:15+00:00"
+ },
+ {
+ "name": "psr/http-factory",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory/tree/master"
+ },
+ "time": "2019-04-30T12:38:16+00:00"
},
{
"name": "psr/http-message",
@@ -1827,20 +2455,23 @@
"request",
"response"
],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/master"
+ },
"time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
- "version": "1.1.2",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": "",
"mirrors": [
{
@@ -1870,7 +2501,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
@@ -1880,7 +2511,10 @@
"psr",
"psr-3"
],
- "time": "2019-11-01T11:05:21+00:00"
+ "support": {
+ "source": "https://github.com/php-fig/log/tree/1.1.4"
+ },
+ "time": "2021-05-03T11:20:27+00:00"
},
{
"name": "psr/simple-cache",
@@ -1934,20 +2568,23 @@
"psr-16",
"simple-cache"
],
+ "support": {
+ "source": "https://github.com/php-fig/simple-cache/tree/master"
+ },
"time": "2017-10-23T01:57:42+00:00"
},
{
"name": "qcloud/cos-sdk-v5",
- "version": "v2.0.3",
+ "version": "v2.6.0",
"source": {
"type": "git",
"url": "https://github.com/tencentyun/cos-php-sdk-v5.git",
- "reference": "5dea6bc8be6f8e48fb95a5c4670800d1d796ac42"
+ "reference": "bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tencentyun/cos-php-sdk-v5/zipball/5dea6bc8be6f8e48fb95a5c4670800d1d796ac42",
- "reference": "5dea6bc8be6f8e48fb95a5c4670800d1d796ac42",
+ "url": "https://api.github.com/repos/tencentyun/cos-php-sdk-v5/zipball/bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b",
+ "reference": "bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b",
"shasum": "",
"mirrors": [
{
@@ -1957,13 +2594,25 @@
]
},
"require": {
- "guzzlehttp/guzzle": "~6.3",
- "guzzlehttp/guzzle-services": "~1.1",
- "php": ">=5.3.0"
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-simplexml": "*",
+ "guzzlehttp/guzzle": "^6.2.1 || ^7.0",
+ "guzzlehttp/guzzle-services": "^1.1",
+ "guzzlehttp/psr7": "^1.3.1 || ^2.0",
+ "php": ">=5.6"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ },
"autoload": {
- "psr-0": {
+ "files": [
+ "src/Common.php"
+ ],
+ "psr-4": {
"Qcloud\\Cos\\": "src/"
}
},
@@ -1979,6 +2628,10 @@
{
"name": "lewzylu",
"email": "327874225@qq.com"
+ },
+ {
+ "name": "tuunalai",
+ "email": "550566181@qq.com"
}
],
"description": "PHP SDK for QCloud COS",
@@ -1987,20 +2640,24 @@
"php",
"qcloud"
],
- "time": "2019-11-07T11:55:10+00:00"
+ "support": {
+ "issues": "https://github.com/tencentyun/cos-php-sdk-v5/issues",
+ "source": "https://github.com/tencentyun/cos-php-sdk-v5/tree/v2.6.0"
+ },
+ "time": "2022-11-14T11:12:33+00:00"
},
{
"name": "qiniu/php-sdk",
- "version": "v7.2.10",
+ "version": "v7.7.0",
"source": {
"type": "git",
"url": "https://github.com/qiniu/php-sdk.git",
- "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8"
+ "reference": "dde03fc55de64815412f8ccfe24e1bd21564a6f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8",
- "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8",
+ "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/dde03fc55de64815412f8ccfe24e1bd21564a6f1",
+ "reference": "dde03fc55de64815412f8ccfe24e1bd21564a6f1",
"shasum": "",
"mirrors": [
{
@@ -2010,20 +2667,22 @@
]
},
"require": {
+ "myclabs/php-enum": "1.6.6",
"php": ">=5.3.3"
},
"require-dev": {
+ "paragonie/random_compat": ">=2",
"phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.3"
+ "squizlabs/php_codesniffer": "~3.6"
},
"type": "library",
"autoload": {
- "psr-4": {
- "Qiniu\\": "src/Qiniu"
- },
"files": [
"src/Qiniu/functions.php"
- ]
+ ],
+ "psr-4": {
+ "Qiniu\\": "src/Qiniu"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2044,7 +2703,11 @@
"sdk",
"storage"
],
- "time": "2019-10-28T10:23:23+00:00"
+ "support": {
+ "issues": "https://github.com/qiniu/php-sdk/issues",
+ "source": "https://github.com/qiniu/php-sdk/tree/v7.7.0"
+ },
+ "time": "2022-09-02T10:53:05+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -2090,6 +2753,10 @@
}
],
"description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
"time": "2019-03-08T08:55:37+00:00"
},
{
@@ -2147,7 +2814,95 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+ },
+ "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": "2022-01-02T09:53:40+00:00"
+ },
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.27.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+ "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "provide": {
+ "ext-ctype": "*"
+ },
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.27-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
},
"funding": [
{
@@ -2163,20 +2918,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:53:40+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.16.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "a54881ec0ab3b2005c406aed0023c062879031e7"
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a54881ec0ab3b2005c406aed0023c062879031e7",
- "reference": "a54881ec0ab3b2005c406aed0023c062879031e7",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"shasum": "",
"mirrors": [
{
@@ -2186,7 +2941,10 @@
]
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
+ },
+ "provide": {
+ "ext-mbstring": "*"
},
"suggest": {
"ext-mbstring": "For best performance"
@@ -2194,16 +2952,20 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16-dev"
+ "dev-main": "1.27-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2228,7 +2990,24 @@
"portable",
"shim"
],
- "time": "2020-05-08T16:50:20+00:00"
+ "support": {
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+ },
+ "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": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php80",
@@ -2321,16 +3100,16 @@
},
{
"name": "symfony/translation",
- "version": "v5.4.14",
+ "version": "v3.2.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab"
+ "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab",
- "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/df36a48672b929bf3995eb62c58d83004b1d0d50",
+ "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50",
"shasum": "",
"mirrors": [
{
@@ -2340,46 +3119,30 @@
]
},
"require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php80": "^1.16",
- "symfony/translation-contracts": "^2.3"
+ "php": ">=5.5.9",
+ "symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "symfony/config": "<4.4",
- "symfony/console": "<5.3",
- "symfony/dependency-injection": "<5.0",
- "symfony/http-kernel": "<5.0",
- "symfony/twig-bundle": "<5.0",
- "symfony/yaml": "<4.4"
- },
- "provide": {
- "symfony/translation-implementation": "2.3"
+ "symfony/config": "<2.8"
},
"require-dev": {
- "psr/log": "^1|^2|^3",
- "symfony/config": "^4.4|^5.0|^6.0",
- "symfony/console": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.0|^6.0",
- "symfony/finder": "^4.4|^5.0|^6.0",
- "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
- "symfony/http-kernel": "^5.0|^6.0",
- "symfony/intl": "^4.4|^5.0|^6.0",
- "symfony/polyfill-intl-icu": "^1.21",
- "symfony/service-contracts": "^1.1.2|^2|^3",
- "symfony/yaml": "^4.4|^5.0|^6.0"
+ "psr/log": "~1.0",
+ "symfony/config": "~2.8|~3.0",
+ "symfony/intl": "^2.8.18|^3.2.5",
+ "symfony/yaml": "~2.8|~3.0"
},
"suggest": {
- "psr/log-implementation": "To use logging capability in translator",
+ "psr/log": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2-dev"
+ }
+ },
"autoload": {
- "files": [
- "Resources/functions.php"
- ],
"psr-4": {
"Symfony\\Component\\Translation\\": ""
},
@@ -2401,39 +3164,25 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Provides tools to internationalize your application",
+ "description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v5.4.14"
+ "source": "https://github.com/symfony/translation/tree/3.2"
},
- "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": "2022-10-07T08:01:20+00:00"
+ "time": "2017-06-24T16:45:17+00:00"
},
{
- "name": "symfony/translation-contracts",
- "version": "v2.5.2",
+ "name": "symfony/yaml",
+ "version": "v2.8.52",
"source": {
"type": "git",
- "url": "https://github.com/symfony/translation-contracts.git",
- "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "02c1859112aa779d9ab394ae4f3381911d84052b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
- "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/02c1859112aa779d9ab394ae4f3381911d84052b",
+ "reference": "02c1859112aa779d9ab394ae4f3381911d84052b",
"shasum": "",
"mirrors": [
{
@@ -2443,25 +3192,22 @@
]
},
"require": {
- "php": ">=7.2.5"
- },
- "suggest": {
- "symfony/translation-implementation": ""
+ "php": ">=5.3.9",
+ "symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Contracts\\Translation\\": ""
- }
+ "Symfony\\Component\\Yaml\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2469,55 +3215,33 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Generic abstractions related to translation",
+ "description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "keywords": [
- "abstractions",
- "contracts",
- "decoupling",
- "interfaces",
- "interoperability",
- "standards"
- ],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/yaml/tree/v2.8.52"
},
- "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": "2022-06-27T16:58:25+00:00"
+ "time": "2018-11-11T11:18:13+00:00"
},
{
"name": "topthink/framework",
- "version": "v6.0.8",
+ "version": "v6.1.1",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
- "reference": "4789343672aef06d571d556da369c0e156609bce"
+ "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/framework/zipball/4789343672aef06d571d556da369c0e156609bce",
- "reference": "4789343672aef06d571d556da369c0e156609bce",
+ "url": "https://api.github.com/repos/top-think/framework/zipball/2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210",
+ "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210",
"shasum": "",
"mirrors": [
{
@@ -2529,16 +3253,16 @@
"require": {
"ext-json": "*",
"ext-mbstring": "*",
- "league/flysystem": "^1.0",
- "league/flysystem-cached-adapter": "^1.0",
- "php": ">=7.1.0",
+ "php": ">=7.2.5",
"psr/container": "~1.0",
+ "psr/http-message": "^1.0",
"psr/log": "~1.0",
"psr/simple-cache": "^1.0",
"topthink/think-helper": "^3.1.1",
"topthink/think-orm": "^2.0"
},
"require-dev": {
+ "guzzlehttp/psr7": "^2.1.0",
"mikey179/vfsstream": "^1.6",
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^7.0"
@@ -2573,22 +3297,22 @@
],
"support": {
"issues": "https://github.com/top-think/framework/issues",
- "source": "https://github.com/top-think/framework/tree/v6.0.8"
+ "source": "https://github.com/top-think/framework/tree/v6.1.1"
},
- "time": "2021-04-27T00:41:08+00:00"
+ "time": "2022-10-26T03:48:53+00:00"
},
{
"name": "topthink/think-captcha",
- "version": "v3.0.2",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-captcha.git",
- "reference": "0b4305da19e118cefd934007875a8112f9352f01"
+ "reference": "52fba122c953995bec3013c635025172491ae299"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-captcha/zipball/0b4305da19e118cefd934007875a8112f9352f01",
- "reference": "0b4305da19e118cefd934007875a8112f9352f01",
+ "url": "https://api.github.com/repos/top-think/think-captcha/zipball/52fba122c953995bec3013c635025172491ae299",
+ "reference": "52fba122c953995bec3013c635025172491ae299",
"shasum": "",
"mirrors": [
{
@@ -2598,7 +3322,7 @@
]
},
"require": {
- "topthink/framework": "^6.0.0"
+ "topthink/framework": "^6.0"
},
"type": "library",
"extra": {
@@ -2612,12 +3336,12 @@
}
},
"autoload": {
- "psr-4": {
- "think\\captcha\\": "src/"
- },
"files": [
"src/helper.php"
- ]
+ ],
+ "psr-4": {
+ "think\\captcha\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2630,20 +3354,24 @@
}
],
"description": "captcha package for thinkphp",
- "time": "2019-10-03T07:45:11+00:00"
+ "support": {
+ "issues": "https://github.com/top-think/think-captcha/issues",
+ "source": "https://github.com/top-think/think-captcha/tree/v3.0.8"
+ },
+ "time": "2022-10-26T07:59:42+00:00"
},
{
"name": "topthink/think-helper",
- "version": "v3.1.4",
+ "version": "v3.1.6",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-helper.git",
- "reference": "c28d37743bda4a0455286ca85b17b5791d626e10"
+ "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-helper/zipball/c28d37743bda4a0455286ca85b17b5791d626e10",
- "reference": "c28d37743bda4a0455286ca85b17b5791d626e10",
+ "url": "https://api.github.com/repos/top-think/think-helper/zipball/769acbe50a4274327162f9c68ec2e89a38eb2aff",
+ "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff",
"shasum": "",
"mirrors": [
{
@@ -2655,14 +3383,17 @@
"require": {
"php": ">=7.1.0"
},
+ "require-dev": {
+ "phpunit/phpunit": "^9.5"
+ },
"type": "library",
"autoload": {
- "psr-4": {
- "think\\": "src"
- },
"files": [
"src/helper.php"
- ]
+ ],
+ "psr-4": {
+ "think\\": "src"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2675,20 +3406,24 @@
}
],
"description": "The ThinkPHP6 Helper Package",
- "time": "2019-11-08T08:01:10+00:00"
+ "support": {
+ "issues": "https://github.com/top-think/think-helper/issues",
+ "source": "https://github.com/top-think/think-helper/tree/v3.1.6"
+ },
+ "time": "2021-12-15T04:27:55+00:00"
},
{
"name": "topthink/think-multi-app",
- "version": "v1.0.11",
+ "version": "v1.0.15",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-multi-app.git",
- "reference": "215f4a6bb88e53ad41b448c61957336eb55ce6f9"
+ "reference": "387e0dac059c20f92cac5da41a871e10829c1c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/215f4a6bb88e53ad41b448c61957336eb55ce6f9",
- "reference": "215f4a6bb88e53ad41b448c61957336eb55ce6f9",
+ "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/387e0dac059c20f92cac5da41a871e10829c1c97",
+ "reference": "387e0dac059c20f92cac5da41a871e10829c1c97",
"shasum": "",
"mirrors": [
{
@@ -2699,7 +3434,7 @@
},
"require": {
"php": ">=7.1.0",
- "topthink/framework": "^6.0.0"
+ "topthink/framework": "^6.0"
},
"type": "library",
"extra": {
@@ -2725,20 +3460,24 @@
}
],
"description": "thinkphp6 multi app support",
- "time": "2019-10-29T06:34:59+00:00"
+ "support": {
+ "issues": "https://github.com/top-think/think-multi-app/issues",
+ "source": "https://github.com/top-think/think-multi-app/tree/v1.0.15"
+ },
+ "time": "2022-10-26T08:03:06+00:00"
},
{
"name": "topthink/think-orm",
- "version": "v2.0.27",
+ "version": "v2.0.54",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-orm.git",
- "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50"
+ "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-orm/zipball/02affaaccade2cdd8bbb2d2f5d15e46113e6eb50",
- "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50",
+ "url": "https://api.github.com/repos/top-think/think-orm/zipball/97b061b47616301ff29fbd4c35ed9184e1162e4e",
+ "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e",
"shasum": "",
"mirrors": [
{
@@ -2749,17 +3488,23 @@
},
"require": {
"ext-json": "*",
+ "ext-pdo": "*",
"php": ">=7.1.0",
- "psr/log": "~1.0",
- "psr/simple-cache": "^1.0",
+ "psr/log": "^1.0|^2.0",
+ "psr/simple-cache": "^1.0|^2.0",
"topthink/think-helper": "^3.1"
},
+ "require-dev": {
+ "phpunit/phpunit": "^7|^8|^9.5"
+ },
"type": "library",
"autoload": {
+ "files": [
+ "stubs/load_stubs.php"
+ ],
"psr-4": {
"think\\": "src"
- },
- "files": []
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2776,20 +3521,24 @@
"database",
"orm"
],
- "time": "2019-10-23T02:16:50+00:00"
+ "support": {
+ "issues": "https://github.com/top-think/think-orm/issues",
+ "source": "https://github.com/top-think/think-orm/tree/v2.0.54"
+ },
+ "time": "2022-07-05T05:25:51+00:00"
},
{
"name": "topthink/think-template",
- "version": "v2.0.7",
+ "version": "v2.0.8",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-template.git",
- "reference": "e98bdbb4a4c94b442f17dfceba81e0134d4fbd19"
+ "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-template/zipball/e98bdbb4a4c94b442f17dfceba81e0134d4fbd19",
- "reference": "e98bdbb4a4c94b442f17dfceba81e0134d4fbd19",
+ "url": "https://api.github.com/repos/top-think/think-template/zipball/abfc293f74f9ef5127b5c416310a01fe42e59368",
+ "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368",
"shasum": "",
"mirrors": [
{
@@ -2819,20 +3568,24 @@
}
],
"description": "the php template engine",
- "time": "2019-09-20T15:31:04+00:00"
+ "support": {
+ "issues": "https://github.com/top-think/think-template/issues",
+ "source": "https://github.com/top-think/think-template/tree/v2.0.8"
+ },
+ "time": "2020-12-10T07:52:03+00:00"
},
{
"name": "topthink/think-view",
- "version": "v1.0.13",
+ "version": "v1.0.14",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-view.git",
- "reference": "90803b73f781db5d42619082c4597afc58b2d4c5"
+ "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/top-think/think-view/zipball/90803b73f781db5d42619082c4597afc58b2d4c5",
- "reference": "90803b73f781db5d42619082c4597afc58b2d4c5",
+ "url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d",
+ "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d",
"shasum": "",
"mirrors": [
{
@@ -2862,95 +3615,19 @@
}
],
"description": "thinkphp template driver",
- "time": "2019-10-07T12:23:10+00:00"
- },
- {
- "name": "voku/portable-ascii",
- "version": "1.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/voku/portable-ascii.git",
- "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a",
- "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a",
- "shasum": "",
- "mirrors": [
- {
- "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
- "preferred": true
- }
- ]
- },
- "require": {
- "php": ">=7.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
- },
- "suggest": {
- "ext-intl": "Use Intl for transliterator_transliterate() support"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "voku\\": "src/voku/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Lars Moelleken",
- "homepage": "http://www.moelleken.org/"
- }
- ],
- "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
- "homepage": "https://github.com/voku/portable-ascii",
- "keywords": [
- "ascii",
- "clean",
- "php"
- ],
"support": {
- "issues": "https://github.com/voku/portable-ascii/issues",
- "source": "https://github.com/voku/portable-ascii/tree/1.6.1"
+ "issues": "https://github.com/top-think/think-view/issues",
+ "source": "https://github.com/top-think/think-view/tree/v1.0.14"
},
- "funding": [
- {
- "url": "https://www.paypal.me/moelleken",
- "type": "custom"
- },
- {
- "url": "https://github.com/voku",
- "type": "github"
- },
- {
- "url": "https://opencollective.com/portable-ascii",
- "type": "open_collective"
- },
- {
- "url": "https://www.patreon.com/voku",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
- "type": "tidelift"
- }
- ],
- "time": "2022-01-24T18:55:24+00:00"
+ "time": "2019-11-06T11:40:13+00:00"
},
{
"name": "w7/sdk-console-php",
- "version": "v1.0.6",
+ "version": "v1.0.7",
"source": {
"type": "git",
"url": "https://gitee.com/free-worker/console-sdk-php.git",
- "reference": "aa5f88a562db9904500fdd22b9076502e03d3f8b"
+ "reference": "5c4ec920cfb2708184420a94368a74cfa05d1441"
},
"require": {
"php": "^7.2",
@@ -2966,6 +3643,14 @@
"providers": [
"W7\\Sdk\\Console\\Service\\ServiceProvider\\OrderServiceProvider"
]
+ },
+ "think": {
+ "services": [
+ "W7\\Sdk\\Console\\Provider\\Tp6Service"
+ ],
+ "config": {
+ "swoole": "src/config/w7.php"
+ }
}
},
"autoload": {
@@ -2982,7 +3667,7 @@
]
},
"description": "w7 console sdk",
- "time": "2022-12-26T03:21:17+00:00"
+ "time": "2022-12-26T03:28:42+00:00"
},
{
"name": "w7corp/sdk-cloud",
@@ -3073,9 +3758,9 @@
"type": "library",
"autoload": {
"psr-4": {
- "EasyAdmin\\": "src",
+ "Test\\": "tests",
"MockApp\\": "mock_app",
- "Test\\": "tests"
+ "EasyAdmin\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3127,8 +3812,8 @@
"type": "library",
"autoload": {
"psr-4": {
- "LogTrace\\": "src",
- "Test\\": "tests"
+ "Test\\": "tests",
+ "LogTrace\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3156,12 +3841,12 @@
"source": {
"type": "git",
"url": "https://github.com/wudi/swoole-ide-helper.git",
- "reference": "a255daa05feffbf4b88d59897a9470696d2fe259"
+ "reference": "70147a030c2dd5c1171bedae3a31970f3bf9c280"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wudi/swoole-ide-helper/zipball/a255daa05feffbf4b88d59897a9470696d2fe259",
- "reference": "a255daa05feffbf4b88d59897a9470696d2fe259",
+ "url": "https://api.github.com/repos/wudi/swoole-ide-helper/zipball/70147a030c2dd5c1171bedae3a31970f3bf9c280",
+ "reference": "70147a030c2dd5c1171bedae3a31970f3bf9c280",
"shasum": "",
"mirrors": [
{
@@ -3170,6 +3855,10 @@
}
]
},
+ "require": {
+ "php": ">=7.0"
+ },
+ "default-branch": true,
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3194,20 +3883,24 @@
"sublime",
"swoole"
],
- "time": "2019-11-02T07:18:22+00:00"
+ "support": {
+ "issues": "https://github.com/wudi/swoole-ide-helper/issues",
+ "source": "https://github.com/wudi/swoole-ide-helper/tree/master"
+ },
+ "time": "2021-06-02T17:13:45+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.12.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "04ce3335667451138df4307d6a9b61565560199e"
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
- "reference": "04ce3335667451138df4307d6a9b61565560199e",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
"shasum": "",
"mirrors": [
{
@@ -3217,21 +3910,25 @@
]
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "1.27-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3255,20 +3952,37 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
+ },
+ "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": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.3.6",
+ "version": "v4.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf"
+ "reference": "1069c7a3fca74578022fab6f81643248d02f8e63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf",
- "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63",
+ "reference": "1069c7a3fca74578022fab6f81643248d02f8e63",
"shasum": "",
"mirrors": [
{
@@ -3278,9 +3992,10 @@
]
},
"require": {
- "php": "^7.1.3",
+ "php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php72": "~1.5"
+ "symfony/polyfill-php72": "~1.5",
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
@@ -3288,9 +4003,9 @@
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "~3.4|~4.0",
- "symfony/process": "~3.4|~4.0",
- "twig/twig": "~1.34|~2.4"
+ "symfony/console": "^3.4|^4.0|^5.0",
+ "symfony/process": "^4.4|^5.0",
+ "twig/twig": "^1.43|^2.13|^3.0.4"
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -3301,11 +4016,6 @@
"Resources/bin/var-dump-server"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.3-dev"
- }
- },
"autoload": {
"files": [
"Resources/functions/dump.php"
@@ -3331,13 +4041,30 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony mechanism for exploring and dumping PHP variables",
+ "description": "Provides mechanisms for walking through any arbitrary PHP variable",
"homepage": "https://symfony.com",
"keywords": [
"debug",
"dump"
],
- "time": "2019-10-13T12:02:04+00:00"
+ "support": {
+ "source": "https://github.com/symfony/var-dumper/tree/v4.4.47"
+ },
+ "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": "2022-10-03T15:15:11+00:00"
}
],
"aliases": [],
diff --git a/config/swoole.php b/config/swoole.php
new file mode 100644
index 0000000..652a619
--- /dev/null
+++ b/config/swoole.php
@@ -0,0 +1,97 @@
+ [
+ 'host' => env('SWOOLE_HOST', '127.0.0.1'), // 监听地址
+ 'port' => env('SWOOLE_PORT', 80), // 监听端口
+ 'mode' => SWOOLE_PROCESS, // 运行模式 默认为SWOOLE_PROCESS
+ 'sock_type' => SWOOLE_SOCK_TCP, // sock type 默认为SWOOLE_SOCK_TCP
+ 'options' => [
+ 'pid_file' => runtime_path() . 'swoole.pid',
+ 'log_file' => runtime_path() . 'swoole.log',
+ 'daemonize' => false,
+ // Normally this value should be 1~4 times larger according to your cpu cores.
+ 'reactor_num' => swoole_cpu_num(),
+ 'worker_num' => swoole_cpu_num(),
+ 'task_worker_num' => swoole_cpu_num(),
+ 'enable_static_handler' => true,
+ 'document_root' => root_path('public'),
+ 'package_max_length' => 20 * 1024 * 1024,
+ 'buffer_output_size' => 10 * 1024 * 1024,
+ 'socket_buffer_size' => 128 * 1024 * 1024,
+ ],
+ ],
+ 'websocket' => [
+ 'enable' => false,
+ 'handler' => Handler::class,
+ 'ping_interval' => 25000,
+ 'ping_timeout' => 60000,
+ 'room' => [
+ 'type' => 'table',
+ 'table' => [
+ 'room_rows' => 4096,
+ 'room_size' => 2048,
+ 'client_rows' => 8192,
+ 'client_size' => 2048,
+ ],
+ 'redis' => [
+ 'host' => '127.0.0.1',
+ 'port' => 6379,
+ 'max_active' => 3,
+ 'max_wait_time' => 5,
+ ],
+ ],
+ 'listen' => [],
+ 'subscribe' => [],
+ ],
+ 'rpc' => [
+ 'server' => [
+ 'enable' => false,
+ 'port' => 9000,
+ 'services' => [
+ ],
+ ],
+ 'client' => [
+ ],
+ ],
+ 'hot_update' => [
+ 'enable' => env('APP_DEBUG', false),
+ 'name' => ['*.php'],
+ 'include' => [app_path()],
+ 'exclude' => [],
+ ],
+ //连接池
+ 'pool' => [
+ 'db' => [
+ 'enable' => true,
+ 'max_active' => 3,
+ 'max_wait_time' => 5,
+ ],
+ 'cache' => [
+ 'enable' => true,
+ 'max_active' => 3,
+ 'max_wait_time' => 5,
+ ],
+ //自定义连接池
+ ],
+ //队列
+ 'queue' => [
+ 'enable' => false,
+ 'workers' => [],
+ ],
+ 'coroutine' => [
+ 'enable' => true,
+ 'flags' => SWOOLE_HOOK_ALL,
+ ],
+ 'tables' => [],
+ //每个worker里需要预加载以共用的实例
+ 'concretes' => [],
+ //重置器
+ 'resetters' => [],
+ //每次请求前需要清空的实例
+ 'instances' => [],
+ //每次请求前需要重新执行的服务
+ 'services' => [],
+];
diff --git a/public/index.php b/public/index.php
index fd08e26..7010c7e 100644
--- a/public/index.php
+++ b/public/index.php
@@ -11,7 +11,7 @@
// [ 应用入口文件 ]
namespace think;
-
+require __DIR__.'/../vendor/topthink/framework/src/helper.php';//加载顺序问题
require __DIR__ . '/../vendor/autoload.php';
// 声明全局变量
diff --git a/think b/think
index 2429d22..5272692 100644
--- a/think
+++ b/think
@@ -2,6 +2,7 @@
Date: Mon, 26 Dec 2022 11:34:18 +0800
Subject: [PATCH 04/41] fix: first
---
config/app.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/app.php b/config/app.php
index 222cc6f..5c2c9ad 100644
--- a/config/app.php
+++ b/config/app.php
@@ -39,7 +39,7 @@ return [
// 错误显示信息,非调试模式有效
'error_message' => '页面错误!请稍后再试~',
// 显示错误信息
- 'show_error_msg' => false,
+ 'show_error_msg' => true,
// 静态资源上传到OSS前缀
'oss_static_prefix' => Env::get('easyadmin.oss_static_prefix', 'static_easyadmin'),
];
--
Gitee
From b93a7762ecdce861f4a9f068da2329617186f76a Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:42:51 +0800
Subject: [PATCH 05/41] fix: first
---
Dockerfile | 18 ++++++++++++++++++
WeEngine.conf | 35 +++++++++++++++++++++++++++++++++++
composer.lock | 6 +++---
env.sh | 22 ++++++++++++++++++++++
start.sh | 6 ++++++
5 files changed, 84 insertions(+), 3 deletions(-)
create mode 100644 Dockerfile
create mode 100644 WeEngine.conf
create mode 100644 env.sh
create mode 100644 start.sh
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b1e2002
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM ccr.ccs.tencentyun.com/w7team/swoole:fpm-php7.2
+MAINTAINER yuanwentao
+
+ENV WEB_PATH /home/WeEngine
+ADD ../config/tpl $WEB_PATH
+ADD WeEngine.conf /usr/local/nginx/conf/vhost/
+
+WORKDIR $WEB_PATH
+
+RUN composer install
+
+RUN ./env.sh
+
+CMD ["sh", "start.sh"]
+
+RUN rm -rf Dockerfile .git \
+ && chown -R 1000:1000 $WEB_PATH \
+ && chmod -R 755 $WEB_PATH
\ No newline at end of file
diff --git a/WeEngine.conf b/WeEngine.conf
new file mode 100644
index 0000000..e31961e
--- /dev/null
+++ b/WeEngine.conf
@@ -0,0 +1,35 @@
+server {
+ listen 8081;
+ server_name 127.0.0.1;
+ root /home/WeEngine/public;
+
+ location / {
+ if (!-e $request_filename) {
+ rewrite ^(.*)$ /index.php?s=/$1 last;
+ }
+ }
+
+ location ~ \.php(.*)$ {
+ fastcgi_pass unix://tmp/php-cgi.sock;
+ fastcgi_index index.php;
+ fastcgi_split_path_info ^((?U).+\.php)(/?.+)$;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PHP_ADMIN_VALUE "open_basedir=/home/:/tmp/:/usr/tmp/:/proc/";
+ include fastcgi_params;
+ }
+
+ location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$ {
+ expires 30d;
+ }
+
+ location ~ .*\.(js|css)?$ {
+ expires 12h;
+ }
+
+ location ~ /\. {
+ deny all;
+ }
+
+ access_log off;
+ error_log /dev/stderr;
+}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index da84bc5..8e06f71 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3623,11 +3623,11 @@
},
{
"name": "w7/sdk-console-php",
- "version": "v1.0.7",
+ "version": "v1.0.8",
"source": {
"type": "git",
"url": "https://gitee.com/free-worker/console-sdk-php.git",
- "reference": "5c4ec920cfb2708184420a94368a74cfa05d1441"
+ "reference": "c3dc20c0bac3bcff64753483187db0d9cc1250c3"
},
"require": {
"php": "^7.2",
@@ -3667,7 +3667,7 @@
]
},
"description": "w7 console sdk",
- "time": "2022-12-26T03:28:42+00:00"
+ "time": "2022-12-26T03:33:58+00:00"
},
{
"name": "w7corp/sdk-cloud",
diff --git a/env.sh b/env.sh
new file mode 100644
index 0000000..a619be4
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# 写入环境变量
+FILE="./.env"
+cat > ${FILE} <<- EOF
+APP_DEBUG = ${APP_DEBUG}
+
+[APP]
+DEFAULT_TIMEZONE = Asia/Shanghai
+
+[DATABASE]
+TYPE = mysql
+HOSTNAME = ${MYSQL_ADDRESS} #w7环境变量是 ip:port
+DATABASE = ${MYSQL_DATABASE}
+USERNAME = ${MYSQL_USERNAME}
+PASSWORD = ${MYSQL_PASSWORD}
+HOSTPORT = 3306
+CHARSET = utf8
+
+[LANG]
+default_lang = zh-cn%
+EOF
\ No newline at end of file
diff --git a/start.sh b/start.sh
new file mode 100644
index 0000000..030514c
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+source .env.sh
+# 启动
+nginx
+php-fpm
+tail -f /dev/stderr
\ No newline at end of file
--
Gitee
From 812e16fc5a7fb29694d20225ea49e3a292097541 Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:46:15 +0800
Subject: [PATCH 06/41] fix: first
---
.example.env | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.example.env b/.example.env
index c2e8a46..e7b7778 100644
--- a/.example.env
+++ b/.example.env
@@ -33,7 +33,7 @@ CDN=
EXAMPLE=true
# 是否开启CSRF过滤
-IS_CSRF=true
+IS_CSRF=false
# 静态文件路径前缀
STATIC_PATH=/static
--
Gitee
From 2c27bf421aca09e46134590215da9efd68b2c97c Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 11:52:16 +0800
Subject: [PATCH 07/41] fix: first
---
.example.env | 2 +-
app/common/controller/AdminController.php | 56 +++++++++++------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.example.env b/.example.env
index e7b7778..c2e8a46 100644
--- a/.example.env
+++ b/.example.env
@@ -33,7 +33,7 @@ CDN=
EXAMPLE=true
# 是否开启CSRF过滤
-IS_CSRF=false
+IS_CSRF=true
# 静态文件路径前缀
STATIC_PATH=/static
diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php
index 9cb1bec..a6adb80 100644
--- a/app/common/controller/AdminController.php
+++ b/app/common/controller/AdminController.php
@@ -248,37 +248,37 @@ class AdminController extends BaseController
*/
private function checkAuth(){
$adminConfig = config('admin');
- $adminId = session('admin.id');
+ $adminId = 1;//session('admin.id');
$expireTime = session('admin.expire_time');
/** @var AuthService $authService */
$authService = app(AuthService::class, ['adminId' => $adminId]);
- $currentNode = $authService->getCurrentNode();
- $currentController = parse_name(app()->request->controller());
-
- // 验证登录
- if (!in_array($currentController, $adminConfig['no_login_controller']) &&
- !in_array($currentNode, $adminConfig['no_login_node'])) {
- empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index'));
-
- // 判断是否登录过期
- if ($expireTime !== true && time() > $expireTime) {
- session('admin', null);
- $this->error('登录已过期,请重新登录', [], __url('admin/login/index'));
- }
- }
-
- // 验证权限
- if (!in_array($currentController, $adminConfig['no_auth_controller']) &&
- !in_array($currentNode, $adminConfig['no_auth_node'])) {
- $check = $authService->checkNode($currentNode);
- !$check && $this->error('无权限访问');
-
- // 判断是否为演示环境
- if(env('easyadmin.is_demo', false) && app()->request->isPost()){
- $this->error('演示环境下不允许修改');
- }
-
- }
+// $currentNode = $authService->getCurrentNode();
+// $currentController = parse_name(app()->request->controller());
+//
+// // 验证登录
+// if (!in_array($currentController, $adminConfig['no_login_controller']) &&
+// !in_array($currentNode, $adminConfig['no_login_node'])) {
+// empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index'));
+//
+// // 判断是否登录过期
+// if ($expireTime !== true && time() > $expireTime) {
+// session('admin', null);
+// $this->error('登录已过期,请重新登录', [], __url('admin/login/index'));
+// }
+// }
+//
+// // 验证权限
+// if (!in_array($currentController, $adminConfig['no_auth_controller']) &&
+// !in_array($currentNode, $adminConfig['no_auth_node'])) {
+// $check = $authService->checkNode($currentNode);
+// !$check && $this->error('无权限访问');
+//
+// // 判断是否为演示环境
+// if(env('easyadmin.is_demo', false) && app()->request->isPost()){
+// $this->error('演示环境下不允许修改');
+// }
+//
+// }
}
/**
--
Gitee
From 79099ad684f251c99f9935efdb8ffdf97dc3058c Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 14:38:42 +0800
Subject: [PATCH 08/41] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8Dadmincontroller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 2 -
app/admin/controller/ConsoleLogin.php | 52 +++++++++++++++++++++
app/admin/view/login/index.html | 11 ++++-
app/common/controller/AdminController.php | 56 +++++++++++------------
env.sh | 47 +++++++++++++++----
5 files changed, 127 insertions(+), 41 deletions(-)
create mode 100644 app/admin/controller/ConsoleLogin.php
diff --git a/Dockerfile b/Dockerfile
index b1e2002..e56a7ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,6 @@ WORKDIR $WEB_PATH
RUN composer install
-RUN ./env.sh
-
CMD ["sh", "start.sh"]
RUN rm -rf Dockerfile .git \
diff --git a/app/admin/controller/ConsoleLogin.php b/app/admin/controller/ConsoleLogin.php
new file mode 100644
index 0000000..eeef81d
--- /dev/null
+++ b/app/admin/controller/ConsoleLogin.php
@@ -0,0 +1,52 @@
+oauth = $oAuth;
+ }
+
+ /**
+ * @return Response
+ */
+ public function doLogin()
+ {
+ $code = $this->request->get('code');
+ $user = $this->oauth->getUserByCode($code);
+ return $this->loginUser($user);
+ }
+
+ /**
+ * @param User $user
+ * @return Response
+ */
+ protected function loginUser(User $user)
+ {
+ //绑定已有账户 或者直接登录
+ $openId = $user->getOpenid();
+ if ($user->isAdmin())
+ {
+ $admin = SystemAdmin::where(['id' =>1])->find();
+ if (!$admin) {
+ $admin = $admin->toArray();
+ unset($admin['password']);
+ $admin['expire_time'] = time() + 7200;
+ session('admin', $admin);
+ return json(['is_login'=>1]);
+ }
+ }
+ return json(['is_login'=>0]);
+ }
+}
\ No newline at end of file
diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html
index 576a171..8017a8f 100644
--- a/app/admin/view/login/index.html
+++ b/app/admin/view/login/index.html
@@ -42,4 +42,13 @@
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php
index a6adb80..9cb1bec 100644
--- a/app/common/controller/AdminController.php
+++ b/app/common/controller/AdminController.php
@@ -248,37 +248,37 @@ class AdminController extends BaseController
*/
private function checkAuth(){
$adminConfig = config('admin');
- $adminId = 1;//session('admin.id');
+ $adminId = session('admin.id');
$expireTime = session('admin.expire_time');
/** @var AuthService $authService */
$authService = app(AuthService::class, ['adminId' => $adminId]);
-// $currentNode = $authService->getCurrentNode();
-// $currentController = parse_name(app()->request->controller());
-//
-// // 验证登录
-// if (!in_array($currentController, $adminConfig['no_login_controller']) &&
-// !in_array($currentNode, $adminConfig['no_login_node'])) {
-// empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index'));
-//
-// // 判断是否登录过期
-// if ($expireTime !== true && time() > $expireTime) {
-// session('admin', null);
-// $this->error('登录已过期,请重新登录', [], __url('admin/login/index'));
-// }
-// }
-//
-// // 验证权限
-// if (!in_array($currentController, $adminConfig['no_auth_controller']) &&
-// !in_array($currentNode, $adminConfig['no_auth_node'])) {
-// $check = $authService->checkNode($currentNode);
-// !$check && $this->error('无权限访问');
-//
-// // 判断是否为演示环境
-// if(env('easyadmin.is_demo', false) && app()->request->isPost()){
-// $this->error('演示环境下不允许修改');
-// }
-//
-// }
+ $currentNode = $authService->getCurrentNode();
+ $currentController = parse_name(app()->request->controller());
+
+ // 验证登录
+ if (!in_array($currentController, $adminConfig['no_login_controller']) &&
+ !in_array($currentNode, $adminConfig['no_login_node'])) {
+ empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index'));
+
+ // 判断是否登录过期
+ if ($expireTime !== true && time() > $expireTime) {
+ session('admin', null);
+ $this->error('登录已过期,请重新登录', [], __url('admin/login/index'));
+ }
+ }
+
+ // 验证权限
+ if (!in_array($currentController, $adminConfig['no_auth_controller']) &&
+ !in_array($currentNode, $adminConfig['no_auth_node'])) {
+ $check = $authService->checkNode($currentNode);
+ !$check && $this->error('无权限访问');
+
+ // 判断是否为演示环境
+ if(env('easyadmin.is_demo', false) && app()->request->isPost()){
+ $this->error('演示环境下不允许修改');
+ }
+
+ }
}
/**
diff --git a/env.sh b/env.sh
index a619be4..b796f5a 100644
--- a/env.sh
+++ b/env.sh
@@ -3,20 +3,47 @@
# 写入环境变量
FILE="./.env"
cat > ${FILE} <<- EOF
-APP_DEBUG = ${APP_DEBUG}
+APP_DEBUG=true
[APP]
-DEFAULT_TIMEZONE = Asia/Shanghai
+DEFAULT_TIMEZONE=Asia/Shanghai
[DATABASE]
-TYPE = mysql
-HOSTNAME = ${MYSQL_ADDRESS} #w7环境变量是 ip:port
-DATABASE = ${MYSQL_DATABASE}
-USERNAME = ${MYSQL_USERNAME}
-PASSWORD = ${MYSQL_PASSWORD}
-HOSTPORT = 3306
-CHARSET = utf8
+TYPE=mysql
+HOSTNAME=${MYSQL_ADDRESS}
+DATABASE=${MYSQL_DATABASE}
+USERNAME=${MYSQL_USERNAME}
+PASSWORD=${MYSQL_PASSWORD}
+HOSTPORT=3306
+CHARSET=utf8
+DEBUG=true
+PREFIX=ea_
[LANG]
-default_lang = zh-cn%
+default_lang=zh-cn
+
+# 后台配置项组
+[EASYADMIN]
+# 后台地址后缀名称
+ADMIN=admin
+
+# 后台登录验证码开关
+CAPTCHA=false
+
+# 是否为演示环境
+IS_DEMO=false
+
+# CDN配置项组
+CDN=
+EXAMPLE=true
+
+# 是否开启CSRF过滤
+IS_CSRF=true
+
+# 静态文件路径前缀
+STATIC_PATH=/static
+
+# OSS静态文件路径前缀
+OSS_STATIC_PREFIX=static_easyadmin
+
EOF
\ No newline at end of file
--
Gitee
From 156c377cfe869f0f9356657f4aab9fafce2ff1b5 Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 15:29:54 +0800
Subject: [PATCH 09/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.dockerignore | 2 ++
Dockerfile | 7 +++++--
config/cookie.php | 6 ++++--
env.sh | 4 +++-
public/index.php | 2 +-
start.sh | 2 +-
6 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 .dockerignore
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..db27dc8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.env
+vendor
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e56a7ab..e124117 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ccr.ccs.tencentyun.com/w7team/swoole:fpm-php7.2
MAINTAINER yuanwentao
ENV WEB_PATH /home/WeEngine
-ADD ../config/tpl $WEB_PATH
+ADD . $WEB_PATH
ADD WeEngine.conf /usr/local/nginx/conf/vhost/
WORKDIR $WEB_PATH
@@ -13,4 +13,7 @@ CMD ["sh", "start.sh"]
RUN rm -rf Dockerfile .git \
&& chown -R 1000:1000 $WEB_PATH \
- && chmod -R 755 $WEB_PATH
\ No newline at end of file
+ && chmod -R 755 $WEB_PATH
+
+#test
+#docker run -it -p 80:80 -e MYSQL_USERNAME=root -e MYSQL_PASSWORD=123456 -e MYSQL_DATABASE=easyadmin -e MYSQL_ADDRESS=172.16.1.13:3306 test
\ No newline at end of file
diff --git a/config/cookie.php b/config/cookie.php
index f728024..8384097 100644
--- a/config/cookie.php
+++ b/config/cookie.php
@@ -10,9 +10,11 @@ return [
// cookie 有效域名
'domain' => '',
// cookie 启用安全传输
- 'secure' => false,
+ 'secure' => true,
// httponly设置
- 'httponly' => false,
+ 'httponly' => true,
// 是否使用 setcookie
'setcookie' => true,
+ //iframe 跨域必须使用none
+ 'samesite' => 'none',
];
diff --git a/env.sh b/env.sh
index b796f5a..d2f1686 100644
--- a/env.sh
+++ b/env.sh
@@ -46,4 +46,6 @@ STATIC_PATH=/static
# OSS静态文件路径前缀
OSS_STATIC_PREFIX=static_easyadmin
-EOF
\ No newline at end of file
+EOF
+
+sed -i "s/:3306//g" .env
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 7010c7e..cbba95e 100644
--- a/public/index.php
+++ b/public/index.php
@@ -20,7 +20,7 @@ define('ROOT_PATH', __DIR__ . DS . '..' . DS);
// 判断是否安装程序
if (!is_file(ROOT_PATH . 'config' . DS . 'install' . DS . 'lock' . DS . 'install.lock')) {
- exit(header("location:/install.php"));
+// exit(header("location:/install.php"));
}
// 执行HTTP应用并响应
diff --git a/start.sh b/start.sh
index 030514c..6d64cea 100644
--- a/start.sh
+++ b/start.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source .env.sh
+source ./env.sh
# 启动
nginx
php-fpm
--
Gitee
From 7a097d7d17c5df6c319402a01d231bc6e1460a39 Mon Sep 17 00:00:00 2001
From: fykyx521
Date: Mon, 26 Dec 2022 16:48:53 +0800
Subject: [PATCH 10/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WeEngine.conf | 3 ++-
app/AllowCrossDomain.php | 13 +++++++++++++
app/middleware.php | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 app/AllowCrossDomain.php
diff --git a/WeEngine.conf b/WeEngine.conf
index e31961e..76a1ff0 100644
--- a/WeEngine.conf
+++ b/WeEngine.conf
@@ -2,11 +2,12 @@ server {
listen 8081;
server_name 127.0.0.1;
root /home/WeEngine/public;
-
+ index index.html index.htm index.php;
location / {
if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?s=/$1 last;
}
+ index index.html index.htm index.php;
}
location ~ \.php(.*)$ {
diff --git a/app/AllowCrossDomain.php b/app/AllowCrossDomain.php
new file mode 100644
index 0000000..a8f7fb2
--- /dev/null
+++ b/app/AllowCrossDomain.php
@@ -0,0 +1,13 @@
+
Date: Mon, 26 Dec 2022 16:55:19 +0800
Subject: [PATCH 11/41] fix: cors
---
app/admin/controller/ConsoleLogin.php | 1 +
app/admin/middleware.php | 2 ++
app/common/tpl/dispatch_jump.tpl | 26 +++++++++++++-------------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/app/admin/controller/ConsoleLogin.php b/app/admin/controller/ConsoleLogin.php
index eeef81d..b77766c 100644
--- a/app/admin/controller/ConsoleLogin.php
+++ b/app/admin/controller/ConsoleLogin.php
@@ -47,6 +47,7 @@ class ConsoleLogin extends Login
return json(['is_login'=>1]);
}
}
+ $this->success();
return json(['is_login'=>0]);
}
}
\ No newline at end of file
diff --git a/app/admin/middleware.php b/app/admin/middleware.php
index 56b6897..961ea68 100644
--- a/app/admin/middleware.php
+++ b/app/admin/middleware.php
@@ -2,6 +2,7 @@
// 全局中间件定义文件
return [
+ \app\AllowCrossDomain::class,
// Session初始化
\think\middleware\SessionInit::class,
@@ -11,6 +12,7 @@ return [
// Csrf安全校验
\app\admin\middleware\CsrfMiddleware::class,
+
// 后台视图初始化
// \app\admin\middleware\ViewInit::class,
diff --git a/app/common/tpl/dispatch_jump.tpl b/app/common/tpl/dispatch_jump.tpl
index 1895f62..fdf1449 100644
--- a/app/common/tpl/dispatch_jump.tpl
+++ b/app/common/tpl/dispatch_jump.tpl
@@ -42,18 +42,18 @@
立即跳转
-
+{* *}