Tests enhanced

Author: lloc

composer.json

@@ -6,7 +6,8 @@
   "homepage": "http://msls.co",
   "require": {
     "php": ">=7.4",
-    "composer/installers": "~1.12.0"
+    "composer/installers": "~1.12.0",
+    "ext-json": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "~9.6",
@@ -34,6 +35,7 @@
     "analyze": "vendor/bin/phpstan analyze",
     "php74": "phpcs -p ./*.php includes/ --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 7.4",
     "php81": "phpcs -p ./*.php includes/ --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.1",
+    "php82": "phpcs -p ./*.php includes/ --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.2",
     "prepare": "wget -O build/translations.json http://api.wordpress.org/translations/core/1.0/",
     "flags-png": "php bin/flags-png.php > flags/flags.php",
     "flags-svg": "php bin/flags-svg.php > css/flags.php"

includes/MslsAdmin.php

@@ -11,6 +11,17 @@
 /**
  * Administration of the options
  *
+ * @method activate_autocomplete(): void
+ * @method sort_by_description(): void
+ * @method exclude_current_blog(): void
+ * @method only_with_translation(): void
+ * @method output_current_blog(): void
+ * @method before_output(): void
+ * @method after_output(): void
+ * @method before_item(): void
+ * @method after_item(): void
+ * @method content_filter(): void
+ *
  * @package Msls
  */
 class MslsAdmin extends MslsMain {

includes/MslsBlog.php

@@ -31,7 +31,7 @@ class MslsBlog {
 	/**
 	 * Constructor
 	 *
-	 * @param \StdClass $obj
+	 * @param ?\StdClass $obj
 	 * @param string $description
 	 */
 	public function __construct( $obj, $description ) {

includes/MslsJson.php

@@ -18,17 +18,17 @@ class MslsJson {
 	 * Container
 	 * @var array
 	 */
-	protected $arr = [];
+	protected array $arr = [];
 
-	/**
+	/** MslsLanguageArray
 	 * Adds a value label pair to the internal class container
 	 *
-	 * @param int $value
+	 * @param ?int $value
 	 * @param string $label
 	 *
 	 * @return MslsJson
 	 */
-	public function add( $value, $label ) {
+	public function add( ?int $value, string $label ) {
 		$this->arr[] = [
 			'value' => intval( $value ),
 			'label' => strval( $label ),

phpunit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage>
     <include>
       <directory suffix=".php">./includes/</directory>

tests/Component/Icon/TestIconPng.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace lloc\Msls\Component\Icon\MslsTests;
+namespace lloc\MslsTests\Component\Icon;
 
 use Brain\Monkey\Functions;
-use lloc\MslsTests\Msls_UnitTestCase;
+use lloc\MslsTests\MslsUnitTestCase;
 use lloc\Msls\Component\Icon\IconPng;
 
-class TestIconPng extends Msls_UnitTestCase {
+class TestIconPng extends MslsUnitTestCase {
 
-	public function test_get() {
+	public function test_get(): void {
 		Functions\when( 'plugin_dir_path' )->justReturn( dirname( __DIR__, 3 ) . '/' );
 
 		$obj = new IconPng();

tests/Component/Icon/TestIconSvg.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace lloc\Msls\Component\Icon\MslsTests;
+namespace lloc\MslsTests\Component\Icon;
 
 use Brain\Monkey\Functions;
-use lloc\MslsTests\Msls_UnitTestCase;
+use lloc\MslsTests\MslsUnitTestCase;
 use lloc\Msls\Component\Icon\IconSvg;
 
-class TestIconSvg extends Msls_UnitTestCase {
+class TestIconSvg extends MslsUnitTestCase {
 
-	public function test_get() {
+
+	public function test_get(): void {
 		Functions\when( 'plugin_dir_path' )->justReturn( dirname( __DIR__, 3 ) . '/' );
 
 		$obj = new IconSvg();

tests/Map/TestHrefLang.php

@@ -1,18 +1,20 @@
 <?php
 
-namespace lloc\Map\MslsTests;
+namespace lloc\MslsTests\Map;
 
 use Brain\Monkey\Functions;
 use Brain\Monkey\Filters;
 
-use lloc\MslsTests\Msls_UnitTestCase;
+use lloc\MslsTests\MslsUnitTestCase;
 use lloc\Msls\Map\HrefLang;
 use lloc\Msls\MslsBlog;
 use lloc\Msls\MslsBlogCollection;
 
-class TestHrefLang extends Msls_UnitTestCase {
+class TestHrefLang extends MslsUnitTestCase {
+
+	protected function setUp(): void {
+        parent::setUp();
 
-	public function get_sut() {
 		$map = [
 			'de_DE'        => 'de',
 			'de_DE_formal' => 'de',
@@ -36,28 +38,24 @@ public function get_sut() {
 		$collection = \Mockery::mock( MslsBlogCollection::class );
 		$collection->shouldReceive( 'get_objects' )->andReturn( $blogs );
 
-		return new HrefLang( $collection );
+		$this->test = new HrefLang( $collection );
 	}
 
-	public function test_get() {
-		$obj = $this->get_sut();
-
-		$this->assertEquals( 'de-DE', $obj->get( 'de_DE' ) );
-		$this->assertEquals( 'de-DE', $obj->get( 'de_DE_formal' ) );
-		$this->assertEquals( 'fr', $obj->get( 'fr_FR' ) );
-		$this->assertEquals( 'es', $obj->get( 'es_ES' ) );
-		$this->assertEquals( 'cat', $obj->get( 'cat' ) );
-		$this->assertEquals( 'en-GB', $obj->get( 'en_GB' ) );
-		$this->assertEquals( 'en-US', $obj->get( 'en_US' ) );
+	public function test_get(): void {
+		$this->assertEquals( 'de-DE', $this->test->get( 'de_DE' ) );
+		$this->assertEquals( 'de-DE', $this->test->get( 'de_DE_formal' ) );
+		$this->assertEquals( 'fr', $this->test->get( 'fr_FR' ) );
+		$this->assertEquals( 'es', $this->test->get( 'es_ES' ) );
+		$this->assertEquals( 'cat', $this->test->get( 'cat' ) );
+		$this->assertEquals( 'en-GB', $this->test->get( 'en_GB' ) );
+		$this->assertEquals( 'en-US', $this->test->get( 'en_US' ) );
 	}
 
-	public function test_get_has_filter() {
-		$obj = $this->get_sut();
-
+	public function test_get_has_filter(): void {
 		Functions\when( 'has_filter' )->justReturn( true );
 		Filters\expectApplied('msls_head_hreflang')->once()->with( 'en_US')->andReturn( 'en-US' );
 
-		$this->assertEquals( 'en-US', $obj->get( 'en_US' ) );
+		$this->assertEquals( 'en-US', $this->test->get( 'en_US' ) );
 	}
 
 }

tests/bootstrap.php renamed to tests/MslsUnitTestCase.php

@@ -6,7 +6,7 @@
 use Brain\Monkey;
 use Brain\Monkey\Functions;
 
-class Msls_UnitTestCase extends TestCase {
+class MslsUnitTestCase extends TestCase {
 
 	/**
 	 * Instance of the class to test