Skip to content

Revert "Fix GH-2635: Fix switch alternative syntax (#2648)"#2693

Merged
TimWolla merged 1 commit intophp:masterfrom
TimWolla:switch-alternative-syntax-revert
Aug 21, 2023
Merged

Revert "Fix GH-2635: Fix switch alternative syntax (#2648)"#2693
TimWolla merged 1 commit intophp:masterfrom
TimWolla:switch-alternative-syntax-revert

Conversation

@TimWolla
Copy link
Copy Markdown
Member

As per the discussion in #2648, the part that might actually be unexpected is that leading indentation also causes problems. The addition of the empty line distracts from that. Now that the CSS for PHP.net is fixed, this can be reverted.

This reverts commit 1d73d6e.

see php/web-php#801

As per the discussion in php#2648, the part that might actually be
unexpected is that leading indentation also causes problems.  The addition of
the empty line distracts from that. Now that the CSS for PHP.net is fixed, this
can be reverted.

This reverts commit 1d73d6e.

see php/web-php#801
@TimWolla TimWolla requested a review from Girgias August 18, 2023 11:49
Comment on lines -73 to +72
<?php endswitch; ?>
<?php endswitch ?>
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Should the semicolon be preserved here?

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.

Yeah keep the semicolons, both variants are fine.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Okay, I've re-added them in #2699 (which I'll immediately merge) to have them in a dedicated commit with a proper message. The “joys” of commit squashing 😔

Copy link
Copy Markdown
Member

@Girgias Girgias left a comment

Choose a reason for hiding this comment

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

Checked the page and yes the indent is now being shown

@TimWolla TimWolla merged commit fb21c51 into php:master Aug 21, 2023
TimWolla added a commit to TimWolla/php-doc-en that referenced this pull request Aug 21, 2023
This was part of an unrelated commit and is now re-added in a dedicated
single-purpose commit.

see php#2648
see php#2693
TimWolla added a commit that referenced this pull request Aug 21, 2023
This was part of an unrelated commit and is now re-added in a dedicated
single-purpose commit.

see #2648
see #2693
@TimWolla TimWolla deleted the switch-alternative-syntax-revert branch August 21, 2023 15:29
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.

2 participants