- upgrade laravel 5.8 to 6.0

- change Input facade with Request facade
- route parameter must exactly match
- php minimum version ^7.2
- start cron job for deleting expired cache files
This commit is contained in:
Arno Kaimbacher 2020-05-13 15:16:15 +02:00
parent 214b118199
commit e89df8ec2a
5 changed files with 347 additions and 284 deletions

View File

@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
protected $commands = [
'App\Console\Commands\Inspire',
'App\Console\Commands\DatasetState',
'App\Console\Commands\SolrIndexBuilder'
'App\Console\Commands\SolrIndexBuilder',
];
/**
@ -25,19 +25,20 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
//$schedule->command('inspire')->hourly();
// $schedule->command('inspire')
// ->everyMinute()
// ->appendOutputTo(storage_path('logs/inspire.log'));
// ->hourly()
// ->withoutOverlapping()
// ->appendOutputTo(storage_path('logs/inspire.log'));
$schedule->command('state:dataset');
//->appendOutputTo(storage_path('logs/inspire.log'));
// $schedule->command('state:dataset');
// // ->appendOutputTo(storage_path('logs/inspire.log'));
//->everyThirtyMinutes();
$schedule->command('cache:clear-expired')
->twiceDaily(1, 16)
->appendOutputTo(storage_path('logs/cacheClear.log'));
}
/**
/**
* Register the Closure based commands for the application.
*
* @return void

View File

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Frontend;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Input;
// use Illuminate\Support\Facades\Input;
use Illuminate\View\View;
class SolariumController extends Controller
@ -21,7 +21,7 @@ class SolariumController extends Controller
*/
public function index(Request $request): View
{
if (Input::has('q') && Input::get('q') != "") {
if ($request->has('q') && $request->input('q') != "") {
// Create a search query
$query = $this->client->createSelect();
@ -35,7 +35,7 @@ class SolariumController extends Controller
//Set the query string
//$query->setQuery(Input::get('q'));
$query->setQuery('%P1%', array(Input::get('q')));
$query->setQuery('%P1%', array($request->input('q')));
// Create a DisMax query
@ -49,14 +49,14 @@ class SolariumController extends Controller
$facetSet->createFacetField('datatype')->setField('doctype');
if (Input::has('year')) {
$query->createFilterQuery('year')->setQuery(sprintf('year:%s', Input::get('year')));
if ($request->has('year')) {
$query->createFilterQuery('year')->setQuery(sprintf('year:%s', $request->input('year')));
}
if (Input::has('language')) {
$query->createFilterQuery('language')->setQuery(sprintf('language:%s', Input::get('language')));
if ($request->has('language')) {
$query->createFilterQuery('language')->setQuery(sprintf('language:%s', $request->input('language')));
}
if (Input::has('datatype')) {
$query->createFilterQuery('datatype')->setQuery(sprintf('doctype:%s', Input::get('datatype')));
if ($request->has('datatype')) {
$query->createFilterQuery('datatype')->setQuery(sprintf('doctype:%s', $request->input('datatype')));
}
// Execute the query and return the result
@ -64,7 +64,7 @@ class SolariumController extends Controller
// Pass the resultset to the view and return.
return view('frontend.search.index', array(
'q' => Input::get('q'),
'q' => $request->input('q'),
'resultset' => $resultset,
));
}
@ -81,8 +81,8 @@ class SolariumController extends Controller
try {
$this->client->ping($ping);
return response()->json('OK');
} catch (\Solarium\Exception $e) {
return response()->json('ERROR', 500);
} catch (\Solarium\Exception\HttpException $e) {
return response()->json('ERROR' . $e->getMessage(), 500);
}
}

View File

@ -8,19 +8,19 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1.3",
"php": "^7.2",
"arifhp86/laravel-clear-expired-cache-file": "^0.0.4",
"astrotomic/laravel-translatable": "^11.1",
"davejamesmiller/laravel-breadcrumbs": "5.x",
"felixkiss/uniquewith-validator": "^3.1",
"fideloper/proxy": "^4.0",
"laravel/framework": "^5.8.0",
"laravel/framework": "^6.0",
"laravel/tinker": "^1.0",
"laravelcollective/html": "^5.6",
"laravelcollective/html": "^6.1",
"mcamara/laravel-localization": "^1.3",
"solarium/solarium": "^3.8",
"yajra/laravel-datatables-oracle": "^9.0",
"zizaco/entrust": "^1.9"
"halpdesk/zizaco-entrust-laravel-6.0": "^1.9"
},
"require-dev": {
"fzaninotto/faker": "^1.8",

566
composer.lock generated
View File

@ -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": "afea7cda488160b5ceee2f305b6a3a53",
"content-hash": "7b170cd659a0ccd3c23b01d9b459f749",
"packages": [
{
"name": "arifhp86/laravel-clear-expired-cache-file",
@ -234,16 +234,16 @@
},
{
"name": "doctrine/inflector",
"version": "1.4.0",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "ab5de36233a1995f9c776c741b803eb8207aebef"
"reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/ab5de36233a1995f9c776c741b803eb8207aebef",
"reference": "ab5de36233a1995f9c776c741b803eb8207aebef",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
"reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
"shasum": ""
},
"require": {
@ -264,7 +264,6 @@
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector",
"Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
}
},
@ -322,7 +321,7 @@
"type": "tidelift"
}
],
"time": "2020-05-06T11:01:57+00:00"
"time": "2020-05-11T11:25:59+00:00"
},
{
"name": "doctrine/lexer",
@ -498,52 +497,6 @@
],
"time": "2020-02-13T22:36:52+00:00"
},
{
"name": "erusev/parsedown",
"version": "1.7.4",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35"
},
"type": "library",
"autoload": {
"psr-0": {
"Parsedown": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Emanuil Rusev",
"email": "hello@erusev.com",
"homepage": "http://erusev.com"
}
],
"description": "Parser for Markdown.",
"homepage": "http://parsedown.org",
"keywords": [
"markdown",
"parser"
],
"time": "2019-12-30T22:54:17+00:00"
},
{
"name": "facade/ignition-contracts",
"version": "1.0.0",
@ -695,6 +648,87 @@
],
"time": "2020-02-22T01:51:47+00:00"
},
{
"name": "halpdesk/zizaco-entrust-laravel-6.0",
"version": "1.9.2",
"source": {
"type": "git",
"url": "https://github.com/halpdesk/entrust.git",
"reference": "dc02ffa6dccc15e2bc5487e0fe9749771c437bb4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/halpdesk/entrust/zipball/dc02ffa6dccc15e2bc5487e0fe9749771c437bb4",
"reference": "dc02ffa6dccc15e2bc5487e0fe9749771c437bb4",
"shasum": ""
},
"require": {
"illuminate/cache": "~6.0",
"illuminate/console": "~6.0",
"illuminate/support": "~6.0",
"php": "^7.2"
},
"require-dev": {
"illuminate/database": "~6.0",
"mockery/mockery": "dev-master",
"phpunit/phpunit": "^8.3"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Zizaco\\Entrust\\EntrustServiceProvider"
],
"aliases": {
"Entrust": "Zizaco\\Entrust\\EntrustFacade"
}
}
},
"autoload": {
"classmap": [
"src/commands"
],
"psr-4": {
"Zizaco\\Entrust\\": "src/Entrust/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Zizaco Zizuini",
"email": "zizaco@gmail.com"
},
{
"name": "Andrew Elkins",
"homepage": "http://andrewelkins.com"
},
{
"name": "Ben Batschelet",
"homepage": "http://github.com/bbatsche"
},
{
"name": "Michele Angioni",
"email": "michele.angioni@gmail.com"
},
{
"name": "Daniel Leppänen",
"email": "daniel.leppanen@gmail.com"
}
],
"description": "This package provides a flexible way to add Role-based Permissions to Laravel",
"keywords": [
"acl",
"auth",
"illuminate",
"laravel",
"permission",
"roles"
],
"time": "2019-09-04T11:59:31+00:00"
},
{
"name": "jakub-onderka/php-console-color",
"version": "v0.2",
@ -787,43 +821,43 @@
},
{
"name": "laravel/framework",
"version": "v5.8.38",
"version": "v6.18.14",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "78eb4dabcc03e189620c16f436358d41d31ae11f"
"reference": "503d1511d6792b0b8d0a4bfed47f7c2f29634e1c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/78eb4dabcc03e189620c16f436358d41d31ae11f",
"reference": "78eb4dabcc03e189620c16f436358d41d31ae11f",
"url": "https://api.github.com/repos/laravel/framework/zipball/503d1511d6792b0b8d0a4bfed47f7c2f29634e1c",
"reference": "503d1511d6792b0b8d0a4bfed47f7c2f29634e1c",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.1",
"doctrine/inflector": "^1.4|^2.0",
"dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.0",
"erusev/parsedown": "^1.7",
"egulias/email-validator": "^2.1.10",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"league/commonmark": "^1.3",
"league/flysystem": "^1.0.8",
"monolog/monolog": "^1.12",
"nesbot/carbon": "^1.26.3 || ^2.0",
"monolog/monolog": "^1.12|^2.0",
"nesbot/carbon": "^2.0",
"opis/closure": "^3.1",
"php": "^7.1.3",
"php": "^7.2",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7",
"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",
"symfony/console": "^4.3.4",
"symfony/debug": "^4.3.4",
"symfony/finder": "^4.3.4",
"symfony/http-foundation": "^4.3.4",
"symfony/http-kernel": "^4.3.4",
"symfony/process": "^4.3.4",
"symfony/routing": "^4.3.4",
"symfony/var-dumper": "^4.3.4",
"tijsverkoyen/css-to-inline-styles": "^2.2.1",
"vlucas/phpdotenv": "^3.3"
},
@ -863,47 +897,45 @@
"require-dev": {
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.1.4",
"guzzlehttp/guzzle": "^6.3",
"filp/whoops": "^2.4",
"guzzlehttp/guzzle": "^6.3|^7.0",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.0",
"mockery/mockery": "^1.3.1",
"moontoast/math": "^1.1",
"orchestra/testbench-core": "3.8.*",
"orchestra/testbench-core": "^4.0",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^7.5|^8.0",
"phpunit/phpunit": "^7.5.15|^8.4|^9.0",
"predis/predis": "^1.1.1",
"symfony/css-selector": "^4.2",
"symfony/dom-crawler": "^4.2",
"true/punycode": "^2.1"
"symfony/cache": "^4.3.4"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage 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-memcached": "Required to use the memcache cache driver.",
"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).",
"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).",
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
"filp/whoops": "Required for friendly error pages in development (^2.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).",
"laravel/tinker": "Required to use the tinker console command (^2.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).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"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).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.x-dev"
}
},
"autoload": {
@ -931,7 +963,7 @@
"framework",
"laravel"
],
"time": "2020-04-14T14:14:36+00:00"
"time": "2020-05-12T14:41:15+00:00"
},
{
"name": "laravel/tinker",
@ -998,35 +1030,35 @@
},
{
"name": "laravelcollective/html",
"version": "v5.8.1",
"version": "v6.1.0",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
"reference": "3a1c9974ea629eed96e101a24e3852ced382eb29"
"reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a1c9974ea629eed96e101a24e3852ced382eb29",
"reference": "3a1c9974ea629eed96e101a24e3852ced382eb29",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/64f2268bf41bf02b3a9dd3c30f102e934d721664",
"reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664",
"shasum": ""
},
"require": {
"illuminate/http": "5.8.*",
"illuminate/routing": "5.8.*",
"illuminate/session": "5.8.*",
"illuminate/support": "5.8.*",
"illuminate/view": "5.8.*",
"php": ">=7.1.3"
"illuminate/http": "^6.0|^7.0",
"illuminate/routing": "^6.0|^7.0",
"illuminate/session": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0",
"illuminate/view": "^6.0|^7.0",
"php": ">=7.2.5"
},
"require-dev": {
"illuminate/database": "5.8.*",
"illuminate/database": "^6.0|^7.0",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.8-dev"
"dev-master": "6.0-dev"
},
"laravel": {
"providers": [
@ -1062,20 +1094,120 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "https://laravelcollective.com",
"time": "2019-09-05T12:32:25+00:00"
"time": "2020-03-02T16:41:28+00:00"
},
{
"name": "league/flysystem",
"version": "1.0.67",
"name": "league/commonmark",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
"reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": "^7.1"
},
"conflict": {
"scrutinizer/ocular": "1.7.*"
},
"require-dev": {
"cebe/markdown": "~1.0",
"commonmark/commonmark.js": "0.29.1",
"erusev/parsedown": "~1.0",
"ext-json": "*",
"github/gfm": "0.29.0",
"michelf/php-markdown": "~1.4",
"mikehaertl/php-shellcommand": "^1.4",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5",
"scrutinizer/ocular": "^1.5",
"symfony/finder": "^4.2"
},
"bin": [
"bin/commonmark"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"League\\CommonMark\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Colin O'Dell",
"email": "colinodell@gmail.com",
"homepage": "https://www.colinodell.com",
"role": "Lead Developer"
}
],
"description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)",
"homepage": "https://commonmark.thephpleague.com",
"keywords": [
"commonmark",
"flavored",
"gfm",
"github",
"github-flavored",
"markdown",
"md",
"parser"
],
"funding": [
{
"url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
"type": "custom"
},
{
"url": "https://www.colinodell.com/sponsor",
"type": "custom"
},
{
"url": "https://www.paypal.me/colinpodell/10.00",
"type": "custom"
},
{
"url": "https://github.com/colinodell",
"type": "github"
},
{
"url": "https://www.patreon.com/colinodell",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/league/commonmark",
"type": "tidelift"
}
],
"time": "2020-05-04T22:15:21+00:00"
},
{
"name": "league/flysystem",
"version": "1.0.68",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3e4198372276ec99ac3409a21d7c9d1ced9026e4",
"reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4",
"shasum": ""
},
"require": {
@ -1146,7 +1278,13 @@
"sftp",
"storage"
],
"time": "2020-04-16T13:21:26+00:00"
"funding": [
{
"url": "https://offset.earth/frankdejonge",
"type": "other"
}
],
"time": "2020-05-12T20:33:44+00:00"
},
{
"name": "mcamara/laravel-localization",
@ -1212,21 +1350,21 @@
},
{
"name": "monolog/monolog",
"version": "1.25.3",
"version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
"reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8",
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
"php": "^7.2",
"psr/log": "^1.0.1"
},
"provide": {
"psr/log-implementation": "1.0.0"
@ -1234,33 +1372,36 @@
"require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
"elasticsearch/elasticsearch": "^6.0",
"graylog2/gelf-php": "^1.4.2",
"jakub-onderka/php-parallel-lint": "^0.9",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0",
"phpspec/prophecy": "^1.6.1",
"phpunit/phpunit": "^8.3",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
"ruflin/elastica": ">=0.90 <3.0",
"sentry/sentry": "^0.13",
"swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
"elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
"ext-mbstring": "Allow to work properly with unicode symbols",
"ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
"sentry/sentry": "Allow sending log messages to a Sentry server"
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "2.x-dev"
}
},
"autoload": {
@ -1286,20 +1427,20 @@
"logging",
"psr-3"
],
"time": "2019-12-20T14:15:16+00:00"
"time": "2019-12-20T14:22:59+00:00"
},
{
"name": "nesbot/carbon",
"version": "2.33.0",
"version": "2.34.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b"
"reference": "52ea68aebbad8a3b27b5d24e4c66ebe1933f8399"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/52ea68aebbad8a3b27b5d24e4c66ebe1933f8399",
"reference": "52ea68aebbad8a3b27b5d24e4c66ebe1933f8399",
"shasum": ""
},
"require": {
@ -1323,7 +1464,8 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-master": "2.x-dev",
"dev-3.x": "3.x-dev"
},
"laravel": {
"providers": [
@ -1368,7 +1510,7 @@
"type": "tidelift"
}
],
"time": "2020-04-20T15:05:43+00:00"
"time": "2020-05-12T19:53:34+00:00"
},
{
"name": "nikic/php-parser",
@ -2761,16 +2903,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "1aab00e39cebaef4d8652497f46c15c1b7e45294"
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1aab00e39cebaef4d8652497f46c15c1b7e45294",
"reference": "1aab00e39cebaef4d8652497f46c15c1b7e45294",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
@ -2782,7 +2924,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -2829,20 +2971,20 @@
"type": "tidelift"
}
],
"time": "2020-05-08T16:50:20+00:00"
"time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "d51debc1391a609c514f6f072dd59a61b461502a"
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/d51debc1391a609c514f6f072dd59a61b461502a",
"reference": "d51debc1391a609c514f6f072dd59a61b461502a",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
"reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"shasum": ""
},
"require": {
@ -2854,7 +2996,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -2902,20 +3044,20 @@
"type": "tidelift"
}
],
"time": "2020-05-08T16:50:20+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "ab0af41deab94ec8dceb3d1fb408bdd038eba4dc"
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ab0af41deab94ec8dceb3d1fb408bdd038eba4dc",
"reference": "ab0af41deab94ec8dceb3d1fb408bdd038eba4dc",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"shasum": ""
},
"require": {
@ -2929,7 +3071,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -2978,20 +3120,20 @@
"type": "tidelift"
}
],
"time": "2020-05-08T16:50:20+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "a54881ec0ab3b2005c406aed0023c062879031e7"
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a54881ec0ab3b2005c406aed0023c062879031e7",
"reference": "a54881ec0ab3b2005c406aed0023c062879031e7",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": ""
},
"require": {
@ -3003,7 +3145,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -3051,20 +3193,20 @@
"type": "tidelift"
}
],
"time": "2020-05-08T16:50:20+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "42fda6d7380e5c940d7f68341ccae89d5ab9963b"
"reference": "f048e612a3905f34931127360bdd2def19a5e582"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/42fda6d7380e5c940d7f68341ccae89d5ab9963b",
"reference": "42fda6d7380e5c940d7f68341ccae89d5ab9963b",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
"reference": "f048e612a3905f34931127360bdd2def19a5e582",
"shasum": ""
},
"require": {
@ -3073,7 +3215,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -3120,20 +3262,20 @@
"type": "tidelift"
}
],
"time": "2020-05-08T17:28:34+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.16.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "7e95fe59d12169fcf4041487e4bf34fca37ee0ed"
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/7e95fe59d12169fcf4041487e4bf34fca37ee0ed",
"reference": "7e95fe59d12169fcf4041487e4bf34fca37ee0ed",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
"shasum": ""
},
"require": {
@ -3142,7 +3284,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.16-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@ -3192,7 +3334,7 @@
"type": "tidelift"
}
],
"time": "2020-05-02T14:56:09+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/process",
@ -3834,84 +3976,6 @@
"laravel"
],
"time": "2020-04-23T01:21:11+00:00"
},
{
"name": "zizaco/entrust",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/Zizaco/entrust.git",
"reference": "05b2542f5f96ea80998a13800c6e216df6821bff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Zizaco/entrust/zipball/05b2542f5f96ea80998a13800c6e216df6821bff",
"reference": "05b2542f5f96ea80998a13800c6e216df6821bff",
"shasum": ""
},
"require": {
"illuminate/cache": "~5.0",
"illuminate/console": "~5.0",
"illuminate/support": "~5.0",
"php": ">=5.5.0"
},
"require-dev": {
"illuminate/database": "~5.0",
"mockery/mockery": "dev-master",
"phpunit/phpunit": "~4.1",
"sami/sami": "dev-master"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Zizaco\\Entrust\\EntrustServiceProvider"
],
"aliases": {
"Entrust": "Zizaco\\Entrust\\EntrustFacade"
}
}
},
"autoload": {
"classmap": [
"src/commands"
],
"psr-4": {
"Zizaco\\Entrust\\": "src/Entrust/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Andrew Elkins",
"homepage": "http://andrewelkins.com"
},
{
"name": "Zizaco Zizuini",
"email": "zizaco@gmail.com"
},
{
"name": "Ben Batschelet",
"homepage": "http://github.com/bbatsche"
},
{
"name": "Michele Angioni",
"email": "michele.angioni@gmail.com"
}
],
"description": "This package provides a flexible way to add Role-based Permissions to Laravel",
"keywords": [
"acl",
"auth",
"illuminate",
"laravel",
"permission",
"roles"
],
"time": "2017-11-13T23:25:18+00:00"
}
],
"packages-dev": [
@ -5379,7 +5443,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^7.1.3"
"php": "^7.2"
},
"platform-dev": [],
"plugin-api-version": "1.1.0"

