Skip to content

Commit

Permalink
Merge pull request #4 from ARCANESOFT/develop
Browse files Browse the repository at this point in the history
Bump arcanesoft/auth package version
  • Loading branch information
arcanedev-maroc authored Jul 31, 2017
2 parents 5c08fde + 29a7bd9 commit fe5de40
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=5.6.4",
"arcanedev/laravel-seo": "~0.5",
"arcanedev/spam-blocker": "~1.3",
"arcanesoft/auth": "~2.2",
"arcanesoft/auth": "~3.0",
"arcanesoft/core": "~2.4"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/Admin/FootersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function store(CreateFooterRequest $request)
$this->authorize(Policies\FootersPolicy::PERMISSION_CREATE);

$footer = Footer::createOne(
$request->getValidatedInputs()
$request->getValidatedData()
);

$this->transNotification('created', ['name' => $footer->name], $footer->toArray());
Expand Down Expand Up @@ -115,7 +115,7 @@ public function update(Footer $footer, UpdateFooterRequest $request)
$this->authorize(Policies\FootersPolicy::PERMISSION_UPDATE);

$footer->updateOne(
$request->getValidatedInputs()
$request->getValidatedData()
);

$this->transNotification('updated', ['name' => $footer->name], $footer->toArray());
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/Admin/MetasController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function index()
{
$this->authorize(Policies\MetasPolicy::PERMISSION_LIST);

$metas = Meta::paginate(50);
$metas = Meta::query()->paginate(50);

$this->setTitle($title = trans('seo::metas.titles.metas-list'));
$this->addBreadcrumb($title);
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/Admin/PagesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function store(CreatePageRequest $request)
$this->authorize(Policies\PagesPolicy::PERMISSION_CREATE);

$page = Page::createOne(
$request->getValidatedInputs()
$request->getValidatedValidated()
);

$this->transNotification('created', ['name' => $page->name], $page->toArray());
Expand Down Expand Up @@ -109,7 +109,7 @@ public function update(Page $page, UpdatePageRequest $request)
$this->authorize(Policies\PagesPolicy::PERMISSION_UPDATE);

$page->updateOne(
$request->getValidatedInputs()
$request->getValidatedValidated()
);

$this->transNotification('updated', ['name' => $page->name], $page->toArray());
Expand Down
6 changes: 3 additions & 3 deletions src/Http/Controllers/Admin/RedirectsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function index()
{
$this->authorize(RedirectsPolicy::PERMISSION_LIST);

$redirects = Redirect::paginate(50);
$redirects = Redirect::query()->paginate(50);

$this->setTitle($title = trans('seo::redirects.titles.redirections-list'));
$this->addBreadcrumb($title);
Expand Down Expand Up @@ -90,7 +90,7 @@ public function store(CreateRedirectRequest $request)
$this->authorize(RedirectsPolicy::PERMISSION_CREATE);

$redirect = Redirect::createRedirect(
$request->getValidatedInputs()
$request->getValidatedData()
);

$this->transNotification('created', [], $redirect->toArray());
Expand Down Expand Up @@ -146,7 +146,7 @@ public function update(Redirect $redirect, UpdateRedirectRequest $request)
{
$this->authorize(RedirectsPolicy::PERMISSION_UPDATE);

$redirect->update($request->getValidatedInputs());
$redirect->update($request->getValidatedData());

$this->transNotification('updated', [], $redirect->toArray());

Expand Down
2 changes: 1 addition & 1 deletion src/Http/Requests/Admin/Footers/FooterFormRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ abstract class FooterFormRequest extends FormRequest
*
* @return array
*/
public function getValidatedInputs()
public function getValidatedData()
{
return $this->only([
// Footer inputs
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Requests/Admin/Pages/PageFormRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ abstract class PageFormRequest extends FormRequest
*
* @return array
*/
public function getValidatedInputs()
public function getValidatedValidated()
{
return $this->only(['name', 'locale', 'content']);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Requests/Admin/Redirects/RedirectFormRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ abstract class RedirectFormRequest extends FormRequest
*
* @return array
*/
public function getValidatedInputs()
public function getValidatedData()
{
return $this->only(['old_url', 'new_url', 'status']);
}
Expand Down
1 change: 0 additions & 1 deletion src/Models/Presenters/MetaPresenter.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php namespace Arcanesoft\Seo\Models\Presenters;

use Arcanesoft\Seo\Helpers\SeoChecker;
use Illuminate\Support\Arr;

/**
* Class MetaPresenter
Expand Down

0 comments on commit fe5de40

Please sign in to comment.