Skip to content

fix #4176 【フィード 】index.rssがErrorになる問題を解決 #4196

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

Merged
ryuring merged 7 commits into from
May 22, 2025
Merged

fix #4176 【フィード 】index.rssがErrorになる問題を解決 #4196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a1a581
fix #4176 【フィード 】index.rssがErrorになる問題を解決
May 21, 2025
16de8a5
PaginatedResultSetのみに修正
May 21, 2025
8ee51e4
テスト調整中
May 21, 2025
65171c4
テスト調整中
May 21, 2025
7ad2a29
テスト調整中
May 21, 2025
a5fc8c1
Update BlogFrontServiceTest.php
ryuring May 22, 2025
35216ba
Update BlogFrontServiceTest.php
ryuring May 22, 2025
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
14 changes: 12 additions & 2 deletions plugins/baser-core/src/Controller/AppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,18 @@ public function beforeRender(EventInterface $event)
*/
public function setupFrontView(): void
{
$this->viewBuilder()->setClassName('BaserCore.BcFrontApp');
$this->viewBuilder()->setTheme(BcUtil::getCurrentTheme());
$builder = $this->viewBuilder();
$builder->setClassName('BaserCore.BcFrontApp');
$builder->setTheme(BcUtil::getCurrentTheme());
if($this->getRequest()->is('rss')) {
$response = $this->getResponse();
$this->setResponse($response
->withType($response->getMimeType('rss'))
->withCharset(Configure::read('App.encoding'))
);
$builder->setTemplatePath((string)$builder->getTemplatePath() . DS . 'rss');
$builder->setLayoutPath('rss');
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions plugins/bc-blog/src/Service/Front/BlogFrontService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ public function getViewVarsForIndex(ServerRequest $request, BlogContent $blogCon
*
* @param ServerRequest $request
* @param BlogContent $blogContent
* @param ResultSet $posts
* @param PaginatedResultSet $posts
* @return array
*
* @checked
* @noTodo
* @unitTest
*/
public function getViewVarsForIndexRss(ServerRequest $request, BlogContent $blogContent, ResultSet $posts): array
public function getViewVarsForIndexRss(ServerRequest $request, BlogContent $blogContent, PaginatedResultSet $posts): array
{
$site = $request->getAttribute('currentSite');
return [
Expand Down
5 changes: 4 additions & 1 deletion plugins/bc-blog/tests/TestCase/Service/Front/BlogFrontServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
use BcBlog\Test\Scenario\MultiSiteBlogPostScenario;
use BcBlog\Test\Scenario\MultiSiteBlogScenario;
use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
use Cake\Datasource\Paging\NumericPaginator;

/**
* BlogFrontServiceTest
Expand Down Expand Up @@ -155,7 +156,9 @@ public function test_getViewVarsForIndexRss()
$this->loginAdmin($request);

//対象メソッドをコル
$rs = $this->BlogFrontService->getViewVarsForIndexRss($request, $blogContentService->get(1), $blogPostsService->getIndex([])->all());
$paginator = new NumericPaginator();
$posts = $paginator->paginate($blogPostsService->getIndex([]));
$rs = $this->BlogFrontService->getViewVarsForIndexRss($request, $blogContentService->get(1), $posts);

//戻る値を確認
$this->assertArrayHasKey('blogContent', $rs);
Expand Down