Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit 5881543

Browse files
committed
Merge branch 'release/1.1.0'
2 parents 009bf79 + e6036b2 commit 5881543

File tree

14 files changed

+2093
-1041
lines changed

14 files changed

+2093
-1041
lines changed

.php_cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?php
22

33
$finder = PhpCsFixer\Finder::create()
4-
->exclude('vendor')
4+
->exclude([
5+
'vendor',
6+
'storage',
7+
'bootstrap/cache',
8+
])
59
->in(__DIR__)
610
;
711

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
3333

3434
ENV COMPOSER_ALLOW_SUPERUSER=1
3535
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
36-
COPY composer.json composer.json
37-
COPY composer.lock composer.lock
3836
RUN composer config -g repos.packagist composer https://packagist.jp
3937
RUN composer global require hirak/prestissimo
38+
COPY composer.json composer.json
39+
COPY composer.lock composer.lock
4040
RUN composer install \
4141
--prefer-dist \
4242
--no-ansi \

app/Http/Middleware/Authenticate.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function handle($request, Closure $next)
2222
'message' => 'Token not provided',
2323
];
2424

25-
return response()->json($data, $data['status'], 401);
25+
return response()->json($data, $data['status']);
2626
}
2727

2828
return $next($request);

0 commit comments

Comments
 (0)