Skip to content

Commit

Permalink
Merge pull request #671 from thiagobfiorenza/master
Browse files Browse the repository at this point in the history
[2.2] Correções de PHP Docs, PSR-12 (issue #424) e retirados uses não utilizados.
  • Loading branch information
edersoares authored Oct 23, 2019
2 parents 3f7207b + c239c5d commit aea6e60
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 17 deletions.
1 change: 0 additions & 1 deletion app/Http/Controllers/BatchEnrollmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public function viewEnroll(
* Lista as enturmações da turma e possibilita a desenturmação em lote.
*
* @param LegacySchoolClass $schoolClass
* @param EnrollmentService $enrollmentService
*
* @return View
*/
Expand Down
1 change: 0 additions & 1 deletion app/Http/Requests/BatchEnrollmentRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Arr;

class BatchEnrollmentRequest extends FormRequest
{
Expand Down
1 change: 0 additions & 1 deletion app/Http/Requests/EnrollmentRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Arr;

class EnrollmentRequest extends FormRequest
{
Expand Down
2 changes: 1 addition & 1 deletion app/Listeners/AuthenticatedUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AuthenticatedUser
*
* @param Authenticated $event
*
* @return void
* @throws ValidationException
*/
public function handle(Authenticated $event)
{
Expand Down
4 changes: 3 additions & 1 deletion app/Mail/ErrorTrackerMail.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ class ErrorTrackerMail extends Mailable implements ShouldQueue
/**
* Create a new message instance.
*
* @return void
* @param $to
* @param $subject
* @param $content
*/
public function __construct($to, $subject, $content)
{
Expand Down
6 changes: 6 additions & 0 deletions app/Models/Individual.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ public function getRealNameAttribute()
}

/**
* @param $value
*
* @return string
*/
public function getMotherNameAttribute($value)
Expand All @@ -87,6 +89,8 @@ public function getMotherNameAttribute($value)
}

/**
* @param $value
*
* @return string
*/
public function getFatherNameAttribute($value)
Expand All @@ -99,6 +103,8 @@ public function getFatherNameAttribute($value)
}

/**
* @param $value
*
* @return string
*/
public function getGuardianNameAttribute($value)
Expand Down
1 change: 0 additions & 1 deletion app/Models/School.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Models;

use Illuminate\Database\Eloquent\Model;
use App\Models\Enrollment;

class School extends Model
{
Expand Down
3 changes: 1 addition & 2 deletions app/Notifications/ResetPasswordNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
namespace App\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;

class ResetPasswordNotification extends Notification
{
Expand Down
10 changes: 3 additions & 7 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@

namespace App\Providers;

use App\Models\SchoolManager;
use App\Observers\SchoolManagerObserver;
use App\Models\LegacyInstitution;
use App\Providers\Postgres\DatabaseServiceProvider;
use Exception;
use App\Services\CacheManager;
use App\Models\LegacyInstitution;
use App\Services\StudentUnificationService;
use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
use iEducar\Support\Navigation\Breadcrumb;
use Exception;
use iEducar\Modules\ErrorTracking\HoneyBadgerTracker;
use iEducar\Modules\ErrorTracking\Tracker;
use iEducar\Support\Navigation\Breadcrumb;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\Request;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
Expand Down
4 changes: 2 additions & 2 deletions app/Services/SchoolClass/AvailableTimeService.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public function isAvailable(int $studentId, int $schoolClassId)

$otherSchoolClass = $schoolClassQuery->get();

foreach ($otherSchoolClass as $otherSchoolClass) {
if ($this->schedulesMatch($schoolClass, $otherSchoolClass)) {
foreach ($otherSchoolClass as $oneSchoolClass) {
if ($this->schedulesMatch($schoolClass, $oneSchoolClass)) {
return false;
}
}
Expand Down

0 comments on commit aea6e60

Please sign in to comment.