Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.travis.yml
#	composer.json
#	config/dingtalk_robot.php
#	src/DingtalkRobot.php
#	src/Exceptions/Exception.php
#	src/Message/ActionCardMessage.php
#	src/Message/FeedCardMessage.php
#	src/Message/LinkMessage.php
#	src/Message/MarkdownMessage.php
#	src/Message/TextMessage.php
#	src/helpers.php
  • Loading branch information
calchen committed Jan 17, 2020
2 parents 0f197e9 + 033a96e commit db86c81
Show file tree
Hide file tree
Showing 49 changed files with 2,590 additions and 341 deletions.
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage_clover: clover.xml
json_path: coveralls-upload.json
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ sftp-config.json
composer.lock
.subsplit
.php_cs.cache
phpunit.xml
.phpunit.result.cache
clover.xml
27 changes: 0 additions & 27 deletions .php_cs

This file was deleted.

4 changes: 4 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
preset: laravel

disabled:
- unused_use
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ after_success:
- php vendor/bin/php-coveralls

notifications:
email: false
email: false
257 changes: 179 additions & 78 deletions README.md

Large diffs are not rendered by default.

Loading

0 comments on commit db86c81

Please sign in to comment.