Fix strict adn syntax errors in tests for PHP 5.6

auth0 · Apr 8, 2019 · ba19dc1 · ba19dc1
1 parent c2499a5
commit ba19dc1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 55 deletions.
diff --git a/tests/testLoginManager.php b/tests/testLoginManager.php
@@ -17,13 +17,6 @@ class TestLoginManager extends WP_Auth0_Test_Case {
 
 	use UsersHelper;
 
-	/**
-	 * WP_Auth0_UsersRepo instance.
-	 *
-	 * @var WP_Auth0_UsersRepo
-	 */
-	protected static $users_repo;
-
 	/**
 	 * Setup for entire test class.
 	 */

diff --git a/tests/testProfileChangeEmail.php b/tests/testProfileChangeEmail.php
@@ -25,13 +25,6 @@ class TestProfileChangeEmail extends WP_Auth0_Test_Case {
 	 */
 	public static $api_client_creds;
 
-	/**
-	 * WP_Auth0_UsersRepo instance used by the UsersHelper trait.
-	 *
-	 * @var WP_Auth0_UsersRepo
-	 */
-	protected static $users_repo;
-
 	/**
 	 * Run before the test suite.
 	 */

diff --git a/tests/testProfileChangePassword.php b/tests/testProfileChangePassword.php
@@ -50,13 +50,6 @@ class TestProfileChangePassword extends WP_Auth0_Test_Case {
 	 */
 	public static $change_password;
 
-	/**
-	 * WP_Auth0_UsersRepo instance.
-	 *
-	 * @var WP_Auth0_UsersRepo
-	 */
-	protected static $users_repo;
-
 	/**
 	 * Setup before the class starts.
 	 */

diff --git a/tests/testProfileDeleteData.php b/tests/testProfileDeleteData.php
@@ -21,13 +21,6 @@ class TestProfileDeleteData extends WP_Auth0_Test_Case {
 
 	use UsersHelper;
 
-	/**
-	 * WP_Auth0_UsersRepo instance.
-	 *
-	 * @var WP_Auth0_UsersRepo
-	 */
-	protected static $users_repo;
-
 	/**
 	 * WP_Auth0_Profile_Delete_Data instance.
 	 *

diff --git a/tests/testProfileDeleteMfa.php b/tests/testProfileDeleteMfa.php
@@ -41,13 +41,6 @@ class TestProfileDeleteMfa extends WP_Auth0_Test_Case {
 	 */
 	public static $delete_mfa;
 
-	/**
-	 * WP_Auth0_UsersRepo instance.
-	 *
-	 * @var WP_Auth0_UsersRepo
-	 */
-	protected static $users_repo;
-
 	/**
 	 * Setup before the class starts.
 	 */

diff --git a/tests/testUserRepoMeta.php b/tests/testUserRepoMeta.php
@@ -27,23 +27,24 @@ public static function setUpBeforeClass() {
 	 * Update and get user meta.
 	 */
 	public function testThatUpdateMetaIsReturnedProperly() {
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_id' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_obj' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'last_update' ) );
+		$users_repo = new WP_Auth0_UsersRepo( self::$opts );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_id' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_obj' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'last_update' ) );
 
 		$userinfo = $this->getUserinfo();
-		self::$users_repo->update_auth0_object( 1, $userinfo );
+		$users_repo->update_auth0_object( 1, $userinfo );
 
-		$this->assertEquals( $userinfo->sub, self::$users_repo::get_meta( 1, 'auth0_id' ) );
+		$this->assertEquals( $userinfo->sub, $users_repo::get_meta( 1, 'auth0_id' ) );
 
-		$saved_update = self::$users_repo::get_meta( 1, 'last_update' );
+		$saved_update = $users_repo::get_meta( 1, 'last_update' );
 		$saved_update = explode( 'T', $saved_update );
 
 		$this->assertCount( 2, $saved_update );
 		$this->assertEquals( explode( 'T', date( 'c' ) )[0], $saved_update[0] );
 
 		// Make sure all the various ways we can get the user profile come back correctly.
-		$saved_userinfo = self::$users_repo::get_meta( 1, 'auth0_obj' );
+		$saved_userinfo = $users_repo::get_meta( 1, 'auth0_obj' );
 		$this->assertEquals( WP_Auth0_Serializer::serialize( $userinfo ), $saved_userinfo );
 
 		$saved_userinfo = WP_Auth0_Serializer::unserialize( $saved_userinfo );
@@ -63,7 +64,8 @@ public function testThatUpdateMetaIsReturnedProperly() {
 	 * Test that unique data cases are handled.
 	 */
 	public function testThatSpecialCharactersAreStoredProperly() {
-		$userinfo = $this->getUserinfo();
+		$userinfo   = $this->getUserinfo();
+		$users_repo = new WP_Auth0_UsersRepo( self::$opts );
 
 		// Specially-encoded characters: ¥ £ € ¢ ₡ ₢ ₣ ₤ ₥ ₦ ₪ ₯.
 		$userinfo->encodedValue1 = '\u00a5 \u00a3 \u20ac \u00a2 \u20a1 \u20a2 \u20a3 \u20a4 \u20a5 \u20a6 \u20aa \u20af';
@@ -77,9 +79,9 @@ public function testThatSpecialCharactersAreStoredProperly() {
 		// "Never Compromise on Identity" in Chinese.
 		$userinfo->encodedValue4 = '绝不妥协于身份';
 
-		self::$users_repo->update_auth0_object( 1, $userinfo );
+		$users_repo->update_auth0_object( 1, $userinfo );
 
-		$saved_userinfo = self::$users_repo::get_meta( 1, 'auth0_obj' );
+		$saved_userinfo = $users_repo::get_meta( 1, 'auth0_obj' );
 		$saved_userinfo = WP_Auth0_Serializer::unserialize( $saved_userinfo );
 		$this->assertEquals( $userinfo, $saved_userinfo );
 
@@ -91,20 +93,21 @@ public function testThatSpecialCharactersAreStoredProperly() {
 	 * Make sure meta values are deleted properly.
 	 */
 	public function testThatDeleteMetaDeletesData() {
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_id' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_obj' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'last_update' ) );
+		$users_repo = new WP_Auth0_UsersRepo( self::$opts );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_id' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_obj' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'last_update' ) );
 
 		$this->storeAuth0Data( 1 );
 
-		$this->assertNotEmpty( self::$users_repo::get_meta( 1, 'auth0_id' ) );
-		$this->assertNotEmpty( self::$users_repo::get_meta( 1, 'auth0_obj' ) );
-		$this->assertNotEmpty( self::$users_repo::get_meta( 1, 'last_update' ) );
+		$this->assertNotEmpty( $users_repo::get_meta( 1, 'auth0_id' ) );
+		$this->assertNotEmpty( $users_repo::get_meta( 1, 'auth0_obj' ) );
+		$this->assertNotEmpty( $users_repo::get_meta( 1, 'last_update' ) );
 
-		self::$users_repo->delete_auth0_object( 1 );
+		$users_repo->delete_auth0_object( 1 );
 
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_id' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'auth0_obj' ) );
-		$this->assertEmpty( self::$users_repo::get_meta( 1, 'last_update' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_id' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'auth0_obj' ) );
+		$this->assertEmpty( $users_repo::get_meta( 1, 'last_update' ) );
 	}
 }