Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 45ef8e0

Browse files
dunglasdunglas
committed
Merge pull request #2 from Soullivaneuh/travis-improve
Travis, Composer and Editor config improvements.
2 parents 505ee80 + ce53013 commit 45ef8e0

3 files changed

Lines changed: 69 additions & 50 deletions

File tree

‎.editorconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
trim_trailing_whitespace = true
7+
8+
[*.php]
9+
indent_style = space
10+
indent_size = 4
11+
12+
[composer.json]
13+
indent_style = space
14+
indent_size = 4

‎.travis.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@ php:
1414
- hhvm
1515

1616
matrix:
17-
allow_failures:
18-
- php: nightly
19-
- php: hhvm-nightly
20-
fast_finish: true
17+
include:
18+
- php: 5.4
19+
env: COMPOSER_FLAGS="--prefer-lowest"
20+
allow_failures:
21+
- php: nightly
22+
- php: hhvm-nightly
23+
fast_finish: true
2124

2225
before_script:
23-
- composer self-update
24-
25-
install:
26-
- composer install --dev
26+
- composer self-update
27+
- composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
28+
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
2729

2830
script:
2931
- vendor/bin/phpspec run

‎composer.json‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
{
2-
"name": "dunglas/php-property-info",
3-
"type": "library",
4-
"description": "Retrieve type and description of PHP properties using various sources ",
5-
"keywords": [
6-
"property",
7-
"type",
8-
"PHPDoc",
9-
"symfony",
10-
"validator",
11-
"doctrine"
12-
],
13-
"homepage": "http://dunglas.fr",
14-
"license": "MIT",
15-
"authors": [
16-
{
17-
"name": "Kévin Dunglas",
18-
"email": "[email protected]"
2+
"name": "dunglas/php-property-info",
3+
"type": "library",
4+
"description": "Retrieve type and description of PHP properties using various sources ",
5+
"keywords": [
6+
"property",
7+
"type",
8+
"PHPDoc",
9+
"symfony",
10+
"validator",
11+
"doctrine"
12+
],
13+
"homepage": "http://dunglas.fr",
14+
"license": "MIT",
15+
"authors": [
16+
{
17+
"name": "Kévin Dunglas",
18+
"email": "[email protected]"
19+
}
20+
],
21+
"autoload": {
22+
"psr-4": {
23+
"PropertyInfo\\": "src/PropertyInfo"
24+
}
25+
},
26+
"autoload-dev": {
27+
"psr-4": {
28+
"PropertyInfo\\Tests\\": "tests"
29+
}
30+
},
31+
"require": {
32+
"php": ">=5.4"
33+
},
34+
"require-dev": {
35+
"phpspec/phpspec": "~2.1",
36+
"phpunit/phpunit": "~4.5",
37+
"doctrine/orm": "~2.3",
38+
"phpdocumentor/reflection": "~1.0"
39+
},
40+
"conflict": {
41+
"phpdocumentor/reflection": "<1.0.4"
42+
},
43+
"suggest": {
44+
"doctrine/orm": "To use Doctrine metadata",
45+
"symfony/validator": "To use Symfony validator metadata",
46+
"phpdocumentor/reflection": "To use the PHPDoc"
1947
}
20-
],
21-
"autoload": {
22-
"psr-4": {
23-
"PropertyInfo\\": "src/PropertyInfo"
24-
}
25-
},
26-
"autoload-dev": {
27-
"psr-4": {
28-
"PropertyInfo\\Tests\\": "tests"
29-
}
30-
},
31-
"require": {
32-
"php": ">=5.4"
33-
},
34-
"require-dev": {
35-
"phpspec/phpspec": "~2.1",
36-
"phpunit/phpunit": "~4.5",
37-
"doctrine/orm": "~2.3",
38-
"phpdocumentor/reflection": "~1.0"
39-
},
40-
"suggest": {
41-
"doctrine/orm": "To use Doctrine metadata",
42-
"symfony/validator": "To use Symfony validator metadata",
43-
"phpdocumentor/reflection": "To use the PHPDoc"
44-
}
4548
}

0 commit comments

Comments
 (0)