Skip to content

Commit

Permalink
Remove public API changes from changeset
Browse files Browse the repository at this point in the history
  • Loading branch information
chrispenny committed May 1, 2023
1 parent d839ad4 commit 8ba38e3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/Contract/StaticPublishingTrigger.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ interface StaticPublishingTrigger
* @param array $context An associative array with extra engine-specific information.
* @return array|SS_List
*/
public function objectsToUpdate(array $context);
public function objectsToUpdate($context);

/**
* Provides a SS_list of objects that need to be deleted.
*
* @param array $context An associative array with extra engine-specific information.
* @return array|SS_List
*/
public function objectsToDelete(array $context);
public function objectsToDelete($context);
}
2 changes: 1 addition & 1 deletion src/Contract/StaticallyPublishable.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ interface StaticallyPublishable
*
* @return array associative array of URL (string) => Priority (int)
*/
public function urlsToCache(): array;
public function urlsToCache();
}
10 changes: 7 additions & 3 deletions src/Extension/Engine/SiteTreePublishingEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Resettable;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\SS_List;
use SilverStripe\StaticPublishQueue\Contract\StaticPublishingTrigger;
use SilverStripe\StaticPublishQueue\Extension\Publishable\PublishableSiteTree;
use SilverStripe\StaticPublishQueue\Job\DeleteStaticCacheJob;
Expand All @@ -35,8 +34,10 @@ class SiteTreePublishingEngine extends SiteTreeExtension implements Resettable
/**
* Queued job service injection property
* Used for unit tests only to cover edge cases where Injector doesn't cover
*
* @var QueuedJobService|null
*/
protected static ?QueuedJobService $queueService = null;
protected static $queueService = null;

/**
* Queues the urls to be flushed into the queue.
Expand Down Expand Up @@ -165,8 +166,11 @@ public function onAfterUnpublish()

/**
* Collect all changes for the given context.
*
* @param array $context
* @return void
*/
public function collectChanges(array $context): void
public function collectChanges($context)
{
Environment::increaseMemoryLimitTo();
Environment::increaseTimeLimitTo();
Expand Down
8 changes: 5 additions & 3 deletions src/Extension/Publishable/PublishableSiteTree.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function getMyVirtualPages()
/**
* @return array|SS_List
*/
public function objectsToUpdate(array $context)
public function objectsToUpdate($context)
{
$list = [];
$siteTree = $this->getOwner();
Expand Down Expand Up @@ -91,7 +91,7 @@ public function objectsToUpdate(array $context)
*
* @return array|SS_List
*/
public function objectsToDelete(array $context)
public function objectsToDelete($context)
{
// This context isn't one of our valid actions, so there's nothing to do here
if ($context['action'] !== SiteTreePublishingEngine::ACTION_UNPUBLISH) {
Expand Down Expand Up @@ -130,8 +130,10 @@ public function objectsToDelete(array $context)

/**
* The only URL belonging to this object is its own URL.
*
* @return array
*/
public function urlsToCache(): array
public function urlsToCache()
{
$page = $this->getOwner();

Expand Down

0 comments on commit 8ba38e3

Please sign in to comment.