Skip to content

Commit eb54610

Browse files
tirjoktirjok
committed
This fix contains some refactoring of controllers.
Cleanup: remove unused variables from controllers
1 parent 6aaa365 commit eb54610

19 files changed

+91
-96
lines changed

‎app/Http/Controllers/ClockworkController.php‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,38 @@
33
namespace App\Http\Controllers;
44

55
use Illuminate\Http\Request;
6-
76
use App\Http\Requests;
8-
use App\Http\Controllers\Controller;
97
use MJErwin\Clockwork\ClockworkClient;
108
use MJErwin\Clockwork\Message;
119

1210
class ClockworkController extends Controller
1311
{
14-
12+
/**
13+
* @var mixed
14+
*/
1515
protected $apiKey;
16+
17+
/**
18+
* @var ClockworkClient
19+
*/
1620
protected $client;
1721

22+
const MSG_NUMBER = '07700900123';
23+
24+
/**
25+
* Initialize ClockworkController
26+
*/
1827
public function __construct()
1928
{
2029
$this->apiKey = env('CLOCKWORK_API_KEY');
2130
$this->client = new ClockworkClient($this->apiKey);
2231
$this->message = new Message();
23-
$this->message->setNumber('07700900123');
24-
$this->message->setContent('Check out this message!');
25-
32+
$this->message->setNumber(self::MSG_NUMBER);
33+
$this->message->setContent(trans('texts.message.sample_body'));
2634
}
35+
2736
/**
2837
* Return all data to the Clockwork API dashboard
29-
* @return mixed
3038
*/
3139
public function getPage()
3240
{
@@ -35,20 +43,23 @@ public function getPage()
3543

3644
/**
3745
* Send a Text Message
46+
*
3847
* @param Request $request
39-
* @return string
48+
*
49+
* @return \Illuminate\Http\RedirectResponse
4050
*/
4151
public function sendTextMessage(Request $request)
4252
{
4353
$this->validate($request, [
4454
'telephone' => 'required'
4555
]);
4656

47-
$number = $request->input('number');
48-
$message = 'Testing Clockwork SMS #LaravelHackathonStarter';
49-
5057
$response = $this->client->sendMessage($this->message);
5158

52-
return redirect()->back()->with('info','Your Message has been sent successfully');
59+
if ($response->getMessageId()) {
60+
return redirect()->back()->with('info', trans('texts.message.sent_success'));
61+
}
62+
63+
return redirect()->back()->with('errors', trans('texts.message.sent_failed'));
5364
}
5465
}

‎app/Http/Controllers/ContactController.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
namespace App\Http\Controllers;
44

55
use Illuminate\Http\Request;
6-
76
use Auth;
87
use Mail;
98
use App\Http\Requests;
10-
use App\Http\Controllers\Controller;
119

1210
class ContactController extends Controller
1311
{
@@ -32,10 +30,10 @@ public function sendMessage(Request $request)
3230
Mail::send('emails.contact', ['body' => $body], function ($message) use ($name,$emailToSendTo) {
3331
$message->from('unicodeveloper@hackathon-starter.com', "From: {$name}");
3432

35-
$message->to($emailToSendTo)->subject("Message From Laravel Hackathon Starter Contact Form");
33+
$message->to($emailToSendTo)->subject(trans('texts.contact.subject'));
3634
});
3735

38-
return redirect()->route('contact')->with('info','Your Message has been dispatched successfully');
36+
return redirect()->route('contact')->with('info', trans('texts.contact.sent_success'));
3937
}
4038

4139
}

‎app/Http/Controllers/FacebookController.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
6-
75
use App\Http\Requests;
8-
use App\Http\Controllers\Controller;
96
use Facebook;
10-
use App\User;
117
use Auth;
128
use Session;
13-
use Illuminate\Support\Collection;
149

