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

Commits on Nov 21, 2022

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

Commits on Nov 22, 2022

  1. bug #960 Correctly resolve the lock alias (pierredup)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Correctly resolve the lock alias
    
    `composer require lock` doesn't resolve the `lock` alias because the package name resolution is skipped when the package argument is `lock`. This PR bypasses this specifically for the `require` command, so that `composer require lock` correctly resolved the alias, but `composer update lock` still skips the name resolution.
    
    Reference: symfony/recipes#1150
    
    Commits
    -------
    
    de71648 Correctly resolve the lock alias
    fabpot committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    2c5e9cb View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Use git binary to resolve location of .git folder and current relativ…

    …e path
    Peukku authored and Mikko Peltola committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    ae675dc View commit details
    Browse the repository at this point in the history
  2. Refactored getBlobPath() for clarity, added testApplyPatchOnSubfolder…

    …() using same dataprovider as is used for testApplyPatch()
    Mikko Peltola committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    48e5039 View commit details
    Browse the repository at this point in the history
  3. tweak coding standards

    Mikko Peltola committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    637b769 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. bug #937 Updating Recipe Fails When Project Located in Subfolder in G…

    …it Repository (Peukku, Mikko Peltola)
    
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Updating Recipe Fails When Project Located in Subfolder in Git Repository
    
    Closes #918 and #864
    
    Updating Recipe fails when symfony project is not in the root of git project.
    As a developer the most problematic thing is that it fails without any errors. Some files are just not updated.
    
    There is a simple project with commands needed to reproduce to see what is happening before the fix: https://github.com/Peukku/symfony-flex-reproducer-918-project-root/
    
    I think there are two reasons for this to happen:
    * $patchString is created with git diff in tmpPath, which has a temporary flat git repository (with no path prefix), but applied bit later in project context where path would be needed.
    * Location of .git directory is assumed to be in project root, when it actually is in git root level. (or in .git/modules/[subproject] when using git submodules). The blobs do get written, but in the wrong location.
    
    This PR uses git binary to resolve location of .git folder and current relative path to be used as the prefix for git diff.
    
    Commits
    -------
    
    637b769 tweak coding standards
    48e5039 Refactored getBlobPath() for clarity, added testApplyPatchOnSubfolder() using same dataprovider as is used for testApplyPatch()
    ae675dc Use git binary to resolve location of .git folder and current relative path
    fabpot committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    c824772 View commit details
    Browse the repository at this point in the history
Loading