Merge branch 'develop' into 935-fix-psalm-issues

This commit is contained in:
Jonny Barnes 2023-07-28 11:08:05 +01:00
commit cd9fed3a68
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
11 changed files with 1203 additions and 975 deletions

View file

@ -8,7 +8,7 @@ use App\Models\Article;
class ArticleService extends Service
{
public function create(array $request, ?string $client = null): Article
public function create(array $request, string $client = null): Article
{
return Article::create([
'title' => $this->getDataByKey($request, 'name'),

View file

@ -18,7 +18,7 @@ class BookmarkService extends Service
/**
* Create a new Bookmark.
*/
public function create(array $request, ?string $client = null): Bookmark
public function create(array $request, string $client = null): Bookmark
{
if (Arr::get($request, 'properties.bookmark-of.0')) {
//micropub request

View file

@ -13,7 +13,7 @@ class LikeService extends Service
/**
* Create a new Like.
*/
public function create(array $request, ?string $client = null): Like
public function create(array $request, string $client = null): Like
{
if (Arr::get($request, 'properties.like-of.0')) {
//micropub request

View file

@ -15,7 +15,7 @@ class HEntryService
/**
* Create the relevant model from some h-entry data.
*/
public function process(array $request, ?string $client = null): ?string
public function process(array $request, string $client = null): ?string
{
if (Arr::get($request, 'properties.like-of') || Arr::get($request, 'like-of')) {
return resolve(LikeService::class)->create($request)->longurl;

View file

@ -18,7 +18,7 @@ class NoteService extends Service
/**
* Create a new note.
*/
public function create(array $request, ?string $client = null): Note
public function create(array $request, string $client = null): Note
{
$note = Note::create(
[

View file

@ -9,7 +9,7 @@ use Illuminate\Support\Arr;
abstract class Service
{
abstract public function create(array $request, ?string $client = null): Model;
abstract public function create(array $request, string $client = null): Model;
protected function getDataByKey(array $request, string $key): ?string
{

378
composer.lock generated

File diff suppressed because it is too large Load diff

1760
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -5,29 +5,29 @@
"repository": "https://github.com/jonnybarnes/jonnybarnes.uk",
"license": "CC0-1.0",
"devDependencies": {
"@babel/core": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@csstools/postcss-oklab-function": "^2.2.3",
"@babel/core": "^7.22.9",
"@babel/preset-env": "^7.22.9",
"@csstools/postcss-oklab-function": "^3.0.1",
"autoprefixer": "^10.4.14",
"babel-loader": "^9.1.2",
"babel-loader": "^9.1.3",
"browserlist": "^1.0.1",
"compression-webpack-plugin": "^10.0.0",
"css-loader": "^6.8.1",
"cssnano": "^6.0.1",
"eslint": "^8.43.0",
"eslint": "^8.45.0",
"eslint-webpack-plugin": "^4.0.1",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.24",
"postcss": "^8.4.27",
"postcss-combine-duplicated-selectors": "^10.0.2",
"postcss-combine-media-query": "^1.0.1",
"postcss-import": "^15.1.0",
"postcss-loader": "^7.3.3",
"postcss-nesting": "^11.3.0",
"postcss-nesting": "^12.0.0",
"style-loader": "^3.3.3",
"stylelint": "^15.9.0",
"stylelint-config-standard": "^33.0.0",
"stylelint": "^15.10.2",
"stylelint-config-standard": "^34.0.0",
"stylelint-webpack-plugin": "^4.1.1",
"webpack": "^5.88.0",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
},
"scripts": {

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=c6d58c1ba0a1e0ad976bd661884a1582",
"/app.js": "/app.js?id=7e1968acfd75b8dc843675097962e3ce",
"/app-dark.css": "/app-dark.css?id=15c72df05e2b1147fa3e4b0670cfb435",
"/app.css": "/app.css?id=4d6a1a7fe095eedc2cb2a4ce822ea8a5",
"/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f",