1510
class FacebookController extends Controller
1611
{
@@ -22,7 +17,7 @@ class FacebookController extends Controller
2217
*/
2318
public function getPage()
2419
{
25-
if( Session::get('provider') !== 'facebook') {
20+
if(Session::get('provider') !== 'facebook') {
2621
Auth::logout();
2722

2823
Session::flush();
@@ -35,9 +30,9 @@ public function getPage()
3530
return view('api.facebook')->withDetails($userDetails);
3631
}
3732

33+
3834
/**
39-
* [getData description]
40-
* @return [type] [description]
35+
* @return mixed
4136
*/
4237
private function getData()
4338
{

‎app/Http/Controllers/FoursquareController.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
6-
75
use FoursquareApi;
86
use App\Http\Requests;
9-
use App\Http\Controllers\Controller;
107

118
class FoursquareController extends Controller
129
{

‎app/Http/Controllers/GithubController.php‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,40 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
6-
75
use App\Http\Requests;
8-
use App\Http\Controllers\Controller;
9-
use GrahamCampbell\GitHub\Facades\GitHub;
106
use GrahamCampbell\GitHub\GitHubManager;
117

128
class GithubController extends Controller
139
{
10+
/**
11+
* @var GitHubManager
12+
*/
1413
protected $github;
15-
protected $repoName;
16-
protected $githubHandle;
1714

15+
const REPO_NAME = 'laravel-emoji';
16+
const GITHUB_HANDLE = 'unicodeveloper';
17+
18+
/**
19+
* Initialize the Controller with necessary arguments
20+
*
21+
* @param GitHubManager $github
22+
*/
1823
public function __construct(GitHubManager $github)
1924
{
2025
$this->github = $github;
21-
$this->repoName = 'laravel-emoji';
22-
$this->githubHandle = 'unicodeveloper';
2326
}
2427

28+
/**
29+
* @return mixed
30+
*/
2531
private function getRepoDetails()
2632
{
27-
return $this->github->connection('alternative')->repos()->show($this->githubHandle, $this->repoName);
33+
return $this->github->connection('alternative')->repos()->show(self::GITHUB_HANDLE, self::REPO_NAME);
2834
}
2935

36+
/**
37+
* @return mixed
38+
*/
3039
public function getPage()
3140
{
3241
$details = $this->getRepoDetails();

‎app/Http/Controllers/LastFmController.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
6-
7-
use Buzz\Browser;
85
use App\Http\Requests;
9-
use App\Http\Controllers\Controller;
106
use Dandelionmood\LastFm\LastFm;
117

128
class LastFmController extends Controller
139
{
10+
/**
11+
* @var array
12+
*/
13+
protected $sampleArtist = ['artist' => 'The Pierces'];
14+
1415
/**
1516
* LastFm Object
1617
* @var object;
@@ -48,7 +49,7 @@ public function getPage()
4849
*/
4950
private function getArtistInfo()
5051
{
51-
$result = (array)$this->lastfm->artist_getInfo(['artist' => 'The Pierces']);
52+
$result = (array)$this->lastfm->artist_getInfo($this->sampleArtist);
5253

5354
return $result['artist'];
5455
}
@@ -59,7 +60,7 @@ private function getArtistInfo()
5960
*/
6061
private function getTopAlbums()
6162
{
62-
$result = (array)$this->lastfm->artist_getTopAlbums(['artist' => 'The Pierces']);
63+
$result = (array)$this->lastfm->artist_getTopAlbums($this->sampleArtist);
6364

6465
return $result['topalbums']->album;
6566
}
@@ -70,7 +71,7 @@ private function getTopAlbums()
7071
*/
7172
private function getTopTracks()
7273
{
73-
$result = (array)$this->lastfm->artist_getTopTracks(['artist' => 'The Pierces']);
74+
$result = (array)$this->lastfm->artist_getTopTracks($this->sampleArtist);
7475

7576
return $result['toptracks']->track;
7677
}

‎app/Http/Controllers/LinkedInController.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
6-
75
use Auth;
86
use Session;
97
use App\Http\Requests;
10-
use App\Http\Controllers\Controller;
11-
use LinkedIn\LinkedIn;
128
use GuzzleHttp\Client;
139

1410
class LinkedInController extends Controller
1511
{
16-
/**
12+
const LINKEDIN_API = 'https://api.linkedin.com/v1';
13+
14+
/**
1715
* LinkedIn API base Url
1816
* @var string
1917
*/
@@ -36,7 +34,7 @@ class LinkedInController extends Controller
3634
*/
3735
public function __construct()
3836
{
39-
$this->baseUrl = 'https://api.linkedin.com/v1';
37+
$this->baseUrl = self::LINKEDIN_API;
4038
$this->client = new Client(['base_uri' => $this->baseUrl]);
4139
}
4240

‎app/Http/Controllers/LobController.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
namespace App\Http\Controllers;
44

5-
use Illuminate\Http\Request;
65

76
use Lob\Lob;
87
use App\Http\Requests;
9-
use App\Http\Controllers\Controller;
108

119
class LobController extends Controller
1210
{
11+
const ZIPCODE = '10007';
1312
/**
1413
* LOB API KEY
1514
* @var string
@@ -33,7 +32,7 @@ public function __construct()
3332

3433
/**
3534
* Get all delivery routes for this zip code
36-
* @param string $zipcdode
35+
* @param string $zipcode
3736
* @return array
3837
*/
3938
private function getRoutes($zipcode)
@@ -49,7 +48,7 @@ private function getRoutes($zipcode)
4948
*/
5049
public function getPage()
5150
{
52-
$routes = $this->getRoutes('10007');
51+
$routes = $this->getRoutes(self::ZIPCODE);
5352

5453
return view('api.lob')->withRoutes($routes);
5554
}

‎app/Http/Controllers/NytController.php‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
use GuzzleHttp\Client;
66
use App\Http\Requests;
7-
use Illuminate\Http\Request;
8-
use App\Http\Controllers\Controller;
97

108
class NytController extends Controller
119
{
10+
const API_URL = 'http://api.nytimes.com/svc';
11+
const RELATIVE_URL = '/books/v3/lists/overview.json?api-key={apiKey}';
1212

1313
/**
1414
* Instance of Guzzle Client
@@ -27,11 +27,19 @@ class NytController extends Controller
2727
*/
2828
public function __construct()
2929
{
30-
$this->baseUrl = 'http://api.nytimes.com/svc';
30+
$this->baseUrl = self::API_URL;
3131
$this->client = new Client(['base_uri' => $this->baseUrl]);
32+
$this->setGetResponse($this->getRelativeUrl());
33+
}
3234

33-
$relativeUrl = '/books/v3/lists/overview.json?api-key=' . env('NYT_BOOKS_API_KEY');
34-
$this->setGetResponse($relativeUrl);
35+
/**
36+
* Get relative url
37+
*
38+
* @return string
39+
*/
40+
public function getRelativeUrl()
41+
{
42+
return str_replace('{apiKey}', env('NYT_BOOKS_API_KEY'), self::RELATIVE_URL);
3543
}
3644

3745
/**

‎app/Http/Controllers/OauthController.php‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
namespace App\Http\Controllers;
44

55
use Illuminate\Http\Request;
6-
76
use App\User;
87
use App\Http\Requests;
98
use Illuminate\Contracts\Auth\Guard;
10-
use App\Http\Controllers\Controller;
119
use Laravel\Socialite\Contracts\Factory as Socialite;
1210
use Session;
1311

14-
1512
class OauthController extends Controller
1613
{
1714
protected $socialite;
@@ -42,8 +39,11 @@ public function execute($request, $provider)
4239

4340
/**
4441
* Find a user by username or create a new user
45-
* @param
46-
* @return
42+
*
43+
* @param $userData
44+
* @param $provider
45+
*
46+
* @return \App\User
4747
*/
4848
public function findByProviderIdOrCreate($userData, $provider)
4949
{
@@ -92,8 +92,8 @@ private function isEmailExists($email = null)
9292

9393
/**
9494
* Check if the user's info needs updating
95-
* @param
96-
* @return
95+
* @param $userData
96+
* @param $user
9797
*/
9898
public function checkIfUserNeedsUpdating($userData, $user)
9999
{
@@ -136,6 +136,4 @@ private function getSocialUser($provider)
136136
{
137137
return $this->socialite->driver($provider)->user();
138138
}
139-
140139
}
141-

0 commit comments

Comments
 (0)