View File

@ -93,10 +93,7 @@
</li>
<!-- <li><a href="#clients">Clients</a></li> -->
<!-- <li><a href="#about">About</a></li> -->
<!-- <li>
<a class="{{ Route::currentRouteName() == 'frontend.pages.show' ? 'current' : '' }}"
href="{!! url('/pages/about') !!}">About</a>
</li> -->
<li class="right"><a href="{{ URL::route('oai') }}" target="_blank"> OAI</a></li>
<!-- <li><a href="#why-us">Why us?</a></li>
@ -153,12 +150,13 @@
<ul id="secondary-nav" class="nav">
<li class="first"><a href="{{ URL::route('frontend.home.contact') }}">Contact</a></li>
<li class="last"><a
href="{!! URL::route('frontend.pages.show', ['page_slug'=>'imprint']) !!}">Impressum</a>
href="{!! URL::route('frontend.pages.show', ['slug'=>'imprint']) !!}">Impressum</a>
</li>
<li class="last"><a href="{{ URL::route('frontend.sitelinks.index') }}">Sitelinks</a></li>
<li class="last"><a
href="{!! URL::route('frontend.pages.show', ['page_slug'=>'terms-and-conditions']) !!}">Terms
and Conditions</a></li>
href="{!! URL::route('frontend.pages.show', ['slug'=>'terms-and-conditions']) !!}">Terms
and Conditions</a>
</li>
<li><a target="_blank" href="https://github.com/geolba"><i class="fab fa-github"></i> rdr
bei GitHub</a></li>