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: symfony/flex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.4.7
Choose a base ref
...
head repository: symfony/flex
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.5.0
Choose a head ref
  • 20 commits
  • 39 files changed
  • 4 contributors

Commits on Jan 2, 2025

  1. Fix license year

    fabpot committed Jan 2, 2025
    Configuration menu
    Copy the full SHA
    31a60ed View commit details
    Browse the repository at this point in the history
  2. Merge branch '1.x' into 2.x

    * 1.x:
      Fix license year
    fabpot committed Jan 2, 2025
    Configuration menu
    Copy the full SHA
    5919c36 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2025

  1. Configuration menu
    Copy the full SHA
    22fa147 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2025

  1. minor #1036 CI: Bump actions and run tests also on newer php versions…

    … (rosier)
    
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    CI: Bump actions and run tests also on newer php versions
    
    Fixes:
    - The `set-output` command is deprecated and will be disabled soon.
    - The `save-state` command is deprecated and will be disabled soon.
    
    Commits
    -------
    
    22fa147 CI: Bump actions and run tests also on newer php versions
    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    fd20265 View commit details
    Browse the repository at this point in the history
  2. Merge branch '1.x' into 2.x

    * 1.x:
      CI: Bump actions and run tests also on newer php versions
    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    26430da View commit details
    Browse the repository at this point in the history
  3. CS fixes

    rosier authored and fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    f34d820 View commit details
    Browse the repository at this point in the history
  4. minor #1037 CS fixes (rosier)

    This PR was squashed before being merged into the 1.x branch.
    
    Discussion
    ----------
    
    CS fixes
    
    I did split this in separate commits to make it easier to review.
    
    I can squash this if you prefer that.
    
    Commits
    -------
    
    f34d820 CS fixes
    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    a7a37d9 View commit details
    Browse the repository at this point in the history
  5. Merge branch '1.x' into 2.x

    * 1.x:
      CS fixes
    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    de1266d View commit details
    Browse the repository at this point in the history
  6. Fix CS

    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    e774cfe View commit details
    Browse the repository at this point in the history
  7. Fix CS

    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    63912e8 View commit details
    Browse the repository at this point in the history
  8. Merge branch '1.x' into 2.x

    * 1.x:
      Fix CS
    fabpot committed Feb 7, 2025
    Configuration menu
    Copy the full SHA
    11d923a View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2025

  1. Fix PHP Parse errors in tests.

    PHP 7.1 and PHP 7.2 don't support a comma after a heredoc end (T_END_HEREDOC)
    rosier committed Feb 9, 2025
    Configuration menu
    Copy the full SHA
    7e76f08 View commit details
    Browse the repository at this point in the history
  2. minor #1038 Fix PHP Parse errors in tests (rosier)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Fix PHP Parse errors in tests
    
    PHP 7.1 and PHP 7.2 don't support a comma after a heredoc end (T_END_HEREDOC)
    
    Commits
    -------
    
    7e76f08 Fix PHP Parse errors in tests.
    fabpot committed Feb 9, 2025
    Configuration menu
    Copy the full SHA
    1aabc8e View commit details
    Browse the repository at this point in the history
  3. Merge branch '1.x' into 2.x

    * 1.x:
      Fix PHP Parse errors in tests.
    fabpot committed Feb 9, 2025
    Configuration menu
    Copy the full SHA
    c146113 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2025

  1. Configuration menu
    Copy the full SHA
    740bc2f View commit details
    Browse the repository at this point in the history
  2. bug #1039 Do not synchronize package.json if symfony/flex is not inst…

    …alled (leofeyer)
    
    This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.
    
    Discussion
    ----------
    
    Do not synchronize package.json if symfony/flex is not installed
    
    Just as the project is not configured and no recipes are loaded if symfony/flex is not in the root `composer.json`, the `package.json` should not be synchronized in this case.
    
    Commits
    -------
    
    740bc2f Do not synchronize package.json if symfony/flex is not installed
    fabpot committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    0491870 View commit details
    Browse the repository at this point in the history
  3. Merge branch '1.x' into 2.x

    * 1.x:
      Do not synchronize package.json if symfony/flex is not installed
    fabpot committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    c5941c6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    791e814 View commit details
    Browse the repository at this point in the history
  5. feature #1032 feat: add ability to skip package.json synchronization …

    …(wuchen90)
    
    This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.
    
    Discussion
    ----------
    
    feat: add ability to skip package.json synchronization
    
    For those who doesn't want the package.json synchronization, this PR offers to opt-out this behavior by setting the config below in extra section of composer.json:
    
    ```json
    {
      "extra": {
        "symfony/flex": {
          "synchronize_package_json": false
        }
      }
    }
    
    ```
    
    fix #1017
    
    Commits
    -------
    
    791e814 feat: add ability to skip package.json synchronization
    fabpot committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    5cc9859 View commit details
    Browse the repository at this point in the history
  6. Merge branch '1.x' into 2.x

    * 1.x:
      feat: add ability to skip package.json synchronization
    fabpot committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    8ce1acd View commit details
    Browse the repository at this point in the history
Loading