Skip to content

Commit a4ae88f

Browse files
Merge branch 'master' of github.com:jaredhendrickson13/pfsense-api into next_patch
2 parents e60a3a4 + 8af3910 commit a4ae88f

5 files changed

Lines changed: 18 additions & 17 deletions

File tree

composer.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"devDependencies": {
33
"prettier": "^3.8.1",
4-
"@prettier/plugin-php": "^0.24.0",
4+
"@prettier/plugin-php": "^0.25.0",
55
"@stoplight/spectral-cli": "^6.15.0"
66
}
77
}

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BinaryContentHandler extends ContentHandler {
3636
*/
3737
protected function _encode(mixed $content = null, ?Response $context = null): mixed {
3838
# We cannot encode error messages. If an error, rethrow it to be handled by the default Response handler
39-
if (!$context instanceof Success) {
39+
if (!($context instanceof Success)) {
4040
throw $context;
4141
}
4242

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ResourceLinkSet {
3030
) {
3131
# Throw an error if any $resource_links value is not a ResourceLink or ResourceLinkSet object
3232
foreach ($this->resource_links as $resource_link) {
33-
if (!$resource_link instanceof ResourceLink and !$resource_link instanceof ResourceLinkSet) {
33+
if (!($resource_link instanceof ResourceLink) and !($resource_link instanceof ResourceLinkSet)) {
3434
throw new ServerError(
3535
message: 'ResourceLinkSets can only contain ResourceLink and ResourceLinkSet objects.',
3636
response_id: 'RESOURCE_LINK_SET_CONTAINS_NON_RESOURCE_LINK',

0 commit comments

Comments
 (0)