diff --git a/.all-contributorsrc b/.all-contributorsrc
index 30a37f639bc82d39a7f1e164280345031e0b8eee..5c12d6de18666a949a3f95aeaec39490af769ddd 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2137,6 +2137,15 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "elyscape",
+ "name": "Eli Young",
+ "avatar_url": "https://avatars.githubusercontent.com/u/792695?v=4",
+ "profile": "https://elyscape.com",
+ "contributions": [
+ "code"
+ ]
}
]
}
diff --git a/README.md b/README.md
index 2e0e95307d0e510b0e5f8a86628f9863db400584..3a54880c999ba4b779dc7159e9340485907c6de3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [](https://crowdin.com/project/snipe-it) [](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [](https://hub.docker.com/r/snipe/snipe-it/) [](https://twitter.com/snipeitapp) [](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[](#contributors)
+[](#contributors)
## Snipe-IT - Open Source Asset Management System
@@ -122,7 +122,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index f4177ea663a80c205ec66f32b0edbcf67c14cf65..462c685361d8da93a25353e813896763100111a1 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -36,13 +36,17 @@ class SettingsController extends Controller
public function ldapAdSettingsTest(LdapAd $ldap): JsonResponse
{
if(!$ldap->init()) {
- Log::info('LDAP is not enabled cannot test.');
+ Log::info('LDAP is not enabled so we cannot test.');
return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
}
// The connect, bind and resulting users message
$message = [];
+
+ // This is all kinda fucked right now. The connection test doesn't actually do what you think,
+ // // and the way we parse the errors
+ // on the JS side is horrible.
Log::info('Preparing to test LDAP user login');
// Test user can connect to the LDAP server
try {
@@ -51,13 +55,11 @@ class SettingsController extends Controller
'message' => 'Successfully connected to LDAP server.'
];
} catch (\Exception $ex) {
- \Log::debug('LDAP connected but Bind failed. Please check your LDAP settings and try again.');
- return response()->json([
- 'message' => 'Error logging into LDAP server, error: ' . $ex->getMessage() . ' - Verify your that your username and password are correct']);
+ \Log::debug('Connection to LDAP server '.Setting::getSettings()->ldap_server.' failed. Please check your LDAP settings and try again. Server Responded with error: ' . $ex->getMessage());
+ return response()->json(
+ ['message' => 'Connection to LDAP server '.Setting::getSettings()->ldap_server." failed. Verify that the LDAP hostname is entered correctly and that it can be reached from this web server. \n\nServer Responded with error: " . $ex->getMessage()
- } catch (\Exception $e) {
- \Log::info('LDAP connection failed but we cannot debug it any further on our end.');
- return response()->json(['message' => 'The LDAP connection failed but we cannot debug it any further on our end. The error from the server is: '.$e->getMessage()], 500);
+ ], 400);
}
Log::info('Preparing to test LDAP bind connection');
@@ -66,12 +68,11 @@ class SettingsController extends Controller
Log::info('Testing Bind');
$ldap->testLdapAdBindConnection();
$message['bind'] = [
- 'message' => 'Successfully binded to LDAP server.'
+ 'message' => 'Successfully bound to LDAP server.'
];
} catch (\Exception $ex) {
Log::info('LDAP Bind failed');
- return response()->json([
- 'message' => 'Error binding to LDAP server, error: ' . $ex->getMessage()
+ return response()->json(['message' => 'Connection to LDAP successful, but we were unable to Bind the LDAP user '.Setting::getSettings()->ldap_uname.". Verify your that your LDAP Bind username and password are correct. \n\nServer Responded with error: " . $ex->getMessage()
], 400);
}
@@ -94,9 +95,17 @@ class SettingsController extends Controller
'email' => $item[$settings['ldap_email']][0] ?? null,
];
});
- $message['user_sync'] = [
- 'users' => $users
- ];
+ if ($users->count() > 0) {
+ $message['user_sync'] = [
+ 'users' => $users
+ ];
+ } else {
+ $message['user_sync'] = [
+ 'message' => 'Connection to LDAP was successful, however there were no users returned from your query. You should confirm the Base Bind DN above.'
+ ];
+ return response()->json($message, 400);
+ }
+
} catch (\Exception $ex) {
Log::info('LDAP sync failed');
$message['user_sync'] = [
diff --git a/app/Services/LdapAd.php b/app/Services/LdapAd.php
index 85410ce7d14649cdef8d1721765d2fd0341731d4..01e6f77d59365b3a91ddf74c2366e376579a970e 100644
--- a/app/Services/LdapAd.php
+++ b/app/Services/LdapAd.php
@@ -504,9 +504,9 @@ class LdapAd extends LdapAdConfiguration
{
try {
$this->ldap->connect();
- } catch (\Adldap\Auth\BindException $e) {
- Log::error($e);
- throw new Exception('Unable to connect to LDAP directory!');
+ } catch (\Exception $e) {
+ Log::debug('LDAP ERROR: '.$e->getMessage());
+ throw new Exception($e->getMessage());
}
}
diff --git a/composer.json b/composer.json
index 689d474af6c5d7cdd3acef16b0d013626dcae917..b6236ecda33fd595d9ae602d97a162a654ba7027 100644
--- a/composer.json
+++ b/composer.json
@@ -45,6 +45,7 @@
"league/flysystem-cached-adapter": "^1.0",
"neitanod/forceutf8": "^2.0",
"nesbot/carbon": "^2.32",
+ "nunomaduro/collision": "v3.2.0",
"onelogin/php-saml": "^3.4",
"paragonie/constant_time_encoding": "^2.3",
"patchwork/utf8": "^1.3",
diff --git a/composer.lock b/composer.lock
index 9925f7f682bcd852b381d6d4935d4aea89b5f13d..2cdae0894e7522b76da7a6d953bf7a9524136f32 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "174cd6c3ab64796350987629a2d7d5df",
+ "content-hash": "d52b855728203ea0392edbdc8893762d",
"packages": [
{
"name": "adldap2/adldap2",
- "version": "v10.3.1",
+ "version": "v10.3.2",
"source": {
"type": "git",
"url": "https://github.com/Adldap2/Adldap2.git",
- "reference": "936a4e2eb925d005198f716a75bb78068c4de94d"
+ "reference": "b2203d800c5932f975abc213c659428697e27cd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/936a4e2eb925d005198f716a75bb78068c4de94d",
- "reference": "936a4e2eb925d005198f716a75bb78068c4de94d",
+ "url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/b2203d800c5932f975abc213c659428697e27cd9",
+ "reference": "b2203d800c5932f975abc213c659428697e27cd9",
"shasum": ""
},
"require": {
@@ -69,7 +69,7 @@
"issues": "https://github.com/Adldap2/Adldap2/issues",
"source": "https://github.com/Adldap2/Adldap2"
},
- "time": "2020-09-09T12:55:51+00:00"
+ "time": "2021-03-05T21:14:57+00:00"
},
{
"name": "alek13/slack",
@@ -195,16 +195,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.173.0",
+ "version": "3.174.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "ab3ee1cba4219d5262ecac8f011f267e9b7f3af9"
+ "reference": "80cc136f47fa808032f411fff70e26f461852510"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ab3ee1cba4219d5262ecac8f011f267e9b7f3af9",
- "reference": "ab3ee1cba4219d5262ecac8f011f267e9b7f3af9",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/80cc136f47fa808032f411fff70e26f461852510",
+ "reference": "80cc136f47fa808032f411fff70e26f461852510",
"shasum": ""
},
"require": {
@@ -212,9 +212,9 @@
"ext-pcre": "*",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
- "guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.4.1",
- "mtdowling/jmespath.php": "^2.5",
+ "guzzlehttp/promises": "^1.4.0",
+ "guzzlehttp/psr7": "^1.7.0",
+ "mtdowling/jmespath.php": "^2.6",
"php": ">=5.5"
},
"require-dev": {
@@ -279,9 +279,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.173.0"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.174.2"
},
- "time": "2021-02-02T20:01:31+00:00"
+ "time": "2021-03-17T18:13:11+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -586,16 +586,16 @@
},
{
"name": "doctrine/annotations",
- "version": "1.11.1",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
+ "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b",
+ "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b",
"shasum": ""
},
"require": {
@@ -610,11 +610,6 @@
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.11.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
@@ -655,9 +650,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.11.1"
+ "source": "https://github.com/doctrine/annotations/tree/1.12.1"
},
- "time": "2020-10-26T10:28:16+00:00"
+ "time": "2021-02-21T21:00:45+00:00"
},
{
"name": "doctrine/cache",
@@ -931,33 +926,32 @@
},
{
"name": "doctrine/dbal",
- "version": "2.10.4",
+ "version": "2.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "47433196b6390d14409a33885ee42b6208160643"
+ "reference": "adce7a954a1c2f14f85e94aed90c8489af204086"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643",
- "reference": "47433196b6390d14409a33885ee42b6208160643",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/adce7a954a1c2f14f85e94aed90c8489af204086",
+ "reference": "adce7a954a1c2f14f85e94aed90c8489af204086",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
- "php": "^7.2"
+ "php": "^7.3 || ^8"
},
"require-dev": {
"doctrine/coding-standard": "^8.1",
"jetbrains/phpstorm-stubs": "^2019.1",
- "nikic/php-parser": "^4.4",
"phpstan/phpstan": "^0.12.40",
- "phpunit/phpunit": "^8.5.5",
+ "phpunit/phpunit": "^9.4",
"psalm/plugin-phpunit": "^0.10.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
- "vimeo/psalm": "^3.14.2"
+ "vimeo/psalm": "^3.17.2"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -968,8 +962,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10.x-dev",
- "dev-develop": "3.0.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -1024,7 +1017,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/2.10.4"
+ "source": "https://github.com/doctrine/dbal/tree/2.12.1"
},
"funding": [
{
@@ -1040,7 +1033,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-12T21:20:41+00:00"
+ "time": "2020-11-14T20:26:58+00:00"
},
{
"name": "doctrine/event-manager",
@@ -1914,18 +1907,89 @@
},
"time": "2020-10-22T13:48:01+00:00"
},
+ {
+ "name": "filp/whoops",
+ "version": "2.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/filp/whoops.git",
+ "reference": "6ecda5217bf048088b891f7403b262906be5a957"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/6ecda5217bf048088b891f7403b262906be5a957",
+ "reference": "6ecda5217bf048088b891f7403b262906be5a957",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5.9 || ^7.0 || ^8.0",
+ "psr/log": "^1.0.1"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9 || ^1.0",
+ "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
+ "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+ },
+ "suggest": {
+ "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
+ "whoops/soap": "Formats errors as SOAP responses"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Whoops\\": "src/Whoops/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Filipe Dobreira",
+ "homepage": "https://github.com/filp",
+ "role": "Developer"
+ }
+ ],
+ "description": "php error handling for cool kids",
+ "homepage": "https://filp.github.io/whoops/",
+ "keywords": [
+ "error",
+ "exception",
+ "handling",
+ "library",
+ "throwable",
+ "whoops"
+ ],
+ "support": {
+ "issues": "https://github.com/filp/whoops/issues",
+ "source": "https://github.com/filp/whoops/tree/2.10.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/denis-sokolov",
+ "type": "github"
+ }
+ ],
+ "time": "2021-03-16T12:00:00+00:00"
+ },
{
"name": "firebase/php-jwt",
- "version": "v5.2.0",
+ "version": "v5.2.1",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
- "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb"
+ "reference": "f42c9110abe98dd6cfe9053c49bc86acc70b2d23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb",
- "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb",
+ "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f42c9110abe98dd6cfe9053c49bc86acc70b2d23",
+ "reference": "f42c9110abe98dd6cfe9053c49bc86acc70b2d23",
"shasum": ""
},
"require": {
@@ -1964,9 +2028,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
- "source": "https://github.com/firebase/php-jwt/tree/master"
+ "source": "https://github.com/firebase/php-jwt/tree/v5.2.1"
},
- "time": "2020-03-25T18:49:23+00:00"
+ "time": "2021-02-12T00:02:00+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -2041,16 +2105,16 @@
},
{
"name": "guzzlehttp/promises",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "60d379c243457e073cff02bc323a2a86cb355631"
+ "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
- "reference": "60d379c243457e073cff02bc323a2a86cb355631",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+ "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
"shasum": ""
},
"require": {
@@ -2090,9 +2154,9 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.4.0"
+ "source": "https://github.com/guzzle/promises/tree/1.4.1"
},
- "time": "2020-09-30T07:37:28+00:00"
+ "time": "2021-03-07T09:25:29+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -2279,21 +2343,21 @@
},
{
"name": "laminas/laminas-diactoros",
- "version": "2.4.1",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
- "reference": "36ef09b73e884135d2059cc498c938e90821bb57"
+ "reference": "4ff7400c1c12e404144992ef43c8b733fd9ad516"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/36ef09b73e884135d2059cc498c938e90821bb57",
- "reference": "36ef09b73e884135d2059cc498c938e90821bb57",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/4ff7400c1c12e404144992ef43c8b733fd9ad516",
+ "reference": "4ff7400c1c12e404144992ef43c8b733fd9ad516",
"shasum": ""
},
"require": {
"laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^7.1",
+ "php": "^7.3 || ~8.0.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
@@ -2312,10 +2376,11 @@
"ext-dom": "*",
"ext-gd": "*",
"ext-libxml": "*",
- "http-interop/http-factory-tests": "^0.5.0",
+ "http-interop/http-factory-tests": "^0.8.0",
"laminas/laminas-coding-standard": "~1.0.0",
- "php-http/psr7-integration-tests": "^1.0",
- "phpunit/phpunit": "^7.5.18"
+ "php-http/psr7-integration-tests": "^1.1",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpunit/phpunit": "^9.1"
},
"type": "library",
"extra": {
@@ -2374,28 +2439,30 @@
"type": "community_bridge"
}
],
- "time": "2020-09-03T14:29:41+00:00"
+ "time": "2020-11-18T18:39:28+00:00"
},
{
"name": "laminas/laminas-zendframework-bridge",
- "version": "1.1.1",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
- "reference": "6ede70583e101030bcace4dcddd648f760ddf642"
+ "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642",
- "reference": "6ede70583e101030bcace4dcddd648f760ddf642",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32",
+ "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0 || ^8.0"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
- "squizlabs/php_codesniffer": "^3.5"
+ "psalm/plugin-phpunit": "^0.15.1",
+ "squizlabs/php_codesniffer": "^3.5",
+ "vimeo/psalm": "^4.6"
},
"type": "library",
"extra": {
@@ -2434,20 +2501,20 @@
"type": "community_bridge"
}
],
- "time": "2020-09-14T14:23:00+00:00"
+ "time": "2021-02-25T21:54:58+00:00"
},
{
"name": "laravel/framework",
- "version": "v6.20.16",
+ "version": "v6.20.19",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "806082fb559fe595cb17cd6aa8571f03ed287814"
+ "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/806082fb559fe595cb17cd6aa8571f03ed287814",
- "reference": "806082fb559fe595cb17cd6aa8571f03ed287814",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/c25308a00c7bbd38401a6254ab403146da9cfd69",
+ "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69",
"shasum": ""
},
"require": {
@@ -2587,20 +2654,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-02-02T13:50:12+00:00"
+ "time": "2021-03-16T14:18:55+00:00"
},
{
"name": "laravel/helpers",
- "version": "v1.4.0",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/helpers.git",
- "reference": "cde8ea2427db4f37d67729846b70452499210a21"
+ "reference": "febb10d8daaf86123825de2cb87f789a3371f0ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/helpers/zipball/cde8ea2427db4f37d67729846b70452499210a21",
- "reference": "cde8ea2427db4f37d67729846b70452499210a21",
+ "url": "https://api.github.com/repos/laravel/helpers/zipball/febb10d8daaf86123825de2cb87f789a3371f0ac",
+ "reference": "febb10d8daaf86123825de2cb87f789a3371f0ac",
"shasum": ""
},
"require": {
@@ -2641,9 +2708,9 @@
"laravel"
],
"support": {
- "source": "https://github.com/laravel/helpers/tree/v1.4.0"
+ "source": "https://github.com/laravel/helpers/tree/v1.4.1"
},
- "time": "2020-11-03T16:38:41+00:00"
+ "time": "2021-02-16T15:27:11+00:00"
},
{
"name": "laravel/passport",
@@ -2785,16 +2852,16 @@
},
{
"name": "laravel/tinker",
- "version": "v2.6.0",
+ "version": "v2.6.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "daae1c43f1300fe88c05d83db6f3d8f76677ad88"
+ "reference": "04ad32c1a3328081097a181875733fa51f402083"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/daae1c43f1300fe88c05d83db6f3d8f76677ad88",
- "reference": "daae1c43f1300fe88c05d83db6f3d8f76677ad88",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/04ad32c1a3328081097a181875733fa51f402083",
+ "reference": "04ad32c1a3328081097a181875733fa51f402083",
"shasum": ""
},
"require": {
@@ -2847,9 +2914,9 @@
],
"support": {
"issues": "https://github.com/laravel/tinker/issues",
- "source": "https://github.com/laravel/tinker/tree/v2.6.0"
+ "source": "https://github.com/laravel/tinker/tree/v2.6.1"
},
- "time": "2021-01-26T20:35:18+00:00"
+ "time": "2021-03-02T16:53:12+00:00"
},
{
"name": "laravelcollective/html",
@@ -2923,50 +2990,108 @@
},
"time": "2020-12-15T20:20:05+00:00"
},
+ {
+ "name": "lcobucci/clock",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lcobucci/clock.git",
+ "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3",
+ "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "infection/infection": "^0.17",
+ "lcobucci/coding-standard": "^6.0",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^0.12",
+ "phpstan/phpstan-deprecation-rules": "^0.12",
+ "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/phpstan-strict-rules": "^0.12",
+ "phpunit/php-code-coverage": "9.1.4",
+ "phpunit/phpunit": "9.3.7"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Lcobucci\\Clock\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "LuÃs Cobucci",
+ "email": "lcobucci@gmail.com"
+ }
+ ],
+ "description": "Yet another clock abstraction",
+ "support": {
+ "issues": "https://github.com/lcobucci/clock/issues",
+ "source": "https://github.com/lcobucci/clock/tree/2.0.x"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/lcobucci",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/lcobucci",
+ "type": "patreon"
+ }
+ ],
+ "time": "2020-08-27T18:56:02+00:00"
+ },
{
"name": "lcobucci/jwt",
- "version": "3.4.3",
+ "version": "4.1.2",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/jwt.git",
- "reference": "cd83b5421df3dbbbc66bd07a5b970c9efb6371b9"
+ "reference": "c544710aa18e079baf0027ca4c8236913f46945b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lcobucci/jwt/zipball/cd83b5421df3dbbbc66bd07a5b970c9efb6371b9",
- "reference": "cd83b5421df3dbbbc66bd07a5b970c9efb6371b9",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c544710aa18e079baf0027ca4c8236913f46945b",
+ "reference": "c544710aa18e079baf0027ca4c8236913f46945b",
"shasum": ""
},
"require": {
+ "ext-hash": "*",
+ "ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
- "php": "^5.6 || ^7.0"
+ "ext-sodium": "*",
+ "lcobucci/clock": "^2.0",
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
- "mikey179/vfsstream": "~1.5",
- "phpmd/phpmd": "~2.2",
- "phpunit/php-invoker": "~1.1",
- "phpunit/phpunit": "^5.7 || ^7.3",
- "squizlabs/php_codesniffer": "~2.3"
- },
- "suggest": {
- "lcobucci/clock": "*"
+ "infection/infection": "^0.21",
+ "lcobucci/coding-standard": "^6.0",
+ "mikey179/vfsstream": "^1.6.7",
+ "phpbench/phpbench": "^1.0@alpha",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^0.12",
+ "phpstan/phpstan-deprecation-rules": "^0.12",
+ "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/phpstan-strict-rules": "^0.12",
+ "phpunit/php-invoker": "^3.1",
+ "phpunit/phpunit": "^9.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1-dev"
- }
- },
"autoload": {
"psr-4": {
"Lcobucci\\JWT\\": "src"
- },
- "files": [
- "compat/class-aliases.php",
- "compat/json-exception-polyfill.php",
- "compat/lcobucci-clock-polyfill.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2974,7 +3099,7 @@
],
"authors": [
{
- "name": "LuÃs Otávio Cobucci Oblonczyk",
+ "name": "LuÃs Cobucci",
"email": "lcobucci@gmail.com",
"role": "Developer"
}
@@ -2986,7 +3111,7 @@
],
"support": {
"issues": "https://github.com/lcobucci/jwt/issues",
- "source": "https://github.com/lcobucci/jwt/tree/3.4.3"
+ "source": "https://github.com/lcobucci/jwt/tree/4.1.2"
},
"funding": [
{
@@ -2998,7 +3123,7 @@
"type": "patreon"
}
],
- "time": "2021-01-27T23:38:30+00:00"
+ "time": "2021-02-19T19:37:15+00:00"
},
{
"name": "league/commonmark",
@@ -3913,16 +4038,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.44.0",
+ "version": "2.46.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd"
+ "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd",
- "reference": "e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
+ "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
"shasum": ""
},
"require": {
@@ -4002,7 +4127,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-26T20:46:41+00:00"
+ "time": "2021-02-24T17:30:44+00:00"
},
{
"name": "nikic/php-parser",
@@ -4060,18 +4185,98 @@
},
"time": "2020-12-20T10:01:03+00:00"
},
+ {
+ "name": "nunomaduro/collision",
+ "version": "v3.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nunomaduro/collision.git",
+ "reference": "f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d",
+ "reference": "f7c45764dfe4ba5f2618d265a6f1f9c72732e01d",
+ "shasum": ""
+ },
+ "require": {
+ "filp/whoops": "^2.1.4",
+ "php": "^7.2.5 || ^8.0",
+ "php-parallel-lint/php-console-highlighter": "0.5.*",
+ "symfony/console": "~2.8|~3.3|~4.0"
+ },
+ "require-dev": {
+ "laravel/framework": "^6.0",
+ "phpunit/phpunit": "^8.0 || ^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "NunoMaduro\\Collision\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Cli error handling for console/command-line PHP applications.",
+ "keywords": [
+ "artisan",
+ "cli",
+ "command-line",
+ "console",
+ "error",
+ "handling",
+ "laravel",
+ "laravel-zero",
+ "php",
+ "symfony"
+ ],
+ "support": {
+ "issues": "https://github.com/nunomaduro/collision/issues",
+ "source": "https://github.com/nunomaduro/collision"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/nunomaduro",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/nunomaduro",
+ "type": "patreon"
+ }
+ ],
+ "time": "2021-02-11T09:01:42+00:00"
+ },
{
"name": "nyholm/psr7",
- "version": "1.3.2",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/Nyholm/psr7.git",
- "reference": "a272953743c454ac4af9626634daaf5ab3ce1173"
+ "reference": "23ae1f00fbc6a886cbe3062ca682391b9cc7c37b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Nyholm/psr7/zipball/a272953743c454ac4af9626634daaf5ab3ce1173",
- "reference": "a272953743c454ac4af9626634daaf5ab3ce1173",
+ "url": "https://api.github.com/repos/Nyholm/psr7/zipball/23ae1f00fbc6a886cbe3062ca682391b9cc7c37b",
+ "reference": "23ae1f00fbc6a886cbe3062ca682391b9cc7c37b",
"shasum": ""
},
"require": {
@@ -4093,7 +4298,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -4123,7 +4328,7 @@
],
"support": {
"issues": "https://github.com/Nyholm/psr7/issues",
- "source": "https://github.com/Nyholm/psr7/tree/1.3.2"
+ "source": "https://github.com/Nyholm/psr7/tree/1.4.0"
},
"funding": [
{
@@ -4135,20 +4340,20 @@
"type": "github"
}
],
- "time": "2020-11-14T17:35:34+00:00"
+ "time": "2021-02-18T15:41:32+00:00"
},
{
"name": "onelogin/php-saml",
- "version": "3.5.1",
+ "version": "3.6.1",
"source": {
"type": "git",
"url": "https://github.com/onelogin/php-saml.git",
- "reference": "593aca859b67d607923fe50d8ad7315373f5b6dd"
+ "reference": "a7328b11887660ad248ea10952dd67a5aa73ba3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/onelogin/php-saml/zipball/593aca859b67d607923fe50d8ad7315373f5b6dd",
- "reference": "593aca859b67d607923fe50d8ad7315373f5b6dd",
+ "url": "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b",
+ "reference": "a7328b11887660ad248ea10952dd67a5aa73ba3b",
"shasum": ""
},
"require": {
@@ -4159,7 +4364,7 @@
"pdepend/pdepend": "^2.5.0",
"php-coveralls/php-coveralls": "^1.0.2 || ^2.0",
"phploc/phploc": "^2.1 || ^3.0 || ^4.0",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1",
+ "phpunit/phpunit": "<7.5.18",
"sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0",
"squizlabs/php_codesniffer": "^3.1.1"
},
@@ -4190,7 +4395,7 @@
"issues": "https://github.com/onelogin/php-saml/issues",
"source": "https://github.com/onelogin/php-saml/"
},
- "time": "2020-12-03T20:08:41+00:00"
+ "time": "2021-03-02T10:13:07+00:00"
},
{
"name": "opis/closure",
@@ -4505,6 +4710,108 @@
},
"time": "2015-12-19T14:08:53+00:00"
},
+ {
+ "name": "php-parallel-lint/php-console-color",
+ "version": "v0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
+ "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e",
+ "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "replace": {
+ "jakub-onderka/php-console-color": "*"
+ },
+ "require-dev": {
+ "php-parallel-lint/php-code-style": "1.0",
+ "php-parallel-lint/php-parallel-lint": "1.0",
+ "php-parallel-lint/php-var-dump-check": "0.*",
+ "phpunit/phpunit": "~4.3",
+ "squizlabs/php_codesniffer": "1.*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-2-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Jakub Onderka",
+ "email": "jakub.onderka@gmail.com"
+ }
+ ],
+ "support": {
+ "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues",
+ "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/master"
+ },
+ "time": "2020-05-14T05:47:14+00:00"
+ },
+ {
+ "name": "php-parallel-lint/php-console-highlighter",
+ "version": "v0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git",
+ "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8",
+ "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8",
+ "shasum": ""
+ },
+ "require": {
+ "ext-tokenizer": "*",
+ "php": ">=5.4.0",
+ "php-parallel-lint/php-console-color": "~0.2"
+ },
+ "replace": {
+ "jakub-onderka/php-console-highlighter": "*"
+ },
+ "require-dev": {
+ "php-parallel-lint/php-code-style": "~1.0",
+ "php-parallel-lint/php-parallel-lint": "~1.0",
+ "php-parallel-lint/php-var-dump-check": "~0.1",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~1.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jakub Onderka",
+ "email": "acci@acci.cz",
+ "homepage": "http://www.acci.cz/"
+ }
+ ],
+ "description": "Highlight PHP code in terminal",
+ "support": {
+ "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues",
+ "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/master"
+ },
+ "time": "2020-05-13T07:37:49+00:00"
+ },
{
"name": "phpdocumentor/reflection-common",
"version": "2.2.0",
@@ -4843,16 +5150,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.12.2",
+ "version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "245710e971a030f42e08f4912863805570f23d39"
+ "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
- "reference": "245710e971a030f42e08f4912863805570f23d39",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+ "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
"shasum": ""
},
"require": {
@@ -4904,9 +5211,9 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
+ "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
},
- "time": "2020-12-19T10:15:11+00:00"
+ "time": "2021-03-17T13:42:18+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -5148,27 +5455,22 @@
},
{
"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": ""
},
"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/"
@@ -5181,7 +5483,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)",
@@ -5195,9 +5497,9 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/master"
+ "source": "https://github.com/php-fig/container/tree/1.1.1"
},
- "time": "2017-02-14T16:28:37+00:00"
+ "time": "2021-03-05T17:36:06+00:00"
},
{
"name": "psr/http-factory",
@@ -5410,16 +5712,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.10.6",
+ "version": "v0.10.7",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3"
+ "reference": "a395af46999a12006213c0c8346c9445eb31640c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6f990c19f91729de8b31e639d6e204ea59f19cf3",
- "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c",
+ "reference": "a395af46999a12006213c0c8346c9445eb31640c",
"shasum": ""
},
"require": {
@@ -5480,9 +5782,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.10.6"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.10.7"
},
- "time": "2021-01-18T15:53:43+00:00"
+ "time": "2021-03-14T02:14:56+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -6081,16 +6383,16 @@
},
{
"name": "spatie/db-dumper",
- "version": "2.21.0",
+ "version": "2.21.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/db-dumper.git",
- "reference": "54150d138dfe5b8043c2a7c6c27a8b41a9e8f418"
+ "reference": "05e5955fb882008a8947c5a45146d86cfafa10d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/db-dumper/zipball/54150d138dfe5b8043c2a7c6c27a8b41a9e8f418",
- "reference": "54150d138dfe5b8043c2a7c6c27a8b41a9e8f418",
+ "url": "https://api.github.com/repos/spatie/db-dumper/zipball/05e5955fb882008a8947c5a45146d86cfafa10d1",
+ "reference": "05e5955fb882008a8947c5a45146d86cfafa10d1",
"shasum": ""
},
"require": {
@@ -6129,7 +6431,7 @@
],
"support": {
"issues": "https://github.com/spatie/db-dumper/issues",
- "source": "https://github.com/spatie/db-dumper/tree/2.21.0"
+ "source": "https://github.com/spatie/db-dumper/tree/2.21.1"
},
"funding": [
{
@@ -6137,40 +6439,41 @@
"type": "github"
}
],
- "time": "2021-01-27T09:26:50+00:00"
+ "time": "2021-02-24T14:56:42+00:00"
},
{
"name": "spatie/laravel-backup",
- "version": "6.11.1",
+ "version": "6.15.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-backup.git",
- "reference": "3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c"
+ "reference": "94be6b3bb5248727367a50161be90e6c422558b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c",
- "reference": "3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c",
+ "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/94be6b3bb5248727367a50161be90e6c422558b4",
+ "reference": "94be6b3bb5248727367a50161be90e6c422558b4",
"shasum": ""
},
"require": {
- "illuminate/console": "^5.8.15|^6.0|^7.0",
- "illuminate/contracts": "^5.8.15|^6.0|^7.0",
- "illuminate/events": "^5.8.15|^6.0|^7.0",
- "illuminate/filesystem": "^5.8.15|^6.0|^7.0",
- "illuminate/notifications": "^5.8.15|^6.0|^7.0",
- "illuminate/support": "^5.8.15|^6.0|^7.0",
+ "ext-zip": "^1.14.0",
+ "illuminate/console": "^6.0|^7.0|^8.0",
+ "illuminate/contracts": "^6.0|^7.0|^8.0",
+ "illuminate/events": "^6.0|^7.0|^8.0",
+ "illuminate/filesystem": "^6.0|^7.0|^8.0",
+ "illuminate/notifications": "^6.0|^7.0|^8.0",
+ "illuminate/support": "^6.0|^7.0|^8.0",
"league/flysystem": "^1.0.49",
- "php": "^7.2",
+ "php": "^7.3|^8.0",
"spatie/db-dumper": "^2.12",
"spatie/temporary-directory": "^1.1",
"symfony/finder": "^4.2|^5.0"
},
"require-dev": {
- "laravel/slack-notification-channel": "^1.0",
+ "laravel/slack-notification-channel": "^2.3",
"league/flysystem-aws-s3-v3": "^1.0",
- "mockery/mockery": "^1.3",
- "orchestra/testbench": "3.8.*|4.*|5.*",
+ "mockery/mockery": "^1.4.2",
+ "orchestra/testbench": "4.*|5.*|6.*",
"phpunit/phpunit": "^8.4|^9.0"
},
"suggest": {
@@ -6214,19 +6517,19 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-backup/issues",
- "source": "https://github.com/spatie/laravel-backup/tree/master"
+ "source": "https://github.com/spatie/laravel-backup/tree/6.15.1"
},
"funding": [
{
- "url": "https://spatie.be/open-source/support-us",
- "type": "custom"
+ "url": "https://github.com/sponsors/spatie",
+ "type": "github"
},
{
- "url": "https://github.com/spatie",
- "type": "github"
+ "url": "https://spatie.be/open-source/support-us",
+ "type": "other"
}
],
- "time": "2020-06-18T09:59:06+00:00"
+ "time": "2021-03-17T09:41:03+00:00"
},
{
"name": "spatie/temporary-directory",
@@ -6337,20 +6640,20 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.2.5",
+ "version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7"
+ "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7",
- "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
+ "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
"shasum": ""
},
"require": {
- "egulias/email-validator": "^2.0",
+ "egulias/email-validator": "^2.0|^3.1",
"php": ">=7.0.0",
"symfony/polyfill-iconv": "^1.0",
"symfony/polyfill-intl-idn": "^1.10",
@@ -6396,7 +6699,7 @@
],
"support": {
"issues": "https://github.com/swiftmailer/swiftmailer/issues",
- "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.5"
+ "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
},
"funding": [
{
@@ -6408,20 +6711,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-12T09:35:59+00:00"
+ "time": "2021-03-09T12:30:35+00:00"
},
{
"name": "symfony/console",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "24026c44fc37099fa145707fecd43672831b837a"
+ "reference": "c98349bda966c70d6c08b4cd8658377c94166492"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a",
- "reference": "24026c44fc37099fa145707fecd43672831b837a",
+ "url": "https://api.github.com/repos/symfony/console/zipball/c98349bda966c70d6c08b4cd8658377c94166492",
+ "reference": "c98349bda966c70d6c08b4cd8658377c94166492",
"shasum": ""
},
"require": {
@@ -6481,7 +6784,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/console/tree/v4.4.19"
+ "source": "https://github.com/symfony/console/tree/v4.4.20"
},
"funding": [
{
@@ -6497,11 +6800,11 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-22T18:44:15+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -6546,7 +6849,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v4.4.19"
+ "source": "https://github.com/symfony/css-selector/tree/v4.4.20"
},
"funding": [
{
@@ -6566,16 +6869,16 @@
},
{
"name": "symfony/debug",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c"
+ "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c",
- "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16",
+ "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16",
"shasum": ""
},
"require": {
@@ -6615,7 +6918,7 @@
"description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/debug/tree/v4.4.19"
+ "source": "https://github.com/symfony/debug/tree/v4.4.20"
},
"funding": [
{
@@ -6631,7 +6934,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-01-28T16:54:48+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -6702,16 +7005,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "d603654eaeb713503bba3e308b9e748e5a6d3f2e"
+ "reference": "a191550d46b73a527b9d244f185fef439d41cf15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/d603654eaeb713503bba3e308b9e748e5a6d3f2e",
- "reference": "d603654eaeb713503bba3e308b9e748e5a6d3f2e",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/a191550d46b73a527b9d244f185fef439d41cf15",
+ "reference": "a191550d46b73a527b9d244f185fef439d41cf15",
"shasum": ""
},
"require": {
@@ -6751,7 +7054,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v4.4.19"
+ "source": "https://github.com/symfony/error-handler/tree/v4.4.20"
},
"funding": [
{
@@ -6767,11 +7070,11 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-11T08:19:35+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -6834,7 +7137,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.19"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.20"
},
"funding": [
{
@@ -6933,16 +7236,16 @@
},
{
"name": "symfony/finder",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6"
+ "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
- "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6",
+ "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6",
"shasum": ""
},
"require": {
@@ -6974,7 +7277,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v4.4.19"
+ "source": "https://github.com/symfony/finder/tree/v4.4.20"
},
"funding": [
{
@@ -6990,7 +7293,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-12T10:48:09+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -7073,16 +7376,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "8888741b633f6c3d1e572b7735ad2cae3e03f9c5"
+ "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8888741b633f6c3d1e572b7735ad2cae3e03f9c5",
- "reference": "8888741b633f6c3d1e572b7735ad2cae3e03f9c5",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a",
+ "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a",
"shasum": ""
},
"require": {
@@ -7121,7 +7424,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v4.4.19"
+ "source": "https://github.com/symfony/http-foundation/tree/v4.4.20"
},
"funding": [
{
@@ -7137,20 +7440,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-25T17:11:33+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "07ea794a327d7c8c5d76e3058fde9fec6a711cb4"
+ "reference": "4f36548465489f293b05406f1770492f6efb8adb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/07ea794a327d7c8c5d76e3058fde9fec6a711cb4",
- "reference": "07ea794a327d7c8c5d76e3058fde9fec6a711cb4",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4f36548465489f293b05406f1770492f6efb8adb",
+ "reference": "4f36548465489f293b05406f1770492f6efb8adb",
"shasum": ""
},
"require": {
@@ -7176,7 +7479,7 @@
"psr/log-implementation": "1.0"
},
"require-dev": {
- "psr/cache": "~1.0",
+ "psr/cache": "^1.0|^2.0|^3.0",
"symfony/browser-kit": "^4.3|^5.0",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/console": "^3.4|^4.0",
@@ -7225,7 +7528,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v4.4.19"
+ "source": "https://github.com/symfony/http-kernel/tree/v4.4.20"
},
"funding": [
{
@@ -7241,20 +7544,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T13:50:53+00:00"
+ "time": "2021-03-04T18:00:27+00:00"
},
{
"name": "symfony/mime",
- "version": "v5.2.2",
+ "version": "v5.2.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "37bade585ea100d235c031b258eff93b5b6bb9a9"
+ "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/37bade585ea100d235c031b258eff93b5b6bb9a9",
- "reference": "37bade585ea100d235c031b258eff93b5b6bb9a9",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/554ba128f1955038b45db5e1fa7e93bfc683b139",
+ "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139",
"shasum": ""
},
"require": {
@@ -7265,12 +7568,13 @@
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
+ "egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<4.4"
},
"require-dev": {
- "egulias/email-validator": "^2.1.10",
+ "egulias/email-validator": "^2.1.10|^3.1",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/property-access": "^4.4|^5.1",
@@ -7307,7 +7611,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v5.2.2"
+ "source": "https://github.com/symfony/mime/tree/v5.2.5"
},
"funding": [
{
@@ -7323,11 +7627,11 @@
"type": "tidelift"
}
],
- "time": "2021-01-25T14:08:25+00:00"
+ "time": "2021-03-07T16:08:20+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -7386,7 +7690,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
},
"funding": [
{
@@ -7406,16 +7710,16 @@
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6"
+ "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6",
- "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
+ "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
"shasum": ""
},
"require": {
@@ -7466,7 +7770,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
},
"funding": [
{
@@ -7482,20 +7786,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44"
+ "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
- "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
+ "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
"shasum": ""
},
"require": {
@@ -7553,7 +7857,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
},
"funding": [
{
@@ -7569,20 +7873,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "6e971c891537eb617a00bb07a43d182a6915faba"
+ "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba",
- "reference": "6e971c891537eb617a00bb07a43d182a6915faba",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
+ "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
"shasum": ""
},
"require": {
@@ -7637,7 +7941,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
},
"funding": [
{
@@ -7653,20 +7957,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T17:09:11+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"
+ "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
- "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+ "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
"shasum": ""
},
"require": {
@@ -7717,7 +8021,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
},
"funding": [
{
@@ -7733,11 +8037,11 @@
"type": "tidelift"
}
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2021-01-22T09:19:47+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@@ -7793,7 +8097,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
},
"funding": [
{
@@ -7813,7 +8117,7 @@
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@@ -7872,7 +8176,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
},
"funding": [
{
@@ -7892,7 +8196,7 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.22.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@@ -7955,7 +8259,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
},
"funding": [
{
@@ -7975,7 +8279,7 @@
},
{
"name": "symfony/process",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -8016,7 +8320,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v4.4.19"
+ "source": "https://github.com/symfony/process/tree/v4.4.20"
},
"funding": [
{
@@ -8036,16 +8340,16 @@
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v2.0.2",
+ "version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "51a21cb3ba3927d4b4bf8f25cc55763351af5f2e"
+ "reference": "81db2d4ae86e9f0049828d9343a72b9523884e5d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/51a21cb3ba3927d4b4bf8f25cc55763351af5f2e",
- "reference": "51a21cb3ba3927d4b4bf8f25cc55763351af5f2e",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/81db2d4ae86e9f0049828d9343a72b9523884e5d",
+ "reference": "81db2d4ae86e9f0049828d9343a72b9523884e5d",
"shasum": ""
},
"require": {
@@ -8055,7 +8359,13 @@
},
"require-dev": {
"nyholm/psr7": "^1.1",
- "symfony/phpunit-bridge": "^4.4 || ^5.0"
+ "psr/log": "^1.1",
+ "symfony/browser-kit": "^4.4 || ^5.0",
+ "symfony/config": "^4.4 || ^5.0",
+ "symfony/event-dispatcher": "^4.4 || ^5.0",
+ "symfony/framework-bundle": "^4.4 || ^5.0",
+ "symfony/http-kernel": "^4.4 || ^5.0",
+ "symfony/phpunit-bridge": "^4.4.19 || ^5.2"
},
"suggest": {
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
@@ -8063,7 +8373,7 @@
"type": "symfony-bridge",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-main": "2.1-dev"
}
},
"autoload": {
@@ -8098,7 +8408,7 @@
],
"support": {
"issues": "https://github.com/symfony/psr-http-message-bridge/issues",
- "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.0.2"
+ "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.0"
},
"funding": [
{
@@ -8114,20 +8424,20 @@
"type": "tidelift"
}
],
- "time": "2020-09-29T08:17:46+00:00"
+ "time": "2021-02-17T10:35:25+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "87529f6e305c7acb162840d1ea57922038072425"
+ "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/87529f6e305c7acb162840d1ea57922038072425",
- "reference": "87529f6e305c7acb162840d1ea57922038072425",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df",
+ "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df",
"shasum": ""
},
"require": {
@@ -8186,7 +8496,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v4.4.19"
+ "source": "https://github.com/symfony/routing/tree/v4.4.20"
},
"funding": [
{
@@ -8202,7 +8512,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-22T15:37:04+00:00"
},
{
"name": "symfony/service-contracts",
@@ -8285,16 +8595,16 @@
},
{
"name": "symfony/translation",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "e1d0c67167a553556d9f974b5fa79c2448df317a"
+ "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/e1d0c67167a553556d9f974b5fa79c2448df317a",
- "reference": "e1d0c67167a553556d9f974b5fa79c2448df317a",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/2271b6d577018a7dea75a9162a08ac84f8234deb",
+ "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb",
"shasum": ""
},
"require": {
@@ -8309,7 +8619,7 @@
"symfony/yaml": "<3.4"
},
"provide": {
- "symfony/translation-implementation": "1.0"
+ "symfony/translation-implementation": "1.0|2.0"
},
"require-dev": {
"psr/log": "~1.0",
@@ -8353,7 +8663,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v4.4.19"
+ "source": "https://github.com/symfony/translation/tree/v4.4.20"
},
"funding": [
{
@@ -8369,7 +8679,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-26T13:53:48+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -8451,7 +8761,7 @@
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
@@ -8520,7 +8830,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v4.4.19"
+ "source": "https://github.com/symfony/var-dumper/tree/v4.4.20"
},
"funding": [
{
@@ -8540,16 +8850,16 @@
},
{
"name": "tecnickcom/tc-lib-barcode",
- "version": "1.17.1",
+ "version": "1.17.6",
"source": {
"type": "git",
"url": "https://github.com/tecnickcom/tc-lib-barcode.git",
- "reference": "cd555b642ce04de1b0ffbe6aff322df914e74ef0"
+ "reference": "a8a7183e2be6379e522dc825a3b7a3af5394a9e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/cd555b642ce04de1b0ffbe6aff322df914e74ef0",
- "reference": "cd555b642ce04de1b0ffbe6aff322df914e74ef0",
+ "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/a8a7183e2be6379e522dc825a3b7a3af5394a9e7",
+ "reference": "a8a7183e2be6379e522dc825a3b7a3af5394a9e7",
"shasum": ""
},
"require": {
@@ -8626,7 +8936,7 @@
],
"support": {
"issues": "https://github.com/tecnickcom/tc-lib-barcode/issues",
- "source": "https://github.com/tecnickcom/tc-lib-barcode/tree/1.17.1"
+ "source": "https://github.com/tecnickcom/tc-lib-barcode/tree/1.17.6"
},
"funding": [
{
@@ -8634,20 +8944,20 @@
"type": "custom"
}
],
- "time": "2020-12-20T12:26:10+00:00"
+ "time": "2021-02-07T13:18:02+00:00"
},
{
"name": "tecnickcom/tc-lib-color",
- "version": "1.14.1",
+ "version": "1.14.6",
"source": {
"type": "git",
"url": "https://github.com/tecnickcom/tc-lib-color.git",
- "reference": "00c6c6e95df12448ecd758b64a70f2b2b2fe2367"
+ "reference": "83cdb57fd900901c6aa2af8cfd67202518fb69b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/00c6c6e95df12448ecd758b64a70f2b2b2fe2367",
- "reference": "00c6c6e95df12448ecd758b64a70f2b2b2fe2367",
+ "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/83cdb57fd900901c6aa2af8cfd67202518fb69b2",
+ "reference": "83cdb57fd900901c6aa2af8cfd67202518fb69b2",
"shasum": ""
},
"require": {
@@ -8697,7 +9007,7 @@
],
"support": {
"issues": "https://github.com/tecnickcom/tc-lib-color/issues",
- "source": "https://github.com/tecnickcom/tc-lib-color/tree/1.14.1"
+ "source": "https://github.com/tecnickcom/tc-lib-color/tree/1.14.6"
},
"funding": [
{
@@ -8705,7 +9015,7 @@
"type": "custom"
}
],
- "time": "2020-12-19T11:45:56+00:00"
+ "time": "2021-02-07T13:13:45+00:00"
},
{
"name": "tightenco/collect",
@@ -9072,30 +9382,35 @@
},
{
"name": "webmozart/assert",
- "version": "1.9.1",
+ "version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
- "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
- "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0 || ^8.0",
+ "php": "^7.2 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
- "vimeo/psalm": "<3.9.1"
+ "vimeo/psalm": "<4.6.1 || 4.6.2"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+ "phpunit/phpunit": "^8.5.13"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.10-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
@@ -9119,33 +9434,34 @@
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
- "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+ "source": "https://github.com/webmozarts/assert/tree/1.10.0"
},
- "time": "2020-07-08T17:02:28+00:00"
+ "time": "2021-03-09T10:59:23+00:00"
}
],
"packages-dev": [
{
"name": "behat/gherkin",
- "version": "v4.7.1",
+ "version": "v4.8.0",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
- "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd"
+ "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Behat/Gherkin/zipball/987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
- "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
+ "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd",
+ "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd",
"shasum": ""
},
"require": {
- "php": ">=5.6"
+ "php": "~7.2|~8.0"
},
"require-dev": {
- "phpunit/phpunit": "~5.7|~6|~7",
- "symfony/phpunit-bridge": "~2.7|~3|~4",
- "symfony/yaml": "~2.3|~3|~4"
+ "cucumber/cucumber": "dev-gherkin-16.0.0",
+ "phpunit/phpunit": "~8|~9",
+ "symfony/phpunit-bridge": "~3|~4|~5",
+ "symfony/yaml": "~3|~4|~5"
},
"suggest": {
"symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -9184,22 +9500,22 @@
],
"support": {
"issues": "https://github.com/Behat/Gherkin/issues",
- "source": "https://github.com/Behat/Gherkin/tree/v4.7.1"
+ "source": "https://github.com/Behat/Gherkin/tree/v4.8.0"
},
- "time": "2021-01-26T16:24:32+00:00"
+ "time": "2021-02-04T12:44:21+00:00"
},
{
"name": "codeception/codeception",
- "version": "4.1.17",
+ "version": "4.1.18",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Codeception.git",
- "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68"
+ "reference": "f47547bac347dfb5ea5351ff91148cbcc08e6818"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c153b1ab289b3e3109e685379aa8847c54ac2b68",
- "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68",
+ "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f47547bac347dfb5ea5351ff91148cbcc08e6818",
+ "reference": "f47547bac347dfb5ea5351ff91148cbcc08e6818",
"shasum": ""
},
"require": {
@@ -9273,7 +9589,7 @@
],
"support": {
"issues": "https://github.com/Codeception/Codeception/issues",
- "source": "https://github.com/Codeception/Codeception/tree/4.1.17"
+ "source": "https://github.com/Codeception/Codeception/tree/4.1.18"
},
"funding": [
{
@@ -9281,7 +9597,7 @@
"type": "open_collective"
}
],
- "time": "2021-02-01T07:30:47+00:00"
+ "time": "2021-02-23T17:11:42+00:00"
},
{
"name": "codeception/lib-asserts",
@@ -9339,16 +9655,16 @@
},
{
"name": "codeception/lib-innerbrowser",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/Codeception/lib-innerbrowser.git",
- "reference": "b7406c710684c255d9b067d7795269a5585a0406"
+ "reference": "693e116f81ef98eae98c43ef785a726faf87394e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/b7406c710684c255d9b067d7795269a5585a0406",
- "reference": "b7406c710684c255d9b067d7795269a5585a0406",
+ "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/693e116f81ef98eae98c43ef785a726faf87394e",
+ "reference": "693e116f81ef98eae98c43ef785a726faf87394e",
"shasum": ""
},
"require": {
@@ -9393,9 +9709,9 @@
],
"support": {
"issues": "https://github.com/Codeception/lib-innerbrowser/issues",
- "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.0"
+ "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.1"
},
- "time": "2021-01-29T18:17:25+00:00"
+ "time": "2021-03-02T08:01:54+00:00"
},
{
"name": "codeception/module-asserts",
@@ -9509,16 +9825,16 @@
},
{
"name": "codeception/module-rest",
- "version": "1.2.7",
+ "version": "1.2.8",
"source": {
"type": "git",
"url": "https://github.com/Codeception/module-rest.git",
- "reference": "beeb5a91a97d042273bf10f00063e9b8f541879a"
+ "reference": "4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/module-rest/zipball/beeb5a91a97d042273bf10f00063e9b8f541879a",
- "reference": "beeb5a91a97d042273bf10f00063e9b8f541879a",
+ "url": "https://api.github.com/repos/Codeception/module-rest/zipball/4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10",
+ "reference": "4c8c6bd75f67a25ff91bdce0d6c135c5e7aa5e10",
"shasum": ""
},
"require": {
@@ -9557,9 +9873,9 @@
],
"support": {
"issues": "https://github.com/Codeception/module-rest/issues",
- "source": "https://github.com/Codeception/module-rest/tree/1.2.7"
+ "source": "https://github.com/Codeception/module-rest/tree/1.2.8"
},
- "time": "2020-11-04T16:58:11+00:00"
+ "time": "2021-03-02T06:47:59+00:00"
},
{
"name": "codeception/module-webdriver",
@@ -10054,16 +10370,16 @@
},
{
"name": "phar-io/version",
- "version": "3.0.4",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
+ "reference": "bae7c545bef187884426f042434e561ab1ddb182"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
- "reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+ "reference": "bae7c545bef187884426f042434e561ab1ddb182",
"shasum": ""
},
"require": {
@@ -10099,22 +10415,22 @@
"description": "Library for handling version information and constraints",
"support": {
"issues": "https://github.com/phar-io/version/issues",
- "source": "https://github.com/phar-io/version/tree/3.0.4"
+ "source": "https://github.com/phar-io/version/tree/3.1.0"
},
- "time": "2020-12-13T23:18:30+00:00"
+ "time": "2021-02-23T14:00:09+00:00"
},
{
"name": "php-webdriver/webdriver",
- "version": "1.9.0",
+ "version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/php-webdriver/php-webdriver.git",
- "reference": "e3633154554605274cc9d59837f55a7427d72003"
+ "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/e3633154554605274cc9d59837f55a7427d72003",
- "reference": "e3633154554605274cc9d59837f55a7427d72003",
+ "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd9290b95b7651d495bd69253d6e3ef469a7f211",
+ "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211",
"shasum": ""
},
"require": {
@@ -10130,7 +10446,7 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
- "ondram/ci-detector": "^2.1 || ^3.5",
+ "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
"php-coveralls/php-coveralls": "^2.4",
"php-mock/php-mock-phpunit": "^1.1 || ^2.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
@@ -10170,9 +10486,9 @@
],
"support": {
"issues": "https://github.com/php-webdriver/php-webdriver/issues",
- "source": "https://github.com/php-webdriver/php-webdriver/tree/1.9.0"
+ "source": "https://github.com/php-webdriver/php-webdriver/tree/1.10.0"
},
- "time": "2020-11-19T15:21:05+00:00"
+ "time": "2021-02-25T13:38:09+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -10473,16 +10789,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "8.5.14",
+ "version": "8.5.15",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3"
+ "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c25f79895d27b6ecd5abfa63de1606b786a461a3",
- "reference": "c25f79895d27b6ecd5abfa63de1606b786a461a3",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/038d4196d8e8cb405cd5e82cedfe413ad6eef9ef",
+ "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef",
"shasum": ""
},
"require": {
@@ -10554,7 +10870,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.14"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.15"
},
"funding": [
{
@@ -10566,7 +10882,7 @@
"type": "github"
}
],
- "time": "2021-01-17T07:37:30+00:00"
+ "time": "2021-03-17T07:27:54+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -11019,16 +11335,16 @@
},
{
"name": "softcreatr/jsonpath",
- "version": "0.7.2",
+ "version": "0.7.3",
"source": {
"type": "git",
"url": "https://github.com/SoftCreatR/JSONPath.git",
- "reference": "46689608586a8081be399342755c36e179f3b5fc"
+ "reference": "e3ae75112a5247e3b27a7e0e72155eae261d8c72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/46689608586a8081be399342755c36e179f3b5fc",
- "reference": "46689608586a8081be399342755c36e179f3b5fc",
+ "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/e3ae75112a5247e3b27a7e0e72155eae261d8c72",
+ "reference": "e3ae75112a5247e3b27a7e0e72155eae261d8c72",
"shasum": ""
},
"require": {
@@ -11073,6 +11389,7 @@
"description": "JSONPath implementation for parsing, searching and flattening arrays",
"support": {
"email": "hello@1-2.dev",
+ "forum": "https://github.com/SoftCreatR/JSONPath/discussions",
"issues": "https://github.com/SoftCreatR/JSONPath/issues",
"source": "https://github.com/SoftCreatR/JSONPath"
},
@@ -11082,20 +11399,20 @@
"type": "github"
}
],
- "time": "2020-10-27T11:37:08+00:00"
+ "time": "2021-03-08T14:18:21+00:00"
},
{
"name": "symfony/browser-kit",
- "version": "v5.2.2",
+ "version": "v5.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd"
+ "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
- "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3ca3a57ce9860318b20a924fec5daf5c6db44d93",
+ "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93",
"shasum": ""
},
"require": {
@@ -11137,7 +11454,7 @@
"description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/browser-kit/tree/v5.2.2"
+ "source": "https://github.com/symfony/browser-kit/tree/v5.2.4"
},
"funding": [
{
@@ -11153,20 +11470,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T12:56:27+00:00"
+ "time": "2021-02-22T06:48:33+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v4.4.19",
+ "version": "v4.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "21032c566558255e551d23f4a516434c9e3a9a78"
+ "reference": "be133557f1b0e6672367325b508e65da5513a311"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/21032c566558255e551d23f4a516434c9e3a9a78",
- "reference": "21032c566558255e551d23f4a516434c9e3a9a78",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be133557f1b0e6672367325b508e65da5513a311",
+ "reference": "be133557f1b0e6672367325b508e65da5513a311",
"shasum": ""
},
"require": {
@@ -11210,7 +11527,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dom-crawler/tree/v4.4.19"
+ "source": "https://github.com/symfony/dom-crawler/tree/v4.4.20"
},
"funding": [
{
@@ -11226,20 +11543,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-02-14T12:29:41+00:00"
},
{
"name": "symfony/yaml",
- "version": "v5.2.2",
+ "version": "v5.2.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "6bb8b36c6dea8100268512bf46e858c8eb5c545e"
+ "reference": "298a08ddda623485208506fcee08817807a251dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/6bb8b36c6dea8100268512bf46e858c8eb5c545e",
- "reference": "6bb8b36c6dea8100268512bf46e858c8eb5c545e",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
+ "reference": "298a08ddda623485208506fcee08817807a251dd",
"shasum": ""
},
"require": {
@@ -11285,7 +11602,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v5.2.2"
+ "source": "https://github.com/symfony/yaml/tree/v5.2.5"
},
"funding": [
{
@@ -11301,7 +11618,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T10:01:46+00:00"
+ "time": "2021-03-06T07:59:01+00:00"
},
{
"name": "theseer/tokenizer",
@@ -11360,7 +11677,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": "^7.2",
+ "php": "^7.2.5",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-json": "*",
@@ -11368,8 +11685,5 @@
"ext-pdo": "*"
},
"platform-dev": [],
- "platform-overrides": {
- "php": "7.2.5"
- },
"plugin-api-version": "2.0.0"
}
diff --git a/config/app.php b/config/app.php
index 0d5997133895924f82ff8ff394052d7400bea31b..55184884dc091b9581feb630f5ff746bdba49724 100755
--- a/config/app.php
+++ b/config/app.php
@@ -333,7 +333,6 @@ return [
Laravel\Passport\PassportServiceProvider::class,
Laravel\Tinker\TinkerServiceProvider::class,
Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
- //Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,
@@ -403,11 +402,9 @@ return [
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
- //'Input' => Illuminate\Support\Facades\Input::class,
'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class,
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
- // 'Debugbar' => Barryvdh\Debugbar\Facade::class, //autodiscover should handle this
'Image' => Intervention\Image\ImageServiceProvider::class,
'Carbon' => Carbon\Carbon::class,
diff --git a/phpunit.xml b/phpunit.xml
index ad15b6f59a22cdcc440f2fc29961ffbb417c8602..cb6b6c20edf6585daf683894c1b1fae6a48646d5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
+ printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
backupStaticAttributes="false"
bootstrap="bootstrap/autoload.php"
colors="true"
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 78fe48ff8f85c855f3683f4d4e9426a671709901..82078ff819e8ad3c2700d2b62c0638f41f4bb3d2 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -6,7 +6,7 @@
<label class="btn btn-default" aria-hidden="true">
{{ trans('button.select_file') }}
- <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg" style="display:none; max-width: 90%" aria-label="image" aria-hidden="true">
+ <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" style="display:none; max-width: 90%" aria-label="image" aria-hidden="true">
</label>
<span class='label label-default' id="uploadFile-info"></span>
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 101e39280921f5556ada8e01a27faa9477100d3b..b1d26a6742511b72aa18c35daa8d5f6ef7920612 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -35,7 +35,7 @@
{{ trans('button.select_file') }}
<input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}"
data-maxsize="{{ $maxSize ?? \App\Helpers\Helper::file_upload_max_size() }}"
- accept="{{ $allowedTypes ?? 'image/gif,image/jpeg,image/png,image/svg'}}" style="display:none; max-width: 90%">
+ accept="{{ $allowedTypes ?? 'image/gif,image/jpeg,image/png,image/svg,image/svg+xml'}}" style="display:none; max-width: 90%">
</label>
<span class='label label-default' id="{{ $logoId }}-info"></span>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 9d0676c5ab20f30fad0b6fbba935f2aad3c1dd31..5081d25fc3fcaa4481fc18b9c3b8807ce143e8c4 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -105,7 +105,7 @@
"logoLabel" => trans('admin/settings/general.favicon'),
"logoClearVariable" => "clear_favicon",
"helpBlock" => trans('admin/settings/general.favicon_size') .' '. trans('admin/settings/general.favicon_format'),
- "allowedTypes" => "image/x-icon,image/gif,image/jpeg,image/png,image/svg,image/vnd.microsoft.icon",
+ "allowedTypes" => "image/x-icon,image/gif,image/jpeg,image/png,image/svg,image/svg+xml,image/vnd.microsoft.icon",
"maxSize" => 20000
])