Skip to content

Commit 87c05aa

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # composer.json # src/Models/Redirect.php
2 parents 0ee9b1c + cf475dd commit 87c05aa

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

.github/workflows/fix-php-code-style-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
uses: aglipanci/[email protected]
2424

2525
- name: Commit changes
26-
uses: stefanzweifel/git-auto-commit-action@v5
26+
uses: stefanzweifel/git-auto-commit-action@v6
2727
with:
2828
commit_message: Fix styling

.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
release-notes: ${{ github.event.release.body }}
2626

2727
- name: Commit updated CHANGELOG
28-
uses: stefanzweifel/git-auto-commit-action@v5
28+
uses: stefanzweifel/git-auto-commit-action@v6
2929
with:
3030
branch: main
3131
commit_message: Update CHANGELOG

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.4",
19+
"php": "^8.2",
2020
"artesaos/seotools": "^1.3",
2121
"illuminate/contracts": "^10.0||^11.0||^12.0",
2222
"mcamara/laravel-localization": "^2.3",

src/Models/Redirect.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class Redirect extends Model
2727
/**
2828
* Returns a list of old and new urls with the status code if set compatible with spatie/laravel-missing-page-redirector,
2929
* that merges the redirects set in the database over the redirects set in the config.
30+
* @return array
3031
*/
3132
public static function getDirectionMap(): array
3233
{

0 commit comments

Comments
 (0)