File tree 8 files changed +51
-31
lines changed
8 files changed +51
-31
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,3 @@ indent_size = 4
7
7
indent_style = space
8
8
insert_final_newline = true
9
9
trim_trailing_whitespace = true
10
-
11
- [* .yml* ]
12
- indent_size = 2
Original file line number Diff line number Diff line change 1
1
spec / export-ignore
2
+ tests / export-ignore
2
3
.editorconfig export-ignore
3
4
.gitattributes export-ignore
4
5
.gitignore export-ignore
6
+ .php_cs export-ignore
5
7
.scrutinizer.yml export-ignore
8
+ .styleci.yml export-ignore
6
9
.travis.yml export-ignore
7
- CONTRIBUTING.md export-ignore
8
10
CONDUCT.md export-ignore
11
+ CONTRIBUTING.md export-ignore
9
12
phpspec.yml.ci export-ignore
10
13
phpspec.yml.dist export-ignore
14
+ phpunit.xml.dist export-ignore
Original file line number Diff line number Diff line change 2
2
vendor /
3
3
composer.lock
4
4
phpspec.yml
5
+ phpunit.xml
Original file line number Diff line number Diff line change
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 ();
Original file line number Diff line number Diff line change 1
1
filter :
2
- paths : [src/*]
2
+ paths : [src/*]
3
3
checks :
4
- php :
5
- code_rating : true
6
- duplication : true
4
+ php :
5
+ code_rating : true
6
+ duplication : true
7
7
tools :
8
- external_code_coverage : true
9
- php_code_sniffer :
10
- config :
11
- standard : " PSR2"
8
+ external_code_coverage : true
Original file line number Diff line number Diff line change
1
+ preset : symfony
2
+
3
+ finder :
4
+ path :
5
+ - " src"
6
+
7
+ enabled :
8
+ - short_array_syntax
Original file line number Diff line number Diff line change @@ -3,35 +3,35 @@ language: php
3
3
sudo : false
4
4
5
5
cache :
6
- directories :
7
- - $HOME/.composer/cache
6
+ directories :
7
+ - $HOME/.composer/cache
8
8
9
9
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
15
15
16
16
env :
17
- global :
18
- - TEST_COMMAND="composer test"
17
+ global :
18
+ - TEST_COMMAND="composer test"
19
19
20
20
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"
25
25
26
26
before_install :
27
- - travis_retry composer self-update
27
+ - travis_retry composer self-update
28
28
29
29
install :
30
- - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
30
+ - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
31
31
32
32
script :
33
- - $TEST_COMMAND
33
+ - $TEST_COMMAND
34
34
35
35
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
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ $ git rebase -i HEAD~3
75
75
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
76
76
77
77
``` bash
78
- $ git remote add upstream
[email protected] :
php-http /repo-name.git
78
+ $ git remote add upstream
[email protected] :
orga /repo-name.git
79
79
$ git pull --rebase upstream master
80
80
$ git push -f origin feature-or-bug-fix-description
81
81
```
You can’t perform that action at this time.
0 commit comments