diff --git a/composer.json b/composer.json
index 1a53884..28d4ff5 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
"type": "project",
"require": {
"php": "^7.1.3",
+ "barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-ide-helper": "^2.4",
"doctrine/dbal": "^2.7",
"fideloper/proxy": "^4.0",
@@ -17,7 +18,6 @@
"laravel/socialite": "^3.0",
"laravel/tinker": "^1.0",
"mightypork/php-sandbox": "^1.0",
- "phpoffice/phpspreadsheet": "^1.3",
"riesjart/relaquent": "^0.1"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index b147615..5d68f45 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,76 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "60a096ac38f47f94abc0e1c82f548194",
+ "content-hash": "1bb552d1b383427434286ed0ced8293b",
"packages": [
+ {
+ "name": "barryvdh/laravel-debugbar",
+ "version": "v3.1.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/barryvdh/laravel-debugbar.git",
+ "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
+ "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/routing": "5.5.x|5.6.x",
+ "illuminate/session": "5.5.x|5.6.x",
+ "illuminate/support": "5.5.x|5.6.x",
+ "maximebf/debugbar": "~1.15.0",
+ "php": ">=7.0",
+ "symfony/debug": "^3|^4",
+ "symfony/finder": "^3|^4"
+ },
+ "require-dev": {
+ "illuminate/framework": "5.5.x"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Barryvdh\\Debugbar\\ServiceProvider"
+ ],
+ "aliases": {
+ "Debugbar": "Barryvdh\\Debugbar\\Facade"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Barryvdh\\Debugbar\\": "src/"
+ },
+ "files": [
+ "src/helpers.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Barry vd. Heuvel",
+ "email": "barryvdh@gmail.com"
+ }
+ ],
+ "description": "PHP Debugbar integration for Laravel",
+ "keywords": [
+ "debug",
+ "debugbar",
+ "laravel",
+ "profiler",
+ "webprofiler"
+ ],
+ "time": "2018-05-03T18:27:04+00:00"
+ },
{
"name": "barryvdh/laravel-ide-helper",
"version": "v2.4.3",
@@ -1394,19 +1462,87 @@
],
"time": "2016-08-17T00:36:58+00:00"
},
+ {
+ "name": "maximebf/debugbar",
+ "version": "v1.15.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/maximebf/php-debugbar.git",
+ "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
+ "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "psr/log": "^1.0",
+ "symfony/var-dumper": "^2.6|^3.0|^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.0|^5.0"
+ },
+ "suggest": {
+ "kriswallsmith/assetic": "The best way to manage assets",
+ "monolog/monolog": "Log using Monolog",
+ "predis/predis": "Redis storage"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.14-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "DebugBar\\": "src/DebugBar/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Maxime Bouroumeau-Fuseau",
+ "email": "maxime.bouroumeau@gmail.com",
+ "homepage": "http://maximebf.com"
+ },
+ {
+ "name": "Barry vd. Heuvel",
+ "email": "barryvdh@gmail.com"
+ }
+ ],
+ "description": "Debug bar in the browser for php application",
+ "homepage": "https://github.com/maximebf/php-debugbar",
+ "keywords": [
+ "debug",
+ "debugbar"
+ ],
+ "time": "2017-12-15T11:13:46+00:00"
+ },
{
"name": "mightypork/php-sandbox",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://git.ondrovo.com/packages/php-sandbox.git",
- "reference": "2d0cab061148cfd8b53e38e2b9043a56270c520b"
+ "reference": "d54eb0ee2849f6caa830d116c02ed861435b4362"
},
"require": {
"laravel/framework": "~5.5",
"php": ">=5.6.0"
},
"type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "MightyPork\\PhpSandbox\\PhpSandboxServiceProvider"
+ ]
+ }
+ },
"autoload": {
"psr-4": {
"MightyPork\\PhpSandbox\\": "src/"
@@ -1423,7 +1559,7 @@
}
],
"description": "Web interface for testing PHP code (Laravel package)",
- "time": "2018-07-14T15:20:40+00:00"
+ "time": "2018-07-14T16:12:14+00:00"
},
{
"name": "monolog/monolog",
@@ -1656,92 +1792,6 @@
],
"time": "2018-07-04T16:31:37+00:00"
},
- {
- "name": "phpoffice/phpspreadsheet",
- "version": "1.3.1",
- "source": {
- "type": "git",
- "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "aa5b0d0236c907fd8dba0883f3ceb97cc52e46ec"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/aa5b0d0236c907fd8dba0883f3ceb97cc52e46ec",
- "reference": "aa5b0d0236c907fd8dba0883f3ceb97cc52e46ec",
- "shasum": ""
- },
- "require": {
- "ext-ctype": "*",
- "ext-dom": "*",
- "ext-gd": "*",
- "ext-iconv": "*",
- "ext-libxml": "*",
- "ext-mbstring": "*",
- "ext-simplexml": "*",
- "ext-xml": "*",
- "ext-xmlreader": "*",
- "ext-xmlwriter": "*",
- "ext-zip": "*",
- "ext-zlib": "*",
- "php": "^5.6|^7.0",
- "psr/simple-cache": "^1.0"
- },
- "require-dev": {
- "dompdf/dompdf": "^0.8.0",
- "friendsofphp/php-cs-fixer": "@stable",
- "jpgraph/jpgraph": "^4.0",
- "mpdf/mpdf": "^7.0.0",
- "phpunit/phpunit": "^5.7",
- "squizlabs/php_codesniffer": "^2.7",
- "tecnickcom/tcpdf": "^6.2"
- },
- "suggest": {
- "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
- "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
- "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
- "tecnick.com/tcpdf": "Option for rendering PDF with PDF Writer"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-2.1-or-later"
- ],
- "authors": [
- {
- "name": "Maarten Balliauw",
- "homepage": "http://blog.maartenballiauw.be"
- },
- {
- "name": "Erik Tilt"
- },
- {
- "name": "Franck Lefevre",
- "homepage": "http://rootslabs.net"
- },
- {
- "name": "Mark Baker",
- "homepage": "http://markbakeruk.net"
- }
- ],
- "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
- "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
- "keywords": [
- "OpenXML",
- "excel",
- "gnumeric",
- "ods",
- "php",
- "spreadsheet",
- "xls",
- "xlsx"
- ],
- "time": "2018-06-12T13:40:21+00:00"
- },
{
"name": "psr/container",
"version": "1.0.0",
diff --git a/config/app.php b/config/app.php
index c517402..b2b1b29 100644
--- a/config/app.php
+++ b/config/app.php
@@ -165,7 +165,7 @@ return [
// sideload
AdamWathan\EloquentOAuthL5\EloquentOAuthServiceProvider::class,
- MightyPork\PhpSandbox\PhpSandboxServiceProvider::class,
+ //MightyPork\PhpSandbox\PhpSandboxServiceProvider::class,
],
/*
diff --git a/porklib/Utils/SpreadsheetBuilder.php b/porklib/Utils/SpreadsheetBuilder.php
index ed0009b..59bda91 100644
--- a/porklib/Utils/SpreadsheetBuilder.php
+++ b/porklib/Utils/SpreadsheetBuilder.php
@@ -8,6 +8,8 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use PhpOffice\PhpSpreadsheet\Writer\IWriter;
+// this requires "phpoffice/phpspreadsheet": "^1.3",
+
/**
* Abstraction above PhpOffice's spreadsheets with stable API.
* Fixing incompatibilities in one place will fix them in the entire application.
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index c266525..5642e51 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -74,11 +74,11 @@
@endset
- @set('services.oauth_providers.stack.client_id')
+ {{--@set('services.oauth_providers.stack.client_id')
{{ __('StackOverflow') }}
- @endset
+ @endset--}}
@set('services.oauth_providers.google.client_id')
diff --git a/routes/web.php b/routes/web.php
index 1a41dff..7f3292a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -84,7 +84,7 @@ Route::get('/auth/facebook/callback', function() {
return _loginVia('facebook');
})->name('oauth-facebook-callback');
-
+/*
Route::get('/auth/stack/authorize', function() {
return SocialAuth::authorize('stack');
})->name('oauth-stack-authorize');
@@ -92,3 +92,4 @@ Route::get('/auth/stack/authorize', function() {
Route::get('/auth/stack/callback', function() {
return _loginVia('stack');
})->name('oauth-stack-callback');
+*/
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore