Commit b6569097 authored by Dominik Hebeler's avatar Dominik Hebeler

Upgrade to Laravel 5.7.x

parent c0b5ba25
{
"name": "laravel/laravel",
"type": "project",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"jenssegers/agent": "^2.6",
"laravel/framework": "5.6.*",
"laravel/framework": "5.7.*",
"laravel/tinker": "^1.0",
"mcamara/laravel-localization": "^1.3",
"mews/captcha": "^2.2",
......@@ -19,48 +19,49 @@
"symfony/dom-crawler": "^4.1"
},
"require-dev": {
"beyondcode/laravel-dump-server": "^1.0",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"autoload": {
"psr-4": {
"App\\": "app/"
},
"classmap": [
"database/seeds",
"database/factories"
],
"psr-4": {
"App\\": "app/"
}
]
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
"@php artisan key:generate --ansi"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Queue Driver
| Default Queue Connection Name
|--------------------------------------------------------------------------
|
| The Laravel queue API supports a variety of back-ends via an unified
| Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver.
|
| Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
| syntax for every one. Here you may define a default connection.
|
*/
'default' => env('QUEUE_DRIVER', 'sync'),
'default' => env('QUEUE_CONNECTION', 'sync'),
/*
|--------------------------------------------------------------------------
| Queue Connections
......@@ -26,46 +20,41 @@ return [
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
|
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
*/
'connections' => [
'sync' => [
'driver' => 'sync',
],
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'retry_after' => 90,
],
'beanstalkd' => [
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
'retry_after' => 90,
],
'sqs' => [
'driver' => 'sqs',
'key' => 'your-public-key',
'secret' => 'your-secret-key',
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
'queue' => 'your-queue-name',
'region' => 'us-east-1',
'key' => env('SQS_KEY', 'your-public-key'),
'secret' => env('SQS_SECRET', 'your-secret-key'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'),
'region' => env('SQS_REGION', 'us-east-1'),
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'retry_after' => 300,
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
'block_for' => null,
],
],
/*
|--------------------------------------------------------------------------
| Failed Queue Jobs
......@@ -76,10 +65,8 @@ return [
| have failed. You may change them to any database / table you wish.
|
*/
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
];
];
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -44,7 +44,7 @@
@endif
</td>
@foreach($langs as $lang => $value)
<td>{!! $langValues[$lang] or "" !!}</td>
<td>{!! $langValues[$lang] ?? "" !!}</td>
@endforeach
</tr>
@endif
......
......@@ -42,7 +42,7 @@
</header>
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
@include('parts.sidebar-opener', ['class' => 'fixed'])
<div class="wrapper {{$page or ''}}">
<div class="wrapper {{$page ?? ''}}">
<main id="main-content">
@if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
......
......@@ -2,7 +2,7 @@
{{-- Don't forget <script src="{{ mix('js/searchbar.js') }}"></script> --}}
<fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<div class="searchbar {{$class or ''}}">
<div class="searchbar {{$class ?? ''}}">
<div class="search-input-submit">
<div id="search-lang">
<select id="input-lang" name="lang">
......@@ -22,7 +22,7 @@
</label>
</div>
<div class="search-input">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/')) autofocus @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/')) autofocus @endif autocomplete="{{$autocomplete ?? 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">
<button class="hidden" id="search-delete-btn" type="button">
&#xd7;
</button>
......
<label class="sidebar-opener navigation-element {{$class or ''}}" for="sidebarToggle"></label>
<label class="sidebar-opener navigation-element {{$class ?? ''}}" for="sidebarToggle"></label>
......@@ -18,64 +18,64 @@ mix
@import "./bootstrap/bootstrap.less";
*/
// css
.less("resources/assets/less/metager/metager.less", "public/css/themes/metager.css", {
.less("resources/less/metager/metager.less", "public/css/themes/metager.css", {
strictMath: true
})
.less("resources/assets/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
.less("resources/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
strictMath: true
})
.less("resources/assets/less/font-awesome/solid.less", "public/css/fontawesome-solid.css", {
.less("resources/less/font-awesome/solid.less", "public/css/fontawesome-solid.css", {
strictMath: true
})
.less("resources/assets/less/bootstrap/bootstrap.less", "public/css/bootstrap.css", {
.less("resources/less/bootstrap/bootstrap.less", "public/css/bootstrap.css", {
strictMath: true
})
.less(
"resources/assets/less/metager/pages/beitritt.less",
"resources/less/metager/pages/beitritt.less",
"public/css/beitritt.css", {
strictMath: true
}
)
.less("resources/assets/less/utility.less", "public/css/utility.css", {
.less("resources/less/utility.less", "public/css/utility.css", {
strictMath: true
})
// js
.babel(
[
"resources/assets/js/lib/jquery.js",
"resources/assets/js/lib/jquery-ui.min.js",
"resources/assets/js/lib/bootstrap.js",
"resources/assets/js/lib/iframeResizer.min.js",
"resources/assets/js/lib/md5.js"
"resources/js/lib/jquery.js",
"resources/js/lib/jquery-ui.min.js",
"resources/js/lib/bootstrap.js",
"resources/js/lib/iframeResizer.min.js",
"resources/js/lib/md5.js"
],
"public/js/lib.js"
)
.babel(
[
"resources/assets/js/scriptStartPage.js",
"resources/assets/js/result-saver.js"
"resources/js/scriptStartPage.js",
"resources/js/result-saver.js"
],
"public/js/scriptStartPage.js"
)
.babel(
[
"resources/assets/js/scriptResultPage.js",
"resources/assets/js/result-saver.js",
"resources/assets/js/translations.js"
"resources/js/scriptResultPage.js",
"resources/js/result-saver.js",
"resources/js/translations.js"
],
"public/js/scriptResultPage.js"
)
.babel("resources/assets/js/searchbar.js", "public/js/searchbar.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/editLanguage.js", "public/js/editLanguage.js")
.babel("resources/js/searchbar.js", "public/js/searchbar.js")
.babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/js/editLanguage.js", "public/js/editLanguage.js")
// utility
.babel(
["resources/assets/js/utility.js", "resources/assets/js/translations.js"],
["resources/js/utility.js", "resources/js/translations.js"],
"public/js/utility.js"
)
.babel("resources/assets/js/widgets.js", "public/js/widgets.js")
.babel("resources/assets/js/scriptJoinPage.js", "public/js/scriptJoinPage.js")
.babel("resources/js/widgets.js", "public/js/widgets.js")
.babel("resources/js/scriptJoinPage.js", "public/js/scriptJoinPage.js")
// source maps
.sourceMaps(false, "inline-source-map")
// versioning
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment