Skip to content

Commit 31bdf35

Browse files
alohaaloha
committed
Merge pull request #15 from andyfleming/naming-fixes
Naming fixes
2 parents 4b72dd8 + 5cc5015 commit 31bdf35

File tree

9 files changed

+49
-29
lines changed

9 files changed

+49
-29
lines changed

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 travisjryan
3+
Copyright (c) 2013-2014 Travis J. Ryan
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
1717
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
1818
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
1919
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ Next, update Composer from the Terminal:
2323

2424
Once composer is finished, you need to add the service provider. Open `app/config/app.php`, and add a new item to the providers array.
2525

26-
'Travisjryan\Twilio\TwilioServiceProvider',
26+
'Aloha\Twilio\TwilioServiceProvider',
2727

2828
Then, add a Facade for more convenient usage. In `app/config/app.php` add the following line to the `aliases` array:
2929

30-
'Twilio' => 'Travisjryan\Twilio\Facades\Twilio',
30+
'Twilio' => 'Aloha\Twilio\Facades\Twilio',
3131

3232
Publish config files from the Terminal
3333

34-
php artisan config:publish travisjryan/twilio
34+
php artisan config:publish aloha/twilio
3535
36-
Edit `config/packages/travisjryan/twilio` with your appropriate Twilio settings
36+
Edit `config/packages/aloha/twilio` with your appropriate Twilio settings
3737

3838

3939
## Usage

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"autoload": {
2020
"psr-0": {
21-
"Travisjryan\\Twilio": "src/"
21+
"Aloha\\Twilio": "src/"
2222
}
2323
},
2424
"minimum-stability": "stable"
25-
}
25+
}

src/Travisjryan/Twilio/Commands/TwilioCallCommand.php renamed to src/Aloha/Twilio/Commands/TwilioCallCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace Travisjryan\Twilio\Commands;
3+
namespace Aloha\Twilio\Commands;
44

55
use Illuminate\Console\Command;
66
use Symfony\Component\Console\Input\InputOption;
77
use Symfony\Component\Console\Input\InputArgument;
8-
use Travisjryan\Twilio;
8+
use Aloha\Twilio;
99

1010
class TwilioCallCommand extends Command {
1111

src/Travisjryan/Twilio/Commands/TwilioSmsCommand.php renamed to src/Aloha/Twilio/Commands/TwilioSmsCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace Travisjryan\Twilio\Commands;
3+
namespace Aloha\Twilio\Commands;
44

55
use Illuminate\Console\Command;
66
use Symfony\Component\Console\Input\InputOption;
77
use Symfony\Component\Console\Input\InputArgument;
8-
use Travisjryan\Twilio;
8+
use Aloha\Twilio;
99

1010
class TwilioSmsCommand extends Command {
1111

src/Travisjryan/Twilio/Facades/Twilio.php renamed to src/Aloha/Twilio/Facades/Twilio.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Travisjryan\Twilio\Facades;
3+
namespace Aloha\Twilio\Facades;
44

55
use Illuminate\Support\Facades\Facade;
66

src/Travisjryan/Twilio/Twilio.php renamed to src/Aloha/Twilio/Twilio.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Travisjryan\Twilio;
3+
namespace Aloha\Twilio;
44

55
class Twilio {
66

src/Travisjryan/Twilio/TwilioServiceProvider.php renamed to src/Aloha/Twilio/TwilioServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php namespace Travisjryan\Twilio;
1+
<?php namespace Aloha\Twilio;
22

33
use Illuminate\Support\ServiceProvider;
44

‎src/config/twilio.php‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
<?php
22

33
return array(
4-
/**
5-
* SID - Your Twilio Account SID #
6-
*/
7-
"sid" => "",
8-
9-
/**
10-
* token - Access token that can be found in your Twilio dashboard
11-
*/
12-
"token" => "",
13-
14-
/**
15-
* from - The Phone number registered with Twilio that your SMS & Calls will come from
16-
*/
17-
"from" => ""
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| SID
8+
|--------------------------------------------------------------------------
9+
|
10+
| Your Twilio Account SID #
11+
|
12+
*/
13+
14+
'sid' => '',
15+
16+
/*
17+
|--------------------------------------------------------------------------
18+
| Access Token
19+
|--------------------------------------------------------------------------
20+
|
21+
| Access token that can be found in your Twilio dashboard
22+
|
23+
*/
24+
25+
'token' => '',
26+
27+
/*
28+
|--------------------------------------------------------------------------
29+
| From Number
30+
|--------------------------------------------------------------------------
31+
|
32+
| The Phone number registered with Twilio that your SMS & Calls will come from
33+
|
34+
*/
35+
36+
'from' => ''
37+
1838
);

0 commit comments

Comments
 (0)