From d7d4cddc7b14e9c211891d71feaccbdc46ab862f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean=20Traull=C3=A9?= <613615+jtraulle@users.noreply.github.com> Date: Sun, 4 Feb 2024 16:22:25 +0100 Subject: [PATCH 1/3] Replace deprecated view var "_serialize" in ProfileTrait. --- src/Controller/Traits/ProfileTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/Traits/ProfileTrait.php b/src/Controller/Traits/ProfileTrait.php index d5a6e796..15e455fd 100644 --- a/src/Controller/Traits/ProfileTrait.php +++ b/src/Controller/Traits/ProfileTrait.php @@ -57,6 +57,6 @@ public function profile($id = null) return $this->redirect($this->getRequest()->referer() ?? '/'); } $this->set(['user' => $user, 'isCurrentUser' => $isCurrentUser]); - $this->set('_serialize', ['user', 'isCurrentUser']); + $this->viewBuilder()->setOption('serialize', ['user', 'isCurrentUser']); } } From 1c39ce163b3bc34076993fc968f5d7838a00587d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean=20Traull=C3=A9?= <613615+jtraulle@users.noreply.github.com> Date: Sun, 4 Feb 2024 15:51:48 +0000 Subject: [PATCH 2/3] Replace deprecated _serialize view var --- src/Controller/Traits/PasswordManagementTrait.php | 4 ++-- src/Controller/Traits/RegisterTrait.php | 2 +- src/Controller/Traits/SimpleCrudTrait.php | 8 ++++---- src/Controller/Traits/UserValidationTrait.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controller/Traits/PasswordManagementTrait.php b/src/Controller/Traits/PasswordManagementTrait.php index a2f9dfa8..e0a7d53c 100644 --- a/src/Controller/Traits/PasswordManagementTrait.php +++ b/src/Controller/Traits/PasswordManagementTrait.php @@ -129,7 +129,7 @@ public function changePassword($id = null) } } $this->set(['user' => $user]); - $this->set('_serialize', ['user']); + $this->viewBuilder()->setOption('serialize', ['user']); } /** @@ -151,7 +151,7 @@ public function resetPassword($token = null) public function requestResetPassword() { $this->set('user', $this->getUsersTable()->newEntity([], ['validate' => false])); - $this->set('_serialize', ['user']); + $this->viewBuilder()->setOption('serialize', ['user']); if (!$this->getRequest()->is('post')) { return; } diff --git a/src/Controller/Traits/RegisterTrait.php b/src/Controller/Traits/RegisterTrait.php index af9d6d0f..2c706847 100644 --- a/src/Controller/Traits/RegisterTrait.php +++ b/src/Controller/Traits/RegisterTrait.php @@ -93,7 +93,7 @@ public function register() } $this->set(['user' => $user]); - $this->set('_serialize', ['user']); + $this->viewBuilder()->setOption('serialize', ['user']); if (!$this->getRequest()->is('post')) { return; diff --git a/src/Controller/Traits/SimpleCrudTrait.php b/src/Controller/Traits/SimpleCrudTrait.php index a2ae5811..c54e1d4f 100644 --- a/src/Controller/Traits/SimpleCrudTrait.php +++ b/src/Controller/Traits/SimpleCrudTrait.php @@ -33,7 +33,7 @@ public function index() $tableAlias = $table->getAlias(); $this->set($tableAlias, $this->paginate($table)); $this->set('tableAlias', $tableAlias); - $this->set('_serialize', [$tableAlias, 'tableAlias']); + $this->viewBuilder()->setOption('serialize', [$tableAlias, 'tableAlias']); } /** @@ -50,7 +50,7 @@ public function view($id = null) $entity = $table->get($id, contain: []); $this->set($tableAlias, $entity); $this->set('tableAlias', $tableAlias); - $this->set('_serialize', [$tableAlias, 'tableAlias']); + $this->viewBuilder()->setOption('serialize', [$tableAlias, 'tableAlias']); } /** @@ -65,7 +65,7 @@ public function add() $entity = $table->newEmptyEntity(); $this->set($tableAlias, $entity); $this->set('tableAlias', $tableAlias); - $this->set('_serialize', [$tableAlias, 'tableAlias']); + $this->viewBuilder()->setOption('serialize', [$tableAlias, 'tableAlias']); if (!$this->getRequest()->is('post')) { return; } @@ -95,7 +95,7 @@ public function edit($id = null) ]); $this->set($tableAlias, $entity); $this->set('tableAlias', $tableAlias); - $this->set('_serialize', [$tableAlias, 'tableAlias']); + $this->viewBuilder()->setOption('serialize', [$tableAlias, 'tableAlias']); if (!$this->getRequest()->is(['patch', 'post', 'put'])) { return; } diff --git a/src/Controller/Traits/UserValidationTrait.php b/src/Controller/Traits/UserValidationTrait.php index 69cf921d..bbe594ca 100644 --- a/src/Controller/Traits/UserValidationTrait.php +++ b/src/Controller/Traits/UserValidationTrait.php @@ -95,7 +95,7 @@ public function validate($type = null, $token = null) public function resendTokenValidation() { $this->set('user', $this->getUsersTable()->newEntity([], ['validate' => false])); - $this->set('_serialize', ['user']); + $this->viewBuilder()->setOption('serialize', ['user']); if (!$this->getRequest()->is('post')) { return; } From 7423297a64ee5bea778dcf2b3c1dc5a726724077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean=20Traull=C3=A9?= <613615+jtraulle@users.noreply.github.com> Date: Sun, 4 Feb 2024 17:56:22 +0000 Subject: [PATCH 3/3] Remove deprecated view var "_serialize" from related tests. --- .../Controller/Traits/SimpleCrudTraitTest.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php b/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php index 4a2a318e..6184d5ae 100644 --- a/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php +++ b/tests/TestCase/Controller/Traits/SimpleCrudTraitTest.php @@ -78,10 +78,6 @@ public function testIndex() $expected = [ 'Users' => $paginated, 'tableAlias' => 'Users', - '_serialize' => [ - 'Users', - 'tableAlias', - ], ]; $this->assertEquals($expected, $this->viewVars); } @@ -98,10 +94,6 @@ public function testView() $expected = [ 'Users' => $this->table->get($id), 'tableAlias' => 'Users', - '_serialize' => [ - 'Users', - 'tableAlias', - ], ]; $this->assertEquals($expected, $this->viewVars); } @@ -140,10 +132,6 @@ public function testAddGet() $expected = [ 'Users' => $this->table->newEmptyEntity(), 'tableAlias' => 'Users', - '_serialize' => [ - 'Users', - 'tableAlias', - ], ]; $this->assertEquals($expected, $this->viewVars); }