Merge pull request #278 from lloc/chore

Chore

Author: lloc

includes/MslsGetSet.php

@@ -81,10 +81,10 @@ public function reset() {
 	}
 
 	/**
-	 * Checks if the array has an non empty item with the specified key name.
+	 * Checks if the array has a non-empty item with the specified key name.
 	 *
 	 * This is method is similar to the overloaded __isset-method since
-	 * __set cleans empty properties but I use for example
+	 * __set cleans empty properties, but I use for example
 	 *
 	 *     $obj->has_value( $temp )
 	 *

includes/MslsOptionsPost.php

@@ -59,9 +59,10 @@ public function get_postlink( $language ) {
 
 	/**
 	 * Get current link
+	 *
 	 * @return string
 	 */
-	public function get_current_link() {
+	public function get_current_link(): string {
 		return (string) get_permalink( $this->get_arg( 0, 0 ) );
 	}
 

tests/TestMslsOptionsPost.php

@@ -8,26 +8,28 @@
 
 class TestMslsOptionsPost extends MslsUnitTestCase {
 
-	public function get_test() {
+	protected function setUp(): void {
+		parent::setUp();
+
 		Functions\expect( 'get_option' )->once()->andReturn( [ 'de_DE' => 42 ] );
 
-		return new MslsOptionsPost();
+		$this->test = new MslsOptionsPost();
 	}
 
-	function test_get_postlink_method() {
-		Functions\expect( 'get_post' )->once()->andReturnNull();
+	public function test_get_postlink_not_has_value() {
+		$this->assertEquals( '', $this->test->get_postlink( 'es_ES' ) );
+	}
 
-		$obj = $this->get_test();
+	public function test_get_postlink_post_is_null(): void {
+		Functions\expect( 'get_post' )->once()->andReturnNull();
 
-		$this->assertIsSTring( $obj->get_postlink( 'de_DE' ) );
+		$this->assertEquals( '', $this->test->get_postlink( 'de_DE' ) );
 	}
 
-	function test_get_current_link_method() {
+	public function test_get_current_link(): void {
 		Functions\expect( 'get_permalink' )->once()->andReturn( 'https://example.org/a-post' );
 
-		$obj = $this->get_test();
-
-		$this->assertEquals( 'https://example.org/a-post', $obj->get_current_link() );
+		$this->assertEquals( 'https://example.org/a-post', $this->test->get_current_link() );
 	}
 
 }

tests/TestMslsOptionsQueryAuthor.php

@@ -8,24 +8,20 @@
 
 class TestMslsOptionsQueryAuthor extends MslsUnitTestCase {
 
-	function get_test() {
+	protected function setUp(): void {
 		Functions\expect( 'get_option' )->once()->andReturn( [ 'de_DE' => 42 ] );
 
-		return new MslsOptionsQueryAuthor();
+		$this->test = new MslsOptionsQueryAuthor();
 	}
 
-	function test_has_value_method() {
-		$obj = $this->get_test();
-
-		$this->assertIsBool( $obj->has_value( 'de_DE' ) );
+	public function test_has_value_method(): void {
+		$this->assertIsBool( $this->test->has_value( 'de_DE' ) );
 	}
 
-	function test_get_current_link_method() {
+	public function test_get_current_link_method(): void {
 		Functions\expect( 'get_author_posts_url' )->once()->andReturn( 'https://example.org/queried-author' );
 
-		$obj = $this->get_test();
-
-		$this->assertEquals( 'https://example.org/queried-author', $obj->get_current_link() );
+		$this->assertEquals( 'https://example.org/queried-author', $this->test->get_current_link() );
 	}
 
 }

tests/TestMslsOptionsQueryDay.php

@@ -11,24 +11,20 @@
  */
 class TestMslsOptionsQueryDay extends MslsUnitTestCase {
 
-	function get_test() {
+	public function setUp(): void {
 		Functions\expect( 'get_option' )->once()->andReturn( [ 'de_DE' => 42 ] );
 
-		return new MslsOptionsQueryDay();
+		$this->test = new MslsOptionsQueryDay();
 	}
 
-	function test_has_value_method() {
-		$obj = $this->get_test();
-
-		$this->assertIsBool( $obj->has_value( 'de_DE' ) );
+	public function test_has_value(): void {
+		$this->assertTrue( $this->test->has_value( 'de_DE' ) );
 	}
 
-	function test_get_current_link_method() {
+	public function test_get_current_link(): void {
 		Functions\expect( 'get_day_link' )->once()->andReturn( 'https://example.org/queried-day' );
 
-		$obj = $this->get_test();
-
-		$this->assertEquals( 'https://example.org/queried-day', $obj->get_current_link() );
+		$this->assertEquals( 'https://example.org/queried-day', $this->test->get_current_link() );
 	}
 
 }