Merge pull request #291 from lloc/chore

Chore
lloc · May 1, 2024 · b521353 · b521353
2 parents 8749174 + 5bb9d3a
commit b521353
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 43 deletions.
diff --git a/tests/TestMslsOptionsQueryAuthor.php b/tests/TestMslsOptionsQueryAuthor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsQueryDay.php b/tests/TestMslsOptionsQueryDay.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsQueryMonth.php b/tests/TestMslsOptionsQueryMonth.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsQueryPostType.php b/tests/TestMslsOptionsQueryPostType.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsQueryYear.php b/tests/TestMslsOptionsQueryYear.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsTax.php b/tests/TestMslsOptionsTax.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsTaxTerm.php b/tests/TestMslsOptionsTaxTerm.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOptionsTaxTermCategory.php b/tests/TestMslsOptionsTaxTermCategory.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsOutput.php b/tests/TestMslsOutput.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsPlugin.php b/tests/TestMslsPlugin.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsPostTag.php b/tests/TestMslsPostTag.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsPostTagClassic.php b/tests/TestMslsPostTagClassic.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsPostType.php b/tests/TestMslsPostType.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsRegistry.php b/tests/TestMslsRegistry.php
@@ -1,12 +1,12 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 
 use lloc\Msls\MslsRegistry;
 
 class TestMslsRegistry extends MslsUnitTestCase {
 
-	function test_set_method() {
+	public function test_set_method(): void {
 		$obj = new MslsRegistry();
 
 		$this->assertEquals( null, $obj->get_object( 'test_var' ) );

diff --git a/tests/TestMslsSqlCacher.php b/tests/TestMslsSqlCacher.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 
@@ -7,37 +7,35 @@
 
 class TestMslsSqlCacher extends MslsUnitTestCase {
 
-	public function get_sut(): MslsSqlCacher {
+	protected function setUp(): void {
 		$wpdb = \Mockery::mock( \WPDB::class );
 		$wpdb->shouldReceive( [
 			'prepare'     => '',
 			'get_results' => []
 		] );
 
-		return new MslsSqlCacher( $wpdb, 'MslsSqlCacherTest' );
+		$this->test = new MslsSqlCacher( $wpdb, 'MslsSqlCacherTest' );
 	}
 
 	public function test_set_params_method(): void {
 		Functions\when( 'wp_cache_get' )->justReturn( false );
 		Functions\when( 'wp_cache_set' )->justReturn( true );
 
-		$obj = $this->get_sut();
+		$this->assertInstanceOf( MslsSqlCacher::class, $this->test->set_params( array( 'Cache', 'Test' ) ) );
+		$this->assertIsSTring( $this->test->get_key() );
+		$this->assertEquals( 'MslsSqlCacherTest_Cache_Test', $this->test->get_key() );
 
-		$this->assertInstanceOf( MslsSqlCacher::class, $obj->set_params( array( 'Cache', 'Test' ) ) );
-		$this->assertIsSTring( $obj->get_key() );
-		$this->assertEquals( 'MslsSqlCacherTest_Cache_Test', $obj->get_key() );
+		$this->assertInstanceOf( MslsSqlCacher::class, $this->test->set_params( 'Cache_Test' ) );
+		$this->assertIsSTring( $this->test->get_key() );
+		$this->assertEquals( 'MslsSqlCacherTest_Cache_Test', $this->test->get_key() );
 
-		$this->assertInstanceOf( MslsSqlCacher::class, $obj->set_params( 'Cache_Test' ) );
-		$this->assertIsSTring( $obj->get_key() );
-		$this->assertEquals( 'MslsSqlCacherTest_Cache_Test', $obj->get_key() );
-
-		$sql = $obj->prepare(
-			"SELECT blog_id FROM {$obj->blogs} WHERE blog_id != %d AND site_id = %d",
-			$obj->blogid,
-			$obj->siteid
+		$sql = $this->test->prepare(
+			"SELECT blog_id FROM {$this->test->blogs} WHERE blog_id != %d AND site_id = %d",
+			$this->test->blogid,
+			$this->test->siteid
 		);
 		$this->assertIsSTring( $sql );
-		$this->assertIsArray( $obj->get_results( $sql ) );
+		$this->assertIsArray( $this->test->get_results( $sql ) );
 	}
 
 }
diff --git a/tests/TestMslsTaxonomy.php b/tests/TestMslsTaxonomy.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 

diff --git a/tests/TestMslsWidget.php b/tests/TestMslsWidget.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare( strict_types=1 );
 
 namespace lloc\MslsTests;
 
@@ -8,10 +8,12 @@
 
 class TestMslsWidget extends MslsUnitTestCase {
 
-	public function get_sut(): MslsWidget {
+	protected function setUp(): void {
+        parent::setUp();
+
 		\Mockery::mock( '\WP_Widget' );
 
-		return \Mockery::mock( MslsWidget::class )->makePartial();
+		$this->test = \Mockery::mock( MslsWidget::class )->makePartial();
 	}
 
 	public function test_widget(): void {
@@ -29,22 +31,18 @@ public function test_widget(): void {
 		Functions\expect( 'get_option' )->andReturn( [] );
 		Functions\expect( 'msls_blog_collection' )->once()->andReturn( $collection );
 
-		$obj = $this->get_sut();
-
 		$this->expectOutputString( '<div><h3>Test</h3>No available translations found</div>' );
-		$obj->widget( [], [ 'title' => 'Test' ] );
+		$this->test->widget( [], [ 'title' => 'Test' ] );
 	}
 
 	public function test_update(): void {
-		$obj = $this->get_sut();
-
-		$result = $obj->update( [], [] );
+		$result = $this->test->update( [], [] );
 		$this->assertEquals( [], $result );
 
-		$result = $obj->update( [ 'title' => 'abc' ], [] );
+		$result = $this->test->update( [ 'title' => 'abc' ], [] );
 		$this->assertEquals( [ 'title' => 'abc' ], $result );
 
-		$result = $obj->update( [ 'title' => 'xyz' ], [ 'title' => 'abc' ] );
+		$result = $this->test->update( [ 'title' => 'xyz' ], [ 'title' => 'abc' ] );
 		$this->assertEquals( [ 'title' => 'xyz' ], $result );
 	}