From e154190680e682e131f060926196c7fde3bf7cee Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 8 Jan 2025 00:36:15 +0100 Subject: [PATCH] fixes --- README.md | 7 +------ doc/installation.rst | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c62c7fba4c4..bee2b94e6fe 100644 --- a/README.md +++ b/README.md @@ -42,18 +42,13 @@ The recommended way to install PHP CS Fixer is to use [Composer](https://getcomp ```console composer require --dev friendsofphp/php-cs-fixer -``` - -or using shim version when facing conflict with dependencies: - -```console +## or when facing conflicts in dependencies: composer require --dev php-cs-fixer/shim ``` For more details and other installation methods (also with Docker or behind CI), see [installation instructions](./doc/installation.rst). - ### Usage Assuming you installed PHP CS Fixer as instructed above, you can run the diff --git a/doc/installation.rst b/doc/installation.rst index e34b2fea180..434a45aae3c 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -18,7 +18,7 @@ To install PHP CS Fixer, `install Composer `_ .. code-block:: console composer require --dev friendsofphp/php-cs-fixer - # or when facing conflicts in dependencies + ## or when facing conflicts in dependencies: composer require --dev php-cs-fixer/shim Upgrade @@ -37,11 +37,11 @@ You can use pre-built Docker images to run ``php-cs-fixer``. docker run -it --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix src -`$FIXER_VERSION` used in example above is an identifier of a release you want to use, which is based on Fixer and PHP versions combined. There are different tags for each Fixer's SemVer level and PHP version with syntax `-php`. For example: +``$FIXER_VERSION`` used in example above is an identifier of a release you want to use, which is based on Fixer and PHP versions combined. There are different tags for each Fixer's SemVer level and PHP version with syntax ``-php``. For example: -* `3.66.1-php7.4` -* `3.66-php8.0` -* `3-php8.3` +* ``3.66.1-php7.4`` +* ``3.66-php8.0`` +* ``3-php8.3`` PHIVE -----