Skip to content

Commit

Permalink
rename applyResponseTagsFromQuery
Browse files Browse the repository at this point in the history
  • Loading branch information
simonrjones committed Mar 13, 2022
1 parent cd65183 commit 36acd1a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/ResponseHelper/ResponseHelperAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ abstract public function apply($response);
* @param bool $setHeaders Whether to automatically set headers once tags are retrieved from query manager
* @return ResponseTagger
*/
public function addTagsFromQueryManager(ResponseTagger $responseTagger, QueryManager $manager, bool $setHeaders = false): ResponseTagger
public function applyResponseTagsFromQuery(ResponseTagger $responseTagger, QueryManager $manager, bool $setHeaders = false): ResponseTagger
{
foreach ($manager->getQueries() as $query) {
if ($query->hasResponseRun() && $query->hasCacheTags()) {
Expand Down
5 changes: 2 additions & 3 deletions src/ResponseHelper/ResponseHelperInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Strata\Frontend\ResponseHelper;

use FOS\HttpCache\ResponseTagger;
use FOS\HttpCache\TagHeaderFormatter\TagHeaderFormatter;
use Strata\Data\Cache\CacheLifetime;
use Strata\Data\Query\QueryManager;
use Strata\Frontend\Exception\InvalidResponseHeaderValueException;
Expand Down Expand Up @@ -33,12 +32,12 @@ public function getHeaders(): array;
public function apply($response);

/**
* Add cache tags to response tagger from query manager
* Apply cache tags to response tagger from query manager
* @param ResponseTagger $responseTagger
* @param QueryManager $manager
* @return ResponseTagger
*/
public function addTagsFromQueryManager(ResponseTagger $responseTagger, QueryManager $manager): ResponseTagger;
public function applyResponseTagsFromQuery(ResponseTagger $responseTagger, QueryManager $manager): ResponseTagger;

/**
* Set cache tag headers from response tagger
Expand Down
4 changes: 2 additions & 2 deletions tests/ResponseHelper/Psr7ResponseHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function testResponseTaggerFromQueryManager()
$response = new Response();
$responseTagger = new ResponseTagger();

$responseTagger = $helper->addTagsFromQueryManager($responseTagger, $manager);
$responseTagger = $helper->applyResponseTagsFromQuery($responseTagger, $manager);
$this->assertNotContains('test1,test2,test3,test4', $response->getHeader('X-Cache-Tags'));

$helper->setHeadersFromResponseTagger($responseTagger);
Expand All @@ -112,7 +112,7 @@ public function testResponseTaggerFromQueryManager()
$manager->add('query4', $query);
$data = $manager->get('query3');

$helper->addTagsFromQueryManager($responseTagger, $manager, true);
$helper->applyResponseTagsFromQuery($responseTagger, $manager, true);
$response = $helper->apply($response);
$this->assertContains('test1,test2,test3,test4,test5,test6', $response->getHeader('X-Cache-Tags'));
}
Expand Down

0 comments on commit 36acd1a

Please sign in to comment.