Skip to content

Commit

Permalink
Merge pull request #1 from ManojKiranA/analysis-L39xMm
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
ManojKiranA committed May 5, 2020
2 parents 0c1383e + 76c83f2 commit ab918b0
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
15 changes: 8 additions & 7 deletions app/Campaign.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@ class Campaign extends Model
const FINISHED = 'finished';

/**
* Checks if Current Campaign status is as Specified
* Checks if Current Campaign status is as Specified.
*
* @param string $status
* @return bool
**/
public function isInStatus(string $status):bool
public function isInStatus(string $status): bool
{
if($this->status === $status){
if ($this->status === $status) {
return true;
}

return false;
}

/**
* Checks if Current Campaign status is Draft
* Checks if Current Campaign status is Draft.
*
* @return bool
**/
Expand All @@ -38,7 +39,7 @@ public function isDraft()
}

/**
* Checks if Current Campaign status is Not Draft
* Checks if Current Campaign status is Not Draft.
*
* @return bool
**/
Expand All @@ -48,7 +49,7 @@ public function isNotDraft()
}

/**
* Checks if Current Campaign status is Finished
* Checks if Current Campaign status is Finished.
*
* @return bool
**/
Expand All @@ -58,7 +59,7 @@ public function isFinished()
}

/**
* Checks if Current Campaign status is Not FINISHED
* Checks if Current Campaign status is Not FINISHED.
*
* @return bool
**/
Expand Down
10 changes: 5 additions & 5 deletions app/Http/Controllers/CampaignController.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ public function update(CampaignStoreRequest $request, Campaign $campaign)
return back();
}

$updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email','content']),
$updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email', 'content']),
[
'track_clicks' => $request->track_clicks ? 1 : 0,
'track_opens' => $request->track_opens ? 1 : 0,
]);
'track_clicks' => $request->track_clicks ? 1 : 0,
'track_opens' => $request->track_opens ? 1 : 0,
]);

$campaign->update($updationArray);

return redirect()->route('campaigns.show', $campaign->id);
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/ListsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function create()
*/
public function store(ListStoreRequest $request)
{
if(! $request->exists('double_opt_in')){
if (! $request->exists('double_opt_in')) {
$request->request->add(['double_opt_in' => 0]);
}

Expand All @@ -66,7 +66,7 @@ public function store(ListStoreRequest $request)
*/
public function show(Request $request, Lists $lists)
{
$contacts = Contact::where('list_id','=',$lists->id)
$contacts = Contact::where('list_id', '=', $lists->id)
->where('subscribed', ! $request->subscribed)
->orderBy('id', 'desc')
->paginate(10);
Expand Down Expand Up @@ -94,7 +94,7 @@ public function edit(Lists $lists)
*/
public function update(ListUpdateRequest $request, Lists $lists)
{
if(! $request->exists('double_opt_in')){
if (! $request->exists('double_opt_in')) {
$request->request->add(['double_opt_in' => 0]);
}

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/CampaignStoreRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function rules()
return [
'subject' => ['required'],
'sending_name' => ['required'],
'sending_email' => ['required','email'],
'sending_email' => ['required', 'email'],
'content' => ['required'],
];
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/ImportSaveRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function authorize()
public function rules()
{
return [
'file' => ['required','mimes:csv,txt'],
'file' => ['required', 'mimes:csv,txt'],
];
}
}
2 changes: 1 addition & 1 deletion app/Http/Requests/SendTestMailRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function authorize()
public function rules()
{
return [
'email' => ['email','required'],
'email' => ['email', 'required'],
];
}
}
2 changes: 1 addition & 1 deletion app/Http/Requests/SettingsUpdateRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function rules()
{
return [
'name' => ['required'],
'email' => ['required','email'],
'email' => ['required', 'email'],
];
}
}
4 changes: 2 additions & 2 deletions app/Http/Requests/SmtpSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ public function rules()
{
return [
'host' => ['required'],
'port' => ['required','integer'],
'port' => ['required', 'integer'],
'username' => ['required'],
'password' => ['required'],
'name' => ['required'],
'address' => ['required','email'],
'address' => ['required', 'email'],
];
}
}
4 changes: 2 additions & 2 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace App\Providers;

use App\View\Components\CheckErrorExistsComponent;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
use Laravel\Dusk\DuskServiceProvider;
use Illuminate\Support\Facades\Blade;

class AppServiceProvider extends ServiceProvider
{
Expand All @@ -19,7 +19,7 @@ public function register()
{
if ($this->app->environment('local', 'testing')) {
$this->app->register(DuskServiceProvider::class);
}
}
}

/**
Expand Down
3 changes: 1 addition & 2 deletions app/View/Components/CheckErrorExistsComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

class CheckErrorExistsComponent extends Component
{
/** @var string $controlName */

/** @var string */
public $controlName;

/**
Expand Down
2 changes: 1 addition & 1 deletion app/View/Components/ErrorAlertComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ErrorAlertComponent extends Component
{
/** @var string $errorMessage */
/** @var string */
public $errorMessage;

/**
Expand Down

0 comments on commit ab918b0

Please sign in to comment.