浏览代码

Merge pull request #7 from lucasmichot/feature/master/dotfiles

Add some dotfiles
Marcel Pociot 9 年之前
父节点
当前提交
f06d00c8cb
共有 3 个文件被更改,包括 55 次插入26 次删除
  1. 16 0
      .editorconfig
  2. 9 0
      .gitattributes
  3. 30 26
      composer.json

+ 16 - 0
.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

+ 9 - 0
.gitattributes

@@ -0,0 +1,9 @@
+* text=auto
+
+/tests export-ignore
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml export-ignore
+/README.md export-ignore

+ 30 - 26
composer.json

@@ -1,29 +1,33 @@
 {
-  "name": "mpociot/laravel-apidoc-generator",
-  "license": "MIT",
-  "description": "Generate beautiful API documentation from your Laravel / Lumen application",
-  "keywords": ["API","Documentation","Laravel"],
-  "homepage": "http://github.com/mpociot/laravel-apidoc-generator",
-  "authors": [
-    {
-      "name": "Marcel Pociot",
-      "email": "m.pociot@gmail.com"
+    "name": "mpociot/laravel-apidoc-generator",
+    "license": "MIT",
+    "description": "Generate beautiful API documentation from your Laravel / Lumen application",
+    "keywords": [
+        "API",
+        "Documentation",
+        "Laravel"
+    ],
+    "homepage": "http://github.com/mpociot/laravel-apidoc-generator",
+    "authors": [
+        {
+            "name": "Marcel Pociot",
+            "email": "m.pociot@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.0",
+        "laravel/framework": "~5.0",
+        "phpdocumentor/reflection-docblock": "~2.0",
+        "mpociot/documentarian": "^0.2.0",
+        "fzaninotto/faker": "^1.6"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "orchestra/testbench": "~3.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "Mpociot\\ApiDoc": "src/"
+        }
     }
-  ],
-  "require": {
-    "php": ">=5.5.0",
-    "laravel/framework": "~5.0",
-    "phpdocumentor/reflection-docblock": "~2.0",
-    "mpociot/documentarian": "^0.2.0",
-    "fzaninotto/faker": "^1.6"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "orchestra/testbench": "~3.0"
-  },
-  "autoload": {
-    "psr-0": {
-      "Mpociot\\ApiDoc": "src/"
-    }
-  }
 }