Skip to content

Commit

Permalink
Update composer.json for support Laravel 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
andersao committed Dec 24, 2015
1 parent 59f773d commit c93cdc5
Show file tree
Hide file tree
Showing 4 changed files with 1,185 additions and 11 deletions.
38 changes: 38 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This file is for unifying the coding style for different editors and IDEs
# editorconfig.org

root = true

[*]
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf

[**.less]
indent_style = tab
indent_size = 2

[**.{css,scss}]
indent_style = tab
indent_size = 2

[**.php]
indent_style = space
indent_size = 4

[**.html]
indent_style = tab
indent_size = 2

[**.js]
indent_style = space
indent_size = 2

[**.yml]
indent_style = space
indent_size = 2
insert_final_newline = false

[**.md]
indent_size = 4
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.idea/
composer.phar
composer.lock
vendor/
19 changes: 9 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
}
],
"require": {
"php": ">=5.4.0",
"illuminate/http": "~5.0|~5.1",
"illuminate/config": "~5.0|~5.1",
"illuminate/support": "~5.0|~5.1",
"illuminate/database": "~5.0|~5.1",
"illuminate/pagination": "~5.0|~5.1",
"illuminate/console": "~5.0|~5.1",
"illuminate/filesystem": "~5.0|~5.1"
"illuminate/http": "~5.0|~5.1|~5.2",
"illuminate/config": "~5.0|~5.1|~5.2",
"illuminate/support": "~5.0|~5.1|~5.2",
"illuminate/database": "~5.0|~5.1|~5.2",
"illuminate/pagination": "~5.0|~5.1|~5.2",
"illuminate/console": "~5.0|~5.1|~5.2",
"illuminate/filesystem": "~5.0|~5.1|~5.2"
},
"autoload": {
"psr-4": {
Expand All @@ -34,8 +33,8 @@
},
"extra": {
"branch-alias": {
"dev-develop": "2.1-dev"
"dev-develop": "2.2-dev"
}
},
"minimum-stability": "dev"
"minimum-stability": "stable"
}
Loading

2 comments on commit c93cdc5

@JackZhangfromChina
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about your work recently?

@JackZhangfromChina
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tell me Xiaolin Su's github name?

Please sign in to comment.