Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

PSR-12 ruleset #22

Merged
merged 20 commits into from Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -89,7 +89,7 @@ All notable changes to this project will be documented in this file, in reverse
return values are still under discussion. We will change these rules, and,
when PSR-12 is finalized, adapt them.
- [#5](https://github.com/zendframework/zend-coding-standard/pull/5) extends
PSR-12 with ZendFramework specific rules:
PSR-12 with Zend Framework specific rules:

*NOTE:* Most of these rules should look familiar as they are already being
used in components rewritten for PHP 7.1.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -111,7 +111,7 @@ $xmlPackage->send();
> **New rules or Sniffs may not be introduced in minor or bugfix releases and should always be based on the develop
branch and queued for the next major release, unless considered a bugfix for existing rules.**

If you want to test changes against ZendFramework components or your own projects, install your forked
If you want to test changes against Zend Framework components or your own projects, install your forked
zend-coding-standard globally with composer:
```bash
$ composer global config repositories.zend-coding-standard vcs git@github.com:<FORK_NAMESPACE>/zend-coding-standard.git
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -19,9 +19,9 @@
"require": {
"php": "^7.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"slevomat/coding-standard": "^4.8.0",
"squizlabs/php_codesniffer": "^3.4.0",
"webimpress/coding-standard": "dev-master"
"slevomat/coding-standard": "^5.0.4",
"squizlabs/php_codesniffer": "^3.5.1",
"webimpress/coding-standard": "^1.0.5"
},
"extra": {
"branch-alias": {
Expand Down