X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FUtil%2FStringsTest.php;h=5adaa9157aa9f8a8c6c96032dd24975015c8180a;hb=054c301ef0345c4ff9f35cfd08717757eab17b9d;hp=611d72fe7cd8b10d864f78142688f97f47a19775;hpb=791986027428ba3764a697449b863024f1dc8598;p=friendica.git

diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
index 611d72fe7c..5adaa9157a 100644
--- a/tests/src/Util/StringsTest.php
+++ b/tests/src/Util/StringsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,7 +37,7 @@ class StringsTest extends TestCase
 		$randomname1 = Strings::getRandomName(10);
 		$randomname2 = Strings::getRandomName(10);
 
-		$this->assertNotEquals($randomname1, $randomname2);
+		self::assertNotEquals($randomname1, $randomname2);
 	}
 
 	/**
@@ -48,7 +48,7 @@ class StringsTest extends TestCase
 		$randomname1 = Strings::getRandomName(9);
 		$randomname2 = Strings::getRandomName(9);
 
-		$this->assertNotEquals($randomname1, $randomname2);
+		self::assertNotEquals($randomname1, $randomname2);
 	}
 
 	/**
@@ -57,7 +57,7 @@ class StringsTest extends TestCase
 	public function testRandomNameNoLength()
 	{
 		$randomname1 = Strings::getRandomName(0);
-		$this->assertEquals(0, strlen($randomname1));
+		self::assertEquals(0, strlen($randomname1));
 	}
 
 	/**
@@ -68,7 +68,7 @@ class StringsTest extends TestCase
 	public function testRandomNameNegativeLength()
 	{
 		$randomname1 = Strings::getRandomName(-23);
-		$this->assertEquals(0, strlen($randomname1));
+		self::assertEquals(0, strlen($randomname1));
 	}
 
 	/**
@@ -77,10 +77,10 @@ class StringsTest extends TestCase
 	public function testRandomNameLength1()
 	{
 		$randomname1 = Strings::getRandomName(1);
-		$this->assertEquals(1, strlen($randomname1));
+		self::assertEquals(1, strlen($randomname1));
 
 		$randomname2 = Strings::getRandomName(1);
-		$this->assertEquals(1, strlen($randomname2));
+		self::assertEquals(1, strlen($randomname2));
 	}
 
 	/**
@@ -93,8 +93,8 @@ class StringsTest extends TestCase
 		$validstring = Strings::escapeTags($invalidstring);
 		$escapedString = Strings::escapeHtml($invalidstring);
 
-		$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
-		$this->assertEquals(
+		self::assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
+		self::assertEquals(
 			"&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;",
 			$escapedString
 		);
@@ -125,14 +125,14 @@ class StringsTest extends TestCase
 	/**
 	 * Tests if the string is a valid hexadecimal value
 	 *
-	 * @param string $input
-	 * @param bool $valid
+	 * @param string|null $input
+	 * @param bool        $valid
 	 *
 	 * @dataProvider dataIsHex
 	 */
-	public function testIsHex($input, $valid)
+	public function testIsHex(string $input = null, bool $valid = false)
 	{
-		$this->assertEquals($valid, Strings::isHex($input));
+		self::assertEquals($valid, Strings::isHex($input));
 	}
 
 	/**
@@ -142,13 +142,13 @@ class StringsTest extends TestCase
 	public function testSubstringReplaceASCII()
 	{
 		for ($start = -10; $start <= 10; $start += 5) {
-			$this->assertEquals(
+			self::assertEquals(
 				substr_replace('string', 'replacement', $start),
 				Strings::substringReplace('string', 'replacement', $start)
 			);
 
 			for ($length = -10; $length <= 10; $length += 5) {
-				$this->assertEquals(
+				self::assertEquals(
 					substr_replace('string', 'replacement', $start, $length),
 					Strings::substringReplace('string', 'replacement', $start, $length)
 				);
@@ -184,7 +184,7 @@ class StringsTest extends TestCase
 	 */
 	public function testSubstringReplaceMultiByte(string $expected, string $string, string $replacement, int $start, int $length = null)
 	{
-		$this->assertEquals(
+		self::assertEquals(
 			$expected,
 			Strings::substringReplace(
 				$string,
@@ -203,7 +203,7 @@ class StringsTest extends TestCase
 			return $text;
 		});
 
-		$this->assertEquals($originalText, $text);
+		self::assertEquals($originalText, $text);
 	}
 
 	public function testPerformWithEscapedBlocksNested()
@@ -218,6 +218,6 @@ class StringsTest extends TestCase
 			return $text;
 		});
 
-		$this->assertEquals($originalText, $text);
+		self::assertEquals($originalText, $text);
 	}
 }