From f9a565c76a06af7ffd184b82bf2c4ee1862276fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 04:17:24 +0000 Subject: [PATCH 1/2] chore: bump @prettier/plugin-php from 0.24.0 to 0.25.0 Bumps [@prettier/plugin-php](https://github.com/prettier/prettier-php) from 0.24.0 to 0.25.0. - [Release notes](https://github.com/prettier/prettier-php/releases) - [Commits](https://github.com/prettier/prettier-php/compare/v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: "@prettier/plugin-php" dependency-version: 0.25.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index e21ff0b0..1f35d69e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "devDependencies": { - "@prettier/plugin-php": "^0.24.0", + "@prettier/plugin-php": "^0.25.0", "@stoplight/spectral-cli": "^6.15.0", "prettier": "^3.8.1" } @@ -91,14 +91,14 @@ } }, "node_modules/@prettier/plugin-php": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.24.0.tgz", - "integrity": "sha512-x9l65fCE/pgoET6RQowgdgG8Xmzs44z6j6Hhg3coINCyCw9JBGJ5ZzMR2XHAM2jmAdbJAIgqB6cUn4/3W3XLTA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.25.0.tgz", + "integrity": "sha512-hi0NhucbspYqw5pZYKywEk5CxsBwA0pBcG6K08AZw7OQDoUm4Hhbxql7z/SzQGeTRHqak5PwDnVNgttZiZdrlg==", "dev": true, "license": "MIT", "dependencies": { "linguist-languages": "^8.0.0", - "php-parser": "^3.2.5" + "php-parser": "^3.4.0" }, "peerDependencies": { "prettier": "^3.0.0" @@ -2119,9 +2119,9 @@ "dev": true }, "node_modules/php-parser": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.2.5.tgz", - "integrity": "sha512-M1ZYlALFFnESbSdmRtTQrBFUHSriHgPhgqtTF/LCbZM4h7swR5PHtUceB2Kzby5CfqcsYwBn7OXTJ0+8Sajwkw==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.5.1.tgz", + "integrity": "sha512-0By/iMXxBM9nIapBXOdFGHlD2os9t/3Pk1aIavUzCH7jKFPjq1WYeOVOv/iXhELCjlL4ZlzKwK1keyxLQjll8g==", "dev": true, "license": "BSD-3-Clause" }, diff --git a/package.json b/package.json index d0f86c80..3fcccbb2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "prettier": "^3.8.1", - "@prettier/plugin-php": "^0.24.0", + "@prettier/plugin-php": "^0.25.0", "@stoplight/spectral-cli": "^6.15.0" } } From 09b06a429552bc21fd9d9c26d5e85b8033356f17 Mon Sep 17 00:00:00 2001 From: Jared Hendrickson Date: Thu, 2 Apr 2026 15:56:24 -0600 Subject: [PATCH 2/2] style: run prettier on changed files --- .../local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc | 2 +- .../files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc b/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc index 2d38e885..a51ebef6 100644 --- a/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc +++ b/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ContentHandlers/BinaryContentHandler.inc @@ -36,7 +36,7 @@ class BinaryContentHandler extends ContentHandler { */ protected function _encode(mixed $content = null, ?Response $context = null): mixed { # We cannot encode error messages. If an error, rethrow it to be handled by the default Response handler - if (!$context instanceof Success) { + if (!($context instanceof Success)) { throw $context; } diff --git a/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc b/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc index 73b38d48..0383337e 100644 --- a/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc +++ b/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/ResourceLinkSet.inc @@ -30,7 +30,7 @@ class ResourceLinkSet { ) { # Throw an error if any $resource_links value is not a ResourceLink or ResourceLinkSet object foreach ($this->resource_links as $resource_link) { - if (!$resource_link instanceof ResourceLink and !$resource_link instanceof ResourceLinkSet) { + if (!($resource_link instanceof ResourceLink) and !($resource_link instanceof ResourceLinkSet)) { throw new ServerError( message: 'ResourceLinkSets can only contain ResourceLink and ResourceLinkSet objects.', response_id: 'RESOURCE_LINK_SET_CONTAINS_NON_RESOURCE_LINK',