From f8063d1bca731ee99ec19602409c9f88255bcf97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:09:47 +0000 Subject: [PATCH 01/13] build(deps-dev): Bump globals from 15.6.0 to 15.7.0 Bumps [globals](https://github.com/sindresorhus/globals) from 15.6.0 to 15.7.0. - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v15.6.0...v15.7.0) --- updated-dependencies: - dependency-name: globals dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6507e6ec..26a82e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@eslint/js": "^9.4.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.5.0", - "globals": "^15.6.0", + "globals": "^15.7.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" } @@ -1393,9 +1393,9 @@ } }, "node_modules/globals": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.6.0.tgz", - "integrity": "sha512-UzcJi88Hw//CurUIRa9Jxb0vgOCcuD/MNjwmXp633cyaRKkCWACkoqHCtfZv43b1kqXGg/fpOa8bwgacCeXsVg==", + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.7.0.tgz", + "integrity": "sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==", "dev": true, "engines": { "node": ">=18" diff --git a/package.json b/package.json index 9827b9de..ea263a09 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@eslint/js": "^9.4.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.5.0", - "globals": "^15.6.0", + "globals": "^15.7.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" }, From 929f26fe769b9ca8df2ca0a5f786310e277c4fd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:02:28 +0000 Subject: [PATCH 02/13] build(deps-dev): Bump @eslint/js from 9.5.0 to 9.6.0 Bumps [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) from 9.5.0 to 9.6.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.6.0/packages/js) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 17 +++++++++++++---- package.json | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26a82e82..ce012173 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@zachleat/snow-fall": "^1.0.2" }, "devDependencies": { - "@eslint/js": "^9.4.0", + "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.5.0", "globals": "^15.7.0", @@ -387,9 +387,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz", - "integrity": "sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.6.0.tgz", + "integrity": "sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1136,6 +1136,15 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/@eslint/js": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz", + "integrity": "sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/eslint/node_modules/eslint-visitor-keys": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", diff --git a/package.json b/package.json index ea263a09..d7b8a2bd 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/jonnybarnes/jonnybarnes.uk", "license": "CC0-1.0", "devDependencies": { - "@eslint/js": "^9.4.0", + "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.5.0", "globals": "^15.7.0", From 8baac038de310cff1eb803bdf94151480dfdfc2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:06:40 +0000 Subject: [PATCH 03/13] build(deps-dev): Bump eslint from 9.5.0 to 9.6.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.5.0 to 9.6.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.5.0...v9.6.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 45 ++++++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce012173..efcd52d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "devDependencies": { "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", - "eslint": "^9.5.0", + "eslint": "^9.6.0", "globals": "^15.7.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" @@ -338,14 +338,14 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.16.0.tgz", - "integrity": "sha512-/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.0.tgz", + "integrity": "sha512-A68TBu6/1mHHuc5YJL0U0VVeGNiklLAL6rRmhTCP2B5XjWLMnrX+HkO+IAXyHvks5cyyY1jjK5ITPQ1HGS2EVA==", "dev": true, "dependencies": { "@eslint/object-schema": "^2.1.4", "debug": "^4.3.1", - "minimatch": "^3.0.5" + "minimatch": "^3.1.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -745,9 +745,9 @@ "integrity": "sha512-nyNeliowryq+roSMktyV3o14DduSuU4BvBzruVSPV6e8U8Eid2zNzSj1AzCQByPId7Q4MrIP2QWL2UHeHGfmcA==" }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1058,16 +1058,16 @@ } }, "node_modules/eslint": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz", - "integrity": "sha512-+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.6.0.tgz", + "integrity": "sha512-ElQkdLMEEqQNM9Njff+2Y4q2afHk7JpkPvrd7Xh7xefwgQynqPxwf55J7di9+MEibWUGdNjFF9ITG9Pck5M84w==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/config-array": "^0.16.0", + "@eslint/config-array": "^0.17.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.5.0", + "@eslint/js": "9.6.0", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", @@ -1078,7 +1078,7 @@ "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.0.1", "eslint-visitor-keys": "^4.0.0", - "espree": "^10.0.1", + "espree": "^10.1.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1136,15 +1136,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@eslint/js": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz", - "integrity": "sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==", - "dev": true, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, "node_modules/eslint/node_modules/eslint-visitor-keys": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", @@ -1158,12 +1149,12 @@ } }, "node_modules/espree": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz", - "integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "dev": true, "dependencies": { - "acorn": "^8.11.3", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.0.0" }, diff --git a/package.json b/package.json index d7b8a2bd..612f0cbe 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "devDependencies": { "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", - "eslint": "^9.5.0", + "eslint": "^9.6.0", "globals": "^15.7.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" From ed8d232ce4ee73a0aea56c7b9b4c111e61bec505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:09:29 +0000 Subject: [PATCH 04/13] build(deps-dev): Bump vimeo/psalm from 5.24.0 to 5.25.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 5.24.0 to 5.25.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/5.24.0...5.25.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 6fd539f9..a94a1e2c 100644 --- a/composer.lock +++ b/composer.lock @@ -13099,16 +13099,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2" + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2", - "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", "shasum": "" }, "require": { @@ -13145,7 +13145,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.1.1" + "source": "https://github.com/symfony/filesystem/tree/v7.1.2" }, "funding": [ { @@ -13161,7 +13161,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T10:03:55+00:00" }, { "name": "symfony/polyfill-iconv", @@ -13428,16 +13428,16 @@ }, { "name": "vimeo/psalm", - "version": "5.24.0", + "version": "5.25.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "462c80e31c34e58cc4f750c656be3927e80e550e" + "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/462c80e31c34e58cc4f750c656be3927e80e550e", - "reference": "462c80e31c34e58cc4f750c656be3927e80e550e", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/01a8eb06b9e9cc6cfb6a320bf9fb14331919d505", + "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505", "shasum": "" }, "require": { @@ -13534,7 +13534,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-05-01T19:32:08+00:00" + "time": "2024-06-16T15:08:35+00:00" }, { "name": "zbateson/mail-mime-parser", From c25c1672f1688a791110f038c86949bfcd368c91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:15:17 +0000 Subject: [PATCH 05/13] build(deps): Bump symfony/serializer from 7.1.1 to 7.1.2 Bumps [symfony/serializer](https://github.com/symfony/serializer) from 7.1.1 to 7.1.2. - [Release notes](https://github.com/symfony/serializer/releases) - [Changelog](https://github.com/symfony/serializer/blob/7.1/CHANGELOG.md) - [Commits](https://github.com/symfony/serializer/compare/v7.1.1...v7.1.2) --- updated-dependencies: - dependency-name: symfony/serializer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a94a1e2c..22f3fb13 100644 --- a/composer.lock +++ b/composer.lock @@ -7903,16 +7903,16 @@ }, { "name": "symfony/serializer", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "74817ee48e37cce1a1b33c66ffdb750e7e048c3c" + "reference": "d2077674aaaff02a95f290de512aa358947e6bbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/74817ee48e37cce1a1b33c66ffdb750e7e048c3c", - "reference": "74817ee48e37cce1a1b33c66ffdb750e7e048c3c", + "url": "https://api.github.com/repos/symfony/serializer/zipball/d2077674aaaff02a95f290de512aa358947e6bbe", + "reference": "d2077674aaaff02a95f290de512aa358947e6bbe", "shasum": "" }, "require": { @@ -7980,7 +7980,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v7.1.1" + "source": "https://github.com/symfony/serializer/tree/v7.1.2" }, "funding": [ { @@ -7996,7 +7996,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T07:42:43+00:00" }, { "name": "symfony/service-contracts", From 05769c410c56130ca7f70089fecd6d17388cef52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:39:54 +0000 Subject: [PATCH 06/13] build(deps): Bump laravel/framework from 11.13.0 to 11.15.0 Bumps [laravel/framework](https://github.com/laravel/framework) from 11.13.0 to 11.15.0. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/11.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v11.13.0...v11.15.0) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 22f3fb13..9e894476 100644 --- a/composer.lock +++ b/composer.lock @@ -585,16 +585,16 @@ }, { "name": "dflydev/dot-access-data", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "f41715465d65213d644d3141a6a93081be5d3549" + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549", - "reference": "f41715465d65213d644d3141a6a93081be5d3549", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f", + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f", "shasum": "" }, "require": { @@ -654,9 +654,9 @@ ], "support": { "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2" + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3" }, - "time": "2022-10-27T11:44:00+00:00" + "time": "2024-07-08T12:26:09+00:00" }, { "name": "doctrine/deprecations", @@ -1999,16 +1999,16 @@ }, { "name": "laravel/framework", - "version": "v11.13.0", + "version": "v11.15.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "92deaa4f037ff100e36809443811301819a8cf84" + "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/92deaa4f037ff100e36809443811301819a8cf84", - "reference": "92deaa4f037ff100e36809443811301819a8cf84", + "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b", + "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b", "shasum": "" }, "require": { @@ -2061,6 +2061,7 @@ }, "provide": { "psr/container-implementation": "1.1|2.0", + "psr/log-implementation": "1.0|2.0|3.0", "psr/simple-cache-implementation": "1.0|2.0|3.0" }, "replace": { @@ -2113,7 +2114,7 @@ "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.1.5", "pda/pheanstalk": "^5.0", - "phpstan/phpstan": "^1.4.7", + "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5|^11.0", "predis/predis": "^2.0.2", "resend/resend-php": "^0.10.0", @@ -2200,7 +2201,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-27T09:04:50+00:00" + "time": "2024-07-09T15:38:12+00:00" }, { "name": "laravel/horizon", From 8792bee24911101b4efb7e18b819262490f27b6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:44:49 +0000 Subject: [PATCH 07/13] build(deps): Bump laravel/scout from 10.9.0 to 10.10.1 Bumps [laravel/scout](https://github.com/laravel/scout) from 10.9.0 to 10.10.1. - [Release notes](https://github.com/laravel/scout/releases) - [Changelog](https://github.com/laravel/scout/blob/10.x/CHANGELOG.md) - [Commits](https://github.com/laravel/scout/compare/v10.9.0...v10.10.1) --- updated-dependencies: - dependency-name: laravel/scout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 9e894476..22de2f79 100644 --- a/composer.lock +++ b/composer.lock @@ -2406,16 +2406,16 @@ }, { "name": "laravel/scout", - "version": "v10.9.0", + "version": "v10.10.1", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "7bac13a61f1670b4314a65a13b8b12c6575270c8" + "reference": "b8f429f0be3a023ec182839a9b58d4aa5f903bbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/7bac13a61f1670b4314a65a13b8b12c6575270c8", - "reference": "7bac13a61f1670b4314a65a13b8b12c6575270c8", + "url": "https://api.github.com/repos/laravel/scout/zipball/b8f429f0be3a023ec182839a9b58d4aa5f903bbb", + "reference": "b8f429f0be3a023ec182839a9b58d4aa5f903bbb", "shasum": "" }, "require": { @@ -2480,7 +2480,7 @@ "issues": "https://github.com/laravel/scout/issues", "source": "https://github.com/laravel/scout" }, - "time": "2024-05-07T14:16:56+00:00" + "time": "2024-07-02T18:13:16+00:00" }, { "name": "laravel/serializable-closure", From be95bd6468351ce51fbe524b22dfcfbb20aca22f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:46:53 +0000 Subject: [PATCH 08/13] build(deps-dev): Bump laravel/sail from 1.29.3 to 1.30.2 Bumps [laravel/sail](https://github.com/laravel/sail) from 1.29.3 to 1.30.2. - [Release notes](https://github.com/laravel/sail/releases) - [Changelog](https://github.com/laravel/sail/blob/1.x/CHANGELOG.md) - [Commits](https://github.com/laravel/sail/compare/v1.29.3...v1.30.2) --- updated-dependencies: - dependency-name: laravel/sail dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 22de2f79..999e8d1c 100644 --- a/composer.lock +++ b/composer.lock @@ -10309,16 +10309,16 @@ }, { "name": "laravel/sail", - "version": "v1.29.3", + "version": "v1.30.2", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "e35b3ffe1b9ea598246d7e99197ee8799f6dc2e5" + "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/e35b3ffe1b9ea598246d7e99197ee8799f6dc2e5", - "reference": "e35b3ffe1b9ea598246d7e99197ee8799f6dc2e5", + "url": "https://api.github.com/repos/laravel/sail/zipball/f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887", + "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887", "shasum": "" }, "require": { @@ -10368,7 +10368,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-06-12T16:24:41+00:00" + "time": "2024-07-05T16:01:51+00:00" }, { "name": "maximebf/debugbar", From 51c3ba8ecf33a0f4ad29d5c619c12765e256889e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:53:11 +0000 Subject: [PATCH 09/13] build(deps-dev): Bump globals from 15.7.0 to 15.8.0 Bumps [globals](https://github.com/sindresorhus/globals) from 15.7.0 to 15.8.0. - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v15.7.0...v15.8.0) --- updated-dependencies: - dependency-name: globals dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index efcd52d4..e5ec63f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.6.0", - "globals": "^15.7.0", + "globals": "^15.8.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" } @@ -1393,9 +1393,9 @@ } }, "node_modules/globals": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.7.0.tgz", - "integrity": "sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==", + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.8.0.tgz", + "integrity": "sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==", "dev": true, "engines": { "node": ">=18" diff --git a/package.json b/package.json index 612f0cbe..ced2e4ad 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@eslint/js": "^9.6.0", "@stylistic/eslint-plugin": "^2.3.0", "eslint": "^9.6.0", - "globals": "^15.7.0", + "globals": "^15.8.0", "stylelint": "^16.6.1", "stylelint-config-standard": "^36.0.1" }, From a2c0fb22988354a9e1f0469db0d2a0704ba2b974 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 12 Jul 2024 15:15:08 +0100 Subject: [PATCH 10/13] Update Postgres in Laravel Sail to v16 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3db9674f..486609ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - pgsql - redis pgsql: - image: 'postgres:14' + image: 'postgres:16' ports: - '${FORWARD_DB_PORT:-5432}:5432' environment: From 8e077045d23e2948d71a8f0f3d64902119e7d422 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 13 Jul 2024 10:55:19 +0100 Subject: [PATCH 11/13] Update Laravel Pint Also fixes some of the filesaftersome new rules were added to the default pint configuration. --- app/Exceptions/InternetArchiveException.php | 4 +--- app/Jobs/DownloadWebMention.php | 3 +-- app/Jobs/ProcessBookmark.php | 3 +-- app/Jobs/ProcessLike.php | 3 +-- app/Jobs/ProcessMedia.php | 3 +-- app/Jobs/ProcessWebMention.php | 3 +-- app/Jobs/SaveProfileImage.php | 3 +-- app/Jobs/SaveScreenshot.php | 3 +-- app/Jobs/SendWebMentions.php | 3 +-- app/Jobs/SyndicateNoteToBluesky.php | 3 +-- app/Jobs/SyndicateNoteToMastodon.php | 3 +-- composer.lock | 22 ++++++++++----------- 12 files changed, 22 insertions(+), 34 deletions(-) diff --git a/app/Exceptions/InternetArchiveException.php b/app/Exceptions/InternetArchiveException.php index 7e810fea..99d5cab7 100644 --- a/app/Exceptions/InternetArchiveException.php +++ b/app/Exceptions/InternetArchiveException.php @@ -2,6 +2,4 @@ namespace App\Exceptions; -class InternetArchiveException extends \Exception -{ -} +class InternetArchiveException extends \Exception {} diff --git a/app/Jobs/DownloadWebMention.php b/app/Jobs/DownloadWebMention.php index 72f469e5..a32b25a9 100644 --- a/app/Jobs/DownloadWebMention.php +++ b/app/Jobs/DownloadWebMention.php @@ -24,8 +24,7 @@ class DownloadWebMention implements ShouldQueue */ public function __construct( protected string $source - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/ProcessBookmark.php b/app/Jobs/ProcessBookmark.php index b1dffe8a..96f65e87 100644 --- a/app/Jobs/ProcessBookmark.php +++ b/app/Jobs/ProcessBookmark.php @@ -25,8 +25,7 @@ class ProcessBookmark implements ShouldQueue */ public function __construct( protected Bookmark $bookmark - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/ProcessLike.php b/app/Jobs/ProcessLike.php index 3a2d6f62..37a377a3 100644 --- a/app/Jobs/ProcessLike.php +++ b/app/Jobs/ProcessLike.php @@ -30,8 +30,7 @@ class ProcessLike implements ShouldQueue */ public function __construct( protected Like $like - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/ProcessMedia.php b/app/Jobs/ProcessMedia.php index cb230c1e..6b6a1dcf 100644 --- a/app/Jobs/ProcessMedia.php +++ b/app/Jobs/ProcessMedia.php @@ -25,8 +25,7 @@ class ProcessMedia implements ShouldQueue */ public function __construct( protected string $filename - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/ProcessWebMention.php b/app/Jobs/ProcessWebMention.php index 457ab71d..a5afd300 100644 --- a/app/Jobs/ProcessWebMention.php +++ b/app/Jobs/ProcessWebMention.php @@ -30,8 +30,7 @@ class ProcessWebMention implements ShouldQueue public function __construct( protected Note $note, protected string $source - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/SaveProfileImage.php b/app/Jobs/SaveProfileImage.php index dd5422a9..d1b09776 100644 --- a/app/Jobs/SaveProfileImage.php +++ b/app/Jobs/SaveProfileImage.php @@ -25,8 +25,7 @@ class SaveProfileImage implements ShouldQueue */ public function __construct( protected array $microformats - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/SaveScreenshot.php b/app/Jobs/SaveScreenshot.php index c086276c..0e07efbd 100755 --- a/app/Jobs/SaveScreenshot.php +++ b/app/Jobs/SaveScreenshot.php @@ -23,8 +23,7 @@ class SaveScreenshot implements ShouldQueue */ public function __construct( protected Bookmark $bookmark - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php index 459b1cd8..89babc89 100644 --- a/app/Jobs/SendWebMentions.php +++ b/app/Jobs/SendWebMentions.php @@ -27,8 +27,7 @@ class SendWebMentions implements ShouldQueue */ public function __construct( protected Note $note - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/SyndicateNoteToBluesky.php b/app/Jobs/SyndicateNoteToBluesky.php index 9e89f639..e815be34 100644 --- a/app/Jobs/SyndicateNoteToBluesky.php +++ b/app/Jobs/SyndicateNoteToBluesky.php @@ -22,8 +22,7 @@ class SyndicateNoteToBluesky implements ShouldQueue */ public function __construct( protected Note $note - ) { - } + ) {} /** * Execute the job. diff --git a/app/Jobs/SyndicateNoteToMastodon.php b/app/Jobs/SyndicateNoteToMastodon.php index 557006a4..b79c092c 100644 --- a/app/Jobs/SyndicateNoteToMastodon.php +++ b/app/Jobs/SyndicateNoteToMastodon.php @@ -22,8 +22,7 @@ class SyndicateNoteToMastodon implements ShouldQueue */ public function __construct( protected Note $note - ) { - } + ) {} /** * Execute the job. diff --git a/composer.lock b/composer.lock index 999e8d1c..f6e1cf2f 100644 --- a/composer.lock +++ b/composer.lock @@ -10243,16 +10243,16 @@ }, { "name": "laravel/pint", - "version": "v1.15.0", + "version": "v1.16.2", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "c52de679b3ac01207016c179d7ce173e4be128c4" + "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/c52de679b3ac01207016c179d7ce173e4be128c4", - "reference": "c52de679b3ac01207016c179d7ce173e4be128c4", + "url": "https://api.github.com/repos/laravel/pint/zipball/51f1ba679a6afe0315621ad143d788bd7ded0eca", + "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca", "shasum": "" }, "require": { @@ -10263,13 +10263,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.49.0", - "illuminate/view": "^10.43.0", - "larastan/larastan": "^2.8.1", - "laravel-zero/framework": "^10.3.0", - "mockery/mockery": "^1.6.7", + "friendsofphp/php-cs-fixer": "^3.59.3", + "illuminate/view": "^10.48.12", + "larastan/larastan": "^2.9.7", + "laravel-zero/framework": "^10.4.0", + "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.33.6" + "pestphp/pest": "^2.34.8" }, "bin": [ "builds/pint" @@ -10305,7 +10305,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-03-26T16:40:24+00:00" + "time": "2024-07-09T15:58:08+00:00" }, { "name": "laravel/sail", From baee7ade4f5622fae7023cda64c0842c03e9611e Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 13 Jul 2024 14:52:57 +0100 Subject: [PATCH 12/13] Improve scope checking Whether the scopes are defined as a space separated string, or an array, we should now be checking them without any errors. --- app/Http/Controllers/MicropubController.php | 20 ++++++++++++++++--- .../Controllers/MicropubMediaController.php | 12 +++++++++-- tests/TestToken.php | 4 ++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index 629cb4e6..837c0953 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -13,6 +13,7 @@ use App\Services\Micropub\UpdateService; use App\Services\TokenService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use illuminate\Support\Arr; use Lcobucci\JWT\Encoding\CannotDecodeContent; use Lcobucci\JWT\Token\InvalidTokenStructure; use Lcobucci\JWT\Validation\RequiredConstraintsViolated; @@ -67,7 +68,12 @@ class MicropubController extends Controller $this->logMicropubRequest($request->all()); if (($request->input('h') === 'entry') || ($request->input('type.0') === 'h-entry')) { - if (stripos($tokenData->claims()->get('scope'), 'create') === false) { + $scopes = $tokenData->claims()->get('scope'); + if (is_string($scopes)) { + $scopes = explode(' ', $scopes); + } + + if (!in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -81,7 +87,11 @@ class MicropubController extends Controller } if ($request->input('h') === 'card' || $request->input('type.0') === 'h-card') { - if (stripos($tokenData->claims()->get('scope'), 'create') === false) { + $scopes = $tokenData->claims()->get('scope'); + if (is_string($scopes)) { + $scopes = explode(' ', $scopes); + } + if (!in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -95,7 +105,11 @@ class MicropubController extends Controller } if ($request->input('action') === 'update') { - if (stripos($tokenData->claims()->get('scope'), 'update') === false) { + $scopes = $tokenData->claims()->get('scope'); + if (is_string($scopes)) { + $scopes = explode(' ', $scopes); + } + if (!in_array('update', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); diff --git a/app/Http/Controllers/MicropubMediaController.php b/app/Http/Controllers/MicropubMediaController.php index b3cdd3e2..4f66398f 100644 --- a/app/Http/Controllers/MicropubMediaController.php +++ b/app/Http/Controllers/MicropubMediaController.php @@ -51,7 +51,11 @@ class MicropubMediaController extends Controller return $micropubResponses->tokenHasNoScopeResponse(); } - if (Str::contains($tokenData->claims()->get('scope'), 'create') === false) { + $scopes = $tokenData->claims()->get('scope'); + if (is_string($scopes)) { + $scopes = explode(' ', $scopes); + } + if (!in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -119,7 +123,11 @@ class MicropubMediaController extends Controller return $micropubResponses->tokenHasNoScopeResponse(); } - if (Str::contains($tokenData->claims()->get('scope'), 'create') === false) { + $scopes = $tokenData->claims()->get('scope'); + if (is_string($scopes)) { + $scopes = explode(' ', $scopes); + } + if (!in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); diff --git a/tests/TestToken.php b/tests/TestToken.php index 5b54d497..397967dc 100644 --- a/tests/TestToken.php +++ b/tests/TestToken.php @@ -14,8 +14,8 @@ trait TestToken return $config->builder() ->issuedAt(new DateTimeImmutable()) ->withClaim('client_id', 'https://quill.p3k.io') - ->withClaim('me', 'https://jonnybarnes.localhost') - ->withClaim('scope', 'create update') + ->withClaim('me', 'http://jonnybarnes.localhost') + ->withClaim('scope', ['create', 'update']) ->getToken($config->signer(), $config->signingKey()) ->toString(); } From bcf61bb6a0b5fab63860bf0f736ae97aa7b900bb Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 13 Jul 2024 14:58:11 +0100 Subject: [PATCH 13/13] Fis Laravel Pint issues --- app/Http/Controllers/MicropubController.php | 7 +++---- app/Http/Controllers/MicropubMediaController.php | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index 837c0953..8a395ee0 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -13,7 +13,6 @@ use App\Services\Micropub\UpdateService; use App\Services\TokenService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use illuminate\Support\Arr; use Lcobucci\JWT\Encoding\CannotDecodeContent; use Lcobucci\JWT\Token\InvalidTokenStructure; use Lcobucci\JWT\Validation\RequiredConstraintsViolated; @@ -73,7 +72,7 @@ class MicropubController extends Controller $scopes = explode(' ', $scopes); } - if (!in_array('create', $scopes)) { + if (! in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -91,7 +90,7 @@ class MicropubController extends Controller if (is_string($scopes)) { $scopes = explode(' ', $scopes); } - if (!in_array('create', $scopes)) { + if (! in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -109,7 +108,7 @@ class MicropubController extends Controller if (is_string($scopes)) { $scopes = explode(' ', $scopes); } - if (!in_array('update', $scopes)) { + if (! in_array('update', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); diff --git a/app/Http/Controllers/MicropubMediaController.php b/app/Http/Controllers/MicropubMediaController.php index 4f66398f..e07e979f 100644 --- a/app/Http/Controllers/MicropubMediaController.php +++ b/app/Http/Controllers/MicropubMediaController.php @@ -17,7 +17,6 @@ use Illuminate\Http\Response; use Illuminate\Http\UploadedFile; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Str; use Intervention\Image\ImageManager; use Lcobucci\JWT\Token\InvalidTokenStructure; use Lcobucci\JWT\Validation\RequiredConstraintsViolated; @@ -55,7 +54,7 @@ class MicropubMediaController extends Controller if (is_string($scopes)) { $scopes = explode(' ', $scopes); } - if (!in_array('create', $scopes)) { + if (! in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse(); @@ -127,7 +126,7 @@ class MicropubMediaController extends Controller if (is_string($scopes)) { $scopes = explode(' ', $scopes); } - if (!in_array('create', $scopes)) { + if (! in_array('create', $scopes)) { $micropubResponses = new MicropubResponses(); return $micropubResponses->insufficientScopeResponse();