diff --git a/src/Events.php b/src/Events.php index 99f488d..16b99f3 100644 --- a/src/Events.php +++ b/src/Events.php @@ -34,8 +34,6 @@ class Events private ?int $perPage = null; - private ?string $site = null; - private string $sort = 'asc'; private ?string $timezone = null; @@ -102,15 +100,6 @@ public function event(?string $id = null): self return $this; } - public function filters(array $filters): self - { - foreach ($filters as $fieldCondition => $value) { - $this->filter($fieldCondition, $value); - } - - return $this; - } - public function filter(string $fieldCondition, $value): self { $this->params->put($fieldCondition, $value); @@ -144,13 +133,6 @@ public function params(Collection $params): self return $this; } - public function site(?string $handle = null): self - { - $this->site = $handle; - - return $this; - } - public function sort(string $direction): self { $this->sort = $direction; diff --git a/src/Tags/Events.php b/src/Tags/Events.php index 1a18b7a..bf35d7c 100755 --- a/src/Tags/Events.php +++ b/src/Tags/Events.php @@ -9,10 +9,8 @@ use Carbon\CarbonPeriodImmutable; use Closure; use Illuminate\Support\Collection; -use Statamic\Contracts\Query\Builder; use Statamic\Entries\Entry; use Statamic\Entries\EntryCollection; -use Statamic\Facades\Compare; use Statamic\Facades\Site; use Statamic\Support\Arr; use Statamic\Tags\Concerns\OutputsItems; @@ -157,19 +155,6 @@ private function day(string $date, EntryCollection $occurrences): array ]; } - private function explodeTerms(array|Builder|string $terms): array - { - if (is_string($terms)) { - return array_filter(explode('|', $terms)); - } - - if (Compare::isQueryBuilder($terms)) { - return $terms->get(); - } - - return $terms; - } - private function generator(): Generator { return new Generator($this->params); diff --git a/tests/TestCase.php b/tests/TestCase.php index be5d962..a6c3633 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,7 +7,6 @@ use Statamic\Facades\Fieldset; use Statamic\Facades\Taxonomy; use Statamic\Facades\Term; -use Statamic\Fields\Blueprint; use Statamic\Fields\BlueprintRepository; use Statamic\Statamic; use Statamic\Testing\AddonTestCase; @@ -20,12 +19,8 @@ abstract class TestCase extends AddonTestCase protected string $addonServiceProvider = ServiceProvider::class; - protected $shouldFakeVersion = true; - protected Collection $collection; - protected Blueprint $blueprint; - protected function setUp(): void { parent::setUp();