diff -u b/README.md b/README.md --- b/README.md +++ b/README.md @@ -50,7 +50,7 @@ Instructions ------------ - Download the module running ```composer require drupal/pagerer:^3``` from -the command line. + the command line. - Enable the module. - Check the Configuration page to setup. - Create and configure any number of 'preset' pagers. diff -u b/pagerer.module b/pagerer.module --- b/pagerer.module +++ b/pagerer.module @@ -2,7 +2,7 @@ /** * @file - * Module file. + * Providing a collection of pager styles. */ use Drupal\Component\Utility\Html; diff -u b/pagerer_example/pagerer_example.routing.yml b/pagerer_example/pagerer_example.routing.yml --- b/pagerer_example/pagerer_example.routing.yml +++ b/pagerer_example/pagerer_example.routing.yml @@ -8,3 +8,3 @@ requirements: - # Accessible = TRUE + # Allow unrestricted access to example page. _access: 'TRUE' diff -u b/src/Form/PagererPresetEditForm.php b/src/Form/PagererPresetEditForm.php --- b/src/Form/PagererPresetEditForm.php +++ b/src/Form/PagererPresetEditForm.php @@ -188,14 +188,18 @@ if (strpos($trigger, 'config', 0) === 0) { $e = explode('_', $trigger); $pane = $e[1]; - $form_state->setRedirect('entity.pagerer_preset.pane_edit_form', - ['pagerer_preset' => $this->entity->id(), 'pane' => $pane]); + $form_state->setRedirect( + 'entity.pagerer_preset.pane_edit_form', + ['pagerer_preset' => $this->entity->id(), 'pane' => $pane] + ); } elseif (strpos($trigger, 'reset', 0) === 0) { $e = explode('_', $trigger); $pane = $e[1]; - $form_state->setRedirect('entity.pagerer_preset.pane_reset_form', - ['pagerer_preset' => $this->entity->id(), 'pane' => $pane]); + $form_state->setRedirect( + 'entity.pagerer_preset.pane_reset_form', + ['pagerer_preset' => $this->entity->id(), 'pane' => $pane] + ); } else { $this->messenger->addMessage($this->t('Changes to the pager %label have been saved.', ['%label' => $this->entity->label()])); reverted: --- b/src/Form/PagererUrlConfigForm.php +++ a/src/Form/PagererUrlConfigForm.php @@ -74,8 +74,7 @@ */ public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); + if (in_array((string) $form_state->getValue('querystring_key'), ['page', 'page_ak'])) { - if (in_array((string) $form_state->getValue('querystring_key'), - ['page', 'page_ak'])) { $form_state->setErrorByName('querystring_key', $this->t("'page' and 'page_ak' can not be used for replacement. Choose a different key name.")); } } reverted: --- b/src/Pagerer.php +++ a/src/Pagerer.php @@ -24,7 +24,7 @@ /** * The route name. * + * @var \Symfony\Component\Routing\Route|string - * @var Symfony\Component\Routing\Route|string */ protected Route|string $routeName; diff -u b/src/Plugin/PagererStyleManager.php b/src/Plugin/PagererStyleManager.php --- b/src/Plugin/PagererStyleManager.php +++ b/src/Plugin/PagererStyleManager.php @@ -16,7 +16,17 @@ class PagererStyleManager extends DefaultPluginManager implements PagererStyleManagerInterface { /** - * Construct function. + * Constructs an PagererStyleManager object. + * + * @param \Traversable $namespaces + * An object that implements \Traversable which contains the root paths + * keyed by the corresponding namespace to look for plugin implementations. + * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend + * Cache backend instance to use. + * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler + * The module handler to invoke the alter hook with. + * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory + * The configuration factory. */ public function __construct( \Traversable $namespaces, diff -u b/src/Plugin/pagerer/Adaptive.php b/src/Plugin/pagerer/Adaptive.php --- b/src/Plugin/pagerer/Adaptive.php +++ b/src/Plugin/pagerer/Adaptive.php @@ -80,12 +80,16 @@ // First. $pages[0] = $this->getPageItem(-$current, 'absolute', FALSE, ($current == 0 ? 'page_current' : 'page'), FALSE); - $pages[0]['href'] = $this->pagerManager->getHref($this->pager, - $this->parameters, 0, [0, $last]); + $pages[0]['href'] = $this->pagerManager->getHref( + $this->pager, + $this->parameters, 0, [0, $last] + ); // Last. $pages[$last] = $this->getPageItem($last - $current, 'absolute', FALSE, ($current == $last ? 'page_current' : 'page'), FALSE); - $pages[$last]['href'] = $this->pagerManager->getHref($this->pager, - $this->parameters, $last, [0, $last]); + $pages[$last]['href'] = $this->pagerManager->getHref( + $this->pager, + $this->parameters, $last, [0, $last] + ); // Neighborhood. $pages = $this->buildNeighborhoodPageList($pages); // Adaptive keys left pointed page. @@ -124,8 +128,12 @@ $d = &$pages[$kpages[$x]]; // Adaptive page. if (isset($d['outer_page'])) { - $d['href'] = $this->pagerManager->getHref($this->pager, - $this->parameters, $kpages[$x], [$kpages[$x - 1], $kpages[$x + 1]]); + $d['href'] = $this->pagerManager->getHref( + $this->pager, + $this->parameters, + $kpages[$x], + [$kpages[$x - 1], $kpages[$x + 1]] + ); continue; } diff -u b/src/Plugin/views/pager/Pagerer.php b/src/Plugin/views/pager/Pagerer.php --- b/src/Plugin/views/pager/Pagerer.php +++ b/src/Plugin/views/pager/Pagerer.php @@ -34,15 +34,11 @@ /** * The list of pagerer presets. - * - * @var \Drupal\Core\Entity\EntityListBuilderInterface */ protected EntityListBuilderInterface $presetsList; /** * The Pagerer preset entity storage. - * - * @var \Drupal\Core\Entity\EntityStorageInterface */ protected EntityStorageInterface $presetStorage; diff -u b/tests/src/Functional/PagererTest.php b/tests/src/Functional/PagererTest.php --- b/tests/src/Functional/PagererTest.php +++ b/tests/src/Functional/PagererTest.php @@ -567,7 +567,6 @@ // Loop through test sets. foreach (['page', 'pg_0', 'px_1'] as $set) { - // $match_querystring = 'expected_querystring_' . $set; switch ($set) { case 'core': // Run with default: 'page' and 0-based page numbers. diff -u b/tests/src/FunctionalJavascript/CorePagerReplacePaginationAJAXTest.php b/tests/src/FunctionalJavascript/CorePagerReplacePaginationAJAXTest.php --- b/tests/src/FunctionalJavascript/CorePagerReplacePaginationAJAXTest.php +++ b/tests/src/FunctionalJavascript/CorePagerReplacePaginationAJAXTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\pagerer\FunctionalJavascript; -use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Tests\views\FunctionalJavascript\PaginationAJAXTest; /** @@ -12,8 +11,6 @@ */ class CorePagerReplacePaginationAJAXTest extends PaginationAJAXTest { - use StringTranslationTrait; - /** * The URL for Pagerer admin UI page. * @@ -36,7 +33,7 @@ $this->drupalGet($this->pagererAdmin . '/preset/add'); $this->submitForm([ 'label' => 'core_replace', - ], $this->t('Create')); + ], 'Create'); // Make 'core_replace' pagerer preset the global pager replacement. \Drupal::configFactory()->getEditable('pagerer.settings')