Skip to content

Commit 30d34dc

Browse files
authored
Clean up build and dependencies (#12)
* Fix style warning * Clean up build and dependencies
1 parent e3ca00a commit 30d34dc

File tree

6 files changed

+10
-27
lines changed

6 files changed

+10
-27
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
/.travis.coverage.sh export-ignore
55
/.travis.yml export-ignore
66
/phpunit.xml.dist export-ignore
7-
/README.md export-ignore

.gitignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
# Ignore Eclipse files
2-
.buildpath
3-
.project
4-
.settings/
5-
61
# build files
72
vendor/
83
composer.lock
94
/phpunit.xml
105
/build
11-
12-
# bad
13-
*.DS_Store

.travis.coverage.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ cache:
1212
- $HOME/.composer/cache
1313

1414
before_script:
15-
- composer update --prefer-stable
15+
- composer install --prefer-dist
1616

1717
script:
1818
- mkdir -p build/logs
1919
- composer test
2020
- composer style
2121

2222
after_script:
23-
- sh .travis.coverage.sh
24-
- composer check
25-
- composer metrics
23+
- composer coverage

composer.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
"require-dev": {
1313
"phpunit/phpunit": "@stable",
1414
"satooshi/php-coveralls": "@stable",
15-
"squizlabs/php_codesniffer": "@stable",
16-
"phpmd/phpmd": "@stable",
17-
"phpmetrics/phpmetrics": "@stable"
15+
"squizlabs/php_codesniffer": "@stable"
1816
},
1917
"autoload": {
2018
"psr-4": { "texdc\\range\\": "src/" }
@@ -23,9 +21,8 @@
2321
"psr-4": { "texdc\\range\\test\\": "test/" }
2422
},
2523
"scripts": {
26-
"test": "vendor/bin/phpunit",
27-
"style": "vendor/bin/phpcs --standard=PSR2 src/ test/",
28-
"check": "vendor/bin/phpmd src/,test/ text cleancode,codesize,design,naming,unusedcode",
29-
"metrics": "vendor/bin/phpmetrics --report-cli src/"
24+
"test": "vendor/bin/phpunit",
25+
"style": "vendor/bin/phpcs --standard=PSR2 src/ test/",
26+
"coverage": "vendor/bin/php-coveralls"
3027
}
3128
}

src/AbstractRange.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ public function abuts(self $another) : bool
203203
*/
204204
public function findGapTo(self $another) : self
205205
{
206-
if ($this->abuts($another) || $this->contains($another) || $another->contains($this) || $this->overlaps($another)) {
206+
if ($this->abuts($another)
207+
|| $this->contains($another)
208+
|| $another->contains($this)
209+
|| $this->overlaps($another)) {
207210
return static::void();
208211
} elseif ($this->isContraryTo($another)) {
209212
return $this->findContraryGap($another);

0 commit comments

Comments
 (0)