Skip to content

Commit 2c3cd0a

Browse files
joehoyleclaude
andcommitted
Use use imports instead of root namespace references
Replace all `\WP_*` and `\TypeError` root namespace references with proper `use` imports at the top of each file. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent ea196dd commit 2c3cd0a

File tree

10 files changed

+37
-22
lines changed

10 files changed

+37
-22
lines changed

tests/ImporterTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Foundry\Tests;
44

5-
class ImporterTest extends \WP_UnitTestCase {
5+
use WP_UnitTestCase;
6+
7+
class ImporterTest extends WP_UnitTestCase {
68

79
public static function set_up_before_class() {
810
parent::set_up_before_class();

tests/api/ControllerTest.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44

55
use Foundry\Tests\Test_Model;
66
use Foundry\Tests\Test_Controller;
7+
use WP_UnitTestCase;
8+
use WP_REST_Server;
9+
use WP_REST_Request;
710

8-
class ControllerTest extends \WP_UnitTestCase {
11+
class ControllerTest extends WP_UnitTestCase {
912

10-
/** @var \WP_REST_Server */
13+
/** @var WP_REST_Server */
1114
protected $server;
1215

1316
public static function set_up_before_class() {
@@ -23,9 +26,9 @@ public function set_up() {
2326
// Routes are registered outside rest_api_init for test isolation.
2427
$this->setExpectedIncorrectUsage( 'register_rest_route' );
2528

26-
/** @var \WP_REST_Server $wp_rest_server */
29+
/** @var WP_REST_Server $wp_rest_server */
2730
global $wp_rest_server;
28-
$wp_rest_server = new \WP_REST_Server();
31+
$wp_rest_server = new WP_REST_Server();
2932
$this->server = $wp_rest_server;
3033

3134
$controller = new Test_Controller();
@@ -45,7 +48,7 @@ public function test_register_routes() {
4548
}
4649

4750
public function test_create_item() {
48-
$request = new \WP_REST_Request( 'POST', '/foundry-test/v1/items' );
51+
$request = new WP_REST_Request( 'POST', '/foundry-test/v1/items' );
4952
$request->set_param( 'name', 'REST Created' );
5053
$request->set_param( 'status', 'active' );
5154
$request->set_param( 'value', 42 );
@@ -69,7 +72,7 @@ public function test_get_item() {
6972
$model->save();
7073
$id = $model->get_id();
7174

72-
$request = new \WP_REST_Request( 'GET', '/foundry-test/v1/items/' . $id );
75+
$request = new WP_REST_Request( 'GET', '/foundry-test/v1/items/' . $id );
7376
$response = $this->server->dispatch( $request );
7477

7578
$this->assertEquals( 200, $response->get_status() );
@@ -79,7 +82,7 @@ public function test_get_item() {
7982
}
8083

8184
public function test_get_item_not_found() {
82-
$request = new \WP_REST_Request( 'GET', '/foundry-test/v1/items/999999' );
85+
$request = new WP_REST_Request( 'GET', '/foundry-test/v1/items/999999' );
8386
$response = $this->server->dispatch( $request );
8487

8588
$this->assertEquals( 404, $response->get_status() );
@@ -99,7 +102,7 @@ public function test_update_item() {
99102
$model->save();
100103
$id = $model->get_id();
101104

102-
$request = new \WP_REST_Request( 'POST', '/foundry-test/v1/items/' . $id );
105+
$request = new WP_REST_Request( 'POST', '/foundry-test/v1/items/' . $id );
103106
$request->set_param( 'name', 'After Update' );
104107
$response = $this->server->dispatch( $request );
105108

@@ -114,7 +117,7 @@ public function test_delete_item() {
114117
$model->save();
115118
$id = $model->get_id();
116119

117-
$request = new \WP_REST_Request( 'DELETE', '/foundry-test/v1/items/' . $id );
120+
$request = new WP_REST_Request( 'DELETE', '/foundry-test/v1/items/' . $id );
118121
$response = $this->server->dispatch( $request );
119122

120123
$this->assertEquals( 200, $response->get_status() );
@@ -127,7 +130,7 @@ public function test_delete_item() {
127130
}
128131

129132
public function test_create_item_rejects_existing_id() {
130-
$request = new \WP_REST_Request( 'POST', '/foundry-test/v1/items' );
133+
$request = new WP_REST_Request( 'POST', '/foundry-test/v1/items' );
131134
$request->set_param( 'id', 999 );
132135
$request->set_param( 'name', 'Should Fail' );
133136

@@ -141,7 +144,7 @@ public function test_response_includes_self_link() {
141144
$model->save();
142145
$id = $model->get_id();
143146

144-
$request = new \WP_REST_Request( 'GET', '/foundry-test/v1/items/' . $id );
147+
$request = new WP_REST_Request( 'GET', '/foundry-test/v1/items/' . $id );
145148
$response = $this->server->dispatch( $request );
146149

147150
$links = $response->get_links();

tests/builtin/TermTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
namespace Foundry\Tests\Builtin;
44

55
use Foundry\Builtin\Term;
6+
use WP_UnitTestCase;
7+
use WP_Term;
8+
use TypeError;
69

7-
class TermTest extends \WP_UnitTestCase {
10+
class TermTest extends WP_UnitTestCase {
811

912
public function test_from_term_and_get_id() {
1013
$term_data = wp_insert_term( 'Test Tag', 'post_tag' );
@@ -25,7 +28,7 @@ public function test_from_id() {
2528
public function test_from_id_throws_for_invalid() {
2629
// get_term() returns null for non-existent IDs; from_id doesn't
2730
// guard against null, so from_term() receives null and throws.
28-
$this->expectException( \TypeError::class );
31+
$this->expectException( TypeError::class );
2932
Term::from_id( 999999 );
3033
}
3134

@@ -36,7 +39,7 @@ public function test_as_term_returns_wp_term() {
3639
$model = Term::from_term( $wp_term );
3740
$result = $model->as_term();
3841

39-
$this->assertInstanceOf( \WP_Term::class, $result );
42+
$this->assertInstanceOf( WP_Term::class, $result );
4043
$this->assertEquals( $wp_term->term_id, $result->term_id );
4144
$this->assertEquals( 'Roundtrip Tag', $result->name );
4245
}

tests/database/ModelTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use Foundry\Tests\Test_Model;
66
use Foundry\Database\QueryResults;
7+
use WP_UnitTestCase;
78

8-
class ModelTest extends \WP_UnitTestCase {
9+
class ModelTest extends WP_UnitTestCase {
910

1011
public static function set_up_before_class() {
1112
parent::set_up_before_class();

tests/database/NamespaceFunctionsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
use Foundry\Tests\Failing_Test_Model;
77
use function Foundry\Database\get_primary_column;
88
use function Foundry\Database\save_many;
9+
use WP_UnitTestCase;
910

10-
class NamespaceFunctionsTest extends \WP_UnitTestCase {
11+
class NamespaceFunctionsTest extends WP_UnitTestCase {
1112

1213
public static function set_up_before_class() {
1314
parent::set_up_before_class();

tests/database/QueryResultsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use Foundry\Tests\Test_Model;
66
use Foundry\Database\QueryResults;
7+
use WP_UnitTestCase;
78

8-
class QueryResultsTest extends \WP_UnitTestCase {
9+
class QueryResultsTest extends WP_UnitTestCase {
910

1011
public static function set_up_before_class() {
1112
parent::set_up_before_class();

tests/database/QueryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use Foundry\Tests\Test_Model;
66
use Foundry\Database\QueryResults;
7+
use WP_UnitTestCase;
78

8-
class QueryTest extends \WP_UnitTestCase {
9+
class QueryTest extends WP_UnitTestCase {
910

1011
public static function set_up_before_class() {
1112
parent::set_up_before_class();

tests/database/RelationsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
use Foundry\Tests\Test_Child_Model;
77
use Foundry\Database\Relations\HasManyAssociation;
88
use Foundry\Database\RelationalQuery;
9+
use WP_UnitTestCase;
910

10-
class RelationsTest extends \WP_UnitTestCase {
11+
class RelationsTest extends WP_UnitTestCase {
1112

1213
public static function set_up_before_class() {
1314
parent::set_up_before_class();

tests/database/TableTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
use function Foundry\Database\ensure_table;
77
use function Foundry\Database\conform_table;
88
use function Foundry\Database\parse_index;
9+
use WP_UnitTestCase;
910

10-
class TableTest extends \WP_UnitTestCase {
11+
class TableTest extends WP_UnitTestCase {
1112

1213
/**
1314
* Remove the WP test framework's temporary table filters so we can

tests/helpers/class-test-model.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Foundry\Tests;
44

55
use Foundry\Database\Model;
6+
use WP_Error;
67

78
class Test_Model extends Model {
89
public static function get_table_name() : string {
@@ -68,6 +69,6 @@ public function set_arbitrary_field( $key, $value ) {
6869
*/
6970
class Failing_Test_Model extends Test_Model {
7071
public function save() {
71-
return new \WP_Error( 'test_error', 'Intentional failure' );
72+
return new WP_Error( 'test_error', 'Intentional failure' );
7273
}
7374
}

0 commit comments

Comments
 (0)