From 0868245589c395272ac762e423b27b0226456302 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 14 Oct 2021 16:21:47 +0200 Subject: [PATCH] Rename master branch to main --- .github/CONTRIBUTING.md | 2 +- composer.json | 2 +- doc/07-runtime.md | 2 +- doc/08-community.md | 2 +- doc/articles/custom-installers.md | 6 +++--- doc/articles/plugins.md | 14 +++++++------- doc/articles/scripts.md | 16 ++++++++-------- src/Composer/Compiler.php | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 66be5eae8..78b4b798b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Contributing to Composer ======================== Please note that this project is released with a -[Contributor Code of Conduct](https://github.com/composer/composer/blob/master/CODE_OF_CONDUCT.md). +[Contributor Code of Conduct](https://github.com/composer/composer/blob/main/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. Reporting Issues diff --git a/composer.json b/composer.json index 9225f2e5f..a824cdc17 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-main": "2.1-dev" } }, "autoload": { diff --git a/doc/07-runtime.md b/doc/07-runtime.md index 3e345ad38..79f0022fd 100644 --- a/doc/07-runtime.md +++ b/doc/07-runtime.md @@ -95,7 +95,7 @@ possible for safety. ---- A few other methods are available for more complex usages, please refer to the -source/docblocks of [the class itself](https://github.com/composer/composer/blob/master/src/Composer/InstalledVersions.php). +source/docblocks of [the class itself](https://github.com/composer/composer/blob/main/src/Composer/InstalledVersions.php). ### Knowing the path in which a package is installed diff --git a/doc/08-community.md b/doc/08-community.md index 7c48a94a8..210256451 100644 --- a/doc/08-community.md +++ b/doc/08-community.md @@ -7,7 +7,7 @@ contributing. If you would like to contribute to Composer, please read the [README](https://github.com/composer/composer) and -[CONTRIBUTING](https://github.com/composer/composer/blob/master/.github/CONTRIBUTING.md) +[CONTRIBUTING](https://github.com/composer/composer/blob/main/.github/CONTRIBUTING.md) documents. The most important guidelines are described as follows: diff --git a/doc/articles/custom-installers.md b/doc/articles/custom-installers.md index 849b9f8f0..23be87265 100644 --- a/doc/articles/custom-installers.md +++ b/doc/articles/custom-installers.md @@ -210,6 +210,6 @@ different installation path. [1]: ../04-schema.md#type [2]: ../04-schema.md#extra -[3]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/PluginInterface.php -[4]: https://github.com/composer/composer/blob/master/src/Composer/Installer/InstallerInterface.php -[5]: https://github.com/composer/composer/blob/master/src/Composer/Installer/LibraryInstaller.php +[3]: https://github.com/composer/composer/blob/main/src/Composer/Plugin/PluginInterface.php +[4]: https://github.com/composer/composer/blob/main/src/Composer/Installer/InstallerInterface.php +[5]: https://github.com/composer/composer/blob/main/src/Composer/Installer/LibraryInstaller.php diff --git a/doc/articles/plugins.md b/doc/articles/plugins.md index df374405b..e19e32562 100644 --- a/doc/articles/plugins.md +++ b/doc/articles/plugins.md @@ -325,12 +325,12 @@ process however, so do not use it in plugins which do not absolutely require it. [1]: ../04-schema.md#type [2]: ../04-schema.md#extra -[3]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/PluginInterface.php -[4]: https://github.com/composer/composer/blob/master/src/Composer/Composer.php -[5]: https://github.com/composer/composer/blob/master/src/Composer/IO/IOInterface.php -[6]: https://github.com/composer/composer/blob/master/src/Composer/EventDispatcher/EventSubscriberInterface.php +[3]: https://github.com/composer/composer/blob/main/src/Composer/Plugin/PluginInterface.php +[4]: https://github.com/composer/composer/blob/main/src/Composer/Composer.php +[5]: https://github.com/composer/composer/blob/main/src/Composer/IO/IOInterface.php +[6]: https://github.com/composer/composer/blob/main/src/Composer/EventDispatcher/EventSubscriberInterface.php [7]: ../01-basic-usage.md#package-versions -[8]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/Capable.php -[9]: https://github.com/composer/composer/blob/master/src/Composer/Plugin/Capability/CommandProvider.php +[8]: https://github.com/composer/composer/blob/main/src/Composer/Plugin/Capable.php +[9]: https://github.com/composer/composer/blob/main/src/Composer/Plugin/Capability/CommandProvider.php [10]: https://symfony.com/doc/current/components/console.html -[11]: https://github.com/composer/composer/blob/master/src/Composer/Util/SyncHelper.php +[11]: https://github.com/composer/composer/blob/main/src/Composer/Util/SyncHelper.php diff --git a/doc/articles/scripts.md b/doc/articles/scripts.md index ae43f26a0..4a29dd60e 100644 --- a/doc/articles/scripts.md +++ b/doc/articles/scripts.md @@ -178,15 +178,15 @@ Depending on the [script types](#event-names) you will get various event subclasses containing various getters with relevant data and associated objects: -- Base class: [`Composer\EventDispatcher\Event`](https://github.com/composer/composer/blob/master/src/Composer/EventDispatcher/Event.php) -- Command Events: [`Composer\Script\Event`](https://github.com/composer/composer/blob/master/src/Composer/Script/Event.php) -- Installer Events: [`Composer\Installer\InstallerEvent`](https://github.com/composer/composer/blob/master/src/Composer/Installer/InstallerEvent.php) -- Package Events: [`Composer\Installer\PackageEvent`](https://github.com/composer/composer/blob/master/src/Composer/Installer/PackageEvent.php) +- Base class: [`Composer\EventDispatcher\Event`](https://github.com/composer/composer/blob/main/src/Composer/EventDispatcher/Event.php) +- Command Events: [`Composer\Script\Event`](https://github.com/composer/composer/blob/main/src/Composer/Script/Event.php) +- Installer Events: [`Composer\Installer\InstallerEvent`](https://github.com/composer/composer/blob/main/src/Composer/Installer/InstallerEvent.php) +- Package Events: [`Composer\Installer\PackageEvent`](https://github.com/composer/composer/blob/main/src/Composer/Installer/PackageEvent.php) - Plugin Events: - - init: [`Composer\EventDispatcher\Event`](https://github.com/composer/composer/blob/master/src/Composer/EventDispatcher/Event.php) - - command: [`Composer\Plugin\CommandEvent`](https://github.com/composer/composer/blob/master/src/Composer/Plugin/CommandEvent.php) - - pre-file-download: [`Composer\Plugin\PreFileDownloadEvent`](https://github.com/composer/composer/blob/master/src/Composer/Plugin/PreFileDownloadEvent.php) - - post-file-download: [`Composer\Plugin\PostFileDownloadEvent`](https://github.com/composer/composer/blob/master/src/Composer/Plugin/PostFileDownloadEvent.php) + - init: [`Composer\EventDispatcher\Event`](https://github.com/composer/composer/blob/main/src/Composer/EventDispatcher/Event.php) + - command: [`Composer\Plugin\CommandEvent`](https://github.com/composer/composer/blob/main/src/Composer/Plugin/CommandEvent.php) + - pre-file-download: [`Composer\Plugin\PreFileDownloadEvent`](https://github.com/composer/composer/blob/main/src/Composer/Plugin/PreFileDownloadEvent.php) + - post-file-download: [`Composer\Plugin\PostFileDownloadEvent`](https://github.com/composer/composer/blob/main/src/Composer/Plugin/PostFileDownloadEvent.php) ## Running scripts manually diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index da5e1d842..6ec0c43ef 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -82,12 +82,12 @@ class Compiler if ($process->run() == 0) { $this->version = trim($process->getOutput()); } else { - // get branch-alias defined in composer.json for dev-master (if any) + // get branch-alias defined in composer.json for dev-main (if any) $localConfig = __DIR__.'/../../composer.json'; $file = new JsonFile($localConfig); $localConfig = $file->read(); - if (isset($localConfig['extra']['branch-alias']['dev-master'])) { - $this->branchAliasVersion = $localConfig['extra']['branch-alias']['dev-master']; + if (isset($localConfig['extra']['branch-alias']['dev-main'])) { + $this->branchAliasVersion = $localConfig['extra']['branch-alias']['dev-main']; } }