Skip to content

Commit 25b7f8b

Browse files
committed
Update git metafiles, simpler coverage for PHP 7.3
1 parent 8f2c9da commit 25b7f8b

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed

.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.* export-ignore
2+
/composer.lock export-ignore
3+
/phpcs.xml.dist export-ignore
4+
/phpunit.xml.dist export-ignore
5+
/tests export-ignore

.gitignore

+8-16
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,20 @@
55
.DS_Store
66
.idea
77
.phpintel
8-
composer.phar
9-
10-
# Local System Files (i.e. cache, logs, etc.) #
11-
/cache
12-
/build/logs
13-
/build/coverage
14-
/tmp
15-
16-
# Test Related Files #
17-
/phpunit.xml
18-
19-
#Exception output
20-
TelegramException.log
218

229
# Composer
23-
vendor/
10+
/composer.phar
11+
/vendor
2412

13+
# Test-Related Files
14+
/clover.xml
15+
/phpcs.xml
16+
/phpunit.xml
2517

26-
# phpDocumentor Logs #
18+
# phpDocumentor Logs
2719
phpdoc-*
2820

29-
# OSX #
21+
# OSX
3022
._*
3123
.Spotlight-V100
3224
.Trashes

.travis.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
dist: trusty
2-
sudo: required
31
language: php
2+
sudo: required
3+
dist: trusty
44

55
addons:
66
mariadb: 10.1
77

88
cache:
99
directories:
10-
- "$HOME/.composer/cache"
10+
- vendor
11+
- $HOME/.composer/cache
1112

1213
php:
1314
- 5.5
@@ -44,7 +45,7 @@ before_script:
4445

4546
script:
4647
- composer check-code
47-
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ] ; then composer test-cov; else composer test; fi
48+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov; else composer test; fi
4849

4950
after_script:
50-
- if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then composer test-cov-upload; fi
51+
- if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then composer test-cov-upload; fi

build/.gitkeep

Whitespace-only changes.

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
},
4848
"scripts": {
4949
"check-code": [
50-
"\"vendor/bin/phpcs\" --standard=phpcs.xml -snp src/ tests/"
50+
"\"vendor/bin/phpcs\" -snp src/ tests/"
5151
],
5252
"test": [
5353
"\"vendor/bin/phpunit\""
5454
],
5555
"test-cov": [
56-
"\"vendor/bin/phpunit\" --coverage-clover build/logs/clover.xml"
56+
"\"vendor/bin/phpunit\" --coverage-clover clover.xml"
5757
],
5858
"test-cov-upload": [
59-
"wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml"
59+
"wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover clover.xml"
6060
]
6161
}
6262
}

phpcs.xml phpcs.xml.dist

File renamed without changes.

0 commit comments

Comments
 (0)