Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 4.x => 5.x #961

Merged
merged 16 commits into from
Jul 31, 2023
Merged

merge 4.x => 5.x #961

merged 16 commits into from
Jul 31, 2023

Conversation

LordSimal
Copy link
Contributor

No description provided.

dependabot bot and others added 16 commits March 27, 2023 04:00
Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Add Truetype collections (.ttc files) to .gitattributes
add .ttc to .gitattributes
…s/stale-8

Bump actions/stale from 7 to 8
Updates the requirements on [josegonzalez/dotenv](https://github.com/josegonzalez/php-dotenv) to permit the latest version.
- [Release notes](https://github.com/josegonzalez/php-dotenv/releases)
- [Commits](josegonzalez/php-dotenv@3.2.0...4.0.0)

---
updated-dependencies:
- dependency-name: josegonzalez/dotenv
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Use Debugger::trimPath() and Debugger::editorUrl() for error templates
This allows using `$this` in the function to reference the application
class instance. This is required for cases like building an AuthencationMiddleware
instance.
Co-authored-by: Marc Würth <ravage@bluewin.ch>
Remove `static` keyword from the function in routes.php.
…/dotenv-tw-4.0

Update josegonzalez/dotenv requirement from ^3.2 to ^4.0
# Conflicts:
#	composer.json
#	phpcs.xml
@LordSimal LordSimal added this to the 5.x milestone Jul 30, 2023
@othercorey
Copy link
Member

Looks good

@LordSimal LordSimal merged commit 58d572e into 5.x Jul 31, 2023
4 checks passed
@LordSimal LordSimal deleted the 5.x-merge branch July 31, 2023 06:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants