Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
keradus committed Jan 8, 2025
1 parent 14f81ba commit e154190
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To install PHP CS Fixer, `install Composer <https://getcomposer.org/download/>`_
.. 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
Expand All @@ -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-cs-fixer-version>-php<php-version>`. 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-cs-fixer-version>-php<php-version>``. 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
-----
Expand Down

0 comments on commit e154190

Please sign in to comment.