Skip to content

Commit

Permalink
Merge pull request #3271 from neos/task/phpStanComposerLintCommand
Browse files Browse the repository at this point in the history
TASK: Adjust phpstan command to Neos' dev collection
  • Loading branch information
mhsdesign authored Jan 24, 2024
2 parents 35a53ae + b1de02f commit 91bc375
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
"replace": {
},
"scripts": {
"lint:phpstan": "../../bin/phpstan analyse",
"lint": [
"../../bin/phpstan analyse"
"@lint:phpstan"
]
},
"suggest": {
Expand Down
5 changes: 3 additions & 2 deletions Readme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Contributing

If you want to contribute to Flow Framework and want to set up a development environment, then follow these steps:

Clone and install the flow dev distribution https://github.com/neos/flow-development-distribution via git and composer or use this shorthand:
``composer create-project neos/flow-development-distribution flow-development @dev --keep-vcs``

Note the **-distribution** package you create a project from, instead of just checking out this repository.
Expand All @@ -65,8 +66,8 @@ Here you can do all Git-related work (``git add .``, ``git commit``, etc).

Unit tests can be run here via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml``, functional tests via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml`` and static analysis via ``composer lint``.

To switch the branch you intend to work on:
``git checkout 6.3 && composer update``
To switch the branch you intend to work on run this command in the root of the dev distribution:
``git checkout 8.3 && composer update``

.. note:: We use an upmerging strategy, so create all bugfixes to lowest maintained branch that
contains the issue (typically the second last LTS release, check the diagram on
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@
"neos/utility-unicode": "self.version"
},
"scripts": {
"lint:phpstan": "../../bin/phpstan analyse",
"lint": [
"../../bin/phpstan analyse"
"@lint:phpstan"
]
},
"suggest": {
Expand Down

0 comments on commit 91bc375

Please sign in to comment.