Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump moment from 2.27.0 to 2.29.2 #777

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump moment from 2.27.0 to 2.29.2 #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71b4e96
Bump moment from 2.27.0 to 2.29.2
dependabot[bot] Apr 8, 2022
d039caf
Apply fixes from StyleCI
StyleCIBot Apr 8, 2022
07cfef9
Merge pull request #778 from FTXInfotech/analysis-J2K54k
viralsolani Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserConfirmed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserConfirmed
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserCreated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserCreated
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserDeactivated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserDeactivated
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserDeleted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserDeleted
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserPasswordChanged.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserPasswordChanged
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserPermanentlyDeleted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserPermanentlyDeleted
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserReactivated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserReactivated
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserRestored.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserRestored
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserSocialDeleted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class UserSocialDeleted
/**
* UserSocialDeleted constructor.
*
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
* @param $social
*/
public function __construct(User $user, $social)
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserUnconfirmed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserUnconfirmed
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Backend/Auth/User/UserUpdated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UserUpdated
public $user;

/**
* @param \App\Models\Auth\User $user
* @param \App\Models\Auth\User $user
*/
public function __construct(User $user)
{
Expand Down
6 changes: 3 additions & 3 deletions app/Exceptions/GeneralException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class GeneralException extends Exception
/**
* GeneralException constructor.
*
* @param string $message
* @param int $code
* @param Throwable|null $previous
* @param string $message
* @param int $code
* @param Throwable|null $previous
*/
public function __construct($message = '', $code = 0, Throwable $previous = null)
{
Expand Down
14 changes: 6 additions & 8 deletions app/Exceptions/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param Exception $exception
* @param Exception $exception
* @return mixed|void
*
* @throws Exception
* @return mixed|void
*/
public function report(Exception $exception)
{
Expand All @@ -56,8 +56,9 @@ public function report(Exception $exception)
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @throws \Exception
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Exception
*/
public function render($request, Exception $exception)
{
Expand Down Expand Up @@ -123,7 +124,6 @@ public function getStatusCode()
* set the status code.
*
* @param [type] $statusCode [description]
*
* @return statuscode
*/
public function setStatusCode($statusCode)
Expand All @@ -137,7 +137,6 @@ public function setStatusCode($statusCode)
* respond with error.
*
* @param $message
*
* @return \Illuminate\Http\JsonResponse
*/
protected function respondWithError($message)
Expand All @@ -153,9 +152,8 @@ protected function respondWithError($message)
/**
* Respond.
*
* @param array $data
* @param array $headers
*
* @param array $data
* @param array $headers
* @return \Illuminate\Http\JsonResponse
*/
public function respond($data, $headers = [])
Expand Down
6 changes: 3 additions & 3 deletions app/Exceptions/ReportableException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class ReportableException extends Exception
/**
* GeneralException constructor.
*
* @param string $message
* @param int $code
* @param Throwable|null $previous
* @param string $message
* @param int $code
* @param Throwable|null $previous
*/
public function __construct($message = '', $code = 0, Throwable $previous = null)
{
Expand Down
37 changes: 15 additions & 22 deletions app/Helpers/General/HtmlHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,17 @@ class HtmlHelper
/**
* HtmlHelper constructor.
*
* @param UrlGenerator|null $url
* @param UrlGenerator|null $url
*/
public function __construct(UrlGenerator $url = null)
{
$this->url = $url;
}

/**
* @param $url
* @param array $attributes
* @param null $secure
*
* @param $url
* @param array $attributes
* @param null $secure
* @return mixed
*/
public function style($url, $attributes = [], $secure = null)
Expand All @@ -48,10 +47,9 @@ public function style($url, $attributes = [], $secure = null)
/**
* Generate a link to a JavaScript file.
*
* @param string $url
* @param array $attributes
* @param bool $secure
*
* @param string $url
* @param array $attributes
* @param bool $secure
* @return \Illuminate\Support\HtmlString
*/
public function script($url, $attributes = [], $secure = null)
Expand All @@ -62,10 +60,9 @@ public function script($url, $attributes = [], $secure = null)
}

/**
* @param $cancel_to
* @param $title
* @param string $classes
*
* @param $cancel_to
* @param $title
* @param string $classes
* @return HtmlString
*/
public function formCancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')
Expand All @@ -74,9 +71,8 @@ public function formCancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm
}

/**
* @param $title
* @param string $classes
*
* @param $title
* @param string $classes
* @return HtmlString
*/
public function formSubmit($title, $classes = 'btn btn-success btn-sm pull-right')
Expand All @@ -87,8 +83,7 @@ public function formSubmit($title, $classes = 'btn btn-success btn-sm pull-right
/**
* Build an HTML attribute string from an array.
*
* @param array $attributes
*
* @param array $attributes
* @return string
*/
public function attributes($attributes)
Expand All @@ -109,9 +104,8 @@ public function attributes($attributes)
/**
* Build a single attribute element.
*
* @param string $key
* @param string $value
*
* @param string $key
* @param string $value
* @return string
*/
protected function attributeElement($key, $value)
Expand Down Expand Up @@ -139,7 +133,6 @@ protected function attributeElement($key, $value)
* Transform the string to an Html serializable object.
*
* @param $html
*
* @return \Illuminate\Support\HtmlString
*/
protected function toHtmlString($html)
Expand Down
6 changes: 2 additions & 4 deletions app/Helpers/General/TimezoneHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
class TimezoneHelper
{
/**
* @param Carbon $date
* @param string $format
*
* @param Carbon $date
* @param string $format
* @return Carbon
*/
public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y'): string
Expand All @@ -22,7 +21,6 @@ public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y'): strin

/**
* @param $date
*
* @return Carbon
*/
public function convertFromLocal($date): Carbon
Expand Down
33 changes: 14 additions & 19 deletions app/Helpers/Global/HtmlHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

if (! function_exists('style')) {
/**
* @param $url
* @param array $attributes
* @param null $secure
*
* @param $url
* @param array $attributes
* @param null $secure
* @return mixed
*/
function style($url, $attributes = [], $secure = null)
Expand All @@ -18,10 +17,9 @@ function style($url, $attributes = [], $secure = null)

if (! function_exists('script')) {
/**
* @param $url
* @param array $attributes
* @param null $secure
*
* @param $url
* @param array $attributes
* @param null $secure
* @return mixed
*/
function script($url, $attributes = [], $secure = null)
Expand All @@ -32,10 +30,9 @@ function script($url, $attributes = [], $secure = null)

if (! function_exists('form_cancel')) {
/**
* @param $cancel_to
* @param $title
* @param string $classes
*
* @param $cancel_to
* @param $title
* @param string $classes
* @return mixed
*/
function form_cancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')
Expand All @@ -46,9 +43,8 @@ function form_cancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')

if (! function_exists('form_submit')) {
/**
* @param $title
* @param string $classes
*
* @param $title
* @param string $classes
* @return mixed
*/
function form_submit($title, $classes = 'btn btn-success btn-sm pull-right')
Expand All @@ -61,10 +57,9 @@ function form_submit($title, $classes = 'btn btn-success btn-sm pull-right')
/**
* Get the active class if the condition is not falsy.
*
* @param $condition
* @param string $activeClass
* @param string $inactiveClass
*
* @param $condition
* @param string $activeClass
* @param string $inactiveClass
* @return string
*/
function active_class($condition, $activeClass = 'active', $inactiveClass = '')
Expand Down
1 change: 0 additions & 1 deletion app/Helpers/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ function includeRouteFiles($folder)
* So we take the original and place that in and send back the path.
*
* @param $path
*
* @return string
*/
function getRtlCss($path)
Expand Down
5 changes: 2 additions & 3 deletions app/Http/Composers/Backend/SidebarComposer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ class SidebarComposer
/**
* SidebarComposer constructor.
*
* @param UserRepository $userRepository
* @param UserRepository $userRepository
*/
public function __construct(UserRepository $userRepository)
{
$this->userRepository = $userRepository;
}

/**
* @param View $view
*
* @param View $view
* @return bool|mixed
*/
public function compose(View $view)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Composers/GlobalComposer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class GlobalComposer
/**
* Bind data to the view.
*
* @param View $view
* @param View $view
*/
public function compose(View $view)
{
Expand Down
Loading