Skip to content

Commit

Permalink
Merge branch 'release/5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
lindyhopchris committed Nov 30, 2024
2 parents f3a4b75 + 342a7aa commit e2f6696
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Tests

on:
push:
branches: [ main, develop ]
branches: [ main, develop, 4.x ]
pull_request:
branches: [ main, develop ]
branches: [ main, develop, 4.x ]

jobs:
build:
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@ All notable changes to this project will be documented in this file. This projec

## Unreleased

## [5.0.1] - 2024-11-30

### Fixed

- Removed more PHP 8.4 deprecation notices.

## [5.0.0] - 2024-11-29

### Added

- **BREAKING**: [#21](https://github.com/laravel-json-api/core/pull/21) The `Authorizer` contract now allows all methods
to return a `bool` or an Illuminate authorization response.

## [4.3.2] - 2024-11-30

### Fixed

- Remove more PHP 8.4 deprecation notices.

## [4.3.1] - 2024-11-29

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"require": {
"php": "^8.2",
"ext-json": "*",
"illuminate/auth": "^11.33",
"illuminate/auth": "^11.0",
"illuminate/contracts": "^11.0",
"illuminate/http": "^11.0",
"illuminate/support": "^11.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Core/Document/ErrorSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

class ErrorSource implements Serializable
{

use Concerns\Serializable;

/**
Expand Down Expand Up @@ -71,7 +70,7 @@ public static function fromArray(array $source): self
* @param string|null $pointer
* @param string|null $parameter
*/
public function __construct(string $pointer = null, string $parameter = null)
public function __construct(?string $pointer = null, ?string $parameter = null)
{
$this->pointer = $pointer;
$this->parameter = $parameter;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/JsonApiService.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function route(): Route
* @param string|null $name
* @return Server
*/
public function server(string $name = null): Server
public function server(?string $name = null): Server
{
if (is_string($name)) {
return $this->servers()->server($name);
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Schema/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public function uriType(): string
/**
* @inheritDoc
*/
public function url($extra = [], bool $secure = null): string
public function url($extra = [], ?bool $secure = null): string
{
$extra = Arr::wrap($extra);

Expand Down

0 comments on commit e2f6696

Please sign in to comment.