Skip to content

Commit f06d00c

Browse files
committed
Merge pull request mpociot#7 from lucasmichot/feature/master/dotfiles
Add some dotfiles
2 parents 262499a + 1351923 commit f06d00c

File tree

3 files changed

+55
-26
lines changed

3 files changed

+55
-26
lines changed

.editorconfig

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

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
* text=auto
2+
3+
/tests export-ignore
4+
/.editorconfig export-ignore
5+
/.gitattributes export-ignore
6+
/.gitignore export-ignore
7+
/.travis.yml export-ignore
8+
/phpunit.xml export-ignore
9+
/README.md export-ignore

composer.json

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
{
2-
"name": "mpociot/laravel-apidoc-generator",
3-
"license": "MIT",
4-
"description": "Generate beautiful API documentation from your Laravel / Lumen application",
5-
"keywords": ["API","Documentation","Laravel"],
6-
"homepage": "http://github.com/mpociot/laravel-apidoc-generator",
7-
"authors": [
8-
{
9-
"name": "Marcel Pociot",
10-
"email": "[email protected]"
2+
"name": "mpociot/laravel-apidoc-generator",
3+
"license": "MIT",
4+
"description": "Generate beautiful API documentation from your Laravel / Lumen application",
5+
"keywords": [
6+
"API",
7+
"Documentation",
8+
"Laravel"
9+
],
10+
"homepage": "http://github.com/mpociot/laravel-apidoc-generator",
11+
"authors": [
12+
{
13+
"name": "Marcel Pociot",
14+
"email": "[email protected]"
15+
}
16+
],
17+
"require": {
18+
"php": ">=5.5.0",
19+
"laravel/framework": "~5.0",
20+
"phpdocumentor/reflection-docblock": "~2.0",
21+
"mpociot/documentarian": "^0.2.0",
22+
"fzaninotto/faker": "^1.6"
23+
},
24+
"require-dev": {
25+
"phpunit/phpunit": "~4.0",
26+
"orchestra/testbench": "~3.0"
27+
},
28+
"autoload": {
29+
"psr-0": {
30+
"Mpociot\\ApiDoc": "src/"
31+
}
1132
}
12-
],
13-
"require": {
14-
"php": ">=5.5.0",
15-
"laravel/framework": "~5.0",
16-
"phpdocumentor/reflection-docblock": "~2.0",
17-
"mpociot/documentarian": "^0.2.0",
18-
"fzaninotto/faker": "^1.6"
19-
},
20-
"require-dev": {
21-
"phpunit/phpunit": "~4.0",
22-
"orchestra/testbench": "~3.0"
23-
},
24-
"autoload": {
25-
"psr-0": {
26-
"Mpociot\\ApiDoc": "src/"
27-
}
28-
}
2933
}

0 commit comments

Comments
 (0)