mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2024-10-01 01:26:10 -04:00
Merge remote-tracking branch 'origin/master' into php8
This commit is contained in:
commit
46013df620
74
composer.lock
generated
74
composer.lock
generated
@ -867,16 +867,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "5.6.3",
|
"version": "5.7.27",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "a9de0dbafeb6b1391b391fbb034734cb0af9f67c"
|
"reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9de0dbafeb6b1391b391fbb034734cb0af9f67c",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
|
||||||
"reference": "a9de0dbafeb6b1391b391fbb034734cb0af9f67c",
|
"reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -888,21 +888,21 @@
|
|||||||
"ext-xml": "*",
|
"ext-xml": "*",
|
||||||
"myclabs/deep-copy": "~1.3",
|
"myclabs/deep-copy": "~1.3",
|
||||||
"php": "^5.6 || ^7.0",
|
"php": "^5.6 || ^7.0",
|
||||||
"phpspec/prophecy": "^1.3.1",
|
"phpspec/prophecy": "^1.6.2",
|
||||||
"phpunit/php-code-coverage": "^4.0.1",
|
"phpunit/php-code-coverage": "^4.0.4",
|
||||||
"phpunit/php-file-iterator": "~1.4",
|
"phpunit/php-file-iterator": "~1.4",
|
||||||
"phpunit/php-text-template": "~1.2",
|
"phpunit/php-text-template": "~1.2",
|
||||||
"phpunit/php-timer": "^1.0.6",
|
"phpunit/php-timer": "^1.0.6",
|
||||||
"phpunit/phpunit-mock-objects": "^3.2",
|
"phpunit/phpunit-mock-objects": "^3.2",
|
||||||
"sebastian/comparator": "~1.1",
|
"sebastian/comparator": "^1.2.4",
|
||||||
"sebastian/diff": "~1.2",
|
"sebastian/diff": "^1.4.3",
|
||||||
"sebastian/environment": "^1.3 || ^2.0",
|
"sebastian/environment": "^1.3.4 || ^2.0",
|
||||||
"sebastian/exporter": "~1.2",
|
"sebastian/exporter": "~2.0",
|
||||||
"sebastian/global-state": "~1.0",
|
"sebastian/global-state": "^1.1",
|
||||||
"sebastian/object-enumerator": "~1.0",
|
"sebastian/object-enumerator": "~2.0",
|
||||||
"sebastian/resource-operations": "~1.0",
|
"sebastian/resource-operations": "~1.0",
|
||||||
"sebastian/version": "~1.0|~2.0",
|
"sebastian/version": "^1.0.6|^2.0.1",
|
||||||
"symfony/yaml": "~2.1|~3.0"
|
"symfony/yaml": "~2.1|~3.0|~4.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "3.0.2"
|
"phpdocumentor/reflection-docblock": "3.0.2"
|
||||||
@ -921,7 +921,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "5.6.x-dev"
|
"dev-master": "5.7.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -952,9 +952,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/5.6.3"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/5.7.27"
|
||||||
},
|
},
|
||||||
"time": "2016-11-14T06:39:40+00:00"
|
"time": "2018-02-01T05:50:59+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
@ -1265,21 +1265,21 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/exporter",
|
"name": "sebastian/exporter",
|
||||||
"version": "1.2.2",
|
"version": "2.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/exporter.git",
|
"url": "https://github.com/sebastianbergmann/exporter.git",
|
||||||
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
|
"reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
|
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
|
||||||
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
|
"reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"sebastian/recursion-context": "~1.0"
|
"sebastian/recursion-context": "~2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
@ -1288,7 +1288,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.3.x-dev"
|
"dev-master": "2.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1332,7 +1332,7 @@
|
|||||||
"issues": "https://github.com/sebastianbergmann/exporter/issues",
|
"issues": "https://github.com/sebastianbergmann/exporter/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/exporter/tree/master"
|
"source": "https://github.com/sebastianbergmann/exporter/tree/master"
|
||||||
},
|
},
|
||||||
"time": "2016-06-17T09:04:28+00:00"
|
"time": "2016-11-19T08:54:04+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/global-state",
|
"name": "sebastian/global-state",
|
||||||
@ -1394,21 +1394,21 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/object-enumerator",
|
"name": "sebastian/object-enumerator",
|
||||||
"version": "1.0.0",
|
"version": "2.0.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
|
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
|
||||||
"reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
|
"reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
|
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
|
||||||
"reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
|
"reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.6",
|
"php": ">=5.6",
|
||||||
"sebastian/recursion-context": "~1.0"
|
"sebastian/recursion-context": "~2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.3"
|
"phpunit/phpunit": "^9.3"
|
||||||
@ -1416,7 +1416,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.0.x-dev"
|
"dev-master": "2.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1440,20 +1440,20 @@
|
|||||||
"issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
|
"issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/object-enumerator/tree/master"
|
"source": "https://github.com/sebastianbergmann/object-enumerator/tree/master"
|
||||||
},
|
},
|
||||||
"time": "2016-01-28T13:25:10+00:00"
|
"time": "2017-02-18T15:18:39+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/recursion-context",
|
"name": "sebastian/recursion-context",
|
||||||
"version": "1.0.5",
|
"version": "2.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/recursion-context.git",
|
"url": "https://github.com/sebastianbergmann/recursion-context.git",
|
||||||
"reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
|
"reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
|
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
|
||||||
"reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
|
"reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1465,7 +1465,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.0.x-dev"
|
"dev-master": "2.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1497,7 +1497,7 @@
|
|||||||
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
|
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
|
"source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
|
||||||
},
|
},
|
||||||
"time": "2016-10-03T07:41:43+00:00"
|
"time": "2016-11-19T07:33:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/resource-operations",
|
"name": "sebastian/resource-operations",
|
||||||
|
Loading…
Reference in New Issue
Block a user