0ct0pu5/XBackBone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply fixes from StyleCI (#103)

Browse source
This commit is contained in:
Sergio Brighenti 2019-11-21 15:23:33 +01:00 • committed by GitHub
parent 7589348daf
commit fc5f719df4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
app/Controllers/MediaController.php
View file

@ -16,19 +16,19 @@ use Slim\Exception\HttpUnauthorizedException;
class MediaController extends Controller
{
/**
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string|null $token
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string|null $token
*
* @return Response
* @throws HttpNotFoundException
* @throws \Twig\Error\LoaderError
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
* @throws FileNotFoundException
*
* @return Response
*/
public function show(Request $request, Response $response, string $userCode, string $mediaCode, string $token = null): Response
{
@ -68,21 +68,21 @@ class MediaController extends Controller
return view()->render($response, 'upload/public.twig', [
'delete_token' => $token,
'media' => $media,
'type' => $type,
'url' => urlFor("/{$userCode}/{$mediaCode}"),
'media' => $media,
'type' => $type,
'url' => urlFor("/{$userCode}/{$mediaCode}"),
]);
}
/**
* @param Request $request
* @param Response $response
* @param int $id
* @param Request $request
* @param Response $response
* @param int $id
*
* @throws HttpNotFoundException
* @throws FileNotFoundException
*
* @return Response
* @throws HttpNotFoundException
*
* @throws FileNotFoundException
*/
public function getRawById(Request $request, Response $response, int $id): Response
{
@ -96,17 +96,17 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string|null $ext
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string|null $ext
*
* @return Response
* @throws HttpBadRequestException
* @throws HttpNotFoundException
*
* @throws FileNotFoundException
*
* @return Response
*/
public function getRaw(Request $request, Response $response, string $userCode, string $mediaCode, ?string $ext = null): Response
{
@ -124,15 +124,15 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
*
* @throws HttpNotFoundException
* @throws FileNotFoundException
*
* @return Response
* @throws HttpNotFoundException
*
* @throws FileNotFoundException
*/
public function download(Request $request, Response $response, string $userCode, string $mediaCode): Response
{
@ -146,13 +146,13 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param int $id
* @param Request $request
* @param Response $response
* @param int $id
*
* @return Response
* @throws HttpNotFoundException
*
* @return Response
*/
public function togglePublish(Request $request, Response $response, int $id): Response
{
@ -172,14 +172,14 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param int $id
* @param Request $request
* @param Response $response
* @param int $id
*
* @throws HttpUnauthorizedException
* @throws HttpNotFoundException
*
* @return Response
* @throws HttpUnauthorizedException
*
* @throws HttpNotFoundException
*/
public function delete(Request $request, Response $response, int $id): Response
{
@ -205,16 +205,16 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string $token
* @param Request $request
* @param Response $response
* @param string $userCode
* @param string $mediaCode
* @param string $token
*
* @throws HttpUnauthorizedException
* @throws HttpNotFoundException
*
* @return Response
* @throws HttpUnauthorizedException
*
* @throws HttpNotFoundException
*/
public function deleteByToken(Request $request, Response $response, string $userCode, string $mediaCode, string $token): Response
{
@ -249,9 +249,9 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param string $storagePath
* @param int $id
* @param Request $request
* @param string $storagePath
* @param int $id
*
* @throws HttpNotFoundException
*/
@ -285,15 +285,15 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param Filesystem $storage
* @param Request $request
* @param Response $response
* @param Filesystem $storage
* @param $media
* @param string $disposition
* @param string $disposition
*
* @return Response
* @throws FileNotFoundException
*
* @return Response
*/
protected function streamMedia(Request $request, Response $response, Filesystem $storage, $media, string $disposition = 'inline'): Response
{
@ -324,15 +324,15 @@ class MediaController extends Controller
}
/**
* @param Filesystem $storage
* @param Filesystem $storage
* @param $media
* @param null $width
* @param null $height
* @param string $disposition
* @param null $width
* @param null $height
* @param string $disposition
*
* @return Response
* @throws FileNotFoundException
*
* @return Response
*/
protected function makeThumbnail(Filesystem $storage, $media, $width = null, $height = null, string $disposition = 'inline')
{
@ -346,10 +346,10 @@ class MediaController extends Controller
}
/**
* @param Response $response
* @param Stream $stream
* @param string $range
* @param string $disposition
* @param Response $response
* @param Stream $stream
* @param string $range
* @param string $disposition
* @param $media
* @param $mime
*
@ -371,11 +371,11 @@ class MediaController extends Controller
}
if ($range === '-') {
$start = $stream->getSize() - (int)substr($range, 1);
$start = $stream->getSize() - (int) substr($range, 1);
} else {
$range = explode('-', $range);
$start = (int)$range[0];
$end = (isset($range[1]) && is_numeric($range[1])) ? (int)$range[1] : $stream->getSize();
$start = (int) $range[0];
$end = (isset($range[1]) && is_numeric($range[1])) ? (int) $range[1] : $stream->getSize();
}
$end = ($end > $stream->getSize() - 1) ? $stream->getSize() - 1 : $end;

14
app/Controllers/UploadController.php
View file

@ -9,14 +9,14 @@ use Psr\Http\Message\ServerRequestInterface as Request;
class UploadController extends Controller
{
/**
* @param Request $request
* @param Response $response
* @param Request $request
* @param Response $response
*
* @return Response
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
*
* @throws \Twig\Error\LoaderError
*
* @return Response
*/
public function webUpload(Request $request, Response $response): Response
{
@ -34,12 +34,12 @@ class UploadController extends Controller
}
/**
* @param Request $request
* @param Response $response
* @param Request $request
* @param Response $response
*
* @return Response
* @throws FileExistsException
*
* @return Response
*/
public function upload(Request $request, Response $response): Response
{

2
app/routes.php
View file

@ -57,7 +57,7 @@ $app->group('', function (RouteCollectorProxy $group) {
$group->post('/upload/{id}/publish', [MediaController::class, 'togglePublish'])->setName('upload.publish');
$group->post('/upload/{id}/unpublish', [MediaController::class, 'togglePublish'])->setName('upload.unpublish');
$group->get('/upload/{id}/raw', [MediaController::class, 'getRawById'])->add(AdminMiddleware::class)->setName('upload.raw');
$group->map(['GET', 'POST'],'/upload/{id}/delete', [MediaController::class, 'delete'])->setName('upload.delete');
$group->map(['GET', 'POST'], '/upload/{id}/delete', [MediaController::class, 'delete'])->setName('upload.delete');
})->add(App\Middleware\CheckForMaintenanceMiddleware::class)->add(AuthMiddleware::class);
$app->get('/', [DashboardController::class, 'redirects'])->setName('root');