Skip to content

Commit eea2a84

Browse files
authored
Merge pull request #195 from fbourigault/prepare-9.0
Prepare 9.0
2 parents 51242d8 + 07fb0b6 commit eea2a84

File tree

4 files changed

+46
-58
lines changed

4 files changed

+46
-58
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ language: php
33
sudo: false
44

55
php:
6-
- 5.3
7-
- 5.4
8-
- 5.5
96
- 5.6
107
- 7.0
8+
- 7.1
119

1210
before_script:
1311
- travis_retry composer self-update

composer.json

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
1-
{
2-
"name": "m4tthumphrey/php-gitlab-api",
3-
"type": "library",
4-
"description": "GitLab API client",
5-
"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
6-
"keywords": ["gitlab", "api"],
7-
"license": "MIT",
8-
"authors": [
9-
{
10-
"name": "Matt Humphrey",
11-
"homepage": "http://m4tt.io"
12-
},
13-
{
14-
"name": "KnpLabs Team",
15-
"homepage": "http://knplabs.com"
16-
},
17-
{
18-
"name": "Thibault Duplessis",
19-
"email": "[email protected]",
20-
"homepage": "http://ornicar.github.com"
21-
}
22-
],
23-
"require": {
24-
"php": ">=5.3.2",
25-
"ext-curl": "*",
26-
"ext-xml": "*",
27-
"kriswallsmith/buzz": ">=0.7"
28-
},
29-
"require-dev": {
30-
"phpunit/phpunit": "~4.5"
31-
},
32-
"autoload": {
33-
"psr-0": { "Gitlab\\": "lib/" }
34-
}
35-
}
1+
{
2+
"name": "m4tthumphrey/php-gitlab-api",
3+
"type": "library",
4+
"description": "GitLab API client",
5+
"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
6+
"keywords": ["gitlab", "api"],
7+
"license": "MIT",
8+
"authors": [
9+
{
10+
"name": "Matt Humphrey",
11+
"homepage": "http://m4tt.io"
12+
},
13+
{
14+
"name": "KnpLabs Team",
15+
"homepage": "http://knplabs.com"
16+
},
17+
{
18+
"name": "Thibault Duplessis",
19+
"email": "[email protected]",
20+
"homepage": "http://ornicar.github.com"
21+
}
22+
],
23+
"require": {
24+
"php": "^5.6 || ^7.0",
25+
"ext-curl": "*",
26+
"ext-xml": "*",
27+
"kriswallsmith/buzz": ">=0.7"
28+
},
29+
"require-dev": {
30+
"phpunit/phpunit": "~4.5"
31+
},
32+
"autoload": {
33+
"psr-4": { "Gitlab\\": "lib/Gitlab/" }
34+
},
35+
"autoload-dev": {
36+
"psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
37+
},
38+
"extra": {
39+
"branch-alias": {
40+
"dev-master": "9.0.x-dev"
41+
}
42+
}
43+
}

phpunit.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
processIsolation="false"
1010
stopOnFailure="false"
1111
syntaxCheck="false"
12-
bootstrap="test/bootstrap.php"
12+
bootstrap="vendor/autoload.php"
1313
>
1414
<testsuites>
1515
<testsuite name="php-gitlab-api Test Suite">
@@ -22,4 +22,4 @@
2222
<directory suffix=".php">./lib/Gitlab/</directory>
2323
</whitelist>
2424
</filter>
25-
</phpunit>
25+
</phpunit>

test/bootstrap.php

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

0 commit comments

Comments
 (0)