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.

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

google plus is removed #442

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ListingFavouriteController extends ListingSearchController
*/
public function indexFavouriteAction(Request $request)
{
$markers = array();
$markers = [];
$listings = new \ArrayIterator();
$nbListings = 0;

Expand All @@ -45,6 +45,7 @@ public function indexFavouriteAction(Request $request)

$favourites = explode(',', $request->cookies->get('favourite'));
if (count($favourites) > 0) {
$listingSearchRequest->setPage($request->query->get('page', 1));
$results = $this->get("cocorico.listing_search.manager")->getListingsByIds(
$listingSearchRequest,
$favourites,
Expand Down
16 changes: 8 additions & 8 deletions src/Cocorico/CoreBundle/Model/ListingSearchRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,33 +269,33 @@ public function setSortBy($sortBy)
}

/**
* @return mixed
* @return int
*/
public function getPage()
public function getPage(): int
{
return $this->page;
}

/**
* @param mixed $page
* @param int $page
*/
public function setPage($page)
public function setPage(?int $page)
{
$this->page = $page;
}

/**
* @return mixed
* @return int
*/
public function getMaxPerPage()
public function getMaxPerPage(): int
{
return $this->maxPerPage;
}

/**
* @param mixed $maxPerPage
* @param int $maxPerPage
*/
public function setMaxPerPage($maxPerPage)
public function setMaxPerPage(?int $maxPerPage)
{
$this->maxPerPage = $maxPerPage;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{{ render(controller('CocoricoCoreBundle:Frontend/ListingSearch:searchForm')) }}

<!-- two-columns -->
<div class="twocolumns row alt">
<div class="twocolumns alt">
<!-- contain the main content of the page -->
<div id="content" class="listing-area col-xs-12 col-md-9">
<div class="content-holder">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,4 @@
'url': url
} only %}
</li>

{#<li>#}
{#<a href="#"><i class="icon-vimeo"></i>#}
{#<span class="hidden">vimoe</span>#}
{#</a>#}
{#</li>#}

<li>
{% include 'CocoricoCoreBundle:Frontend/SocialButton:gplus.html.twig' with {
'url': url
} only %}
</li>
</ul>

This file was deleted.