Skip to content

Commit 574e51c

Browse files
Maximilian GroschMaximilian Grosch
authored andcommitted
Merge pull request #10 in CFA/coding-guidelines from to_github to master
* commit '445b6a51a030570ad2057982a975219f611c3694': changed email addresses to the new format Added career link Updated readme title Updated readme.md: Use new command names - Renamed repository - Updated composer dependencies
2 parents f71122b + 445b6a5 commit 574e51c

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# Flyeralarm Coding Guidelines
1+
# Flyeralarm PHP Coding Guideline Validator
22

33

4-
This repository contains the ruleset for the PHP code we develop at flyeralarm.
4+
This repository contains the ruleset for the PHP code we develop at [FLYERALARM](https://flyeralarm.com).
55
It mostly consists of PSR-2 with some custom additions. The rules are enforced with the help of squizlabs/PHP_CodeSniffer
66

77

8-
How-To work within *this* project
9-
------
8+
## How-To work within *this* project
109
To prepare run command:
1110
```
1211
make
@@ -18,40 +17,38 @@ make test
1817
```
1918

2019

21-
Embed into *your* project
22-
------------------------
20+
## Embed into *your* project
2321

2422
Add as composer dev dependency:
2523
```
26-
composer config repositories.flyeralarm/coding-guidelines git ssh://git@stash.flyeralarm:7999/cfa/coding-guidelines.git
27-
composer require --dev flyeralarm/coding-guidelines
24+
composer config repositories.flyeralarm/php-code-validator git https://github.com/flyeralarm/php-code-validator.git
25+
composer require --dev flyeralarm/php-code-validator
2826
```
2927

3028
Embed code sniffer in your Makefile. To intend please use tabs instead of spaces. \
31-
_Usage:_ vendor/bin/fa-coding-guideline-validator <folder-to-test-one> <folder-to-test-two> <...>
29+
_Usage:_ vendor/bin/php-code-validator <folder-to-test-one> <folder-to-test-two> <...>
30+
31+
Example Makefile:
3232
```
3333
test:
34-
vendor/bin/fa-coding-guideline-validator src/ tests/
34+
vendor/bin/php-code-validator src/ tests/
3535
```
3636

3737

38-
Update to latest stable
39-
-----------------------
38+
### Update to latest stable
4039

4140
```
42-
composer update flyeralarm/coding-guidelines
41+
composer update flyeralarm/php-code-validator
4342
```
4443

4544

46-
Run sniffer within your project
47-
-------------------------------
45+
### Run sniffer
4846
```
4947
make test
5048
```
5149

5250

53-
Use within PHPStorm
54-
-------------------
51+
## Use within PHPStorm
5552
1) Ensure the path to PHP Code Sniffer is configured - [open configuration manual](https://confluence.jetbrains.com/display/PhpStorm/PHP+Code+Sniffer+in+PhpStorm#PHPCodeSnifferinPhpStorm-1.1.SpecifyingthepathtoPHPCodeSniffer)
5653
2) Open settings: \
5754
Mac: `PhpStorm` > `Preferences` > `Editor` > `Inspections` > `PHP` \
@@ -61,3 +58,6 @@ Use within PHPStorm
6158
5) Choose "Custom" for „Coding standard:“ and click on `...` on the right hand side
6259
6) Select Path to ruleset. This would be something like <YOUR_APP_ROOT>/vendor/flyeralarm/coding-guidelines/ruleset.xml
6360
7) Confirm dialogs by pressing `ok`
61+
62+
63+
On a side note: [We are searching for talented people to join our various teams of developers in multiple locations](https://karriere.flyeralarm.com/jobs)
File renamed without changes.

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"name": "flyeralarm/coding-guidelines",
2+
"name": "flyeralarm/php-code-validator",
33
"description": "A custom coding standard for flyeralarm",
44
"type": "config",
55
"license": "proprietary",
66
"authors": [
77
{
88
"name": "Daniel Müller",
9-
"email": "d.mueller@flyeralarm.de"
9+
"email": "daniel.mueller@flyeralarm.com"
1010
},
1111
{
1212
"name": "Maximilian Grosch",
13-
"email": "m.grosch@flyeralarm.de"
13+
"email": "maximilian.grosch@flyeralarm.com"
1414
}
1515
],
1616
"minimum-stability": "stable",
1717
"require": {
1818
"squizlabs/php_codesniffer": "^3.0"
1919
},
2020
"bin": [
21-
"bin/fa-coding-guideline-validator"
21+
"bin/php-code-validator"
2222
]
2323
}

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)