StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Dane Everitt 2019-08-04 13:49:26 -07:00
commit 81143e231a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 303 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

57
composer.lock generated
View file

@ -46,9 +46,9 @@
"authors": [
{
"name": "Gijs Jorissen",
"role": "Developer",
"email": "hello@appstract.team",
"homepage": "https://appstract.team",
"role": "Developer"
"homepage": "https://appstract.team"
}
],
"description": "Handy Blade directives",
@ -1069,12 +1069,12 @@
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/ivanakimov/hashids.php.git",
"url": "https://github.com/vinkla/hashids.git",
"reference": "b6c61142bfe36d43740a5419d11c351dddac0458"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/b6c61142bfe36d43740a5419d11c351dddac0458",
"url": "https://api.github.com/repos/vinkla/hashids/zipball/b6c61142bfe36d43740a5419d11c351dddac0458",
"reference": "b6c61142bfe36d43740a5419d11c351dddac0458",
"shasum": ""
},
@ -2633,8 +2633,8 @@
"authors": [
{
"name": "Antonio Carlos Ribeiro",
"email": "acr@antoniocarlosribeiro.com",
"role": "Creator & Designer"
"role": "Creator & Designer",
"email": "acr@antoniocarlosribeiro.com"
}
],
"description": "A One Time Password Authentication package, compatible with Google Authenticator.",
@ -2801,9 +2801,9 @@
"authors": [
{
"name": "Dries Vints",
"role": "Maintainer",
"email": "dries.vints@gmail.com",
"homepage": "http://driesvints.com",
"role": "Maintainer"
"homepage": "http://driesvints.com"
}
],
"description": "Prologue Alerts is a package that handles global site messages.",
@ -3302,9 +3302,9 @@
"authors": [
{
"name": "Jarek Tkaczyk",
"role": "Developer",
"email": "jarek@softonsofa.com",
"homepage": "https://softonsofa.com/",
"role": "Developer"
"homepage": "https://softonsofa.com/"
}
],
"description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.",
@ -3404,9 +3404,9 @@
"authors": [
{
"name": "Jarek Tkaczyk",
"role": "Developer",
"email": "jarek@softonsofa.com",
"homepage": "http://softonsofa.com/",
"role": "Developer"
"homepage": "http://softonsofa.com/"
}
],
"description": "Laravel Eloquent hooks system.",
@ -5750,16 +5750,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.13.1",
"version": "v2.15.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161"
"reference": "20064511ab796593a3990669eff5f5b535001f7c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161",
"reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c",
"reference": "20064511ab796593a3990669eff5f5b535001f7c",
"shasum": ""
},
"require": {
@ -5768,7 +5768,7 @@
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^5.6 || >=7.0 <7.3",
"php": "^5.6 || ^7.0",
"php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.17 || ^4.1.6",
"symfony/event-dispatcher": "^3.0 || ^4.0",
@ -5780,21 +5780,18 @@
"symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.1",
"keradus/cli-executor": "^1.2",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.1",
"php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
"phpunitgoodpractices/traits": "^1.5.1",
"symfony/phpunit-bridge": "^4.0"
"phpunitgoodpractices/traits": "^1.8",
"symfony/phpunit-bridge": "^4.3"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@ -5837,7 +5834,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2018-10-21T00:32:10+00:00"
"time": "2019-06-01T10:32:12+00:00"
},
{
"name": "fzaninotto/faker",
@ -6998,8 +6995,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
"role": "lead",
"email": "sebastian@phpunit.de"
}
],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@ -7271,8 +7268,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
"role": "lead",
"email": "sebastian@phpunit.de"
}
],
"description": "The PHP Unit Testing framework.",