Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
a4e6d169
Commit
a4e6d169
authored
May 18, 2021
by
Dominik Hebeler
Browse files
upgrade to laravel 7
parent
eed80343
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/Exceptions/Handler.php
View file @
a4e6d169
...
...
@@ -2,7 +2,7 @@
namespace
App\Exceptions
;
use
Exception
;
use
Throwable
;
use
Illuminate\Auth\AuthenticationException
;
use
Illuminate\Foundation\Exceptions\Handler
as
ExceptionHandler
;
...
...
@@ -27,10 +27,10 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \
Exception
$exception
* @param \
Throwable
$exception
* @return void
*/
public
function
report
(
Exception
$exception
)
public
function
report
(
Throwable
$exception
)
{
parent
::
report
(
$exception
);
}
...
...
@@ -39,10 +39,10 @@ class Handler extends ExceptionHandler
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \
Exception
$exception
* @param \
Throwable
$exception
* @return \Illuminate\Http\Response
*/
public
function
render
(
$request
,
Exception
$exception
)
public
function
render
(
$request
,
Throwable
$exception
)
{
if
(
$request
->
is
(
'*/meta/meta.ger3*'
))
{
$registry
=
\
Prometheus\CollectorRegistry
::
getDefault
();
...
...
composer.json
View file @
a4e6d169
...
...
@@ -9,25 +9,26 @@
"license"
:
"
MIT
"
,
"require"
:
{
"php"
:
"^7.2.5|^8.0"
,
"
endclothing/prometheus_client_php
"
:
"
^1.0
"
,
"
fideloper/proxy
"
:
"
^4.4
"
,
"
fruitcake/laravel-cors
"
:
"
^2.0
"
,
"
guzzlehttp/guzzle
"
:
"
^6.3.1|^7.0.1
"
,
"
laravel/framework
"
:
"
^7.29
"
,
"
laravel/tinker
"
:
"
^2.5
"
,
"
endclothing/prometheus_client_php
"
:
"
^1.0
"
,
"
globalcitizen/php-iban
"
:
"
^4.0.0
"
,
"
jenssegers/agent
"
:
"
^2.6
"
,
"
laravel/framework
"
:
"
^6.0
"
,
"
laravel/tinker
"
:
"
^2.5
"
,
"
mcamara/laravel-localization
"
:
"
1.6.*
"
,
"
mews/captcha
"
:
"
^3.2.6
"
,
"
symfony/dom-crawler
"
:
"
^5.2
"
},
"require-dev"
:
{
"
browserstack/browserstack-local
"
:
"
^1.1
"
,
"
facade/ignition
"
:
"
^1.16.15
"
,
"
facade/ignition
"
:
"
^2.0
"
,
"
fakerphp/faker
"
:
"
^1.9.1
"
,
"
laravel/dusk
"
:
"
^
6
.1
5
"
,
"
mockery/mockery
"
:
"
^
1.0
"
,
"
nunomaduro/collision
"
:
"
^
3.
0
"
,
"
php-webdriver/webdriver
"
:
"
^1.
6
"
,
"
php
unit/phpunit
"
:
"
^8.5.8|^9.3.3
"
"
mockery/mockery
"
:
"
^
1.3
.1
"
,
"
nunomaduro/collision
"
:
"
^
4.3
"
,
"
phpunit/phpunit
"
:
"
^8.5.8|^9.
3.
3
"
,
"
browserstack/browserstack-local
"
:
"
^1.
1
"
,
"
php
-webdriver/webdriver
"
:
"
^1.6
"
},
"config"
:
{
"optimize-autoloader"
:
true
,
...
...
@@ -67,4 +68,4 @@
"@php artisan key:generate --ansi"
]
}
}
}
\ No newline at end of file
config/app.php
View file @
a4e6d169
...
...
@@ -213,6 +213,7 @@ return [
'File'
=>
Illuminate\Support\Facades\File
::
class
,
'Gate'
=>
Illuminate\Support\Facades\Gate
::
class
,
'Hash'
=>
Illuminate\Support\Facades\Hash
::
class
,
'Http'
=>
Illuminate\Support\Facades\Http
::
class
,
'Lang'
=>
Illuminate\Support\Facades\Lang
::
class
,
'Log'
=>
Illuminate\Support\Facades\Log
::
class
,
'Mail'
=>
Illuminate\Support\Facades\Mail
::
class
,
...
...
config/mail.php
View file @
a4e6d169
...
...
@@ -4,112 +4,107 @@ return [
/*
|--------------------------------------------------------------------------
|
Mail Driv
er
|
Default Mail
er
|--------------------------------------------------------------------------
|
|
Laravel supports both SMTP and PHP's "mail" function as drivers for the
|
sending of e-mail. You may specify which one you're using throughout
|
your application here. By default, Laravel is setup for SMTP mail
.
|
This option controls the default mailer that is used to send any email
|
messages sent by your application. Alternative mailers may be setup
|
and used as needed; however, this mailer will be used by default
.
|
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
| "ses", "sparkpost", "log"
|
*/
*/
'd
river'
=>
env
(
'MAIL_
DRIV
ER'
,
'smtp'
),
'd
efault'
=>
env
(
'MAIL_
MAIL
ER'
,
'smtp'
),
/*
|--------------------------------------------------------------------------
|
SMTP Host Addres
s
|
Mailer Configuration
s
|--------------------------------------------------------------------------
|
| Here you may
provide the host address of the SMTP serv
er used by your
|
applications. A default option is provided that is compatible with
|
the Mailgun mail service which will provide reliable deliveri
es.
| Here you may
configure all of the mail
er
s
used by your
application plus
|
their respective settings. Several examples have been configured for
|
you and you are free to add your own as your application requir
es.
|
*/
'host'
=>
env
(
'MAIL_HOST'
,
'smtp.mailgun.org'
),
/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
| Laravel supports a variety of mail "transport" drivers to be used while
| sending an e-mail. You will specify which one you are using for your
| mailers below. You are free to add additional mailers as required.
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
| Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array"
|
*/
*/
'port'
=>
env
(
'MAIL_PORT'
,
587
),
'mailers'
=>
[
'smtp'
=>
[
'transport'
=>
'smtp'
,
'host'
=>
env
(
'MAIL_HOST'
,
'smtp.mailgun.org'
),
'port'
=>
env
(
'MAIL_PORT'
,
587
),
'encryption'
=>
env
(
'MAIL_ENCRYPTION'
,
'tls'
),
'username'
=>
env
(
'MAIL_USERNAME'
),
'password'
=>
env
(
'MAIL_PASSWORD'
),
'timeout'
=>
null
,
'auth_mode'
=>
null
,
],
/*
|--------------------------------------------------------------------------
| Global "From" Address
|--------------------------------------------------------------------------
|
| You may wish for all e-mails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is
| used globally for all e-mails that are sent by your application.
|
*/
'ses'
=>
[
'transport'
=>
'ses'
,
],
'from'
=>
[
'address'
=>
null
,
'name'
=>
null
,
],
'mailgun'
=>
[
'transport'
=>
'mailgun'
,
],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'postmark'
=>
[
'transport'
=>
'postmark'
,
],
'encryption'
=>
env
(
'MAIL_ENCRYPTION'
,
'tls'
),
'sendmail'
=>
[
'transport'
=>
'sendmail'
,
'path'
=>
'/usr/sbin/sendmail -bs'
,
],
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'log'
=>
[
'transport'
=>
'log'
,
'channel'
=>
env
(
'MAIL_LOG_CHANNEL'
),
],
'username'
=>
env
(
'MAIL_USERNAME'
),
'array'
=>
[
'transport'
=>
'array'
,
],
],
/*
|--------------------------------------------------------------------------
|
SMTP Server Password
|
Global "From" Address
|--------------------------------------------------------------------------
|
|
Here y
ou may
set the password required by your SMTP server to send out
|
messages from your application. This will be given to the server on
|
connection so that the application will be able to send messages
.
|
Y
ou may
wish for all e-mails sent by your application to be sent from
|
the same address. Here, you may specify a name and address that is
|
used globally for all e-mails that are sent by your application
.
|
*/
*/
'password'
=>
env
(
'MAIL_PASSWORD'
),
'from'
=>
[
'address'
=>
env
(
'MAIL_FROM_ADDRESS'
,
'hello@example.com'
),
'name'
=>
env
(
'MAIL_FROM_NAME'
,
'Example'
),
],
/*
|--------------------------------------------------------------------------
|
Sendmail System Path
|
Markdown Mail Settings
|--------------------------------------------------------------------------
|
|
When using the "sendmail" driver to send e-mails, we will need to know
| the
path to where Sendmail lives on this server. A default path has
|
been provided here, which will work well on most of your systems.
|
If you are using Markdown based email rendering, you may configure your
| the
me and component paths here, allowing you to customize the design
|
of the emails. Or, you may simply stick with the Laravel defaults!
|
*/
*/
'sendmail'
=>
'/usr/sbin/sendmail -bs'
,
'markdown'
=>
[
'theme'
=>
'default'
,
'paths'
=>
[
resource_path
(
'views/vendor/mail'
),
],
],
];
];
\ No newline at end of file
config/session.php
View file @
a4e6d169
...
...
@@ -161,7 +161,7 @@ return [
|
*/
'secure'
=>
env
(
'SESSION_SECURE_COOKIE'
,
false
),
'secure'
=>
env
(
'SESSION_SECURE_COOKIE'
),
/*
|--------------------------------------------------------------------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment