diff --git a/app/Auth/Access/Saml2Service.php b/app/Auth/Access/Saml2Service.php
index 056977a3d..bb57ceb73 100644
--- a/app/Auth/Access/Saml2Service.php
+++ b/app/Auth/Access/Saml2Service.php
@@ -1,18 +1,15 @@
<?php namespace BookStack\Auth\Access;
-use BookStack\Auth\Access;
use BookStack\Auth\User;
use BookStack\Auth\UserRepo;
use BookStack\Exceptions\SamlException;
-use Illuminate\Contracts\Auth\Authenticatable;
-
+use Illuminate\Support\Str;
/**
* Class Saml2Service
* Handles any app-specific SAML tasks.
- * @package BookStack\Services
*/
-class Saml2Service extends Access\ExternalAuthService
+class Saml2Service extends ExternalAuthService
{
protected $config;
protected $userRepo;
@@ -21,7 +18,6 @@ class Saml2Service extends Access\ExternalAuthService
/**
* Saml2Service constructor.
- * @param \BookStack\Auth\UserRepo $userRepo
*/
public function __construct(UserRepo $userRepo, User $user)
{
@@ -33,80 +29,79 @@ class Saml2Service extends Access\ExternalAuthService
/**
* Check if groups should be synced.
- * @return bool
*/
- public function shouldSyncGroups()
+ protected function shouldSyncGroups(): bool
{
return $this->enabled && $this->config['user_to_groups'] !== false;
}
- /** Calculate the display name
- * @param array $samlAttributes
- * @param string $defaultValue
- * @return string
+ /**
+ * Calculate the display name
*/
- protected function getUserDisplayName(array $samlAttributes, string $defaultValue)
+ protected function getUserDisplayName(array $samlAttributes, string $defaultValue): string
{
- $displayNameAttr = $this->config['display_name_attribute'];
+ $displayNameAttr = $this->config['display_name_attributes'];
$displayName = [];
foreach ($displayNameAttr as $dnAttr) {
- $dnComponent = $this->getSamlResponseAttribute($samlAttributes, $dnAttr, null);
- if ($dnComponent !== null) {
- $displayName[] = $dnComponent;
- }
+ $dnComponent = $this->getSamlResponseAttribute($samlAttributes, $dnAttr, null);
+ if ($dnComponent !== null) {
+ $displayName[] = $dnComponent;
+ }
}
if (count($displayName) == 0) {
- $displayName = $defaultValue;
+ $displayName = $defaultValue;
} else {
- $displayName = implode(' ', $displayName);
+ $displayName = implode(' ', $displayName);
}
return $displayName;
}
- protected function getUserName(array $samlAttributes, string $defaultValue)
+ /**
+ * Get the value to use as the external id saved in BookStack
+ * used to link the user to an existing BookStack DB user.
+ */
+ protected function getExternalId(array $samlAttributes, string $defaultValue)
{
- $userNameAttr = $this->config['user_name_attribute'];
-
+ $userNameAttr = $this->config['external_id_attribute'];
if ($userNameAttr === null) {
- $userName = $defaultValue;
- } else {
- $userName = $this->getSamlResponseAttribute($samlAttributes, $userNameAttr, $defaultValue);
+ return $defaultValue;
}
- return $userName;
+ return $this->getSamlResponseAttribute($samlAttributes, $userNameAttr, $defaultValue);
}
/**
* Extract the details of a user from a SAML response.
- * @param $samlID
- * @param $samlAttributes
- * @return array
+ * @throws SamlException
*/
- public function getUserDetails($samlID, $samlAttributes)
+ public function getUserDetails(string $samlID, $samlAttributes): array
{
$emailAttr = $this->config['email_attribute'];
- $userName = $this->getUserName($samlAttributes, $samlID);
+ $externalId = $this->getExternalId($samlAttributes, $samlID);
+ $email = $this->getSamlResponseAttribute($samlAttributes, $emailAttr, null);
+
+ if ($email === null) {
+ throw new SamlException(trans('errors.saml_no_email_address'));
+ }
return [
- 'uid' => $userName,
- 'name' => $this->getUserDisplayName($samlAttributes, $userName),
- 'dn' => $samlID,
- 'email' => $this->getSamlResponseAttribute($samlAttributes, $emailAttr, null),
+ 'external_id' => $externalId,
+ 'name' => $this->getUserDisplayName($samlAttributes, $externalId),
+ 'email' => $email,
+ 'saml_id' => $samlID,
];
}
/**
* Get the groups a user is a part of from the SAML response.
- * @param array $samlAttributes
- * @return array
*/
- public function getUserGroups($samlAttributes)
+ public function getUserGroups(array $samlAttributes): array
{
$groupsAttr = $this->config['group_attribute'];
- $userGroups = $samlAttributes[$groupsAttr];
+ $userGroups = $samlAttributes[$groupsAttr] ?? null;
if (!is_array($userGroups)) {
$userGroups = [];
@@ -119,12 +114,9 @@ class Saml2Service extends Access\ExternalAuthService
* For an array of strings, return a default for an empty array,
* a string for an array with one element and the full array for
* more than one element.
- *
- * @param array $data
- * @param $defaultValue
- * @return string
*/
- protected function simplifyValue(array $data, $defaultValue) {
+ protected function simplifyValue(array $data, $defaultValue)
+ {
switch (count($data)) {
case 0:
$data = $defaultValue;
@@ -139,39 +131,32 @@ class Saml2Service extends Access\ExternalAuthService
/**
* Get a property from an SAML response.
* Handles properties potentially being an array.
- * @param array $userDetails
- * @param string $propertyKey
- * @param $defaultValue
- * @return mixed
*/
protected function getSamlResponseAttribute(array $samlAttributes, string $propertyKey, $defaultValue)
{
if (isset($samlAttributes[$propertyKey])) {
- $data = $this->simplifyValue($samlAttributes[$propertyKey], $defaultValue);
- } else {
- $data = $defaultValue;
+ return $this->simplifyValue($samlAttributes[$propertyKey], $defaultValue);
}
- return $data;
+ return $defaultValue;
}
/**
- * Register a user that is authenticated but not
- * already registered.
- * @param array $userDetails
- * @return User
+ * Register a user that is authenticated but not already registered.
*/
- protected function registerUser($userDetails)
+ protected function registerUser(array $userDetails): User
{
// Create an array of the user data to create a new user instance
+
$userData = [
'name' => $userDetails['name'],
- 'email' => $userDetails['email'],
- 'password' => str_random(30),
- 'external_auth_id' => $userDetails['uid'],
+ 'email' => $userDetails['email'] ?? '',
+ 'password' => Str::random(32),
+ 'external_auth_id' => $userDetails['external_id'],
'email_confirmed' => true,
];
+ // TODO - Handle duplicate email address scenario
$user = $this->user->forceCreate($userData);
$this->userRepo->attachDefaultRole($user);
$this->userRepo->downloadAndAssignUserAvatar($user);
@@ -180,14 +165,12 @@ class Saml2Service extends Access\ExternalAuthService
/**
* Get the user from the database for the specified details.
- * @param array $userDetails
- * @return User|null
*/
- protected function getOrRegisterUser($userDetails)
+ protected function getOrRegisterUser(array $userDetails): ?User
{
$isRegisterEnabled = config('services.saml.auto_register') === true;
$user = $this->user
- ->where('external_auth_id', $userDetails['uid'])
+ ->where('external_auth_id', $userDetails['external_id'])
->first();
if ($user === null && $isRegisterEnabled) {
@@ -198,30 +181,30 @@ class Saml2Service extends Access\ExternalAuthService
}
/**
- * Process the SAML response for a user. Login the user when
- * they exist, optionally registering them automatically.
- * @param string $samlID
- * @param array $samlAttributes
- * @throws SamlException
+ * Process the SAML response for a user. Login the user when
+ * they exist, optionally registering them automatically.
+ * @throws SamlException
*/
- public function processLoginCallback($samlID, $samlAttributes)
+ public function processLoginCallback(string $samlID, array $samlAttributes): User
{
$userDetails = $this->getUserDetails($samlID, $samlAttributes);
$isLoggedIn = auth()->check();
if ($isLoggedIn) {
throw new SamlException(trans('errors.saml_already_logged_in'), '/login');
- } else {
- $user = $this->getOrRegisterUser($userDetails);
- if ($user === null) {
- throw new SamlException(trans('errors.saml_user_not_registered', ['name' => $userDetails['uid']]), '/login');
- } else {
- $groups = $this->getUserGroups($samlAttributes);
- $this->syncWithGroups($user, $groups);
- auth()->login($user);
- }
}
+ $user = $this->getOrRegisterUser($userDetails);
+ if ($user === null) {
+ throw new SamlException(trans('errors.saml_user_not_registered', ['name' => $userDetails['external_id']]), '/login');
+ }
+
+ if ($this->shouldSyncGroups()) {
+ $groups = $this->getUserGroups($samlAttributes);
+ $this->syncWithGroups($user, $groups);
+ }
+
+ auth()->login($user);
return $user;
}
}
diff --git a/app/Config/services.php b/app/Config/services.php
index 0f80a9fc1..4f00d42c5 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -137,12 +137,11 @@ return [
'enabled' => env('SAML2_ENABLED', false),
'auto_register' => env('SAML_AUTO_REGISTER', false),
'email_attribute' => env('SAML_EMAIL_ATTRIBUTE', 'email'),
- 'display_name_attribute' => explode('|', env('SAML_DISPLAY_NAME_ATTRIBUTE', 'username')),
- 'user_name_attribute' => env('SAML_USER_NAME_ATTRIBUTE', null),
+ 'display_name_attributes' => explode('|', env('SAML_DISPLAY_NAME_ATTRIBUTES', 'username')),
+ 'external_id_attribute' => env('SAML_EXTERNAL_ID_ATTRIBUTE', null),
'group_attribute' => env('SAML_GROUP_ATTRIBUTE', 'group'),
- 'remove_from_groups' => env('SAML_REMOVE_FROM_GROUPS',false),
+ 'remove_from_groups' => env('SAML_REMOVE_FROM_GROUPS', false),
'user_to_groups' => env('SAML_USER_TO_GROUPS', false),
- 'id_is_user_name' => env('SAML_ID_IS_USER_NAME', true),
]
];
diff --git a/composer.lock b/composer.lock
index 3ec106ded..6de48b13a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,23 +1,82 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c156e1738dbab2a57f9a926d9a9a5a6a",
+ "content-hash": "42d7a337f6d603ab247b525ade5c3cee",
"packages": [
{
- "name": "aws/aws-sdk-php",
- "version": "3.112.0",
+ "name": "aacotroneo/laravel-saml2",
+ "version": "1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "1e21446c6780a3b9b5e4315bd6d4347d2c3381eb"
+ "url": "https://github.com/aacotroneo/laravel-saml2.git",
+ "reference": "5045701a07bcd7600a17c92971368669870f546a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1e21446c6780a3b9b5e4315bd6d4347d2c3381eb",
- "reference": "1e21446c6780a3b9b5e4315bd6d4347d2c3381eb",
+ "url": "https://api.github.com/repos/aacotroneo/laravel-saml2/zipball/5045701a07bcd7600a17c92971368669870f546a",
+ "reference": "5045701a07bcd7600a17c92971368669870f546a",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "illuminate/support": ">=5.0.0",
+ "onelogin/php-saml": "^3.0.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "0.9.*"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Aacotroneo\\Saml2\\Saml2ServiceProvider"
+ ],
+ "aliases": {
+ "Saml2": "Aacotroneo\\Saml2\\Facades\\Saml2Auth"
+ }
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Aacotroneo\\Saml2\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "aacotroneo",
+ "email": "aacotroneo@gmail.com"
+ }
+ ],
+ "description": "A Laravel package for Saml2 integration as a SP (service provider) based on OneLogin toolkit, which is much lightweight than simplesamlphp",
+ "homepage": "https://github.com/aacotroneo/laravel-saml2",
+ "keywords": [
+ "SAML2",
+ "laravel",
+ "onelogin",
+ "saml"
+ ],
+ "time": "2018-11-08T14:03:58+00:00"
+ },
+ {
+ "name": "aws/aws-sdk-php",
+ "version": "3.117.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aws/aws-sdk-php.git",
+ "reference": "3dc81df70f1cdf2842c85915548bffb870c1e1da"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3dc81df70f1cdf2842c85915548bffb870c1e1da",
+ "reference": "3dc81df70f1cdf2842c85915548bffb870c1e1da",
"shasum": ""
},
"require": {
@@ -87,7 +146,7 @@
"s3",
"sdk"
],
- "time": "2019-09-12T18:09:53+00:00"
+ "time": "2019-11-15T19:21:02+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
@@ -147,21 +206,21 @@
},
{
"name": "barryvdh/laravel-snappy",
- "version": "v0.4.5",
+ "version": "v0.4.6",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-snappy.git",
- "reference": "9be767fc7a082665a84945f36c70b0cbead91ce9"
+ "reference": "94d53c88fa58baa4573c5854663ebc9955f21265"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/9be767fc7a082665a84945f36c70b0cbead91ce9",
- "reference": "9be767fc7a082665a84945f36c70b0cbead91ce9",
+ "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/94d53c88fa58baa4573c5854663ebc9955f21265",
+ "reference": "94d53c88fa58baa4573c5854663ebc9955f21265",
"shasum": ""
},
"require": {
- "illuminate/filesystem": "5.5.x|5.6.x|5.7.x|5.8.x|6.0.*",
- "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x|6.0.*",
+ "illuminate/filesystem": "5.5.x|5.6.x|5.7.x|5.8.x|6.*",
+ "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x|6.*",
"knplabs/knp-snappy": "^1",
"php": ">=7"
},
@@ -204,7 +263,7 @@
"wkhtmltoimage",
"wkhtmltopdf"
],
- "time": "2019-08-30T16:12:23+00:00"
+ "time": "2019-10-02T23:27:09+00:00"
},
{
"name": "cogpowered/finediff",
@@ -259,16 +318,16 @@
},
{
"name": "doctrine/cache",
- "version": "v1.8.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
+ "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
- "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55",
+ "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55",
"shasum": ""
},
"require": {
@@ -279,7 +338,7 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
- "doctrine/coding-standard": "^4.0",
+ "doctrine/coding-standard": "^6.0",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
@@ -290,7 +349,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8.x-dev"
+ "dev-master": "1.9.x-dev"
}
},
"autoload": {
@@ -303,6 +362,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -311,10 +374,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@@ -324,41 +383,48 @@
"email": "schmittjoh@gmail.com"
}
],
- "description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "https://www.doctrine-project.org",
+ "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+ "homepage": "https://www.doctrine-project.org/projects/cache.html",
"keywords": [
+ "abstraction",
+ "apcu",
"cache",
- "caching"
+ "caching",
+ "couchdb",
+ "memcached",
+ "php",
+ "redis",
+ "riak",
+ "xcache"
],
- "time": "2018-08-21T18:01:43+00:00"
+ "time": "2019-11-15T14:31:57+00:00"
},
{
"name": "doctrine/dbal",
- "version": "v2.9.2",
+ "version": "v2.10.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9"
+ "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
- "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
+ "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
- "php": "^7.1"
+ "php": "^7.2"
},
"require-dev": {
- "doctrine/coding-standard": "^5.0",
- "jetbrains/phpstorm-stubs": "^2018.1.2",
- "phpstan/phpstan": "^0.10.1",
- "phpunit/phpunit": "^7.4",
- "symfony/console": "^2.0.5|^3.0|^4.0",
- "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
+ "doctrine/coding-standard": "^6.0",
+ "jetbrains/phpstorm-stubs": "^2019.1",
+ "phpstan/phpstan": "^0.11.3",
+ "phpunit/phpunit": "^8.4.1",
+ "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -369,7 +435,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
+ "dev-master": "2.10.x-dev",
"dev-develop": "3.0.x-dev"
}
},
@@ -383,6 +449,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -391,10 +461,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@@ -405,27 +471,38 @@
"keywords": [
"abstraction",
"database",
+ "db2",
"dbal",
+ "mariadb",
+ "mssql",
"mysql",
- "persistence",
+ "oci8",
+ "oracle",
+ "pdo",
"pgsql",
- "php",
- "queryobject"
+ "postgresql",
+ "queryobject",
+ "sasql",
+ "sql",
+ "sqlanywhere",
+ "sqlite",
+ "sqlserver",
+ "sqlsrv"
],
- "time": "2018-12-31T03:27:51+00:00"
+ "time": "2019-11-03T16:50:43+00:00"
},
{
"name": "doctrine/event-manager",
- "version": "v1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
- "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
+ "reference": "629572819973f13486371cb611386eb17851e85c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
- "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+ "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c",
+ "reference": "629572819973f13486371cb611386eb17851e85c",
"shasum": ""
},
"require": {
@@ -435,7 +512,7 @@
"doctrine/common": "<2.9@dev"
},
"require-dev": {
- "doctrine/coding-standard": "^4.0",
+ "doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
@@ -454,6 +531,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -462,10 +543,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@@ -479,27 +556,29 @@
"email": "ocramius@gmail.com"
}
],
- "description": "Doctrine Event Manager component",
+ "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
"homepage": "https://www.doctrine-project.org/projects/event-manager.html",
"keywords": [
"event",
- "eventdispatcher",
- "eventmanager"
+ "event dispatcher",
+ "event manager",
+ "event system",
+ "events"
],
- "time": "2018-06-11T11:59:03+00:00"
+ "time": "2019-11-10T09:48:07+00:00"
},
{
"name": "doctrine/inflector",
- "version": "v1.3.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
+ "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
- "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
+ "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
"shasum": ""
},
"require": {
@@ -524,6 +603,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -532,10 +615,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@@ -553,20 +632,20 @@
"singularize",
"string"
],
- "time": "2018-01-09T20:05:19+00:00"
+ "time": "2019-10-30T19:59:35+00:00"
},
{
"name": "doctrine/lexer",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
+ "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
- "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+ "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"shasum": ""
},
"require": {
@@ -580,7 +659,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -615,7 +694,7 @@
"parser",
"php"
],
- "time": "2019-07-30T19:33:28+00:00"
+ "time": "2019-10-30T14:39:59+00:00"
},
{
"name": "dompdf/dompdf",
@@ -946,27 +1025,28 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.3.3",
+ "version": "6.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+ "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+ "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
"shasum": ""
},
"require": {
+ "ext-json": "*",
"guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.4",
+ "guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
- "psr/log": "^1.0"
+ "psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
@@ -978,12 +1058,12 @@
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
"GuzzleHttp\\": "src/"
- }
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1007,7 +1087,7 @@
"rest",
"web service"
],
- "time": "2018-04-22T15:46:56+00:00"
+ "time": "2019-10-23T15:58:00+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1133,16 +1213,16 @@
},
{
"name": "intervention/image",
- "version": "2.5.0",
+ "version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
- "reference": "39eaef720d082ecc54c64bf54541c55f10db546d"
+ "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Intervention/image/zipball/39eaef720d082ecc54c64bf54541c55f10db546d",
- "reference": "39eaef720d082ecc54c64bf54541c55f10db546d",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
+ "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
"shasum": ""
},
"require": {
@@ -1199,7 +1279,7 @@
"thumbnail",
"watermark"
],
- "time": "2019-06-24T14:06:31+00:00"
+ "time": "2019-11-02T09:15:47+00:00"
},
{
"name": "knplabs/knp-snappy",
@@ -1269,16 +1349,16 @@
},
{
"name": "laravel/framework",
- "version": "v6.0.3",
+ "version": "v6.5.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902"
+ "reference": "e47180500498cf8aa2a8ffb59a3b4daa007fa13d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/56789e9dec750e0fbe8e9e6ae90a01a4e6887902",
- "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/e47180500498cf8aa2a8ffb59a3b4daa007fa13d",
+ "reference": "e47180500498cf8aa2a8ffb59a3b4daa007fa13d",
"shasum": ""
},
"require": {
@@ -1374,7 +1454,8 @@
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
- "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
+ "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)",
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
@@ -1410,7 +1491,7 @@
"framework",
"laravel"
],
- "time": "2019-09-10T18:46:24+00:00"
+ "time": "2019-11-12T15:20:18+00:00"
},
{
"name": "laravel/socialite",
@@ -1478,16 +1559,16 @@
},
{
"name": "league/flysystem",
- "version": "1.0.55",
+ "version": "1.0.57",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
+ "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
- "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+ "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
"shasum": ""
},
"require": {
@@ -1558,7 +1639,7 @@
"sftp",
"storage"
],
- "time": "2019-08-24T11:17:19+00:00"
+ "time": "2019-10-16T21:01:05+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
@@ -1672,16 +1753,16 @@
},
{
"name": "monolog/monolog",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "68545165e19249013afd1d6f7485aecff07a2d22"
+ "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22",
- "reference": "68545165e19249013afd1d6f7485aecff07a2d22",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c",
+ "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c",
"shasum": ""
},
"require": {
@@ -1749,7 +1830,7 @@
"logging",
"psr-3"
],
- "time": "2019-08-30T09:56:44+00:00"
+ "time": "2019-11-13T10:27:43+00:00"
},
{
"name": "mtdowling/jmespath.php",
@@ -1808,16 +1889,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.24.0",
+ "version": "2.26.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29"
+ "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29",
- "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e01ecc0b71168febb52ae1fdc1cfcc95428e604e",
+ "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e",
"shasum": ""
},
"require": {
@@ -1864,27 +1945,77 @@
"homepage": "http://github.com/kylekatarnls"
}
],
- "description": "A API extension for DateTime that supports 281 different languages.",
+ "description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
- "time": "2019-08-31T16:37:55+00:00"
+ "time": "2019-10-21T21:32:25+00:00"
},
{
- "name": "opis/closure",
- "version": "3.4.0",
+ "name": "onelogin/php-saml",
+ "version": "3.3.1",
"source": {
"type": "git",
- "url": "https://github.com/opis/closure.git",
- "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
+ "url": "https://github.com/onelogin/php-saml.git",
+ "reference": "bb34489635cd5c7eb1b42833e4c57ca1c786a81a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
- "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
+ "url": "https://api.github.com/repos/onelogin/php-saml/zipball/bb34489635cd5c7eb1b42833e4c57ca1c786a81a",
+ "reference": "bb34489635cd5c7eb1b42833e4c57ca1c786a81a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4",
+ "robrichards/xmlseclibs": ">=3.0.4"
+ },
+ "require-dev": {
+ "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",
+ "sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0",
+ "squizlabs/php_codesniffer": "^3.1.1"
+ },
+ "suggest": {
+ "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
+ "ext-gettext": "Install gettext and php5-gettext libs to handle translations",
+ "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "OneLogin\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "OneLogin PHP SAML Toolkit",
+ "homepage": "https://developers.onelogin.com/saml/php",
+ "keywords": [
+ "SAML2",
+ "onelogin",
+ "saml"
+ ],
+ "time": "2019-11-06T16:59:38+00:00"
+ },
+ {
+ "name": "opis/closure",
+ "version": "3.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/opis/closure.git",
+ "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7",
+ "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7",
"shasum": ""
},
"require": {
@@ -1932,7 +2063,7 @@
"serialization",
"serialize"
],
- "time": "2019-09-02T21:07:33+00:00"
+ "time": "2019-10-19T18:38:51+00:00"
},
{
"name": "paragonie/random_compat",
@@ -2058,28 +2189,28 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.5.0",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+ "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
- "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/2ba2586380f8d2b44ad1b9feb61c371020b27793",
+ "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit": "4.7.*"
+ "phpunit/phpunit": "^4.7|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -2089,7 +2220,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "Apache2"
+ "Apache-2.0"
],
"authors": [
{
@@ -2104,7 +2235,7 @@
"php",
"type"
],
- "time": "2015-07-25T16:39:46+00:00"
+ "time": "2019-11-06T22:27:00+00:00"
},
{
"name": "predis/predis",
@@ -2257,16 +2388,16 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@@ -2275,7 +2406,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -2300,7 +2431,7 @@
"psr",
"psr-3"
],
- "time": "2018-11-20T15:27:04+00:00"
+ "time": "2019-11-01T11:05:21+00:00"
},
{
"name": "psr/simple-cache",
@@ -2472,6 +2603,44 @@
],
"time": "2018-07-19T23:38:55+00:00"
},
+ {
+ "name": "robrichards/xmlseclibs",
+ "version": "3.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/robrichards/xmlseclibs.git",
+ "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/0a53d3c3aa87564910cae4ed01416441d3ae0db5",
+ "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "php": ">= 5.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "RobRichards\\XMLSecLibs\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "A PHP library for XML Security",
+ "homepage": "https://github.com/robrichards/xmlseclibs",
+ "keywords": [
+ "security",
+ "signature",
+ "xml",
+ "xmldsig"
+ ],
+ "time": "2019-11-05T11:44:22+00:00"
+ },
{
"name": "sabberworm/php-css-parser",
"version": "8.3.0",
@@ -2593,16 +2762,16 @@
},
{
"name": "socialiteproviders/manager",
- "version": "v3.4.2",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Manager.git",
- "reference": "e3e8e78b9a3060801cd008941a0894a0a0c479e1"
+ "reference": "09903d33429f9f6c0da32c545c036a3e18964bbf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/e3e8e78b9a3060801cd008941a0894a0a0c479e1",
- "reference": "e3e8e78b9a3060801cd008941a0894a0a0c479e1",
+ "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/09903d33429f9f6c0da32c545c036a3e18964bbf",
+ "reference": "09903d33429f9f6c0da32c545c036a3e18964bbf",
"shasum": ""
},
"require": {
@@ -2646,7 +2815,7 @@
}
],
"description": "Easily add new or override built-in providers in Laravel Socialite.",
- "time": "2019-09-09T03:07:52+00:00"
+ "time": "2019-09-25T06:06:35+00:00"
},
{
"name": "socialiteproviders/microsoft-azure",
@@ -2724,16 +2893,16 @@
},
{
"name": "socialiteproviders/slack",
- "version": "v3.0.3",
+ "version": "v3.1",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Slack.git",
- "reference": "8d5d0c0c916adf2af6b406679130441db0afc387"
+ "reference": "d46826640fbeae8f34328d99c358404a1e1050a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Slack/zipball/8d5d0c0c916adf2af6b406679130441db0afc387",
- "reference": "8d5d0c0c916adf2af6b406679130441db0afc387",
+ "url": "https://api.github.com/repos/SocialiteProviders/Slack/zipball/d46826640fbeae8f34328d99c358404a1e1050a3",
+ "reference": "d46826640fbeae8f34328d99c358404a1e1050a3",
"shasum": ""
},
"require": {
@@ -2757,20 +2926,20 @@
}
],
"description": "Slack OAuth2 Provider for Laravel Socialite",
- "time": "2017-04-10T05:10:48+00:00"
+ "time": "2019-01-11T19:48:14+00:00"
},
{
"name": "socialiteproviders/twitch",
- "version": "v5.0.0",
+ "version": "v5.1",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Twitch.git",
- "reference": "8c19b26ff24c40cc019413042a5492c5ed21a658"
+ "reference": "f9b1f90a94f539e1b29e84ee0f731f42d59f3213"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/8c19b26ff24c40cc019413042a5492c5ed21a658",
- "reference": "8c19b26ff24c40cc019413042a5492c5ed21a658",
+ "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/f9b1f90a94f539e1b29e84ee0f731f42d59f3213",
+ "reference": "f9b1f90a94f539e1b29e84ee0f731f42d59f3213",
"shasum": ""
},
"require": {
@@ -2794,20 +2963,20 @@
}
],
"description": "Twitch OAuth2 Provider for Laravel Socialite",
- "time": "2018-06-20T10:59:51+00:00"
+ "time": "2019-07-01T10:35:46+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.2.1",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a"
+ "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
- "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/149cfdf118b169f7840bbe3ef0d4bc795d1780c9",
+ "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9",
"shasum": ""
},
"require": {
@@ -2856,20 +3025,20 @@
"mail",
"mailer"
],
- "time": "2019-04-21T09:21:45+00:00"
+ "time": "2019-11-12T09:31:26+00:00"
},
{
"name": "symfony/console",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "de63799239b3881b8a08f8481b22348f77ed7b36"
+ "reference": "831424efae0a1fe6642784bd52aae14ece6538e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36",
- "reference": "de63799239b3881b8a08f8481b22348f77ed7b36",
+ "url": "https://api.github.com/repos/symfony/console/zipball/831424efae0a1fe6642784bd52aae14ece6538e6",
+ "reference": "831424efae0a1fe6642784bd52aae14ece6538e6",
"shasum": ""
},
"require": {
@@ -2931,20 +3100,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:26:39+00:00"
+ "time": "2019-11-13T07:29:07+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03"
+ "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
- "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
+ "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
"shasum": ""
},
"require": {
@@ -2984,20 +3153,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2019-08-20T14:07:54+00:00"
+ "time": "2019-10-02T08:36:26+00:00"
},
{
"name": "symfony/debug",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced"
+ "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced",
- "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/5ea9c3e01989a86ceaa0283f21234b12deadf5e2",
+ "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2",
"shasum": ""
},
"require": {
@@ -3040,20 +3209,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2019-08-20T14:27:59+00:00"
+ "time": "2019-10-28T17:07:32+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2"
+ "reference": "0df002fd4f500392eabd243c2947061a50937287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
- "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0df002fd4f500392eabd243c2947061a50937287",
+ "reference": "0df002fd4f500392eabd243c2947061a50937287",
"shasum": ""
},
"require": {
@@ -3110,20 +3279,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:55:16+00:00"
+ "time": "2019-11-03T09:04:05+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v1.1.5",
+ "version": "v1.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "c61766f4440ca687de1084a5c00b08e167a2575c"
+ "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c",
- "reference": "c61766f4440ca687de1084a5c00b08e167a2575c",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+ "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
"shasum": ""
},
"require": {
@@ -3168,20 +3337,20 @@
"interoperability",
"standards"
],
- "time": "2019-06-20T06:46:26+00:00"
+ "time": "2019-09-17T09:54:03+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2"
+ "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
- "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f",
+ "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f",
"shasum": ""
},
"require": {
@@ -3217,20 +3386,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2019-08-14T12:26:46+00:00"
+ "time": "2019-10-30T12:53:54+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc"
+ "reference": "cabe67275034e173350e158f3b1803d023880227"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc",
- "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cabe67275034e173350e158f3b1803d023880227",
+ "reference": "cabe67275034e173350e158f3b1803d023880227",
"shasum": ""
},
"require": {
@@ -3272,20 +3441,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:55:16+00:00"
+ "time": "2019-11-12T13:07:20+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52"
+ "reference": "5fdf186f26f9080de531d3f1d024348b2f0ab12f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52",
- "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5fdf186f26f9080de531d3f1d024348b2f0ab12f",
+ "reference": "5fdf186f26f9080de531d3f1d024348b2f0ab12f",
"shasum": ""
},
"require": {
@@ -3364,20 +3533,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T16:47:42+00:00"
+ "time": "2019-11-13T09:07:28+00:00"
},
{
"name": "symfony/mime",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "987a05df1c6ac259b34008b932551353f4f408df"
+ "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df",
- "reference": "987a05df1c6ac259b34008b932551353f4f408df",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/22aecf6b11638ef378fab25d6c5a2da8a31a1448",
+ "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448",
"shasum": ""
},
"require": {
@@ -3423,7 +3592,7 @@
"mime",
"mime-type"
],
- "time": "2019-08-22T08:16:11+00:00"
+ "time": "2019-11-12T13:10:02+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -3778,16 +3947,16 @@
},
{
"name": "symfony/process",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a"
+ "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a",
- "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a",
+ "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
+ "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
"shasum": ""
},
"require": {
@@ -3823,20 +3992,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:26:39+00:00"
+ "time": "2019-10-28T17:07:32+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f"
+ "reference": "533fd12a41fb9ce8d4e861693365427849487c0e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f",
- "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/533fd12a41fb9ce8d4e861693365427849487c0e",
+ "reference": "533fd12a41fb9ce8d4e861693365427849487c0e",
"shasum": ""
},
"require": {
@@ -3899,20 +4068,20 @@
"uri",
"url"
],
- "time": "2019-08-26T08:26:39+00:00"
+ "time": "2019-11-04T20:23:03+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v1.1.6",
+ "version": "v1.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3"
+ "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
- "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
+ "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
"shasum": ""
},
"require": {
@@ -3957,20 +4126,20 @@
"interoperability",
"standards"
],
- "time": "2019-08-20T14:44:19+00:00"
+ "time": "2019-10-14T12:27:06+00:00"
},
{
"name": "symfony/translation",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "28498169dd334095fa981827992f3a24d50fed0f"
+ "reference": "bbce239b35b0cd47bd75848b23e969f17dd970e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f",
- "reference": "28498169dd334095fa981827992f3a24d50fed0f",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/bbce239b35b0cd47bd75848b23e969f17dd970e7",
+ "reference": "bbce239b35b0cd47bd75848b23e969f17dd970e7",
"shasum": ""
},
"require": {
@@ -4033,20 +4202,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:55:16+00:00"
+ "time": "2019-11-06T23:21:49+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v1.1.6",
+ "version": "v1.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a"
+ "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
- "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6",
+ "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6",
"shasum": ""
},
"require": {
@@ -4090,20 +4259,20 @@
"interoperability",
"standards"
],
- "time": "2019-08-02T12:15:04+00:00"
+ "time": "2019-09-17T11:12:18+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6"
+ "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6",
- "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf",
+ "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf",
"shasum": ""
},
"require": {
@@ -4166,25 +4335,27 @@
"debug",
"dump"
],
- "time": "2019-08-26T08:26:39+00:00"
+ "time": "2019-10-13T12:02:04+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
- "version": "2.2.1",
+ "version": "2.2.2",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
- "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
+ "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
- "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
+ "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
"shasum": ""
},
"require": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
"php": "^5.5 || ^7.0",
- "symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
+ "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
@@ -4213,7 +4384,7 @@
],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
- "time": "2017-11-27T11:13:29+00:00"
+ "time": "2019-10-24T08:53:34+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -4520,16 +4691,16 @@
},
{
"name": "composer/composer",
- "version": "1.9.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5"
+ "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
- "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
+ "url": "https://api.github.com/repos/composer/composer/zipball/bb01f2180df87ce7992b8331a68904f80439dd2f",
+ "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f",
"shasum": ""
},
"require": {
@@ -4596,7 +4767,7 @@
"dependency",
"package"
],
- "time": "2019-08-02T18:55:33+00:00"
+ "time": "2019-11-01T16:20:17+00:00"
},
{
"name": "composer/semver",
@@ -4722,24 +4893,24 @@
},
{
"name": "composer/xdebug-handler",
- "version": "1.3.3",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+ "reference": "cbe23383749496fe0f373345208b79568e4bc248"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
- "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
+ "reference": "cbe23383749496fe0f373345208b79568e4bc248",
"shasum": ""
},
"require": {
- "php": "^5.3.2 || ^7.0",
+ "php": "^5.3.2 || ^7.0 || ^8.0",
"psr/log": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
},
"type": "library",
"autoload": {
@@ -4757,25 +4928,25 @@
"email": "john-stevenson@blueyonder.co.uk"
}
],
- "description": "Restarts a process without xdebug.",
+ "description": "Restarts a process without Xdebug.",
"keywords": [
"Xdebug",
"performance"
],
- "time": "2019-05-27T17:52:04+00:00"
+ "time": "2019-11-06T16:40:04+00:00"
},
{
"name": "doctrine/instantiator",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": ""
},
"require": {
@@ -4818,20 +4989,20 @@
"constructor",
"instantiate"
],
- "time": "2019-03-17T17:37:11+00:00"
+ "time": "2019-10-21T16:45:58+00:00"
},
{
"name": "facade/flare-client-php",
- "version": "1.0.4",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
- "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e"
+ "reference": "04c0bbd1881942f59e27877bac3b29ba57519666"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e",
- "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/04c0bbd1881942f59e27877bac3b29ba57519666",
+ "reference": "04c0bbd1881942f59e27877bac3b29ba57519666",
"shasum": ""
},
"require": {
@@ -4843,7 +5014,7 @@
},
"require-dev": {
"larapack/dd": "^1.1",
- "phpunit/phpunit": "^7.0",
+ "phpunit/phpunit": "^7.5.16",
"spatie/phpunit-snapshot-assertions": "^2.0"
},
"type": "library",
@@ -4872,26 +5043,26 @@
"flare",
"reporting"
],
- "time": "2019-09-11T14:19:56+00:00"
+ "time": "2019-11-08T11:11:17+00:00"
},
{
"name": "facade/ignition",
- "version": "1.6.5",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "97244f6d511332f3574acab8242c09ddcfda892b"
+ "reference": "67736a01597b9e08f00a1fc8966b92b918dba5ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/97244f6d511332f3574acab8242c09ddcfda892b",
- "reference": "97244f6d511332f3574acab8242c09ddcfda892b",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/67736a01597b9e08f00a1fc8966b92b918dba5ea",
+ "reference": "67736a01597b9e08f00a1fc8966b92b918dba5ea",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
- "facade/flare-client-php": "^1.0.4",
+ "facade/flare-client-php": "^1.1",
"facade/ignition-contracts": "^1.0",
"filp/whoops": "^2.4",
"illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0",
@@ -4926,7 +5097,10 @@
"autoload": {
"psr-4": {
"Facade\\Ignition\\": "src"
- }
+ },
+ "files": [
+ "src/helpers.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -4940,7 +5114,7 @@
"laravel",
"page"
],
- "time": "2019-09-13T13:38:04+00:00"
+ "time": "2019-11-14T10:51:35+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -5049,16 +5223,16 @@
},
{
"name": "fzaninotto/faker",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+ "reference": "27a216cbe72327b2d6369fab721a5843be71e57d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
- "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d",
+ "reference": "27a216cbe72327b2d6369fab721a5843be71e57d",
"shasum": ""
},
"require": {
@@ -5067,13 +5241,11 @@
"require-dev": {
"ext-intl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7",
- "squizlabs/php_codesniffer": "^1.5"
+ "squizlabs/php_codesniffer": "^2.9.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "1.8-dev"
- }
+ "branch-alias": []
},
"autoload": {
"psr-4": {
@@ -5095,7 +5267,7 @@
"faker",
"fixtures"
],
- "time": "2018-07-12T10:23:15+00:00"
+ "time": "2019-11-14T13:13:06+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -5235,23 +5407,23 @@
},
{
"name": "justinrainbow/json-schema",
- "version": "5.2.8",
+ "version": "5.2.9",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
+ "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
- "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+ "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
+ "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.2.20",
+ "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
"json-schema/json-schema-test-suite": "1.2.0",
"phpunit/phpunit": "^4.8.35"
},
@@ -5297,7 +5469,7 @@
"json",
"schema"
],
- "time": "2019-01-14T23:55:14+00:00"
+ "time": "2019-09-25T14:49:45+00:00"
},
{
"name": "laravel/browser-kit-testing",
@@ -5362,25 +5534,25 @@
},
{
"name": "maximebf/debugbar",
- "version": "v1.15.0",
+ "version": "v1.15.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
- "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
+ "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
- "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+ "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
+ "php": ">=5.6",
"psr/log": "^1.0",
- "symfony/var-dumper": "^2.6|^3.0|^4.0"
+ "symfony/var-dumper": "^2.6|^3|^4"
},
"require-dev": {
- "phpunit/phpunit": "^4.0|^5.0"
+ "phpunit/phpunit": "^5"
},
"suggest": {
"kriswallsmith/assetic": "The best way to manage assets",
@@ -5390,7 +5562,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.14-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
@@ -5419,20 +5591,20 @@
"debug",
"debugbar"
],
- "time": "2017-12-15T11:13:46+00:00"
+ "time": "2019-09-24T14:55:42+00:00"
},
{
"name": "mockery/mockery",
- "version": "1.2.3",
+ "version": "1.2.4",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031"
+ "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/4eff936d83eb809bde2c57a3cea0ee9643769031",
- "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/b3453f75fd23d9fd41685f2148f4abeacabc6405",
+ "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405",
"shasum": ""
},
"require": {
@@ -5446,7 +5618,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -5484,7 +5656,7 @@
"test double",
"testing"
],
- "time": "2019-08-07T15:01:07+00:00"
+ "time": "2019-09-30T08:30:27+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -5901,22 +6073,22 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.8.1",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
+ "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
- "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
+ "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
"sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
@@ -5960,20 +6132,20 @@
"spy",
"stub"
],
- "time": "2019-06-13T12:50:23+00:00"
+ "time": "2019-10-03T11:07:50+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "7.0.7",
+ "version": "7.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800"
+ "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
- "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f",
+ "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f",
"shasum": ""
},
"require": {
@@ -5982,7 +6154,7 @@
"php": "^7.2",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^3.1.0",
+ "phpunit/php-token-stream": "^3.1.1",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
"sebastian/environment": "^4.2.2",
"sebastian/version": "^2.0.1",
@@ -6023,7 +6195,7 @@
"testing",
"xunit"
],
- "time": "2019-07-25T05:31:54+00:00"
+ "time": "2019-09-17T06:24:36+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -6167,16 +6339,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a"
+ "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a",
- "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
+ "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
"shasum": ""
},
"require": {
@@ -6212,20 +6384,20 @@
"keywords": [
"tokenizer"
],
- "time": "2019-07-25T05:29:42+00:00"
+ "time": "2019-09-17T06:23:10+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "8.3.5",
+ "version": "8.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "302faed7059fde575cf3403a78c730c5e3a62750"
+ "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/302faed7059fde575cf3403a78c730c5e3a62750",
- "reference": "302faed7059fde575cf3403a78c730c5e3a62750",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67f9e35bffc0dd52d55d565ddbe4230454fd6a4e",
+ "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e",
"shasum": ""
},
"require": {
@@ -6269,7 +6441,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.3-dev"
+ "dev-master": "8.4-dev"
}
},
"autoload": {
@@ -6295,7 +6467,7 @@
"testing",
"xunit"
],
- "time": "2019-09-14T09:12:03+00:00"
+ "time": "2019-11-06T09:42:23+00:00"
},
{
"name": "scrivo/highlight.php",
@@ -7020,16 +7192,16 @@
},
{
"name": "seld/jsonlint",
- "version": "1.7.1",
+ "version": "1.7.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
- "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
"shasum": ""
},
"require": {
@@ -7065,7 +7237,7 @@
"parser",
"validator"
],
- "time": "2018-01-24T12:46:19+00:00"
+ "time": "2019-10-24T14:27:39+00:00"
},
{
"name": "seld/phar-utils",
@@ -7113,16 +7285,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.4.2",
+ "version": "3.5.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
+ "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
- "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
+ "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
"shasum": ""
},
"require": {
@@ -7160,20 +7332,20 @@
"phpcs",
"standards"
],
- "time": "2019-04-10T23:49:02+00:00"
+ "time": "2019-10-28T04:36:32+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "cc686552948d627528c0e2e759186dff67c2610e"
+ "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cc686552948d627528c0e2e759186dff67c2610e",
- "reference": "cc686552948d627528c0e2e759186dff67c2610e",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b9efd5708c3a38593e19b6a33e40867f4f89d72",
+ "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72",
"shasum": ""
},
"require": {
@@ -7221,11 +7393,11 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2019-08-26T08:26:39+00:00"
+ "time": "2019-10-28T17:07:32+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v4.3.4",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index 37de5dcc1..fd687f041 100644
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -19,6 +19,7 @@ return [
'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
'saml_already_logged_in' => 'Already logged in',
'saml_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
+ 'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
'social_no_action_defined' => 'No action defined',
'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',