Skip to content

Commit 6d40169

Browse files
Lucas MichotGabrielAnca
andauthored
Many improvements. (#299)
Co-authored-by: Gabriel Anca Corral <[email protected]>
1 parent db7b204 commit 6d40169

File tree

7 files changed

+58
-21
lines changed

7 files changed

+58
-21
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- checkout
11-
- run: composer install --no-interaction
11+
- run: composer install --no-interaction --no-suggest --prefer-dist
1212
- run: vendor/bin/phpunit
1313
- run: vendor/bin/phpcs --standard=PSR2 src test
1414

.codeclimate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
exclude_paths:
2-
- test/*
2+
- test/*

.editorconfig

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

.gitattributes

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
/test export-ignore
2-
/phpunit.xml export-ignore
3-
/.github export-ignore
4-
/.circleci export-ignore
5-
/.codeclimate.yml export-ignore
1+
* text=auto
2+
3+
/.circleci export-ignore
4+
/.github export-ignore
5+
/test export-ignore
6+
.codeclimate.yml export-ignore
7+
.editorconfig export-ignore
8+
.gitattributes export-ignore
9+
.gitignore export-ignore
10+
phpunit.xml.dist export-ignore

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
.DS_Store
33

44
# PhpStorm
5-
.idea
5+
/.idea
66

77
# Composer
8+
/vendor
89
composer.lock
910
composer.phar
10-
/vendor
1111

1212
# PhpUnit
1313
phpunit.phar
14-
/phpunit.xml
14+
phpunit.xml
1515

1616
# Extras
17-
build/
17+
/build
1818
*.swp

composer.json

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,53 @@
11
{
22
"name": "intercom/intercom-php",
33
"description": "Intercom API client built on top of Guzzle 6",
4-
"keywords": ["intercom", "intercom.io", "api", "guzzle"],
4+
"keywords": [
5+
"api",
6+
"guzzle",
7+
"intercom",
8+
"intercom.io"
9+
],
510
"license": "Apache-2.0",
611
"authors": [
712
{
813
"name": "Intercom Platform Team",
9-
"homepage": "http://intercom.io"
14+
"homepage": "https://www.intercom.com"
1015
}
1116
],
17+
"support": {
18+
"issues": "https://github.com/intercom/intercom-php/issues",
19+
"source": "https://github.com/intercom/intercom-php"
20+
},
1221
"autoload": {
1322
"psr-4": {
14-
"Intercom\\": ["src"]
23+
"Intercom\\": [
24+
"src"
25+
]
1526
}
1627
},
1728
"autoload-dev": {
1829
"psr-4": {
19-
"Intercom\\Test\\": ["test"]
30+
"Intercom\\Test\\": [
31+
"test"
32+
]
2033
}
2134
},
2235
"require": {
2336
"php": ">= 7.1",
2437
"ext-json": "*",
25-
"php-http/httplug": "^1.0 || ^2.0",
38+
"php-http/client-common": "^1.9 || ^2.0",
2639
"php-http/client-implementation": "*",
2740
"php-http/discovery": "^1.4",
41+
"php-http/httplug": "^1.0 || ^2.0",
2842
"php-http/message": "^1.7",
29-
"psr/http-message": "^1.0",
30-
"php-http/client-common": "^1.9 || ^2.0"
43+
"psr/http-message": "^1.0"
3144
},
3245
"require-dev": {
46+
"php-http/guzzle6-adapter": "^1.0 || ^2.0",
3347
"phpunit/phpunit": "^7.0",
34-
"squizlabs/php_codesniffer": "^3.1",
35-
"php-http/guzzle6-adapter": "^1.0 || ^2.0"
48+
"squizlabs/php_codesniffer": "^3.1"
49+
},
50+
"config": {
51+
"sort-packages": true
3652
}
3753
}

phpunit.xml renamed to phpunit.xml.dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
convertNoticesToExceptions="true"
88
convertWarningsToExceptions="true"
99
processIsolation="false"
10-
stopOnFailure="false">
10+
stopOnFailure="false"
11+
>
1112
<testsuites>
1213
<testsuite name="Intercom Test Suite">
1314
<directory suffix=".php">./test/</directory>

0 commit comments

Comments
 (0)