From 83be887789ecebd8c47d5bdc079c18117bc2a241 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 31 Jul 2023 14:49:10 +0900 Subject: [PATCH 1/4] fix: Pager does not use shared View object --- system/Config/Services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index 66d0532e5e47..b18b99e91a91 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -445,7 +445,7 @@ public static function pager(?PagerConfig $config = null, ?RendererInterface $vi } $config ??= config(PagerConfig::class); - $view ??= AppServices::renderer(); + $view ??= AppServices::renderer(null, null, false); return new Pager($config, $view); } From 35bd0c5e138aa7fa6a5b1265f7a9d2e208aeda1e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 31 Jul 2023 14:50:14 +0900 Subject: [PATCH 2/4] fix: incorrect fix in the past Revert https://github.com/codeigniter4/CodeIgniter4/pull/6251 --- system/Pager/Pager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php index 2c0179a69dc3..11103d56ce9c 100644 --- a/system/Pager/Pager.php +++ b/system/Pager/Pager.php @@ -123,7 +123,7 @@ protected function displayLinks(string $group, string $template): string $pager = new PagerRenderer($this->getDetails($group)); return $this->view->setVar('pager', $pager) - ->render($this->config->templates[$template], null, false); + ->render($this->config->templates[$template]); } /** From d6bf0d9b7b220c3ce8da7aa45cfc4b08515b15ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 31 Jul 2023 15:11:30 +0900 Subject: [PATCH 3/4] docs: improve doc comments --- system/View/View.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system/View/View.php b/system/View/View.php index 164d67642305..08497438845a 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -29,14 +29,16 @@ class View implements RendererInterface use ViewDecoratorTrait; /** - * Data that is made available to the Views. + * Saved Data. * * @var array */ protected $data = []; /** - * Merge savedData and userData + * Data for the variables that are available in the Views. + * + * @var array|null */ protected $tempData; @@ -48,7 +50,7 @@ class View implements RendererInterface protected $viewPath; /** - * The render variables + * Data for rendering including Caching and Debug Toolbar data. * * @var array */ From ef5361d151c2a5f659b4989be18e07bd747c34d0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 31 Jul 2023 15:32:09 +0900 Subject: [PATCH 4/4] chore: remove ignoreErrors --- phpstan-baseline.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index edf7e2771bfb..b02160f16183 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -2786,10 +2786,5 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/View.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$tempData has no type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; return ['parameters' => ['ignoreErrors' => $ignoreErrors]];