diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index fe02e64..f5fd4ca 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
-use Illuminate\Http\Request;
class LoginController extends Controller
{
@@ -38,14 +37,14 @@ class LoginController extends Controller
$this->middleware('guest', ['except' => 'logout']);
}
- public function logout(Request $request)
- {
- $this->guard()->logout();
+ // public function logout(Request $request)
+ // {
+ // $this->guard()->logout();
- $request->session()->flush();
+ // $request->session()->flush();
- $request->session()->regenerate();
+ // $request->session()->regenerate();
- return redirect('/');
- }
+ // return redirect('/');
+ // }
}
diff --git a/composer.json b/composer.json
index 70e80f6..aa78148 100755
--- a/composer.json
+++ b/composer.json
@@ -13,15 +13,16 @@
"davejamesmiller/laravel-breadcrumbs": "5.x",
"felixkiss/uniquewith-validator": "^3.1",
"fideloper/proxy": "^4.0",
- "laravel/framework": "5.6.*",
+ "laravel/framework": "^5.8.0",
"laravel/tinker": "^1.0",
"laravelcollective/html": "^5.6",
"mcamara/laravel-localization": "^1.3",
"solarium/solarium": "^3.8",
- "yajra/laravel-datatables-oracle": "^8.8",
+ "yajra/laravel-datatables-oracle": "^9.0",
"zizaco/entrust": "^1.9"
},
"require-dev": {
+ "composer/composer": "^1.9",
"fzaninotto/faker": "^1.8",
"phpunit/phpunit": "^7.0",
"squizlabs/php_codesniffer": "^3.4"
@@ -39,23 +40,22 @@
}
},
"autoload-dev": {
- "classmap": [
- "tests/TestCase.php"
- ]
+ "psr-4": {
+ "Tests\\": "tests/"
+ }
},
"scripts": {
"post-install-cmd": [
- "php artisan clear-compiled",
- "php artisan optimize"
- ],
+ "@php artisan clear-compiled"
+ ],
"post-create-project-cmd": [
"php -r \"copy('.env.example', '.env');\"",
- "php artisan key:generate"
+ "@php artisan key:generate --ansi"
],
"post-autoload-dump": [
- "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
- "@php artisan package:discover"
- ]
+ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+ "@php artisan package:discover --ansi"
+ ]
},
"config": {
"preferred-install": "dist",
diff --git a/composer.lock b/composer.lock
index 3841ad9..d4c8166 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "7732d767538d35502d7af9f65094f386",
+ "content-hash": "bf5915ebe687455a34b3e969ec0b94c1",
"packages": [
{
"name": "astrotomic/laravel-translatable",
@@ -72,16 +72,16 @@
},
{
"name": "davejamesmiller/laravel-breadcrumbs",
- "version": "5.3.0",
+ "version": "5.3.1",
"source": {
"type": "git",
"url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
- "reference": "1edeee4a77f467293aa5e5ea4a0b8f010216b8da"
+ "reference": "40a73bc9b32fbbee18938dc92228dea161365245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/1edeee4a77f467293aa5e5ea4a0b8f010216b8da",
- "reference": "1edeee4a77f467293aa5e5ea4a0b8f010216b8da",
+ "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/40a73bc9b32fbbee18938dc92228dea161365245",
+ "reference": "40a73bc9b32fbbee18938dc92228dea161365245",
"shasum": ""
},
"require": {
@@ -127,7 +127,7 @@
"keywords": [
"laravel"
],
- "time": "2019-09-03T15:24:57+00:00"
+ "time": "2019-10-20T18:25:39+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -688,89 +688,47 @@
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
- {
- "name": "kylekatarnls/update-helper",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/kylekatarnls/update-helper.git",
- "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e",
- "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.1.0 || ^2.0.0",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "codeclimate/php-test-reporter": "dev-master",
- "composer/composer": "2.0.x-dev || ^2.0.0-dev",
- "phpunit/phpunit": ">=4.8.35 <6.0"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "UpdateHelper\\ComposerPlugin"
- },
- "autoload": {
- "psr-0": {
- "UpdateHelper\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kyle",
- "email": "kylekatarnls@gmail.com"
- }
- ],
- "description": "Update helper",
- "time": "2019-07-29T11:03:54+00:00"
- },
{
"name": "laravel/framework",
- "version": "v5.6.39",
+ "version": "v5.8.35",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "37bb306f516669ab4f888c16003f694313ab299e"
+ "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e",
- "reference": "37bb306f516669ab4f888c16003f694313ab299e",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197",
+ "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197",
"shasum": ""
},
"require": {
- "doctrine/inflector": "~1.1",
- "dragonmantank/cron-expression": "~2.0",
- "erusev/parsedown": "~1.7",
+ "doctrine/inflector": "^1.1",
+ "dragonmantank/cron-expression": "^2.0",
+ "egulias/email-validator": "^2.0",
+ "erusev/parsedown": "^1.7",
+ "ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"league/flysystem": "^1.0.8",
- "monolog/monolog": "~1.12",
- "nesbot/carbon": "1.25.*",
+ "monolog/monolog": "^1.12",
+ "nesbot/carbon": "^1.26.3 || ^2.0",
+ "opis/closure": "^3.1",
"php": "^7.1.3",
- "psr/container": "~1.0",
+ "psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7",
- "swiftmailer/swiftmailer": "~6.0",
- "symfony/console": "~4.0",
- "symfony/debug": "~4.0",
- "symfony/finder": "~4.0",
- "symfony/http-foundation": "~4.0",
- "symfony/http-kernel": "~4.0",
- "symfony/process": "~4.0",
- "symfony/routing": "~4.0",
- "symfony/var-dumper": "~4.0",
+ "swiftmailer/swiftmailer": "^6.0",
+ "symfony/console": "^4.2",
+ "symfony/debug": "^4.2",
+ "symfony/finder": "^4.2",
+ "symfony/http-foundation": "^4.2",
+ "symfony/http-kernel": "^4.2",
+ "symfony/process": "^4.2",
+ "symfony/routing": "^4.2",
+ "symfony/var-dumper": "^4.2",
"tijsverkoyen/css-to-inline-styles": "^2.2.1",
- "vlucas/phpdotenv": "~2.2"
+ "vlucas/phpdotenv": "^3.3"
},
"conflict": {
"tightenco/collect": "<5.5.33"
@@ -806,43 +764,49 @@
"illuminate/view": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "~3.0",
- "doctrine/dbal": "~2.6",
+ "aws/aws-sdk-php": "^3.0",
+ "doctrine/dbal": "^2.6",
"filp/whoops": "^2.1.4",
- "league/flysystem-cached-adapter": "~1.0",
- "mockery/mockery": "~1.0",
+ "guzzlehttp/guzzle": "^6.3",
+ "league/flysystem-cached-adapter": "^1.0",
+ "mockery/mockery": "^1.0",
"moontoast/math": "^1.1",
- "orchestra/testbench-core": "3.6.*",
- "pda/pheanstalk": "~3.0",
- "phpunit/phpunit": "~7.0",
+ "orchestra/testbench-core": "3.8.*",
+ "pda/pheanstalk": "^4.0",
+ "phpunit/phpunit": "^7.5|^8.0",
"predis/predis": "^1.1.1",
- "symfony/css-selector": "~4.0",
- "symfony/dom-crawler": "~4.0"
+ "symfony/css-selector": "^4.2",
+ "symfony/dom-crawler": "^4.2",
+ "true/punycode": "^2.1"
},
"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).",
+ "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.",
- "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
- "laravel/tinker": "Required to use the tinker console command (~1.0).",
- "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
- "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
- "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
- "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).",
- "nexmo/client": "Required to use the Nexmo transport (~1.0).",
- "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
- "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
- "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
- "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).",
- "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).",
- "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
+ "filp/whoops": "Required for friendly error pages in development (^2.1.4).",
+ "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
+ "laravel/tinker": "Required to use the tinker console command (^1.0).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+ "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+ "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+ "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+ "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+ "nexmo/client": "Required to use the Nexmo transport (^1.0).",
+ "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
+ "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
+ "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).",
+ "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).",
+ "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).",
+ "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.6-dev"
+ "dev-master": "5.8-dev"
}
},
"autoload": {
@@ -870,7 +834,7 @@
"framework",
"laravel"
],
- "time": "2018-10-04T14:50:41+00:00"
+ "time": "2019-09-03T16:44:30+00:00"
},
{
"name": "laravel/tinker",
@@ -937,35 +901,35 @@
},
{
"name": "laravelcollective/html",
- "version": "v5.6.10",
+ "version": "v5.8.1",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
+ "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
- "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a1c9974ea629eed96e101a24e3852ced382eb29",
+ "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29",
"shasum": ""
},
"require": {
- "illuminate/http": "5.6.*",
- "illuminate/routing": "5.6.*",
- "illuminate/session": "5.6.*",
- "illuminate/support": "5.6.*",
- "illuminate/view": "5.6.*",
+ "illuminate/http": "5.8.*",
+ "illuminate/routing": "5.8.*",
+ "illuminate/session": "5.8.*",
+ "illuminate/support": "5.8.*",
+ "illuminate/view": "5.8.*",
"php": ">=7.1.3"
},
"require-dev": {
- "illuminate/database": "5.6.*",
+ "illuminate/database": "5.8.*",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.6-dev"
+ "dev-master": "5.8-dev"
},
"laravel": {
"providers": [
@@ -990,18 +954,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": "2018-06-18T15:04:16+00:00"
+ "time": "2019-09-05T12:32:25+00:00"
},
{
"name": "league/flysystem",
@@ -1229,34 +1193,41 @@
},
{
"name": "nesbot/carbon",
- "version": "1.25.3",
+ "version": "2.25.3",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8"
+ "reference": "d07636581795383e2fea2d711212d30f941f2039"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8",
- "reference": "ad6afecd38ce2d7f7bd1b5d47ffd8e93ebbd3ed8",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d07636581795383e2fea2d711212d30f941f2039",
+ "reference": "d07636581795383e2fea2d711212d30f941f2039",
"shasum": ""
},
"require": {
- "kylekatarnls/update-helper": "^1.1",
- "php": ">=5.3.9",
- "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+ "ext-json": "*",
+ "php": "^7.1.8 || ^8.0",
+ "symfony/translation": "^3.4 || ^4.0"
},
"require-dev": {
- "composer/composer": "^1.2",
- "friendsofphp/php-cs-fixer": "~2",
- "phpunit/phpunit": "^4.8.35 || ^5.7"
+ "friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
+ "kylekatarnls/multi-tester": "^1.1",
+ "phpmd/phpmd": "dev-php-7.1-compatibility",
+ "phpstan/phpstan": "^0.11",
+ "phpunit/phpunit": "^7.5 || ^8.0",
+ "squizlabs/php_codesniffer": "^3.4"
},
"bin": [
- "bin/upgrade-carbon"
+ "bin/carbon"
],
"type": "library",
"extra": {
- "update-helper": "Carbon\\Upgrade"
+ "laravel": {
+ "providers": [
+ "Carbon\\Laravel\\ServiceProvider"
+ ]
+ }
},
"autoload": {
"psr-4": {
@@ -1272,16 +1243,20 @@
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
+ },
+ {
+ "name": "kylekatarnls",
+ "homepage": "http://github.com/kylekatarnls"
}
],
- "description": "A simple API extension for DateTime.",
+ "description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
- "time": "2019-06-03T17:56:44+00:00"
+ "time": "2019-10-20T11:05:44+00:00"
},
{
"name": "nikic/php-parser",
@@ -1334,6 +1309,67 @@
],
"time": "2019-09-01T07:51:21+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": {
+ "php": "^5.4 || ^7.0"
+ },
+ "require-dev": {
+ "jeremeamia/superclosure": "^2.0",
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Opis\\Closure\\": "src/"
+ },
+ "files": [
+ "functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Marius Sarca",
+ "email": "marius.sarca@gmail.com"
+ },
+ {
+ "name": "Sorin Sarca",
+ "email": "sarca_sorin@hotmail.com"
+ }
+ ],
+ "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
+ "homepage": "https://opis.io/closure",
+ "keywords": [
+ "anonymous functions",
+ "closure",
+ "function",
+ "serializable",
+ "serialization",
+ "serialize"
+ ],
+ "time": "2019-10-19T18:38:51+00:00"
+ },
{
"name": "paragonie/random_compat",
"version": "v9.99.99",
@@ -1379,6 +1415,56 @@
],
"time": "2018-07-02T15:55:56+00:00"
},
+ {
+ "name": "phpoption/phpoption",
+ "version": "1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/schmittjoh/php-option.git",
+ "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+ "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.7.*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "PhpOption\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache2"
+ ],
+ "authors": [
+ {
+ "name": "Johannes M. Schmitt",
+ "email": "schmittjoh@gmail.com"
+ }
+ ],
+ "description": "Option Type for PHP",
+ "keywords": [
+ "language",
+ "option",
+ "php",
+ "type"
+ ],
+ "time": "2015-07-25T16:39:46+00:00"
+ },
{
"name": "psr/cache",
"version": "1.0.1",
@@ -1727,28 +1813,28 @@
},
{
"name": "solarium/solarium",
- "version": "3.8.1",
+ "version": "3.x-dev",
"source": {
"type": "git",
"url": "https://github.com/solariumphp/solarium.git",
- "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705"
+ "reference": "9c823be99f8aae5867fb3cf2c849f24ff50fd055"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/solariumphp/solarium/zipball/c353babec89fdbe8c64054bfec8e77bcb5da6705",
- "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705",
+ "url": "https://api.github.com/repos/solariumphp/solarium/zipball/9c823be99f8aae5867fb3cf2c849f24ff50fd055",
+ "reference": "9c823be99f8aae5867fb3cf2c849f24ff50fd055",
"shasum": ""
},
"require": {
- "php": ">=5.3.2",
- "symfony/event-dispatcher": "~2.3|~3.0"
+ "php": ">=5.3.9",
+ "symfony/event-dispatcher": "^2.7 || ^3.0 || ^4.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^3.8 || ^6.2",
- "phpunit/phpunit": "~3.7",
- "satooshi/php-coveralls": "~1.0",
- "squizlabs/php_codesniffer": "~1.4",
- "zendframework/zendframework1": "~1.12"
+ "phpunit/phpunit": "^3.7",
+ "satooshi/php-coveralls": "^1.0",
+ "squizlabs/php_codesniffer": "^1.4",
+ "zendframework/zendframework1": "^1.12"
},
"suggest": {
"minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
@@ -1756,7 +1842,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "3.3.x-dev"
+ "dev-develop": "3.3-dev"
}
},
"autoload": {
@@ -1781,7 +1867,7 @@
"search",
"solr"
],
- "time": "2017-02-02T13:32:22+00:00"
+ "time": "2018-10-31T13:07:48+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -1847,25 +1933,27 @@
},
{
"name": "symfony/console",
- "version": "v4.2.11",
+ "version": "v4.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "fc2e274aade6567a750551942094b2145ade9b6c"
+ "reference": "929ddf360d401b958f611d44e726094ab46a7369"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/fc2e274aade6567a750551942094b2145ade9b6c",
- "reference": "fc2e274aade6567a750551942094b2145ade9b6c",
+ "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
+ "reference": "929ddf360d401b958f611d44e726094ab46a7369",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/contracts": "^1.0",
- "symfony/polyfill-mbstring": "~1.0"
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php73": "^1.8",
+ "symfony/service-contracts": "^1.1"
},
"conflict": {
"symfony/dependency-injection": "<3.4",
+ "symfony/event-dispatcher": "<4.3",
"symfony/process": "<3.3"
},
"provide": {
@@ -1875,9 +1963,10 @@
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
+ "symfony/event-dispatcher": "^4.3",
"symfony/lock": "~3.4|~4.0",
- "symfony/process": "~3.4|~4.0"
+ "symfony/process": "~3.4|~4.0",
+ "symfony/var-dumper": "^4.3"
},
"suggest": {
"psr/log": "For using the console logger",
@@ -1888,7 +1977,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.2-dev"
+ "dev-master": "4.3-dev"
}
},
"autoload": {
@@ -1915,7 +2004,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-07-24T17:13:20+00:00"
+ "time": "2019-10-07T12:36:49+00:00"
},
{
"name": "symfony/contracts",
@@ -2105,30 +2194,37 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.32",
+ "version": "v4.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "3e922c4c3430b9de624e8a285dada5e61e230959"
+ "reference": "6229f58993e5a157f6096fc7145c0717d0be8807"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e922c4c3430b9de624e8a285dada5e61e230959",
- "reference": "3e922c4c3430b9de624e8a285dada5e61e230959",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807",
+ "reference": "6229f58993e5a157f6096fc7145c0717d0be8807",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8"
+ "php": "^7.1.3",
+ "symfony/event-dispatcher-contracts": "^1.1"
},
"conflict": {
- "symfony/dependency-injection": "<3.3"
+ "symfony/dependency-injection": "<3.4"
+ },
+ "provide": {
+ "psr/event-dispatcher-implementation": "1.0",
+ "symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0|~4.0",
- "symfony/dependency-injection": "~3.3|~4.0",
- "symfony/expression-language": "~2.8|~3.0|~4.0",
- "symfony/stopwatch": "~2.8|~3.0|~4.0"
+ "symfony/config": "~3.4|~4.0",
+ "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/expression-language": "~3.4|~4.0",
+ "symfony/http-foundation": "^3.4|^4.0",
+ "symfony/service-contracts": "^1.1",
+ "symfony/stopwatch": "~3.4|~4.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -2137,7 +2233,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.4-dev"
+ "dev-master": "4.3-dev"
}
},
"autoload": {
@@ -2164,7 +2260,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-08-23T08:05:57+00:00"
+ "time": "2019-10-01T16:40:32+00:00"
},
{
"name": "symfony/finder",
@@ -2272,30 +2368,33 @@
},
{
"name": "symfony/http-kernel",
- "version": "v4.0.15",
+ "version": "v4.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e75e7ff97254d5bc3fbf9c76831dd3b47edb9df7"
+ "reference": "5f08141850932e8019c01d8988bf3ed6367d2991"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e75e7ff97254d5bc3fbf9c76831dd3b47edb9df7",
- "reference": "e75e7ff97254d5bc3fbf9c76831dd3b47edb9df7",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991",
+ "reference": "5f08141850932e8019c01d8988bf3ed6367d2991",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
"symfony/debug": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1",
- "symfony/polyfill-ctype": "~1.8"
+ "symfony/event-dispatcher": "^4.3",
+ "symfony/http-foundation": "^4.1.1",
+ "symfony/polyfill-ctype": "~1.8",
+ "symfony/polyfill-php73": "^1.9"
},
"conflict": {
+ "symfony/browser-kit": "<4.3",
"symfony/config": "<3.4",
- "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4",
- "symfony/var-dumper": "<3.4",
+ "symfony/dependency-injection": "<4.3",
+ "symfony/translation": "<4.2",
+ "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2"
},
"provide": {
@@ -2303,11 +2402,11 @@
},
"require-dev": {
"psr/cache": "~1.0",
- "symfony/browser-kit": "~3.4|~4.0",
+ "symfony/browser-kit": "^4.3",
"symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~3.4|~4.0",
- "symfony/dependency-injection": "^3.4.10|^4.0.10",
+ "symfony/dependency-injection": "^4.3",
"symfony/dom-crawler": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
@@ -2315,8 +2414,10 @@
"symfony/routing": "~3.4|~4.0",
"symfony/stopwatch": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0",
- "symfony/translation": "~3.4|~4.0",
- "symfony/var-dumper": "~3.4|~4.0"
+ "symfony/translation": "~4.2",
+ "symfony/translation-contracts": "^1.1",
+ "symfony/var-dumper": "^4.1.1",
+ "twig/twig": "^1.34|^2.4"
},
"suggest": {
"symfony/browser-kit": "",
@@ -2328,7 +2429,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.3-dev"
}
},
"autoload": {
@@ -2355,7 +2456,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2018-12-06T17:29:37+00:00"
+ "time": "2019-10-07T15:06:41+00:00"
},
{
"name": "symfony/mime",
@@ -2709,6 +2810,64 @@
],
"time": "2019-08-06T08:03:45+00:00"
},
+ {
+ "name": "symfony/polyfill-php73",
+ "version": "v1.12.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php73.git",
+ "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
+ "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.12-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php73\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2019-08-06T08:03:45+00:00"
+ },
{
"name": "symfony/process",
"version": "v4.3.5",
@@ -3035,29 +3194,30 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.6.1",
+ "version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
+ "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
- "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156",
+ "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
+ "php": "^5.4 || ^7.0",
+ "phpoption/phpoption": "^1.5",
"symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "3.6-dev"
}
},
"autoload": {
@@ -3070,10 +3230,15 @@
"BSD-3-Clause"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com",
+ "homepage": "https://gjcampbell.co.uk/"
+ },
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
- "homepage": "http://www.vancelucas.com"
+ "homepage": "https://vancelucas.com/"
}
],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
@@ -3082,32 +3247,32 @@
"env",
"environment"
],
- "time": "2019-01-29T11:11:52+00:00"
+ "time": "2019-09-10T21:37:39+00:00"
},
{
"name": "yajra/laravel-datatables-oracle",
- "version": "v8.13.7",
+ "version": "v9.7.0",
"source": {
"type": "git",
"url": "https://github.com/yajra/laravel-datatables.git",
- "reference": "17b50e3ee91ceb5b1cc6e596c366718af4ff45cc"
+ "reference": "bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/17b50e3ee91ceb5b1cc6e596c366718af4ff45cc",
- "reference": "17b50e3ee91ceb5b1cc6e596c366718af4ff45cc",
+ "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8",
+ "reference": "bb6ff7b76bd6253396cb7a5a7b6c51c5ab14b1a8",
"shasum": ""
},
"require": {
- "illuminate/database": "5.4.*|5.5.*|5.6.*|5.7.*",
- "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*",
- "illuminate/http": "5.4.*|5.5.*|5.6.*|5.7.*",
- "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*",
- "illuminate/view": "5.4.*|5.5.*|5.6.*|5.7.*",
- "php": ">=7.0"
+ "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": {
- "orchestra/testbench": "~3.5"
+ "orchestra/testbench": "^3.8"
},
"suggest": {
"yajra/laravel-datatables-buttons": "Plugin for server-side exporting of dataTables.",
@@ -3118,7 +3283,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.0-dev"
+ "dev-master": "9.0-dev"
},
"laravel": {
"providers": [
@@ -3153,7 +3318,7 @@
"jquery",
"laravel"
],
- "time": "2019-06-12T05:03:20+00:00"
+ "time": "2019-10-02T05:58:48+00:00"
},
{
"name": "zizaco/entrust",
@@ -3235,6 +3400,308 @@
}
],
"packages-dev": [
+ {
+ "name": "composer/ca-bundle",
+ "version": "1.2.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/ca-bundle.git",
+ "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
+ "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "ext-pcre": "*",
+ "php": "^5.3.2 || ^7.0 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
+ "psr/log": "^1.0",
+ "symfony/process": "^2.5 || ^3.0 || ^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\CaBundle\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+ "keywords": [
+ "cabundle",
+ "cacert",
+ "certificate",
+ "ssl",
+ "tls"
+ ],
+ "time": "2019-08-30T08:44:50+00:00"
+ },
+ {
+ "name": "composer/composer",
+ "version": "1.9.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/composer.git",
+ "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/composer/zipball/314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
+ "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
+ "shasum": ""
+ },
+ "require": {
+ "composer/ca-bundle": "^1.0",
+ "composer/semver": "^1.0",
+ "composer/spdx-licenses": "^1.2",
+ "composer/xdebug-handler": "^1.1",
+ "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0",
+ "seld/jsonlint": "^1.4",
+ "seld/phar-utils": "^1.0",
+ "symfony/console": "^2.7 || ^3.0 || ^4.0",
+ "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
+ "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+ "symfony/process": "^2.7 || ^3.0 || ^4.0"
+ },
+ "conflict": {
+ "symfony/console": "2.8.38"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7",
+ "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+ },
+ "suggest": {
+ "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+ "ext-zip": "Enabling the zip extension allows you to unzip archives",
+ "ext-zlib": "Allow gzip compression of HTTP requests"
+ },
+ "bin": [
+ "bin/composer"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.9-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\": "src/Composer"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nils Adermann",
+ "email": "naderman@naderman.de",
+ "homepage": "http://www.naderman.de"
+ },
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
+ "homepage": "https://getcomposer.org/",
+ "keywords": [
+ "autoload",
+ "dependency",
+ "package"
+ ],
+ "time": "2019-08-02T18:55:33+00:00"
+ },
+ {
+ "name": "composer/semver",
+ "version": "1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/semver.git",
+ "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.5 || ^5.0.5",
+ "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\Semver\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nils Adermann",
+ "email": "naderman@naderman.de",
+ "homepage": "http://www.naderman.de"
+ },
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ },
+ {
+ "name": "Rob Bast",
+ "email": "rob.bast@gmail.com",
+ "homepage": "http://robbast.nl"
+ }
+ ],
+ "description": "Semver library that offers utilities, version constraint parsing and validation.",
+ "keywords": [
+ "semantic",
+ "semver",
+ "validation",
+ "versioning"
+ ],
+ "time": "2019-03-19T17:25:45+00:00"
+ },
+ {
+ "name": "composer/spdx-licenses",
+ "version": "1.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/spdx-licenses.git",
+ "reference": "7ac1e6aec371357df067f8a688c3d6974df68fa5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7ac1e6aec371357df067f8a688c3d6974df68fa5",
+ "reference": "7ac1e6aec371357df067f8a688c3d6974df68fa5",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\Spdx\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nils Adermann",
+ "email": "naderman@naderman.de",
+ "homepage": "http://www.naderman.de"
+ },
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ },
+ {
+ "name": "Rob Bast",
+ "email": "rob.bast@gmail.com",
+ "homepage": "http://robbast.nl"
+ }
+ ],
+ "description": "SPDX licenses list and validation library.",
+ "keywords": [
+ "license",
+ "spdx",
+ "validator"
+ ],
+ "time": "2019-07-29T10:31:59+00:00"
+ },
+ {
+ "name": "composer/xdebug-handler",
+ "version": "1.3.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/xdebug-handler.git",
+ "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
+ "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Composer\\XdebugHandler\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "John Stevenson",
+ "email": "john-stevenson@blueyonder.co.uk"
+ }
+ ],
+ "description": "Restarts a process without xdebug.",
+ "keywords": [
+ "Xdebug",
+ "performance"
+ ],
+ "time": "2019-05-27T17:52:04+00:00"
+ },
{
"name": "doctrine/instantiator",
"version": "1.2.0",
@@ -3341,6 +3808,72 @@
],
"time": "2018-07-12T10:23:15+00:00"
},
+ {
+ "name": "justinrainbow/json-schema",
+ "version": "5.2.9",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/justinrainbow/json-schema.git",
+ "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
+ },
+ "dist": {
+ "type": "zip",
+ "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||~2.15.1",
+ "json-schema/json-schema-test-suite": "1.2.0",
+ "phpunit/phpunit": "^4.8.35"
+ },
+ "bin": [
+ "bin/validate-json"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "JsonSchema\\": "src/JsonSchema/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bruno Prieto Reis",
+ "email": "bruno.p.reis@gmail.com"
+ },
+ {
+ "name": "Justin Rainbow",
+ "email": "justin.rainbow@gmail.com"
+ },
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ },
+ {
+ "name": "Robert Schönthal",
+ "email": "seroscho@googlemail.com"
+ }
+ ],
+ "description": "A library to validate a json schema.",
+ "homepage": "https://github.com/justinrainbow/json-schema",
+ "keywords": [
+ "json",
+ "schema"
+ ],
+ "time": "2019-09-25T14:49:45+00:00"
+ },
{
"name": "myclabs/deep-copy",
"version": "1.9.3",
@@ -4606,6 +5139,99 @@
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00"
},
+ {
+ "name": "seld/jsonlint",
+ "version": "1.7.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/jsonlint.git",
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+ },
+ "bin": [
+ "bin/jsonlint"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "JSON Linter",
+ "keywords": [
+ "json",
+ "linter",
+ "parser",
+ "validator"
+ ],
+ "time": "2018-01-24T12:46:19+00:00"
+ },
+ {
+ "name": "seld/phar-utils",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/phar-utils.git",
+ "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
+ "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Seld\\PharUtils\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be"
+ }
+ ],
+ "description": "PHAR file format utilities, for when PHP phars you up",
+ "keywords": [
+ "phra"
+ ],
+ "time": "2015-10-13T18:44:15+00:00"
+ },
{
"name": "squizlabs/php_codesniffer",
"version": "3.5.1",
@@ -4657,6 +5283,56 @@
],
"time": "2019-10-16T21:14:26+00:00"
},
+ {
+ "name": "symfony/filesystem",
+ "version": "v4.3.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+ "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3",
+ "symfony/polyfill-ctype": "~1.8"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Filesystem\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Filesystem Component",
+ "homepage": "https://symfony.com",
+ "time": "2019-08-20T14:07:54+00:00"
+ },
{
"name": "theseer/tokenizer",
"version": "1.1.3",
diff --git a/config/app.php b/config/app.php
index 89a89e1..672ae80 100755
--- a/config/app.php
+++ b/config/app.php
@@ -202,9 +202,10 @@ return [
'aliases' => [
'App' => 'Illuminate\Support\Facades\App',
+ 'Arr' => Illuminate\Support\Arr::class,
'Artisan' => 'Illuminate\Support\Facades\Artisan',
- 'Auth' => 'Illuminate\Support\Facades\Auth',
- 'Blade' => 'Illuminate\Support\Facades\Blade',
+ 'Auth' => Illuminate\Support\Facades\Auth::class,
+ 'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => 'Illuminate\Support\Facades\Bus',
'Cache' => 'Illuminate\Support\Facades\Cache',
diff --git a/resources/assets/js/app.js b/resources/js/app.js
similarity index 100%
rename from resources/assets/js/app.js
rename to resources/js/app.js
diff --git a/resources/assets/js/approveDataset.js b/resources/js/approveDataset.js
similarity index 100%
rename from resources/assets/js/approveDataset.js
rename to resources/js/approveDataset.js
diff --git a/resources/assets/js/bootstrap.js b/resources/js/bootstrap.js
similarity index 100%
rename from resources/assets/js/bootstrap.js
rename to resources/js/bootstrap.js
diff --git a/resources/assets/js/ckeditor.js b/resources/js/ckeditor.js
similarity index 100%
rename from resources/assets/js/ckeditor.js
rename to resources/js/ckeditor.js
diff --git a/resources/assets/js/components/CustomActions.vue b/resources/js/components/CustomActions.vue
similarity index 100%
rename from resources/assets/js/components/CustomActions.vue
rename to resources/js/components/CustomActions.vue
diff --git a/resources/assets/js/components/Dataset.vue b/resources/js/components/Dataset.vue
similarity index 100%
rename from resources/assets/js/components/Dataset.vue
rename to resources/js/components/Dataset.vue
diff --git a/resources/assets/js/components/LocationsMap.vue b/resources/js/components/LocationsMap.vue
similarity index 100%
rename from resources/assets/js/components/LocationsMap.vue
rename to resources/js/components/LocationsMap.vue
diff --git a/resources/assets/js/components/MyAutocomplete.vue b/resources/js/components/MyAutocomplete.vue
similarity index 100%
rename from resources/assets/js/components/MyAutocomplete.vue
rename to resources/js/components/MyAutocomplete.vue
diff --git a/resources/assets/js/components/MyVuetable.vue b/resources/js/components/MyVuetable.vue
similarity index 100%
rename from resources/assets/js/components/MyVuetable.vue
rename to resources/js/components/MyVuetable.vue
diff --git a/resources/assets/js/components/PersonTable.vue b/resources/js/components/PersonTable.vue
similarity index 100%
rename from resources/assets/js/components/PersonTable.vue
rename to resources/js/components/PersonTable.vue
diff --git a/resources/assets/js/components/ShowModal.vue b/resources/js/components/ShowModal.vue
similarity index 100%
rename from resources/assets/js/components/ShowModal.vue
rename to resources/js/components/ShowModal.vue
diff --git a/resources/assets/js/datasetPublish.js b/resources/js/datasetPublish.js
similarity index 100%
rename from resources/assets/js/datasetPublish.js
rename to resources/js/datasetPublish.js
diff --git a/resources/assets/js/jquery-global.js b/resources/js/jquery-global.js
similarity index 100%
rename from resources/assets/js/jquery-global.js
rename to resources/js/jquery-global.js
diff --git a/resources/assets/js/lib.js b/resources/js/lib.js
similarity index 100%
rename from resources/assets/js/lib.js
rename to resources/js/lib.js
diff --git a/resources/assets/js/releaseDataset.js b/resources/js/releaseDataset.js
similarity index 100%
rename from resources/assets/js/releaseDataset.js
rename to resources/js/releaseDataset.js
diff --git a/resources/assets/js/scripts.js b/resources/js/scripts.js
similarity index 100%
rename from resources/assets/js/scripts.js
rename to resources/js/scripts.js
diff --git a/resources/assets/js/search/App.vue b/resources/js/search/App.vue
similarity index 100%
rename from resources/assets/js/search/App.vue
rename to resources/js/search/App.vue
diff --git a/resources/assets/js/search/app-class.ts b/resources/js/search/app-class.ts
similarity index 100%
rename from resources/assets/js/search/app-class.ts
rename to resources/js/search/app-class.ts
diff --git a/resources/assets/js/search/main.ts b/resources/js/search/main.ts
similarity index 100%
rename from resources/assets/js/search/main.ts
rename to resources/js/search/main.ts
diff --git a/resources/assets/js/search/models/filter-item.ts b/resources/js/search/models/filter-item.ts
similarity index 100%
rename from resources/assets/js/search/models/filter-item.ts
rename to resources/js/search/models/filter-item.ts
diff --git a/resources/assets/js/search/search-results/dataservice.ts b/resources/js/search/search-results/dataservice.ts
similarity index 100%
rename from resources/assets/js/search/search-results/dataservice.ts
rename to resources/js/search/search-results/dataservice.ts
diff --git a/resources/assets/js/search/search-results/facet-list-class.ts b/resources/js/search/search-results/facet-list-class.ts
similarity index 97%
rename from resources/assets/js/search/search-results/facet-list-class.ts
rename to resources/js/search/search-results/facet-list-class.ts
index dec7947..d1c4f96 100644
--- a/resources/assets/js/search/search-results/facet-list-class.ts
+++ b/resources/js/search/search-results/facet-list-class.ts
@@ -1,5 +1,5 @@
import { Component, Vue, Prop, Provide } from 'vue-property-decorator';
-import FilterItem from './../models/filter-item';
+import FilterItem from '../models/filter-item';
@Component
export default class FacetList extends Vue {
diff --git a/resources/assets/js/search/search-results/facet-list.vue b/resources/js/search/search-results/facet-list.vue
similarity index 100%
rename from resources/assets/js/search/search-results/facet-list.vue
rename to resources/js/search/search-results/facet-list.vue
diff --git a/resources/assets/js/search/search-results/vs-pagination-class.ts b/resources/js/search/search-results/vs-pagination-class.ts
similarity index 100%
rename from resources/assets/js/search/search-results/vs-pagination-class.ts
rename to resources/js/search/search-results/vs-pagination-class.ts
diff --git a/resources/assets/js/search/search-results/vs-pagination.vue b/resources/js/search/search-results/vs-pagination.vue
similarity index 100%
rename from resources/assets/js/search/search-results/vs-pagination.vue
rename to resources/js/search/search-results/vs-pagination.vue
diff --git a/resources/assets/js/search/search-results/vs-results-class.ts b/resources/js/search/search-results/vs-results-class.ts
similarity index 100%
rename from resources/assets/js/search/search-results/vs-results-class.ts
rename to resources/js/search/search-results/vs-results-class.ts
diff --git a/resources/assets/js/search/search-results/vs-results.vue b/resources/js/search/search-results/vs-results.vue
similarity index 100%
rename from resources/assets/js/search/search-results/vs-results.vue
rename to resources/js/search/search-results/vs-results.vue
diff --git a/resources/assets/js/search/text-search/vs-input.vue b/resources/js/search/text-search/vs-input.vue
similarity index 100%
rename from resources/assets/js/search/text-search/vs-input.vue
rename to resources/js/search/text-search/vs-input.vue
diff --git a/resources/assets/js/strings/messages/en.js b/resources/js/strings/messages/en.js
similarity index 100%
rename from resources/assets/js/strings/messages/en.js
rename to resources/js/strings/messages/en.js
diff --git a/resources/assets/js/tinyDatePicker.js b/resources/js/tinyDatePicker.js
similarity index 100%
rename from resources/assets/js/tinyDatePicker.js
rename to resources/js/tinyDatePicker.js
diff --git a/resources/assets/js/typings.d.ts b/resources/js/typings.d.ts
similarity index 100%
rename from resources/assets/js/typings.d.ts
rename to resources/js/typings.d.ts
diff --git a/resources/assets/sass/_variables.scss b/resources/sass/_variables.scss
similarity index 100%
rename from resources/assets/sass/_variables.scss
rename to resources/sass/_variables.scss
diff --git a/resources/assets/sass/app1.scss b/resources/sass/app1.scss
similarity index 100%
rename from resources/assets/sass/app1.scss
rename to resources/sass/app1.scss
diff --git a/resources/assets/sass/font-awesome.scss b/resources/sass/font-awesome.scss
similarity index 100%
rename from resources/assets/sass/font-awesome.scss
rename to resources/sass/font-awesome.scss
diff --git a/resources/assets/sass/style.scss b/resources/sass/style.scss
similarity index 100%
rename from resources/assets/sass/style.scss
rename to resources/sass/style.scss
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index bcc1e59..da8dbf0 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -38,7 +38,7 @@
Remember me
- Forgot Your Password?
+ {{-- Forgot Your Password? --}}
diff --git a/routes/web.php b/routes/web.php
index 7cbcd6d..3c48fb0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
'Auth\AuthController',
// 'password' => 'Auth\PasswordController',
// ]);
-//Auth::routes();
-$this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
-$this->post('login', 'Auth\LoginController@login');
-$this->get('logout', 'Auth\LoginController@logout')->name('logout');
-// Registration Routes...
-$this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
-$this->post('register', 'Auth\RegisterController@register');
-// Password Reset Routes...
-$this->get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
-$this->post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
-$this->get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset');
-$this->post('password/reset', 'Auth\ResetPasswordController@reset');
+// Auth::routes();
+// Authentication Routes...
+ Route::get('login', 'Auth\LoginController@showLoginForm')->name('login');
+ Route::post('login', 'Auth\LoginController@login');
+ Route::get('logout', 'Auth\LoginController@logout')->name('logout');
+
+// // Registration Routes...
+// Route::get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
+// Route::post('register', 'Auth\RegisterController@register');
+// // // Password Reset Routes...
+// Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
+// Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+// Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset');
+// Route::post('password/reset', 'Auth\ResetPasswordController@reset');
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 021aee3..7e8d6a3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,6 +8,6 @@
"experimentalDecorators": true,
},
"include": [
- "resources/assets/js/**/*"
+ "resources/js/**/*"
]
}
\ No newline at end of file
diff --git a/webpack.mix.js b/webpack.mix.js
index 6ae1500..66f2ff8 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -14,17 +14,17 @@ let mix = require('laravel-mix');
// .sass('resources/assets/sass/app1.scss', 'public/css')
-mix.js('resources/assets/js/datasetPublish.js', 'public/backend/publish')
- .js('resources/assets/js/search/main.ts', 'public/js/search')
- .js('resources/assets/js/app.js', 'public/js')
- .js('resources/assets/js/lib.js', 'public/js')
- .js('resources/assets/js/releaseDataset.js', 'public/backend/publish')
- .js('resources/assets/js/approveDataset.js', 'public/backend/publish')
- .js('resources/assets/js/ckeditor.js', 'public/backend/')
- .sass('resources/assets/sass/app1.scss', 'public/css', { implementation: require('node-sass')})
+mix.js('resources/js/datasetPublish.js', 'public/backend/publish')
+ .js('resources/js/search/main.ts', 'public/js/search')
+ .js('resources/js/app.js', 'public/js')
+ .js('resources/js/lib.js', 'public/js')
+ .js('resources/js/releaseDataset.js', 'public/backend/publish')
+ .js('resources/js/approveDataset.js', 'public/backend/publish')
+ .js('resources/js/ckeditor.js', 'public/backend/')
+ .sass('resources/sass/app1.scss', 'public/css', { implementation: require('node-sass')})
//.sass('node_modules/purecss/build/pure.css', 'public/css', { implementation: require('node-sass') })
- .sass('resources/assets/sass/font-awesome.scss', 'public/css', { implementation: require('node-sass') })
- .js('resources/assets/js/scripts.js', 'public/js')
+ .sass('resources/sass/font-awesome.scss', 'public/css', { implementation: require('node-sass') })
+ .js('resources/js/scripts.js', 'public/js')
.scripts([
'node_modules/datatables.net/js/jquery.dataTables.js',
'node_modules/datatables.net-buttons/js/dataTables.buttons.js',