Skip to content

Commit

Permalink
Merge branch 'fix/resource-actions' of github.com:doublethreedigital/…
Browse files Browse the repository at this point in the history
…runway into fix/resource-actions
  • Loading branch information
duncanmcclean committed Dec 4, 2024
2 parents d4ffc79 + f8d1cb7 commit 797d2ee
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion routes/cp.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use Illuminate\Support\Facades\Route;
use StatamicRadPack\Runway\Http\Controllers\CP\ModelActionController;
use StatamicRadPack\Runway\Http\Controllers\CP\ModelRevisionsController;
use StatamicRadPack\Runway\Http\Controllers\CP\PublishedModelsController;
use StatamicRadPack\Runway\Http\Controllers\CP\ModelActionController;
use StatamicRadPack\Runway\Http\Controllers\CP\ResourceActionController;
use StatamicRadPack\Runway\Http\Controllers\CP\ResourceController;
use StatamicRadPack\Runway\Http\Controllers\CP\ResourceListingController;
Expand Down
4 changes: 2 additions & 2 deletions tests/Console/Commands/GenerateMigrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class GenerateMigrationTest extends TestCase
{
use RefreshDatabase;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand All @@ -37,7 +37,7 @@ public function setUp(): void
});
}

public function tearDown(): void
protected function tearDown(): void
{
parent::tearDown();

Expand Down
2 changes: 1 addition & 1 deletion tests/Fieldtypes/BelongsToFieldtypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class BelongsToFieldtypeTest extends TestCase

protected BelongsToFieldtype $fieldtype;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/Fieldtypes/HasManyFieldtypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class HasManyFieldtypeTest extends TestCase

protected HasManyFieldtype $fieldtype;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/Http/Controllers/ApiControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class ApiControllerTest extends TestCase
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand Down
4 changes: 2 additions & 2 deletions tests/Http/Controllers/CP/ModelRevisionsControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ModelRevisionsControllerTest extends TestCase
{
private $dir;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand All @@ -22,7 +22,7 @@ public function setUp(): void
config(['statamic.revisions.path' => $this->dir]);
}

public function tearDown(): void
protected function tearDown(): void
{
Folder::delete($this->dir);

Expand Down
4 changes: 2 additions & 2 deletions tests/Http/Controllers/CP/PublishedModelsControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class PublishedModelsControllerTest extends TestCase
{
private $dir;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand All @@ -21,7 +21,7 @@ public function setUp(): void
config(['statamic.revisions.path' => $this->dir]);
}

public function tearDown(): void
protected function tearDown(): void
{
Folder::delete($this->dir);

Expand Down
2 changes: 1 addition & 1 deletion tests/Http/Controllers/CP/ResourceActionControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class ResourceActionControllerTest extends TestCase
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand Down
4 changes: 2 additions & 2 deletions tests/Http/Controllers/CP/RestoreModelRevisionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RestoreModelRevisionController extends TestCase
{
private $dir;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand All @@ -21,7 +21,7 @@ public function setUp(): void
config(['statamic.revisions.path' => $this->dir]);
}

public function tearDown(): void
protected function tearDown(): void
{
Folder::delete($this->dir);

Expand Down
2 changes: 1 addition & 1 deletion tests/Tags/RunwayTagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RunwayTagTest extends TestCase
{
public $tag;

public function setUp(): void
protected function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit 797d2ee

Please sign in to comment.