jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Final prep work to get ready for PHP8

Browse source
This commit is contained in:
Jonny Barnes 2020-12-31 13:34:55 +00:00
parent 8a7bbdab27
commit d43530cdd2
7 changed files with 601 additions and 516 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/MicropubController.php
View file

@ -43,7 +43,7 @@ class MicropubController extends Controller
{
try {
$tokenData = $this->tokenService->validateToken(request()->input('access_token'));
} catch (RequiredConstraintsViolated | InvalidTokenStructure) {
} catch (RequiredConstraintsViolated | InvalidTokenStructure $exception) {
$micropubResponses = new MicropubResponses();
return $micropubResponses->invalidTokenResponse();
@ -115,7 +115,7 @@ class MicropubController extends Controller
{
try {
$tokenData = $this->tokenService->validateToken(request()->input('access_token'));
} catch (RequiredConstraintsViolated | InvalidTokenStructure) {
} catch (RequiredConstraintsViolated | InvalidTokenStructure $exception) {
$micropubResponses = new MicropubResponses();
return $micropubResponses->invalidTokenResponse();

4
app/Http/Controllers/MicropubMediaController.php
View file

@ -37,7 +37,7 @@ class MicropubMediaController extends Controller
{
try {
$tokenData = $this->tokenService->validateToken(request()->input('access_token'));
} catch (RequiredConstraintsViolated | InvalidTokenStructure) {
} catch (RequiredConstraintsViolated | InvalidTokenStructure $exception) {
$micropubResponses = new MicropubResponses();
return $micropubResponses->invalidTokenResponse();
@ -104,7 +104,7 @@ class MicropubMediaController extends Controller
{
try {
$tokenData = $this->tokenService->validateToken(request()->input('access_token'));
} catch (RequiredConstraintsViolated | InvalidTokenStructure) {
} catch (RequiredConstraintsViolated | InvalidTokenStructure $exception) {
$micropubResponses = new MicropubResponses();
return $micropubResponses->invalidTokenResponse();

22
app/Http/Controllers/SessionStoreController.php
View file

@ -1,22 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
class SessionStoreController extends Controller
{
/**
* Save the selected colour scheme in the session.
*
* @return string[]
*/
public function saveColour(): array
{
$css = request()->input('css');
session(['css' => $css]);
return ['status' => 'ok'];
}
}

19
composer.json
View file

@ -9,7 +9,7 @@
],
"license": "CC0-1.0",
"require": {
"php": "^8.0",
"php": "^7.4|^8.0",
"ext-intl": "*",
"ext-json": "*",
"ext-dom": "*",
@ -17,7 +17,7 @@
"fideloper/proxy": "~4.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"indieauth/client": "~0.1",
"indieauth/client": "^1.1",
"intervention/image": "^2.4",
"jonnybarnes/indieweb": "~0.2",
"jonnybarnes/webmentions-parser": "~0.5",
@ -27,11 +27,11 @@
"laravel/scout": "^8.0",
"laravel/telescope": "^4.0",
"laravel/tinker": "^2.0",
"lcobucci/jwt": "^3.1",
"lcobucci/jwt": "^4.0",
"league/commonmark": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"mf2/mf2": "~0.3",
"pmatseykanets/laravel-scout-postgres": "^7.0",
"pmatseykanets/laravel-scout-postgres": "dev-php8",
"predis/predis": "~1.0",
"sensiolabs/security-checker": "^6.0",
"spatie/browsershot": "~3.0",
@ -43,10 +43,11 @@
"barryvdh/laravel-ide-helper": "^2.6",
"beyondcode/laravel-dump-server": "^1.0",
"facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.9.1",
"fakerphp/faker": "^1.9.2",
"laravel/dusk": "^6.0",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^5.0",
"phpunit/php-code-coverage": "^9.2",
"phpunit/phpunit": "^9.0",
"vimeo/psalm": "^4.0"
},
@ -91,5 +92,11 @@
"test": [
"vendor/bin/phpunit --stop-on-failure"
]
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/jonnybarnes/laravel-scout-postgres"
}
]
}

1048
composer.lock generated
View file

File diff suppressed because it is too large Load diff

14
phpunit.xml
View file

@ -19,11 +19,6 @@
<directory suffix="Test.php">./tests/Feature</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./app</directory>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="BCRYPT_ROUNDS" value="4"/>
@ -32,5 +27,14 @@
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="TELESCOPE_ENABLED" value="false"/>
<ini name="memory_limit" value="512M"/>
</php>
<coverage pathCoverage="true" includeUncoveredFiles="true" processUncoveredFiles="true">
<include>
<directory suffix=".php">./app</directory>
</include>
<report>
<html outputDirectory="./public/coverage"/>
</report>
</coverage>
</phpunit>

6
tests/Feature/TokenServiceTest.php
View file

@ -28,9 +28,9 @@ class TokenServiceTest extends TestCase
$token = $tokenService->getNewToken($data);
$valid = $tokenService->validateToken($token);
$validData = [
'me' => $valid->getClaim('me'),
'client_id' => $valid->getClaim('client_id'),
'scope' => $valid->getClaim('scope')
'me' => $valid->claims()->get('me'),
'client_id' => $valid->claims()->get('client_id'),
'scope' => $valid->claims()->get('scope')
];
$this->assertSame($data, $validData);
}