Skip to content

Compatibility with the DisplayLastPost extension by Aurelienazerty #14

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

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

Compatibility with the DisplayLastPost extension by Aurelienazerty #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86f5dcc
Compatibility with the DisplayLastPost extension by Aurelienazerty
Aurelienazerty Nov 6, 2017
48db8ec
Compatibility with the DisplayLastPost extension by Aurelienazerty
Aurelienazerty Aug 13, 2018
27cb605
Formatting issues
Aurelienazerty Jan 2, 2019
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
1 change: 1 addition & 0 deletions kasimi/postnumbers/config/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ services:
- '@template'
- '@dbal.conn'
- '@?rxu.FirstPostOnEveryPage.listener'
- '@?Aurelienazerty.DisplayLastPost.listener'
tags:
- { name: event.listener }
17 changes: 15 additions & 2 deletions kasimi/postnumbers/event/listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use phpbb\template\template;
use phpbb\user;
use rxu\FirstPostOnEveryPage\event\listener as FirstPostOnEveryPage;
use Aurelienazerty\DisplayLastPost\event\listener as DisplayLastPost;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;

class listener implements EventSubscriberInterface
Expand All @@ -42,6 +43,9 @@ class listener implements EventSubscriberInterface

/** @var FirstPostOnEveryPage */
protected $firstPostOnEveryPage;

/** @var DisplayLastPost */
protected $displayLastPost;

/** @var boolean */
protected $is_active = false;
Expand All @@ -67,14 +71,16 @@ class listener implements EventSubscriberInterface
* @param template $template
* @param db_interface $db
* @param FirstPostOnEveryPage $firstPostOnEveryPage
* @param DisplayLastPost $displayLastPost
Copy link
Copy Markdown
Owner

@kasimi kasimi Nov 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use tabs here to fix alignment.

*/
public function __construct(
user $user,
config $config,
request_interface $request,
template $template,
db_interface $db,
FirstPostOnEveryPage $firstPostOnEveryPage = null
FirstPostOnEveryPage $firstPostOnEveryPage = null,
DisplayLastPost $displayLastPost = null
)
{
$this->user = $user;
Expand All @@ -83,6 +89,7 @@ public function __construct(
$this->template = $template;
$this->db = $db;
$this->firstPostOnEveryPage = $firstPostOnEveryPage;
$this->displayLastPost = $displayLastPost;
Copy link
Copy Markdown
Owner

@kasimi kasimi Nov 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a tab here to fix alignment.

}

/**
Expand Down Expand Up @@ -319,7 +326,13 @@ protected function get_post_number($default_sort_by, $default_sort_dir, $default
$this->offset = $is_ascending ? 1 : 0;
}

return $this->first_post_num + ($is_ascending ? +$this->offset++ : -$this->offset++);
$return = $this->first_post_num + ($is_ascending ? +$this->offset++ : -$this->offset++);

Copy link
Copy Markdown
Owner

@kasimi kasimi Nov 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the tabs on this empty line, same on line 334.

if ($this->displayLastPost !== null && $start) {
Copy link
Copy Markdown
Owner

@kasimi kasimi Nov 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move the { to a new line.

$return = $is_ascending ? $return - 1 : $return + 1;
}

return $return;
}

/**
Expand Down