Merge pull request #65 from toplan/dev

use phpsms v1.3.0 to fix issue #59
toplan · Apr 15, 2016 · 1278f2b · 1278f2b
2 parents 7fccd5d + 88b8e29
commit 1278f2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -35,8 +35,8 @@ phpsms为laravel-sms提供了全套的短信发送机制，而且phpsms也有自
 # 安装
 在项目根目录下运行如下composer命令:
 ```php
-   //安装2.2版本(推荐)
-   composer require 'toplan/laravel-sms:~2.2.7',
+   //安装2.3版本(推荐)
+   composer require 'toplan/laravel-sms:~2.3.0',
 
    //安装开发中版本
    composer require 'toplan/laravel-sms:dev-master'

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "toplan/laravel-sms",
     "description": "sms send package for laravel",
     "license": "MIT",
-    "version": "2.2.7",
+    "version": "2.3.0",
     "keywords": ["sms", "laravel sms", "laravel-sms"],
     "authors": [
         {
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "toplan/phpsms": "~1.2.2"
+        "toplan/phpsms": "~1.3.0"
     },
     "autoload": {
         "classmap": [

diff --git a/src/Toplan/LaravelSms/SmsManagerServiceProvider.php b/src/Toplan/LaravelSms/SmsManagerServiceProvider.php
@@ -5,7 +5,7 @@
 use DB;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\ServiceProvider;
-use Toplan\PhpSms\Sms;
+use PhpSms as PS;
 
 class SmsManagerServiceProvider extends ServiceProvider
 {
@@ -64,7 +64,7 @@ protected function initPhpSms()
 
         // define how to use queue
         $queueJob = config('laravel-sms.queueJob', 'App\Jobs\SendReminderSms');
-        Sms::queue(false, function ($sms, $data) use ($queueJob) {
+        PS::queue(false, function ($sms, $data) use ($queueJob) {
             if (!class_exists($queueJob)) {
                 throw new LaravelSmsException("Class [$queueJob] does not exists.");
             }
@@ -78,7 +78,7 @@ protected function initPhpSms()
 
         // before send hook
         // store sms data to database
-        Sms::beforeSend(function ($task) {
+        PS::beforeSend(function ($task) {
             if (!config('laravel-sms.database_enable', false)) {
                 return true;
             }
@@ -97,7 +97,7 @@ protected function initPhpSms()
 
         // after send hook
         // update sms data in database
-        Sms::afterSend(function ($task, $result) {
+        PS::afterSend(function ($task, $result) {
             if (!config('laravel-sms.database_enable', false)) {
                 return true;
             }