Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PHP-CS-Fixer/PHP-CS-Fixer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: zoonru/PHP-CS-Fixer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 14, 2024

  1. Hotfix

    @danog
    danog committed Mar 14, 2024
    Copy the full SHA
    4299036 View commit details

  2. Fix

    @danog
    danog committed Mar 14, 2024
    Copy the full SHA
    42d98f4 View commit details

Commits on Mar 19, 2024

  1. Merge remote-tracking branch 'o/master'

    @danog
    danog committed Mar 19, 2024
    Copy the full SHA
    85c8444 View commit details

  2. Cleanup

    @danog
    danog committed Mar 19, 2024
    Copy the full SHA
    7662d69 View commit details

Commits on Mar 21, 2024

  1. Merge remote-tracking branch 'o/master'

    @danog
    danog committed Mar 21, 2024
    Copy the full SHA
    7d28e30 View commit details

Commits on Dec 2, 2024

  1. Merge branch 'PHP-CS-Fixer:master' into master

    @xtrime-ru
    xtrime-ru authored Dec 2, 2024

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thomasmoon Thomas Moon
    GPG key ID: 5A9C3407BA47887E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d095b21 View commit details

Commits on Feb 10, 2025

  1. Merge remote-tracking branch 'o/master'

    @danog
    danog committed Feb 10, 2025
    Copy the full SHA
    90b1644 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php
2 changes: 1 addition & 1 deletion src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php
View file
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void

// insert the new line with indented semicolon
$tokens->insertAt($index++, [$newline, new Token(';')]);
} else {
} elseif (self::STRATEGY_NO_MULTI_LINE === $this->configuration['strategy']) {
if (!$previous->isWhitespace() || !str_contains($previous->getContent(), "\n")) {
continue;
}