Remove use of deprecated Pagination Component (NOJIRA)

arlen · Oct 26, 2022 · cf00ffc · cf00ffc
1 parent 57627d6
commit cf00ffc
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 26 deletions.
diff --git a/app/src/Controller/AdHocAttributesController.php b/app/src/Controller/AdHocAttributesController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class AdHocAttributesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'AdHocAttributes.tag' => 'asc'
     ]

diff --git a/app/src/Controller/AddressesController.php b/app/src/Controller/AddressesController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class AddressesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Addresses.street' => 'asc'
     ]

diff --git a/app/src/Controller/ApiUsersController.php b/app/src/Controller/ApiUsersController.php
@@ -30,7 +30,7 @@
 namespace App\Controller;
 
 class ApiUsersController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'ApiUsers.username' => 'asc'
     ]

diff --git a/app/src/Controller/ApiV2Controller.php b/app/src/Controller/ApiV2Controller.php
@@ -300,7 +300,7 @@ public function index() {
 
     // This magically makes REST calls paginated... can use eg direction=,
     // sort=, limit=, page= 
-    $this->set($this->tableName, $this->Paginator->paginate($query));
+    $this->set($this->tableName, $this->paginate($query));
 
     // Let the view render
     $this->render('/Standard/api/v2/json/index');

diff --git a/app/src/Controller/AuthenticationEventsController.php b/app/src/Controller/AuthenticationEventsController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class AuthenticationEventsController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'AuthenticationEvents.id' => 'desc'
     ]

diff --git a/app/src/Controller/CosController.php b/app/src/Controller/CosController.php
@@ -36,7 +36,7 @@
 use Cake\ORM\TableRegistry;
 
 class CosController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Cos.name' => 'asc'
     ]

diff --git a/app/src/Controller/CousController.php b/app/src/Controller/CousController.php
@@ -34,7 +34,7 @@
 //use \App\Lib\Enum\PermissionEnum;
 
 class CousController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Cous.name' => 'asc'
     ]

diff --git a/app/src/Controller/EmailAddressesController.php b/app/src/Controller/EmailAddressesController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class EmailAddressesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'EmailAddresses.mail' => 'asc'
     ]

diff --git a/app/src/Controller/ExternalIdentitiesController.php b/app/src/Controller/ExternalIdentitiesController.php
@@ -36,7 +36,7 @@
 // Use extend MVEAController for breadcrumb rendering. ExternalIdentities is
 // sort of an MVEA, so maybe it makes sense to treat it as such.
 class ExternalIdentitiesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'PrimaryName.family' => 'asc'
     ],

diff --git a/app/src/Controller/ExternalIdentityRolesController.php b/app/src/Controller/ExternalIdentityRolesController.php
@@ -36,7 +36,7 @@
 // Use extend MVEAController for breadcrumb rendering. ExternalIdentityRoles is sort of
 // an MVEA, so maybe it makes sense to treat it as such.
 class ExternalIdentityRolesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'ExternalIdentityRoles.ordr' => 'asc',
       'ExternalIdentityRoles.title' => 'asc'

diff --git a/app/src/Controller/GroupMembersController.php b/app/src/Controller/GroupMembersController.php
@@ -33,7 +33,7 @@
 use Cake\Log\Log;
 
 class GroupMembersController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'People.primary_name.name' => 'asc'
     ]

diff --git a/app/src/Controller/GroupNestingsController.php b/app/src/Controller/GroupNestingsController.php
@@ -33,7 +33,7 @@
 use Cake\Log\Log;
 
 class GroupNestingsController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Group.name' => 'asc'
     ]

diff --git a/app/src/Controller/GroupOwnersController.php b/app/src/Controller/GroupOwnersController.php
@@ -33,7 +33,7 @@
 use Cake\Log\Log;
 
 class GroupOwnersController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'People.primary_name.name' => 'asc'
     ]

diff --git a/app/src/Controller/GroupsController.php b/app/src/Controller/GroupsController.php
@@ -33,7 +33,7 @@
 use Cake\Log\Log;
 
 class GroupsController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Groups.name' => 'asc'
     ]

diff --git a/app/src/Controller/HistoryRecordsController.php b/app/src/Controller/HistoryRecordsController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class HistoryRecordsController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'HistoryRecords.id' => 'desc'
     ]

diff --git a/app/src/Controller/IdentifiersController.php b/app/src/Controller/IdentifiersController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class IdentifiersController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Identifiers.identifier' => 'asc'
     ]

diff --git a/app/src/Controller/NamesController.php b/app/src/Controller/NamesController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class NamesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Names.family' => 'asc',
       'Names.given' => 'asc'

diff --git a/app/src/Controller/PeopleController.php b/app/src/Controller/PeopleController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class PeopleController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
 // XXX this will sort by family name, but it this universally correct?
 // so we need a configuration, or can we do something automagic?

diff --git a/app/src/Controller/PersonRolesController.php b/app/src/Controller/PersonRolesController.php
@@ -36,7 +36,7 @@
 // Use extend MVEAController for breadcrumb rendering. PersonRoles is sort of
 // an MVEA, so maybe it makes sense to treat it as such.
 class PersonRolesController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'PersonRoles.ordr' => 'asc',
       'PersonRoles.title' => 'asc'

diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
@@ -499,10 +499,7 @@ public function index() {
       }
     }
 
-    // The Cake documents describe $this->paginate (which worked in Cake 2),
-    // but it doesn't seem to work in Cake 4. So we just use $this->pagination
-    // ourselves here.
-    $resultSet = $this->Paginator->paginate($query, $this->pagination);
+    $resultSet = $this->paginate($query);
 
     $this->set($tableName, $resultSet);
     $this->set('vv_permission_set', $this->RegistryAuth->calculatePermissionsForResultSet($resultSet));

diff --git a/app/src/Controller/TelephoneNumbersController.php b/app/src/Controller/TelephoneNumbersController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class TelephoneNumbersController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'TelephoneNumbers.number' => 'asc'
     ]

diff --git a/app/src/Controller/TypesController.php b/app/src/Controller/TypesController.php
@@ -33,7 +33,7 @@
 use Cake\Log\Log;
 
 class TypesController extends StandardController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Types.attribute' => 'asc',
       'Types.display_name' => 'asc'

diff --git a/app/src/Controller/UrlsController.php b/app/src/Controller/UrlsController.php
@@ -34,7 +34,7 @@
 use Cake\ORM\TableRegistry;
 
 class UrlsController extends MVEAController {
-  public $pagination = [
+  public $paginate = [
     'order' => [
       'Urls.url' => 'asc'
     ]