From 93502eed682bd561a79bef640296cf76406d6c2a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 3 Jun 2020 09:57:32 +0200 Subject: [PATCH 1/2] Add powershell instructions, fixes #8883 --- doc/00-intro.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/00-intro.md b/doc/00-intro.md index 897d23609..ea88808a0 100644 --- a/doc/00-intro.md +++ b/doc/00-intro.md @@ -10,7 +10,7 @@ Composer is **not** a package manager in the same sense as Yum or Apt are. Yes, it deals with "packages" or libraries, but it manages them on a per-project basis, installing them in a directory (e.g. `vendor`) inside your project. By default it does not install anything globally. Thus, it is a dependency -manager. It does however support a "global" project for convenience via the +manager. It does however support a "global" project for convenience via the [global](03-cli.md#global) command. This idea is not new and Composer is strongly inspired by node's @@ -58,7 +58,7 @@ project, or globally as a system wide executable. #### Locally -To install Composer locally, run the installer in your project directory. See +To install Composer locally, run the installer in your project directory. See [the Download page](https://getcomposer.org/download/) for instructions. The installer will check a few PHP settings and then download `composer.phar` @@ -134,8 +134,16 @@ to download `composer.phar`. Create a new `composer.bat` file alongside `composer.phar`: +Using cmd.exe: + +```sh +C:\bin> echo @php "%~dp0composer.phar" %*>composer.bat +``` + +Using PowerShell: + ```sh -C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat +PS C:\bin> Set-Content composer.bat '@php "%~dp0composer.phar" %*' ``` Add the directory to your PATH environment variable if it isn't already. From 547763ab67148e001216f7fb9f0ed38a8da38f7a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 3 Jun 2020 10:03:43 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 6 ++++++ composer.lock | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab1d3bba9..962a7759b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### [1.10.7] 2020-06-03 + + * Fix PHP 8 deprecations + * Fixed detection of pcntl_signal being in disabled_functions when pcntl_async_signal is allowed + ### [1.10.6] 2020-05-06 * Fixed version guessing to take composer-runtime-api and composer-plugin-api requirements into account to avoid selecting packages which require Composer 2 @@ -855,6 +860,7 @@ * Initial release +[1.10.7]: https://github.com/composer/composer/compare/1.10.6...1.10.7 [1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6 [1.10.5]: https://github.com/composer/composer/compare/1.10.4...1.10.5 [1.10.4]: https://github.com/composer/composer/compare/1.10.3...1.10.4 diff --git a/composer.lock b/composer.lock index 2fd85b33e..1a5309f88 100644 --- a/composer.lock +++ b/composer.lock @@ -1345,23 +1345,23 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.39", + "version": "v3.4.41", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "c02893ae43532b46a4f0e0f207d088b939f278d9" + "reference": "f926812c6b3d456dfbd13c706293f49e9a10bc2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c02893ae43532b46a4f0e0f207d088b939f278d9", - "reference": "c02893ae43532b46a4f0e0f207d088b939f278d9", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/f926812c6b3d456dfbd13c706293f49e9a10bc2a", + "reference": "f926812c6b3d456dfbd13c706293f49e9a10bc2a", "shasum": "" }, "require": { "php": ">=5.3.3" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -1406,9 +1406,6 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v3.4.38" - }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1423,7 +1420,7 @@ "type": "tidelift" } ], - "time": "2020-02-21T08:01:47+00:00" + "time": "2020-05-21T18:33:26+00:00" } ], "aliases": [],