Skip to content

Commit 504ab8c

Browse files
committed
Update files from boilerplate, add styleci
1 parent c15ae8a commit 504ab8c

8 files changed

+51
-31
lines changed

.editorconfig

-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ indent_size = 4
77
indent_style = space
88
insert_final_newline = true
99
trim_trailing_whitespace = true
10-
11-
[*.yml*]
12-
indent_size = 2

.gitattributes

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
spec/ export-ignore
2+
tests/ export-ignore
23
.editorconfig export-ignore
34
.gitattributes export-ignore
45
.gitignore export-ignore
6+
.php_cs export-ignore
57
.scrutinizer.yml export-ignore
8+
.styleci.yml export-ignore
69
.travis.yml export-ignore
7-
CONTRIBUTING.md export-ignore
810
CONDUCT.md export-ignore
11+
CONTRIBUTING.md export-ignore
912
phpspec.yml.ci export-ignore
1013
phpspec.yml.dist export-ignore
14+
phpunit.xml.dist export-ignore

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ build/
22
vendor/
33
composer.lock
44
phpspec.yml
5+
phpunit.xml

.php_cs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
/*
4+
* In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
5+
* with composer.
6+
*
7+
* @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
8+
* @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
9+
*/
10+
11+
use SLLH\StyleCIBridge\ConfigBridge;
12+
13+
return ConfigBridge::create();

.scrutinizer.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
filter:
2-
paths: [src/*]
2+
paths: [src/*]
33
checks:
4-
php:
5-
code_rating: true
6-
duplication: true
4+
php:
5+
code_rating: true
6+
duplication: true
77
tools:
8-
external_code_coverage: true
9-
php_code_sniffer:
10-
config:
11-
standard: "PSR2"
8+
external_code_coverage: true

.styleci.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
preset: symfony
2+
3+
finder:
4+
path:
5+
- "src"
6+
7+
enabled:
8+
- short_array_syntax

.travis.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@ language: php
33
sudo: false
44

55
cache:
6-
directories:
7-
- $HOME/.composer/cache
6+
directories:
7+
- $HOME/.composer/cache
88

99
php:
10-
- 5.4
11-
- 5.5
12-
- 5.6
13-
- 7.0
14-
- hhvm
10+
- 5.4
11+
- 5.5
12+
- 5.6
13+
- 7.0
14+
- hhvm
1515

1616
env:
17-
global:
18-
- TEST_COMMAND="composer test"
17+
global:
18+
- TEST_COMMAND="composer test"
1919

2020
matrix:
21-
fast_finish: true
22-
include:
23-
- php: 5.4
24-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
21+
fast_finish: true
22+
include:
23+
- php: 5.4
24+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2525

2626
before_install:
27-
- travis_retry composer self-update
27+
- travis_retry composer self-update
2828

2929
install:
30-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
30+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3131

3232
script:
33-
- $TEST_COMMAND
33+
- $TEST_COMMAND
3434

3535
after_success:
36-
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
37-
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
36+
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
37+
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ git rebase -i HEAD~3
7575
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
7676

7777
``` bash
78-
$ git remote add upstream [email protected]:php-http/repo-name.git
78+
$ git remote add upstream [email protected]:orga/repo-name.git
7979
$ git pull --rebase upstream master
8080
$ git push -f origin feature-or-bug-fix-description
8181
```

0 commit comments

Comments
 (0)