diff --git a/composer.json b/composer.json
index 93bc3007..d7724c19 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
"hieu-le/active": "^3.5",
"laravel/framework": "5.8.*",
"laravel/passport": "^7.2",
- "laravel/socialite": "^3.0",
+ "laravel/socialite": "^4.1",
"laravel/tinker": "~1.0",
"laravelcollective/html": "^5.4.0",
"spatie/laravel-cors": "^1.2",
diff --git a/composer.lock b/composer.lock
index 6363a059..458c545d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,24 +4,25 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "bc7cfbdcc12b751fca065d9e692de5fc",
+ "content-hash": "e0aac0786fde1c97a765c5b8f0c35ae5",
"packages": [
{
"name": "arcanedev/log-viewer",
- "version": "4.7.2",
+ "version": "4.7.3",
"source": {
"type": "git",
"url": "https://github.com/ARCANEDEV/LogViewer.git",
- "reference": "9ae1d23f67d5d1c7490c69636b34303457fb0af3"
+ "reference": "bb7bbce12d6220edff8bb4a2e45d1210cb4e08b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ARCANEDEV/LogViewer/zipball/9ae1d23f67d5d1c7490c69636b34303457fb0af3",
- "reference": "9ae1d23f67d5d1c7490c69636b34303457fb0af3",
+ "url": "https://api.github.com/repos/ARCANEDEV/LogViewer/zipball/bb7bbce12d6220edff8bb4a2e45d1210cb4e08b6",
+ "reference": "bb7bbce12d6220edff8bb4a2e45d1210cb4e08b6",
"shasum": ""
},
"require": {
"arcanedev/support": "~4.5.0",
+ "ext-json": "*",
"php": ">=7.1.3",
"psr/log": "~1.0"
},
@@ -55,9 +56,9 @@
"authors": [
{
"name": "ARCANEDEV",
- "role": "Developer",
"email": "arcanedev.maroc@gmail.com",
- "homepage": "https://github.com/arcanedev-maroc"
+ "homepage": "https://github.com/arcanedev-maroc",
+ "role": "Developer"
}
],
"description": "Provides a Log Viewer for Laravel 5",
@@ -71,20 +72,20 @@
"log-viewer",
"logviewer"
],
- "time": "2019-04-13T10:01:41+00:00"
+ "time": "2019-09-12T19:13:38+00:00"
},
{
"name": "arcanedev/no-captcha",
- "version": "9.0.0",
+ "version": "9.0.1",
"source": {
"type": "git",
"url": "https://github.com/ARCANEDEV/noCAPTCHA.git",
- "reference": "f012c78b1c6b562c8ed692f121652f484d700248"
+ "reference": "ec3702eb76cb611340348625e115fc94dad42204"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ARCANEDEV/noCAPTCHA/zipball/f012c78b1c6b562c8ed692f121652f484d700248",
- "reference": "f012c78b1c6b562c8ed692f121652f484d700248",
+ "url": "https://api.github.com/repos/ARCANEDEV/noCAPTCHA/zipball/ec3702eb76cb611340348625e115fc94dad42204",
+ "reference": "ec3702eb76cb611340348625e115fc94dad42204",
"shasum": ""
},
"require": {
@@ -124,9 +125,9 @@
"authors": [
{
"name": "ARCANEDEV",
- "role": "Developer",
"email": "arcanedev.maroc@gmail.com",
- "homepage": "https://github.com/arcanedev-maroc"
+ "homepage": "https://github.com/arcanedev-maroc",
+ "role": "Developer"
}
],
"description": "No CAPTCHA (new Google reCAPTCHA) with Laravel support",
@@ -139,7 +140,7 @@
"no-captcha",
"recaptcha"
],
- "time": "2019-02-27T21:43:52+00:00"
+ "time": "2019-02-27T22:06:02+00:00"
},
{
"name": "arcanedev/php-html",
@@ -177,9 +178,9 @@
"authors": [
{
"name": "ARCANEDEV",
- "role": "Developer",
"email": "arcanedev.maroc@gmail.com",
- "homepage": "https://github.com/arcanedev-maroc"
+ "homepage": "https://github.com/arcanedev-maroc",
+ "role": "Developer"
}
],
"description": "A simple way to create html tags with php.",
@@ -249,16 +250,16 @@
},
{
"name": "beyondcode/laravel-self-diagnosis",
- "version": "1.3.1",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/beyondcode/laravel-self-diagnosis.git",
- "reference": "803bed67402f83881c402dfbeae7204d90730fc0"
+ "reference": "6792a2d8b29ab9080490dac145e310514dcf6224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/beyondcode/laravel-self-diagnosis/zipball/803bed67402f83881c402dfbeae7204d90730fc0",
- "reference": "803bed67402f83881c402dfbeae7204d90730fc0",
+ "url": "https://api.github.com/repos/beyondcode/laravel-self-diagnosis/zipball/6792a2d8b29ab9080490dac145e310514dcf6224",
+ "reference": "6792a2d8b29ab9080490dac145e310514dcf6224",
"shasum": ""
},
"require": {
@@ -296,9 +297,9 @@
"authors": [
{
"name": "Marcel Pociot",
- "role": "Developer",
"email": "marcel@beyondco.de",
- "homepage": "https://beyondcode.de"
+ "homepage": "https://beyondcode.de",
+ "role": "Developer"
}
],
"description": "Perform various self diagnosis tests on your Laravel application.",
@@ -307,7 +308,7 @@
"beyondcode",
"laravel-self-diagnosis"
],
- "time": "2019-08-26T21:23:08+00:00"
+ "time": "2019-09-03T15:01:16+00:00"
},
{
"name": "composer/semver",
@@ -373,20 +374,20 @@
},
{
"name": "creativeorange/gravatar",
- "version": "v1.0.12",
+ "version": "v1.0.13",
"source": {
"type": "git",
"url": "https://github.com/creativeorange/gravatar.git",
- "reference": "865c8f20b1a20c5de105f90deeea596f7e060e25"
+ "reference": "c757291f791bf169e614b98b2ac3dad189bba2c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/creativeorange/gravatar/zipball/865c8f20b1a20c5de105f90deeea596f7e060e25",
- "reference": "865c8f20b1a20c5de105f90deeea596f7e060e25",
+ "url": "https://api.github.com/repos/creativeorange/gravatar/zipball/c757291f791bf169e614b98b2ac3dad189bba2c9",
+ "reference": "c757291f791bf169e614b98b2ac3dad189bba2c9",
"shasum": ""
},
"require": {
- "illuminate/support": "5.*",
+ "illuminate/support": "^5.0|^6",
"php": ">=5.4.0"
},
"type": "library",
@@ -412,43 +413,44 @@
"authors": [
{
"name": "Jaco Tijssen",
- "role": "Developer",
"email": "jaco@creativeorange.nl",
- "homepage": "https://www.creativeorange.nl"
+ "homepage": "https://www.creativeorange.nl",
+ "role": "Developer"
}
],
- "description": "Gravatar for Laravel 5.0.x through 5.5.x package for retrieving gravatar image URLs or checking the existance of an image.",
+ "description": "A Laravel Gravatar package for retrieving gravatar image URLs or checking the existance of an image.",
"keywords": [
"avatar",
"gravatar",
"laravel"
],
- "time": "2019-06-03T08:45:09+00:00"
+ "time": "2019-08-29T20:00:13+00:00"
},
{
"name": "davejamesmiller/laravel-breadcrumbs",
- "version": "5.2.1",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
- "reference": "6465e8710341578092fdd8aea24319d4f53ab27c"
+ "reference": "1edeee4a77f467293aa5e5ea4a0b8f010216b8da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/6465e8710341578092fdd8aea24319d4f53ab27c",
- "reference": "6465e8710341578092fdd8aea24319d4f53ab27c",
+ "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/1edeee4a77f467293aa5e5ea4a0b8f010216b8da",
+ "reference": "1edeee4a77f467293aa5e5ea4a0b8f010216b8da",
"shasum": ""
},
"require": {
- "illuminate/support": "5.6.*|5.7.*|5.8.*",
- "illuminate/view": "5.6.*|5.7.*|5.8.*",
+ "facade/ignition-contracts": "^1.0",
+ "illuminate/support": "^5.6|^6.0",
+ "illuminate/view": "^5.6|^6.0",
"php": ">=7.1.3"
},
"require-dev": {
- "laravel/framework": "5.6.*|5.7.*|5.8.*",
- "orchestra/testbench": "3.6.*|3.7.*|3.8.*",
+ "orchestra/testbench": "^3.6",
"php-coveralls/php-coveralls": "^1.0",
- "phpunit/phpunit": "7.*"
+ "phpunit/phpunit": "^7.0|^8.0",
+ "spatie/phpunit-snapshot-assertions": "^2.0"
},
"type": "library",
"extra": {
@@ -481,7 +483,7 @@
"keywords": [
"laravel"
],
- "time": "2019-02-27T13:09:37+00:00"
+ "time": "2019-09-03T15:24:57+00:00"
},
{
"name": "defuse/php-encryption",
@@ -1097,27 +1099,71 @@
],
"time": "2019-03-17T18:48:37+00:00"
},
+ {
+ "name": "facade/ignition-contracts",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/facade/ignition-contracts.git",
+ "reference": "f445db0fb86f48e205787b2592840dd9c80ded28"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28",
+ "reference": "f445db0fb86f48e205787b2592840dd9c80ded28",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Facade\\IgnitionContracts\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://flareapp.io",
+ "role": "Developer"
+ }
+ ],
+ "description": "Solution contracts for Ignition",
+ "homepage": "https://github.com/facade/ignition-contracts",
+ "keywords": [
+ "contracts",
+ "flare",
+ "ignition"
+ ],
+ "time": "2019-08-30T14:06:08+00:00"
+ },
{
"name": "fideloper/proxy",
- "version": "4.2.0",
+ "version": "4.2.1",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
- "reference": "39a4c2165e578bc771f5dc031c273210a3a9b6d2"
+ "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/39a4c2165e578bc771f5dc031c273210a3a9b6d2",
- "reference": "39a4c2165e578bc771f5dc031c273210a3a9b6d2",
+ "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/03085e58ec7bee24773fa5a8850751a6e61a7e8a",
+ "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a",
"shasum": ""
},
"require": {
- "illuminate/contracts": "~5.0|~6.0",
+ "illuminate/contracts": "^5.0|^6.0|^7.0",
"php": ">=5.4.0"
},
"require-dev": {
- "illuminate/http": "~5.6|~6.0",
- "mockery/mockery": "~1.0",
+ "illuminate/http": "^5.0|^6.0|^7.0",
+ "mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.0"
},
"type": "library",
@@ -1149,7 +1195,7 @@
"proxy",
"trusted proxy"
],
- "time": "2019-07-29T16:49:45+00:00"
+ "time": "2019-09-03T16:45:42+00:00"
},
{
"name": "firebase/php-jwt",
@@ -1184,13 +1230,13 @@
"authors": [
{
"name": "Neuman Vong",
- "role": "Developer",
- "email": "neuman+pear@twilio.com"
+ "email": "neuman+pear@twilio.com",
+ "role": "Developer"
},
{
"name": "Anant Narayanan",
- "role": "Developer",
- "email": "anant@php.net"
+ "email": "anant@php.net",
+ "role": "Developer"
}
],
"description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
@@ -1640,16 +1686,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.8.34",
+ "version": "v5.8.35",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b"
+ "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/c3a870b96c7afe5174f486af74768ccfddeec77b",
- "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197",
+ "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197",
"shasum": ""
},
"require": {
@@ -1732,6 +1778,7 @@
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
+ "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"filp/whoops": "Required for friendly error pages in development (^2.1.4).",
@@ -1783,35 +1830,35 @@
"framework",
"laravel"
],
- "time": "2019-08-27T14:35:59+00:00"
+ "time": "2019-09-03T16:44:30+00:00"
},
{
"name": "laravel/passport",
- "version": "v7.4.0",
+ "version": "v7.5.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
- "reference": "4460bd1fb5d913d75e547caf02a5a19c6d77794d"
+ "reference": "663e720a6d15e8ec70bf5309f774439a110efc89"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/passport/zipball/4460bd1fb5d913d75e547caf02a5a19c6d77794d",
- "reference": "4460bd1fb5d913d75e547caf02a5a19c6d77794d",
+ "url": "https://api.github.com/repos/laravel/passport/zipball/663e720a6d15e8ec70bf5309f774439a110efc89",
+ "reference": "663e720a6d15e8ec70bf5309f774439a110efc89",
"shasum": ""
},
"require": {
"ext-json": "*",
"firebase/php-jwt": "~3.0|~4.0|~5.0",
"guzzlehttp/guzzle": "~6.0",
- "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0",
- "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0",
+ "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
"league/oauth2-server": "^7.0",
"php": ">=7.1",
"phpseclib/phpseclib": "^2.0",
@@ -1819,8 +1866,8 @@
"zendframework/zend-diactoros": "~1.0|~2.0"
},
"require-dev": {
- "mockery/mockery": "~1.0",
- "phpunit/phpunit": "~7.4"
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^7.4|^8.0"
},
"type": "library",
"extra": {
@@ -1854,38 +1901,39 @@
"oauth",
"passport"
],
- "time": "2019-08-20T18:10:43+00:00"
+ "time": "2019-09-24T20:59:35+00:00"
},
{
"name": "laravel/socialite",
- "version": "v3.3.0",
+ "version": "v4.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
- "reference": "79316f36641f1916a50ab14d368acdf1d97e46de"
+ "reference": "f509d06e1e7323997b804c5152874f8aad4508e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/socialite/zipball/79316f36641f1916a50ab14d368acdf1d97e46de",
- "reference": "79316f36641f1916a50ab14d368acdf1d97e46de",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/f509d06e1e7323997b804c5152874f8aad4508e9",
+ "reference": "f509d06e1e7323997b804c5152874f8aad4508e9",
"shasum": ""
},
"require": {
+ "ext-json": "*",
"guzzlehttp/guzzle": "~6.0",
- "illuminate/contracts": "~5.4",
- "illuminate/http": "~5.4",
- "illuminate/support": "~5.4",
+ "illuminate/http": "~5.7.0|~5.8.0|^6.0|^7.0",
+ "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0",
"league/oauth1-client": "~1.0",
- "php": ">=5.6.4"
+ "php": "^7.1.3"
},
"require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4.0|~5.0"
+ "illuminate/contracts": "~5.7.0|~5.8.0|^6.0|^7.0",
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^7.0|^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
},
"laravel": {
"providers": [
@@ -1917,7 +1965,7 @@
"laravel",
"oauth"
],
- "time": "2018-12-21T14:06:32+00:00"
+ "time": "2019-09-03T15:27:17+00:00"
},
{
"name": "laravel/tinker",
@@ -1984,16 +2032,16 @@
},
{
"name": "laravelcollective/html",
- "version": "v5.8.0",
+ "version": "v5.8.1",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "0e360143d3476fe4141d267a260c140569fa207b"
+ "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/0e360143d3476fe4141d267a260c140569fa207b",
- "reference": "0e360143d3476fe4141d267a260c140569fa207b",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a1c9974ea629eed96e101a24e3852ced382eb29",
+ "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29",
"shasum": ""
},
"require": {
@@ -2037,18 +2085,18 @@
"MIT"
],
"authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
- },
{
"name": "Adam Engebretson",
"email": "adam@laravelcollective.com"
+ },
+ {
+ "name": "Taylor Otwell",
+ "email": "taylorotwell@gmail.com"
}
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "https://laravelcollective.com",
- "time": "2019-03-01T22:53:41+00:00"
+ "time": "2019-09-05T12:32:25+00:00"
},
{
"name": "lcobucci/jwt",
@@ -2094,8 +2142,8 @@
"authors": [
{
"name": "Luís Otávio Cobucci Oblonczyk",
- "role": "Developer",
- "email": "lcobucci@gmail.com"
+ "email": "lcobucci@gmail.com",
+ "role": "Developer"
}
],
"description": "A simple library to work with JSON Web Token and JSON Web Signature",
@@ -2349,15 +2397,15 @@
"authors": [
{
"name": "Alex Bilbie",
- "role": "Developer",
"email": "hello@alexbilbie.com",
- "homepage": "http://www.alexbilbie.com"
+ "homepage": "http://www.alexbilbie.com",
+ "role": "Developer"
},
{
"name": "Andy Millington",
- "role": "Developer",
"email": "andrew@noexceptions.io",
- "homepage": "https://www.noexceptions.io"
+ "homepage": "https://www.noexceptions.io",
+ "role": "Developer"
}
],
"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
@@ -2381,16 +2429,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.24.0",
+ "version": "1.25.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
+ "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
- "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+ "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
"shasum": ""
},
"require": {
@@ -2455,20 +2503,20 @@
"logging",
"psr-3"
],
- "time": "2018-11-05T09:00:11+00:00"
+ "time": "2019-09-06T13:49:17+00:00"
},
{
"name": "nesbot/carbon",
- "version": "2.23.1",
+ "version": "2.24.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "767617a047e5b8b8b3b0b6023a2650847ed7df02"
+ "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/767617a047e5b8b8b3b0b6023a2650847ed7df02",
- "reference": "767617a047e5b8b8b3b0b6023a2650847ed7df02",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29",
+ "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29",
"shasum": ""
},
"require": {
@@ -2522,20 +2570,20 @@
"datetime",
"time"
],
- "time": "2019-08-17T13:57:34+00:00"
+ "time": "2019-08-31T16:37:55+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.2.3",
+ "version": "v4.2.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "e612609022e935f3d0337c1295176505b41188c8"
+ "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8",
- "reference": "e612609022e935f3d0337c1295176505b41188c8",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4",
+ "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4",
"shasum": ""
},
"require": {
@@ -2573,20 +2621,20 @@
"parser",
"php"
],
- "time": "2019-08-12T20:17:41+00:00"
+ "time": "2019-09-01T07:51:21+00:00"
},
{
"name": "opis/closure",
- "version": "3.3.1",
+ "version": "3.4.0",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722"
+ "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
- "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
+ "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
+ "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
"shasum": ""
},
"require": {
@@ -2634,7 +2682,7 @@
"serialization",
"serialize"
],
- "time": "2019-07-09T21:58:11+00:00"
+ "time": "2019-09-02T21:07:33+00:00"
},
{
"name": "paragonie/random_compat",
@@ -2733,16 +2781,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.21",
+ "version": "2.0.23",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d"
+ "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d",
- "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
+ "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
"shasum": ""
},
"require": {
@@ -2776,28 +2824,28 @@
"authors": [
{
"name": "Jim Wigginton",
- "role": "Lead Developer",
- "email": "terrafrost@php.net"
+ "email": "terrafrost@php.net",
+ "role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
- "role": "Developer",
- "email": "pm@datasphere.ch"
+ "email": "pm@datasphere.ch",
+ "role": "Developer"
},
{
"name": "Andreas Fischer",
- "role": "Developer",
- "email": "bantu@phpbb.com"
+ "email": "bantu@phpbb.com",
+ "role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
- "role": "Developer",
- "email": "petrich@tronic-media.com"
+ "email": "petrich@tronic-media.com",
+ "role": "Developer"
},
{
"name": "Graham Campbell",
- "role": "Developer",
- "email": "graham@alt-three.com"
+ "email": "graham@alt-three.com",
+ "role": "Developer"
}
],
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
@@ -2821,7 +2869,7 @@
"x.509",
"x509"
],
- "time": "2019-07-12T12:53:49+00:00"
+ "time": "2019-09-17T03:41:22+00:00"
},
{
"name": "psr/container",
@@ -3267,24 +3315,24 @@
},
{
"name": "spatie/laravel-cors",
- "version": "1.5.2",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-cors.git",
- "reference": "8f822676376bac76dd791d13252062e3bcc22a43"
+ "reference": "d74099d57821d5a72ae21416c0be0dcd58779355"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-cors/zipball/8f822676376bac76dd791d13252062e3bcc22a43",
- "reference": "8f822676376bac76dd791d13252062e3bcc22a43",
+ "url": "https://api.github.com/repos/spatie/laravel-cors/zipball/d74099d57821d5a72ae21416c0be0dcd58779355",
+ "reference": "d74099d57821d5a72ae21416c0be0dcd58779355",
"shasum": ""
},
"require": {
- "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
+ "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
"php": "^7.2"
},
"require-dev": {
- "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*",
+ "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*|^4.0",
"phpunit/phpunit": "^8.0"
},
"type": "library",
@@ -3307,9 +3355,9 @@
"authors": [
{
"name": "Freek Van der Herten",
- "role": "Developer",
"email": "freek@spatie.be",
- "homepage": "https://spatie.be"
+ "homepage": "https://spatie.be",
+ "role": "Developer"
}
],
"description": "Send CORS headers in a Laravel or Lumen application",
@@ -3322,7 +3370,7 @@
"request",
"spatie"
],
- "time": "2019-07-19T13:46:27+00:00"
+ "time": "2019-09-04T06:55:15+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -4800,8 +4848,8 @@
"authors": [
{
"name": "Tijs Verkoyen",
- "role": "Developer",
- "email": "css_to_inline_styles@verkoyen.eu"
+ "email": "css_to_inline_styles@verkoyen.eu",
+ "role": "Developer"
}
],
"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.",
@@ -4941,24 +4989,24 @@
},
{
"name": "yajra/laravel-datatables-oracle",
- "version": "v9.4.1",
+ "version": "v9.6.1",
"source": {
"type": "git",
"url": "https://github.com/yajra/laravel-datatables.git",
- "reference": "ac37f93026b6b607d1bb56789d147a4efd8d97d9"
+ "reference": "42cba7ffae2e7b41981dacf7257c681f00aee1a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/ac37f93026b6b607d1bb56789d147a4efd8d97d9",
- "reference": "ac37f93026b6b607d1bb56789d147a4efd8d97d9",
+ "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/42cba7ffae2e7b41981dacf7257c681f00aee1a5",
+ "reference": "42cba7ffae2e7b41981dacf7257c681f00aee1a5",
"shasum": ""
},
"require": {
- "illuminate/database": "5.8.*",
- "illuminate/filesystem": "5.8.*",
- "illuminate/http": "5.8.*",
- "illuminate/support": "5.8.*",
- "illuminate/view": "5.8.*",
+ "illuminate/database": "5.8.*|^6.0",
+ "illuminate/filesystem": "5.8.*|^6.0",
+ "illuminate/http": "5.8.*|^6.0",
+ "illuminate/support": "5.8.*|^6.0",
+ "illuminate/view": "5.8.*|^6.0",
"php": "^7.1.3"
},
"require-dev": {
@@ -5008,7 +5056,7 @@
"jquery",
"laravel"
],
- "time": "2019-06-12T05:06:59+00:00"
+ "time": "2019-09-26T08:35:02+00:00"
},
{
"name": "zendframework/zend-diactoros",
@@ -5125,16 +5173,16 @@
},
{
"name": "bvipul/generator",
- "version": "v5.8.1",
+ "version": "v5.8.2",
"source": {
"type": "git",
"url": "https://github.com/bvipul/generator.git",
- "reference": "e30162b230a90392e1f41c826f0643b984a993e5"
+ "reference": "10df87f87965de6b6f9d18a084b2d2abe075a2a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bvipul/generator/zipball/e30162b230a90392e1f41c826f0643b984a993e5",
- "reference": "e30162b230a90392e1f41c826f0643b984a993e5",
+ "url": "https://api.github.com/repos/bvipul/generator/zipball/10df87f87965de6b6f9d18a084b2d2abe075a2a9",
+ "reference": "10df87f87965de6b6f9d18a084b2d2abe075a2a9",
"shasum": ""
},
"type": "package",
@@ -5154,7 +5202,7 @@
}
],
"description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.",
- "time": "2019-04-02T08:15:31+00:00"
+ "time": "2019-08-31T16:00:50+00:00"
},
{
"name": "codedungeon/php-cli-colors",
@@ -5466,8 +5514,8 @@
"authors": [
{
"name": "Filipe Dobreira",
- "role": "Developer",
- "homepage": "https://github.com/filp"
+ "homepage": "https://github.com/filp",
+ "role": "Developer"
}
],
"description": "php error handling for cool kids",
@@ -5484,16 +5532,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.15.2",
+ "version": "v2.15.3",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "c9d30fddfa3feb8b82663104864224f2ce7a3675"
+ "reference": "705490b0f282f21017d73561e9498d2b622ee34c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c9d30fddfa3feb8b82663104864224f2ce7a3675",
- "reference": "c9d30fddfa3feb8b82663104864224f2ce7a3675",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/705490b0f282f21017d73561e9498d2b622ee34c",
+ "reference": "705490b0f282f21017d73561e9498d2b622ee34c",
"shasum": ""
},
"require": {
@@ -5523,9 +5571,10 @@
"php-cs-fixer/accessible-object": "^1.0",
"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",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
"phpunitgoodpractices/traits": "^1.8",
- "symfony/phpunit-bridge": "^4.3"
+ "symfony/phpunit-bridge": "^4.3",
+ "symfony/yaml": "^3.0 || ^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@@ -5568,7 +5617,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2019-08-27T16:03:01+00:00"
+ "time": "2019-08-31T12:51:54+00:00"
},
{
"name": "fzaninotto/faker",
@@ -5706,8 +5755,8 @@
"authors": [
{
"name": "Hassan Khan",
- "role": "Developer",
- "homepage": "http://hassankhan.me/"
+ "homepage": "http://hassankhan.me/",
+ "role": "Developer"
}
],
"description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
@@ -5727,32 +5776,32 @@
},
{
"name": "laravel/telescope",
- "version": "v2.0.6",
+ "version": "v2.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/telescope.git",
- "reference": "61b415ea2401fe659ee35fa809908628aa08bf07"
+ "reference": "d9c5c53d3a0c60dcd4ef3777884d0cf368eb3e6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/telescope/zipball/61b415ea2401fe659ee35fa809908628aa08bf07",
- "reference": "61b415ea2401fe659ee35fa809908628aa08bf07",
+ "url": "https://api.github.com/repos/laravel/telescope/zipball/d9c5c53d3a0c60dcd4ef3777884d0cf368eb3e6f",
+ "reference": "d9c5c53d3a0c60dcd4ef3777884d0cf368eb3e6f",
"shasum": ""
},
"require": {
"ext-json": "*",
- "laravel/framework": "~5.8.0|~5.9.0",
+ "laravel/framework": "~5.8.0|^6.0|^7.0",
"moontoast/math": "^1.1",
"php": "^7.1.3",
"symfony/var-dumper": "^4.1"
},
"require-dev": {
- "orchestra/testbench": "~3.7"
+ "orchestra/testbench": "^3.8|^4.0|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "2.0-dev"
},
"laravel": {
"providers": [
@@ -5785,7 +5834,7 @@
"laravel",
"monitoring"
],
- "time": "2019-07-12T06:52:24+00:00"
+ "time": "2019-08-30T11:58:27+00:00"
},
{
"name": "mockery/mockery",
@@ -5987,18 +6036,18 @@
"authors": [
{
"name": "Arne Blankerts",
- "role": "Developer",
- "email": "arne@blankerts.de"
+ "email": "arne@blankerts.de",
+ "role": "Developer"
},
{
"name": "Sebastian Heuer",
- "role": "Developer",
- "email": "sebastian@phpeople.de"
+ "email": "sebastian@phpeople.de",
+ "role": "Developer"
},
{
"name": "Sebastian Bergmann",
- "role": "Developer",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "Developer"
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
@@ -6034,18 +6083,18 @@
"authors": [
{
"name": "Arne Blankerts",
- "role": "Developer",
- "email": "arne@blankerts.de"
+ "email": "arne@blankerts.de",
+ "role": "Developer"
},
{
"name": "Sebastian Heuer",
- "role": "Developer",
- "email": "sebastian@phpeople.de"
+ "email": "sebastian@phpeople.de",
+ "role": "Developer"
},
{
"name": "Sebastian Bergmann",
- "role": "Developer",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "Developer"
}
],
"description": "Library for handling version information and constraints",
@@ -6104,35 +6153,33 @@
},
{
"name": "phpdocumentor/reflection-common",
- "version": "1.0.1",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+ "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
- "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+ "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": ">=7.1"
},
"require-dev": {
- "phpunit/phpunit": "^4.6"
+ "phpunit/phpunit": "~6"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.x-dev"
}
},
"autoload": {
"psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src"
- ]
+ "phpDocumentor\\Reflection\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -6154,30 +6201,30 @@
"reflection",
"static analysis"
],
- "time": "2017-09-11T18:02:19+00:00"
+ "time": "2018-08-07T13:53:10+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "4.3.1",
+ "version": "4.3.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
+ "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
- "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+ "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"shasum": ""
},
"require": {
"php": "^7.0",
- "phpdocumentor/reflection-common": "^1.0.0",
- "phpdocumentor/type-resolver": "^0.4.0",
+ "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+ "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
- "doctrine/instantiator": "~1.0.5",
+ "doctrine/instantiator": "^1.0.5",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.4"
},
@@ -6205,41 +6252,40 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2019-04-30T17:48:53+00:00"
+ "time": "2019-09-12T14:27:41+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.4.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+ "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+ "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
- "phpdocumentor/reflection-common": "^1.0"
+ "php": "^7.1",
+ "phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "mockery/mockery": "^0.9.4",
- "phpunit/phpunit": "^5.2||^4.8.24"
+ "ext-tokenizer": "^7.1",
+ "mockery/mockery": "~1",
+ "phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src/"
- ]
+ "phpDocumentor\\Reflection\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -6252,7 +6298,8 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2017-07-14T14:27:02+00:00"
+ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+ "time": "2019-08-22T18:11:29+00:00"
},
{
"name": "phpspec/prophecy",
@@ -6367,8 +6414,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -6418,8 +6465,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
@@ -6460,8 +6507,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Simple template engine.",
@@ -6509,8 +6556,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Utility class for timing",
@@ -6571,16 +6618,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "8.3.4",
+ "version": "8.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36"
+ "reference": "302faed7059fde575cf3403a78c730c5e3a62750"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
- "reference": "e31cce0cf4499c0ccdbbb211a3280d36ab341e36",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/302faed7059fde575cf3403a78c730c5e3a62750",
+ "reference": "302faed7059fde575cf3403a78c730c5e3a62750",
"shasum": ""
},
"require": {
@@ -6603,7 +6650,7 @@
"sebastian/comparator": "^3.0.2",
"sebastian/diff": "^3.0.2",
"sebastian/environment": "^4.2.2",
- "sebastian/exporter": "^3.1.0",
+ "sebastian/exporter": "^3.1.1",
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
@@ -6639,8 +6686,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "The PHP Unit Testing framework.",
@@ -6650,7 +6697,7 @@
"testing",
"xunit"
],
- "time": "2019-08-11T06:56:55+00:00"
+ "time": "2019-09-14T09:12:03+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -6872,16 +6919,16 @@
},
{
"name": "sebastian/exporter",
- "version": "3.1.1",
+ "version": "3.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
+ "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
- "reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
+ "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
"shasum": ""
},
"require": {
@@ -6935,7 +6982,7 @@
"export",
"exporter"
],
- "time": "2019-08-11T12:43:14+00:00"
+ "time": "2019-09-14T09:02:43+00:00"
},
{
"name": "sebastian/global-state",
@@ -7216,8 +7263,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Collection of value objects that represent the types of the PHP type system",
@@ -7259,8 +7306,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
@@ -7482,16 +7529,16 @@
},
{
"name": "symfony/yaml",
- "version": "v4.3.3",
+ "version": "v4.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6"
+ "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/34d29c2acd1ad65688f58452fd48a46bd996d5a6",
- "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
+ "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
"shasum": ""
},
"require": {
@@ -7537,7 +7584,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-07-24T14:47:54+00:00"
+ "time": "2019-08-20T14:27:59+00:00"
},
{
"name": "theseer/tokenizer",
@@ -7581,16 +7628,16 @@
},
{
"name": "webmozart/assert",
- "version": "1.4.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+ "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
- "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
+ "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
"shasum": ""
},
"require": {
@@ -7598,8 +7645,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1"
+ "phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
"extra": {
@@ -7628,7 +7674,7 @@
"check",
"validate"
],
- "time": "2018-12-25T11:19:39+00:00"
+ "time": "2019-08-24T08:43:50+00:00"
}
],
"aliases": [],
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
deleted file mode 100644
index 24793412..00000000
--- a/deploy/Dockerfile
+++ /dev/null
@@ -1,104 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update \
- && apt-get install -qy language-pack-en-base \
- && locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-
-RUN apt-get -y install apache2
-RUN a2enmod headers
-RUN a2enmod rewrite
-
-
-# add PPA for PHP 7
-RUN apt-get install -y --no-install-recommends apt-utils
-RUN apt update
-RUN apt -y dist-upgrade
-
-RUN apt remove --purge ca-certificates
-RUN apt autoremove
-RUN apt install ca-certificates
-
-RUN apt-get install -y software-properties-common python-software-properties
-RUN add-apt-repository -y ppa:ondrej/php
-
-
-# Adding php 7
-RUN apt-get update
-RUN apt-get install -y php7.1 php7.1-fpm php7.1-cli php7.1-common php7.1-mbstring php7.1-gd php7.1-intl php7.1-xml php7.1-mysql php7.1-mcrypt php7.1-zip
-RUN apt-get -y install libapache2-mod-php7.1 php7.1 php7.1-cli php-xdebug php7.1-mbstring sqlite3 php7.1-mysql php-imagick php-memcached php-pear curl imagemagick php7.1-dev php7.1-phpdbg php7.1-gd npm nodejs-legacy php7.1-json php7.1-curl php7.1-sqlite3 php7.1-intl apache2 vim git-core wget libsasl2-dev libssl-dev
-
-RUN apt-get -y install libsslcommon2-dev libcurl4-openssl-dev autoconf g++ make openssl libssl-dev libcurl4-openssl-dev pkg-config libsasl2-dev libpcre3-dev
-
-RUN apt-get install -y imagemagick graphicsmagick
-RUN a2enmod headers
-RUN a2enmod rewrite
-
-
-ENV APACHE_RUN_USER www-data
-ENV APACHE_RUN_GROUP www-data
-ENV APACHE_LOG_DIR /var/log/apache2
-ENV APACHE_PID_FILE /var/run/apache2.pid
-ENV APACHE_RUN_DIR /var/run/apache2
-ENV APACHE_LOCK_DIR /var/lock/apache2
-RUN ln -sf /dev/stdout /var/log/apache2/access.log && \
- ln -sf /dev/stderr /var/log/apache2/error.log
-RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
-
-
-# Update application repository list and install the Redis server.
-#RUN apt-get update && apt-get install -y redis-server
-
-
-
-
-# Allow Composer to be run as root
-ENV COMPOSER_ALLOW_SUPERUSER 1
-
-# Setup the Composer installer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
- && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \
- && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \
- && php /tmp/composer-setup.php \
- && chmod a+x composer.phar \
- && mv composer.phar /usr/local/bin/composer
-
-# Install composer dependencies
-RUN echo pwd: `pwd` && echo ls: `ls`
-
-
-
-# RUN composer install
-
-
-EXPOSE 80
-
-# Expose default port
-#EXPOSE 6379
-
-
-
-VOLUME [ "/var/www/html" ,"/etc/mysql"]
-WORKDIR /var/www/html
-
-
-ENTRYPOINT [ "/usr/sbin/apache2" ]
-CMD ["-D", "FOREGROUND"]
-
-COPY . /var/www/html
-COPY ./deploy/vhost.conf /etc/apache2/sites-available/000-default.conf
-
-
-RUN chown -R www-data:www-data /var/www/html \
- && a2enmod rewrite
-
-RUN chown -R 777 /var/www/html/
-
-RUN composer install
-
-#RUN php artisan vendor:publish --provider="Tymon\JWTAuth\Providers\LaravelServiceProvider"
-
-
-
-
diff --git a/deploy/vhost.conf b/deploy/vhost.conf
deleted file mode 100644
index 8c1b296a..00000000
--- a/deploy/vhost.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-
- DocumentRoot /var/www/html/public
-
-
- AllowOverride all
- Require all granted
-
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index b8438add..2ddc97f4 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,54 +1,51 @@
-version: '3'
+version: "3"
+
services:
app:
- image: inshastri/laravel-adminpanel:latest
+ image: lap-www
+ container_name: lap-www
+ build:
+ context: ./docker/app
+ dockerfile: Dockerfile
+ restart: always
ports:
- 80:80
- - 8080:8080
- links:
- - mysql
- - redis
- environment:
- DB_HOST: mysql
- DB_DATABASE: laravel_docker
- DB_USERNAME: root
- DB_PASSWORD: toor
- REDIS_HOST: redis
- SESSION_DRIVER: redis
- CACHE_DRIVER: redis
- networks:
- - testservice_bridge2
- mysql:
- image: mysql:5
volumes:
- - ./data:/var/lib/mysql
- ports:
- - 3306:3306
+ - .:/var/www/html/
+ mysql:
+ container_name: lap-mysql
+ image: mysql:5.7
restart: always
+ ports:
+ - 13306:3306
+ volumes:
+ - mysql:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD: toor
- MYSQL_DATABASE: laravel_docker
- networks:
- - testservice_bridge2
+ MYSQL_DATABASE: laravel-admin-panel
+ MYSQL_ROOT_PASSWORD: root
+ MYSQL_USER: admin
+ MYSQL_PASSWORD: admin
redis:
- image: redis:4.0-alpine
+ container_name: lap-redis
+ image: redis:4-alpine
+ restart: always
ports:
- - 6379:6379
- networks:
- - testservice_bridge2
+ - 16379:6379
+ volumes:
+ - redis:/data
phpmyadmin:
+ container_name: lap-phpmyadmin
image: phpmyadmin/phpmyadmin
+ restart: always
+ ports:
+ - 8081:80
+ links:
+ - mysql
environment:
- PMA_PORT: 3306
PMA_HOST: mysql
- PMA_USER: root
- PMA_PASSWORD: toor
- ports:
- - "8005:80"
- restart: always
- depends_on:
- - mysql
- networks:
- - testservice_bridge2
-networks:
- testservice_bridge2:
+
+volumes:
+ mysql:
+ driver: "local"
+ redis:
+ driver: "local"
\ No newline at end of file
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
new file mode 100644
index 00000000..71086273
--- /dev/null
+++ b/docker/app/Dockerfile
@@ -0,0 +1,77 @@
+FROM php:7.2-apache-stretch
+
+ENV LARAVEL_VERSION 5.8
+ENV INSTALL_DIR /var/www/html
+ENV COMPOSER_HOME /var/www/.composer/
+
+# Install common tools and libraries
+RUN apt-get update && apt-get install -y \
+ cron \
+ git \
+ gzip \
+ libfreetype6-dev \
+ libicu-dev \
+ libjpeg62-turbo-dev \
+ libmcrypt-dev \
+ libpng-dev \
+ libxslt1-dev \
+ libmagickwand-dev \
+ lsof \
+ mysql-client \
+ vim \
+ zip \
+ unzip \
+ curl \
+ openssl \
+ libssl-dev \
+ libcurl4-openssl-dev
+
+RUN pecl install imagick-3.4.3
+
+# http://devdocs.magento.com/guides/v2.0/install-gde/system-requirements.html
+RUN docker-php-ext-install bcmath \
+ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+ && docker-php-ext-install gd \
+ && docker-php-ext-install intl \
+ && docker-php-ext-install mbstring \
+ && docker-php-ext-install opcache \
+ && docker-php-ext-install pdo_mysql \
+ && docker-php-ext-install zip \
+ && docker-php-ext-install xml \
+ && docker-php-ext-install ctype \
+ && docker-php-ext-install json \
+ && docker-php-ext-enable imagick \
+ && docker-php-ext-install bz2 \
+ && docker-php-ext-install exif
+
+# Install Node, Npm
+RUN apt-get install -y gnupg \
+ && curl -sL https://deb.nodesource.com/setup_11.x | bash - \
+ && apt-get install -y nodejs \
+ && mkdir /var/www/.config /var/www/.npm
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Make sure the volume mount point is empty
+RUN rm -rf /var/www/html/*
+
+# Set www-data as owner for /var/www
+RUN chown -R www-data:www-data /var/www/
+RUN chmod -R g+w /var/www/
+
+# add apache modules and configuration
+RUN a2enmod rewrite \
+ && a2enmod headers \
+ && a2enmod expires \
+ && echo "memory_limit=2048M" > /usr/local/etc/php/conf.d/memory-limit.ini
+
+# Remove unnecssary modules
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# copy project files
+COPY . /var/www/html
+COPY vhost.conf /etc/apache2/sites-available/000-default.conf
+
+
+WORKDIR $INSTALL_DIR
diff --git a/docker/app/vhost.conf b/docker/app/vhost.conf
new file mode 100644
index 00000000..d19a054e
--- /dev/null
+++ b/docker/app/vhost.conf
@@ -0,0 +1,13 @@
+
+ DocumentRoot /var/www/html/public
+
+
+ AllowOverride All
+ Require all granted
+
+
+ ErrorLog /var/www/html/error.log
+ CustomLog /var/www/html/access.log combined
+
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker/bash b/docker/bash
new file mode 100644
index 00000000..7c9baf46
--- /dev/null
+++ b/docker/bash
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker/cli bash
diff --git a/docker/cli b/docker/cli
new file mode 100644
index 00000000..49705665
--- /dev/null
+++ b/docker/cli
@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker-compose exec app "$@"
diff --git a/docker/clinotty b/docker/clinotty
new file mode 100644
index 00000000..69a8cba8
--- /dev/null
+++ b/docker/clinotty
@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker-compose exec -T app "$@"
diff --git a/docker/composer b/docker/composer
new file mode 100644
index 00000000..ed68efe1
--- /dev/null
+++ b/docker/composer
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker/cli composer "$@"
diff --git a/docker/copyfromcontainer b/docker/copyfromcontainer
new file mode 100644
index 00000000..e37ab84e
--- /dev/null
+++ b/docker/copyfromcontainer
@@ -0,0 +1,10 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
+
+if [ "$1" == "--all" ]; then
+ docker cp $(docker-compose ps -q app|awk '{print $1}'):/var/www/html/./ src/
+ echo "Completed copying all files from container to host"
+else
+ docker cp $(docker-compose ps -q app|awk '{print $1}'):/var/www/html/$1 src/
+ echo "Completed copying $1 from container to host"
+fi
diff --git a/docker/copytocontainer b/docker/copytocontainer
new file mode 100644
index 00000000..12491e30
--- /dev/null
+++ b/docker/copytocontainer
@@ -0,0 +1,12 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a directory or file to copy to container (ex. vendor, --all)" && exit
+
+if [ "$1" == "--all" ]; then
+ docker cp src/./ $(docker-compose ps -q app|awk '{print $1}'):/var/www/html/
+ echo "Completed copying all files from host to container"
+else
+ docker cp src/$1 $(docker-compose ps -q app|awk '{print $1}'):/var/www/html/
+ echo "Completed copying $1 from host to container"
+fi
+
+docker/fixowns
diff --git a/docker/fixowns b/docker/fixowns
new file mode 100644
index 00000000..d7dd2c0b
--- /dev/null
+++ b/docker/fixowns
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "Correcting filesystem ownerships..."
+docker/rootnotty chown -R www-data:www-data /var/www/
diff --git a/docker/fixperms b/docker/fixperms
new file mode 100644
index 00000000..822d04be
--- /dev/null
+++ b/docker/fixperms
@@ -0,0 +1,8 @@
+#!/bin/bash
+echo "Correcting filesystem permissions..."
+
+docker/clinotty find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
+docker/clinotty find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
+docker/clinotty chmod u+x docker/magento
+
+echo "Filesystem permissions corrected."
diff --git a/docker/grunt b/docker/grunt
new file mode 100644
index 00000000..7c71d02f
--- /dev/null
+++ b/docker/grunt
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker/cli node_modules/grunt/bin/grunt "$@"
diff --git a/docker/node b/docker/node
new file mode 100644
index 00000000..1f2c4417
--- /dev/null
+++ b/docker/node
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker/cli node "$@"
diff --git a/docker/npm b/docker/npm
new file mode 100644
index 00000000..5f054d0a
--- /dev/null
+++ b/docker/npm
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker/cli npm "$@"
diff --git a/docker/restart b/docker/restart
new file mode 100644
index 00000000..9f394793
--- /dev/null
+++ b/docker/restart
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker/stop
+docker/start
diff --git a/docker/rootnotty b/docker/rootnotty
new file mode 100644
index 00000000..696952d8
--- /dev/null
+++ b/docker/rootnotty
@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker-compose exec -u root -T app "$@"
diff --git a/docker/start b/docker/start
new file mode 100644
index 00000000..535ab9d4
--- /dev/null
+++ b/docker/start
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose -f docker-compose.yml up -d
diff --git a/docker/stop b/docker/stop
new file mode 100644
index 00000000..9f1de4dc
--- /dev/null
+++ b/docker/stop
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose stop
diff --git a/package-lock.json b/package-lock.json
index 22a4b370..75ab1ea4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -939,9 +939,9 @@
"dev": true
},
"@types/node": {
- "version": "12.7.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz",
- "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==",
+ "version": "12.7.4",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.4.tgz",
+ "integrity": "sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ==",
"dev": true
},
"@types/q": {
@@ -1298,9 +1298,9 @@
}
},
"anymatch": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz",
- "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz",
+ "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==",
"requires": {
"normalize-path": "^3.0.0",
"picomatch": "^2.0.4"
@@ -2015,11 +2015,11 @@
"dev": true
},
"chokidar": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz",
- "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz",
+ "integrity": "sha512-df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==",
"requires": {
- "anymatch": "^3.0.1",
+ "anymatch": "^3.1.0",
"braces": "^3.0.2",
"fsevents": "^2.0.6",
"glob-parent": "^5.0.0",
@@ -2161,6 +2161,12 @@
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true
},
+ "collect.js": {
+ "version": "4.16.6",
+ "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.16.6.tgz",
+ "integrity": "sha512-Y0mR+JAWmUmA7HOByjdtc4dnQF/PRl4ap3jpG7RpC5vJjMmjDxBC8SFtp0s0vcRKoY+9WhJG0HUk1H2ze0Ao7A==",
+ "dev": true
+ },
"collection-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2461,13 +2467,12 @@
}
},
"cross-env": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
- "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz",
+ "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==",
"dev": true,
"requires": {
- "cross-spawn": "^6.0.5",
- "is-windows": "^1.0.0"
+ "cross-spawn": "^6.0.5"
}
},
"cross-spawn": {
@@ -2785,9 +2790,9 @@
}
},
"cyclist": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
- "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
"dev": true
},
"d": {
@@ -2851,10 +2856,18 @@
"dev": true
},
"deep-equal": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
- "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
- "dev": true
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
+ "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
+ "dev": true,
+ "requires": {
+ "is-arguments": "^1.0.4",
+ "is-date-object": "^1.0.1",
+ "is-regex": "^1.0.4",
+ "object-is": "^1.0.1",
+ "object-keys": "^1.1.1",
+ "regexp.prototype.flags": "^1.2.0"
+ }
},
"deepmerge": {
"version": "2.2.1",
@@ -3126,9 +3139,9 @@
"dev": true
},
"elliptic": {
- "version": "6.5.0",
- "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
- "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+ "version": "6.5.1",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+ "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
"dev": true,
"requires": {
"bn.js": "^4.4.0",
@@ -3946,9 +3959,9 @@
}
},
"glob-parent": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
- "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+ "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
"requires": {
"is-glob": "^4.0.1"
}
@@ -4584,6 +4597,12 @@
}
}
},
+ "is-arguments": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+ "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+ "dev": true
+ },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4918,9 +4937,9 @@
"dev": true
},
"laravel-mix": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-4.1.2.tgz",
- "integrity": "sha512-nA+JME+59hWI5u+r3VfPfmpUj8CxlNmNsvslBOUtUwRc1K2Wq55uAPUtTLgAp7n5JngF3O7qFN3LcTCVO/SpZQ==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-4.1.4.tgz",
+ "integrity": "sha512-fpFNpPyYAdeZ5mozlKbHpw+tCiRFUCCdSsK/D2+yYhlyIEbzPcAe4ar5cjeT33TnDNiKXSS42cB58yUSW5Y5tg==",
"dev": true,
"requires": {
"@babel/core": "^7.2.0",
@@ -4934,6 +4953,7 @@
"babel-merge": "^2.0.1",
"chokidar": "^2.0.3",
"clean-css": "^4.1.3",
+ "collect.js": "^4.12.8",
"concatenate": "0.0.2",
"css-loader": "^1.0.1",
"dotenv": "^6.2.0",
@@ -4946,7 +4966,7 @@
"html-loader": "^0.5.5",
"imagemin": "^6.0.0",
"img-loader": "^3.0.0",
- "lodash": "^4.17.5",
+ "lodash": "^4.17.15",
"md5": "^2.2.1",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"postcss-loader": "^3.0.0",
@@ -5761,9 +5781,9 @@
"dev": true
},
"loglevel": {
- "version": "1.6.3",
- "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
- "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
+ "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==",
"dev": true
},
"loose-envify": {
@@ -6427,6 +6447,12 @@
}
}
},
+ "object-is": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+ "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+ "dev": true
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -6645,12 +6671,12 @@
"dev": true
},
"parallel-transform": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
- "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
"dev": true,
"requires": {
- "cyclist": "~0.2.2",
+ "cyclist": "^1.0.1",
"inherits": "^2.0.3",
"readable-stream": "^2.1.5"
}
@@ -6825,9 +6851,9 @@
"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="
},
"portfinder": {
- "version": "1.0.23",
- "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz",
- "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==",
+ "version": "1.0.24",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
+ "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
"dev": true,
"requires": {
"async": "^1.5.2",
@@ -7795,11 +7821,20 @@
"dev": true
},
"regexp-tree": {
- "version": "0.1.11",
- "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
- "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==",
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.13.tgz",
+ "integrity": "sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==",
"dev": true
},
+ "regexp.prototype.flags": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
+ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2"
+ }
+ },
"regexpu-core": {
"version": "4.5.5",
"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz",
@@ -8120,9 +8155,9 @@
"dev": true
},
"sass": {
- "version": "1.22.10",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.10.tgz",
- "integrity": "sha512-DUpS1tVMGCH6gr/N9cXCoemrjoNdOLhAHfQ37fJw2A5ZM4gSI9ej/8Xi95Xwus03RqZ2zdSnKZGULL7oS+jfMA==",
+ "version": "1.22.12",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.12.tgz",
+ "integrity": "sha512-u5Rxn+dKTPCW5/11kMNxtmqKsxCjcpnqj9CaJoru1NqeJ0DOa9rOM00e0HqmseTAatGkKoLY+jaNecMYevu1gg==",
"requires": {
"chokidar": ">=2.0.0 <4.0.0"
}
@@ -8237,9 +8272,9 @@
}
},
"serialize-javascript": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz",
- "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==",
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+ "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
"dev": true
},
"serve-index": {
@@ -9027,9 +9062,9 @@
"dev": true
},
"terser": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz",
- "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.1.tgz",
+ "integrity": "sha512-cGbc5utAcX4a9+2GGVX4DsenG6v0x3glnDi5hx8816X1McEAwPlPgRtXPJzSBsbpILxZ8MQMT0KvArLuE0HP5A==",
"dev": true,
"requires": {
"commander": "^2.20.0",
@@ -9077,9 +9112,9 @@
"dev": true
},
"tinymce": {
- "version": "5.0.14",
- "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.0.14.tgz",
- "integrity": "sha512-dQai8m80HgcfZ7e+F4YJBr69+mQJSDNpZYJTAnGlGTBc5fKfu6R6G2tq/G9It//ylZ7H/e7yvBQ+WyZBPQCnkQ=="
+ "version": "5.0.16",
+ "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.0.16.tgz",
+ "integrity": "sha512-qXymNZmAR5fSp5Lp3mVMtHxpiTMvba7TV6wGFcyJP5eUGIhsPw+XkezjvWCFs7lrW+ti0YBBblJNzxG5/8ZtFg=="
},
"to-arraybuffer": {
"version": "1.0.1",
@@ -9346,9 +9381,9 @@
}
},
"upath": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
- "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
"dev": true
},
"upper-case": {
@@ -10264,9 +10299,9 @@
}
},
"webpack": {
- "version": "4.39.2",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz",
- "integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==",
+ "version": "4.39.3",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.3.tgz",
+ "integrity": "sha512-BXSI9M211JyCVc3JxHWDpze85CvjC842EvpRsVTc/d15YJGlox7GIDd38kJgWrb3ZluyvIjgenbLDMBQPDcxYQ==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
@@ -10308,9 +10343,9 @@
}
},
"webpack-cli": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.7.tgz",
- "integrity": "sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==",
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz",
+ "integrity": "sha512-RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==",
"dev": true,
"requires": {
"chalk": "2.4.2",
@@ -10383,13 +10418,14 @@
}
},
"webpack-dev-middleware": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
- "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz",
+ "integrity": "sha512-5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==",
"dev": true,
"requires": {
"memory-fs": "^0.4.1",
- "mime": "^2.4.2",
+ "mime": "^2.4.4",
+ "mkdirp": "^0.5.1",
"range-parser": "^1.2.1",
"webpack-log": "^2.0.0"
},
@@ -11218,12 +11254,12 @@
}
},
"webpack-merge": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
- "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+ "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
"dev": true,
"requires": {
- "lodash": "^4.17.5"
+ "lodash": "^4.17.15"
}
},
"webpack-notifier": {
diff --git a/package.json b/package.json
index 0f93d07f..2e1df28b 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,7 @@
"private": true,
"scripts": {
"dev": "npm run development",
- "build-client": "cross-env NODE_ENV=development webpack --mode=development --env build --config=client/webpack.config.js",
- "development": "npm run build-client && cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+ "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
@@ -13,10 +12,10 @@
"devDependencies": {
"axios": "^0.19.0",
"bootstrap-sass": ">=3.4.1",
- "cross-env": "^5.1",
+ "cross-env": "^5.2",
"font-awesome": "^4.7.0",
"jquery": "^3.4.1",
- "laravel-mix": "^4.1.2",
+ "laravel-mix": "^4.1.4",
"lodash": "^4.17.13",
"resolve-url-loader": "3.1.0",
"sass-loader": "^7.3.1",
@@ -32,8 +31,8 @@
"moment": "^2.24.0",
"nestable2": "^1.5.0",
"pluralize": "^8.0.0",
- "sass": "^1.22.10",
+ "sass": "^1.22.12",
"select2": "^4.0.10",
- "tinymce": "^5.0.14"
+ "tinymce": "^5.0.16"
}
}