Skip to content

Added patches directory and patches.lock.json to .gitattributes#721

Merged
xepozz merged 2 commits intotemporalio:masterfrom
root-aza:master
Mar 8, 2026
Merged

Added patches directory and patches.lock.json to .gitattributes#721
xepozz merged 2 commits intotemporalio:masterfrom
root-aza:master

Conversation

@root-aza
Copy link
Contributor

@root-aza root-aza commented Mar 5, 2026

What was changed

.gitattributes

Why?

When using cweagans/composer-patches, the plugin reacts to changes
in vendor/ and attempts to patch phpunit, which should not happen in the project

Log composer install
 - Removing phpunit/phpunit (10.5.34)
Gathering patches for root package.
Removing package phpunit/phpunit so that it can be re-installed and re-patched.
Installing dependencies from lock file (including require-dev)
Verifying lock file contents can be installed on current platform.
Package operations: 1 install, 0 updates, 0 removals
  - Downloading phpunit/phpunit (10.5.34)
Gathering patches for root package.
Gathering patches for dependencies. This might take a minute.
  - Installing phpunit/phpunit (10.5.34): Extracting archive
  - Applying patches for phpunit/phpunit
    patches/phpunit-run-test-protected.patch (Make runTest protected)

In RemoteFilesystem.php line 106:
                                                                               
  [TypeError]                                                                  
  Composer\Util\RemoteFilesystem::copy(): Argument #1 ($originUrl) must be of  
   type string, null given, called in /app/vendor/cweagans/composer-patches/s  
  rc/Patches.php on line 388                                                   
                                                                               

Exception trace:
  at phar:///usr/bin/composer/src/Composer/Util/RemoteFilesystem.php:106
 Composer\Util\RemoteFilesystem->copy() at /app/vendor/cweagans/composer-patches/src/Patches.php:388
 cweagans\Composer\Patches->getAndApplyPatch() at /app/vendor/cweagans/composer-patches/src/Patches.php:324
 cweagans\Composer\Patches->postInstall() at phar:///usr/bin/composer/src/Composer/EventDispatcher/EventDispatcher.php:228
 Composer\EventDispatcher\EventDispatcher->doDispatch() at phar:///usr/bin/composer/src/Composer/EventDispatcher/EventDispatcher.php:158
 Composer\EventDispatcher\EventDispatcher->dispatchPackageEvent() at phar:///usr/bin/composer/src/Composer/Installer/InstallationManager.php:399
 Composer\Installer\InstallationManager::Composer\Installer\{closure}() at phar:///usr/bin/composer/src/Composer/Installer/InstallationManager.php:414
 Composer\Installer\InstallationManager->executeBatch() at phar:///usr/bin/composer/src/Composer/Installer/InstallationManager.php:322
 Composer\Installer\InstallationManager->downloadAndExecuteBatch() at phar:///usr/bin/composer/src/Composer/Installer/InstallationManager.php:221
 Composer\Installer\InstallationManager->execute() at phar:///usr/bin/composer/src/Composer/Installer.php:839
 Composer\Installer->doInstall() at phar:///usr/bin/composer/src/Composer/Installer.php:300
 Composer\Installer->run() at phar:///usr/bin/composer/src/Composer/Command/InstallCommand.php:147
 Composer\Command\InstallCommand->execute() at phar:///usr/bin/composer/vendor/symfony/console/Command/Command.php:298
 Symfony\Component\Console\Command\Command->run() at phar:///usr/bin/composer/vendor/symfony/console/Application.php:1040
 Symfony\Component\Console\Application->doRunCommand() at phar:///usr/bin/composer/vendor/symfony/console/Application.php:301
 Symfony\Component\Console\Application->doRun() at phar:///usr/bin/composer/src/Composer/Console/Application.php:400
 Composer\Console\Application->doRun() at phar:///usr/bin/composer/vendor/symfony/console/Application.php:171
 Symfony\Component\Console\Application->run() at phar:///usr/bin/composer/src/Composer/Console/Application.php:137
 Composer\Console\Application->run() at phar:///usr/bin/composer/bin/composer:98
 require() at /usr/bin/composer:29

install [--prefer-source] [--prefer-dist] [--prefer-install PREFER-INSTALL] [--dry-run] [--download-only] [--dev] [--no-suggest] [--no-dev] [--no-autoloader] [--no-progress] [--no-install] [--audit] [--audit-format AUDIT-FORMAT] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [-a|--classmap-authoritative] [--apcu-autoloader] [--apcu-autoloader-prefix APCU-AUTOLOADER-PREFIX] [--ignore-platform-req IGNORE-PLATFORM-REQ] [--ignore-platform-reqs] [--] [<packages>...]

Checklist

  1. Closes

  2. How was this tested:

  1. Any docs updates needed?

@root-aza root-aza requested review from a team, roxblnfk and wolfy-j as code owners March 5, 2026 09:00
@vercel
Copy link

vercel bot commented Mar 5, 2026

@root-aza is attempting to deploy a commit to the Temporal Team on Vercel.

A member of the Team first needs to authorize it.

@xepozz xepozz merged commit cdbf687 into temporalio:master Mar 8, 2026
72 of 75 checks passed
@xepozz
Copy link
Collaborator

xepozz commented Mar 8, 2026

Missed these changes, thank you!

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.

3 participants