Browse Source

merged and resolved the conflict in composer.lock

pull/5/head
ScytAl3 5 months ago
parent
commit
ad1b94f2c9
  1. 21
      SECURITY.md
  2. 78
      composer.lock

21
SECURITY.md

@ -0,0 +1,21 @@
# Security Policy
## Supported Versions
Use this section to tell people about which versions of your project are
currently being supported with security updates.
| Version | Supported |
| ------- | ------------------ |
| 5.1.x | :white_check_mark: |
| 5.0.x | :x: |
| 4.0.x | :white_check_mark: |
| < 4.0 | :x: |
## Reporting a Vulnerability
Use this section to tell people how to report a vulnerability.
Tell them where to go, how often they can expect to get an update on a
reported vulnerability, what to expect if the vulnerability is accepted or
declined, etc.

78
composer.lock

@ -1645,6 +1645,84 @@
],
"time": "2021-01-14T21:52:44+00:00"
},
{
"name": "friendsofphp/proxy-manager-lts",
"version": "v1.0.3",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git",
"reference": "121af47c9aee9c03031bdeca3fac0540f59aa5c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/121af47c9aee9c03031bdeca3fac0540f59aa5c3",
"reference": "121af47c9aee9c03031bdeca3fac0540f59aa5c3",
"shasum": ""
},
"require": {
"laminas/laminas-code": "~3.4.1|^4.0",
"php": ">=7.1",
"symfony/filesystem": "^4.4.17|^5.0"
},
"conflict": {
"laminas/laminas-stdlib": "<3.2.1",
"zendframework/zend-stdlib": "<3.2.1"
},
"replace": {
"ocramius/proxy-manager": "^2.1"
},
"require-dev": {
"ext-phar": "*",
"symfony/phpunit-bridge": "^5.2"
},
"type": "library",
"extra": {
"thanks": {
"name": "ocramius/proxy-manager",
"url": "https://github.com/Ocramius/ProxyManager"
}
},
"autoload": {
"psr-4": {
"ProxyManager\\": "src/ProxyManager"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com",
"homepage": "http://ocramius.github.io/"
},
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
}
],
"description": "Adding support for a wider range of PHP versions to ocramius/proxy-manager",
"homepage": "https://github.com/FriendsOfPHP/proxy-manager-lts",
"keywords": [
"aop",
"lazy loading",
"proxy",
"proxy pattern",
"service proxies"
],
"funding": [
{
"url": "https://github.com/Ocramius",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/ocramius/proxy-manager",
"type": "tidelift"
}
],
"time": "2021-01-14T21:52:44+00:00"
},
{
"name": "laminas/laminas-code",
"version": "4.3.0",

Loading…
Cancel
Save