Fix nomercure tag usage by tehmaestro · Pull Request #2212 · php/frankenphp · GitHub
Skip to content

Fix nomercure tag usage#2212

Merged
dunglas merged 4 commits into
php:mainfrom
tehmaestro:nomercure-fix
Feb 22, 2026
Merged

Fix nomercure tag usage#2212
dunglas merged 4 commits into
php:mainfrom
tehmaestro:nomercure-fix

Conversation

@tehmaestro

@tehmaestro tehmaestro commented Feb 21, 2026

Copy link
Copy Markdown
Contributor
  • Fixes nomercure tag build
  • Conditionally addds the mercure route and mercure project import

Fixes #2209

I am by no means a go developer, feel free to use this or not :)

@tehmaestro

tehmaestro commented Feb 21, 2026

Copy link
Copy Markdown
Contributor Author

Comment thread caddy/mercure-route.go Outdated
@@ -0,0 +1,47 @@
//go:build !nomercure

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file name should be mercureroot.go, but I would just go for mercure.go

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for just mercure.go

@tehmaestro tehmaestro Feb 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to do that, but there's already a mercure.go and mercure-skip.go
Wanna put these in the same file?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

Comment thread caddy/mercure-route-skip.go Outdated
@@ -0,0 +1,10 @@
//go:build nomercure

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one also just mercure-skip or nomercure.go

@tehmaestro

Copy link
Copy Markdown
Contributor Author
  • Merge to the same file
  • Rename function to be more relevant?
  • Rebase to pass integration tests

Comment thread caddy/php-server.go Outdated
Co-authored-by: Alexander Stecher <45872305+AlliBalliBaba@users.noreply.github.com>
Signed-off-by: tehmaestro <alexnegrila89@gmail.com>
Comment thread caddy/mercure.go
@dunglas dunglas merged commit c99b6db into php:main Feb 22, 2026
11 checks passed
@dunglas

dunglas commented Feb 22, 2026

Copy link
Copy Markdown
Member

johanjanssens pushed a commit to johanjanssens/frankenphp that referenced this pull request Feb 26, 2026
- Fixes nomercure tag build
- Conditionally addds the mercure route and mercure project import

Fixes php#2209

I am by no means a go developer, feel free to use this or not :)

---------

Signed-off-by: tehmaestro <alexnegrila89@gmail.com>
Co-authored-by: Alexander Stecher <45872305+AlliBalliBaba@users.noreply.github.com>
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.

Snyk high severity issue due to A-GPL license

4 participants