Fix mcrypt fatal - Removed on PHP 7.2

includes/class-syndication-encryption.php

@@ -10,35 +10,36 @@ class Syndication_Encryption {
 	 *
 	 * @var Syndication_Encryptor
 	 */
-	private static $encryptor;
+	private $encryptor;
 
 	/**
-	 * Returns the best possible Encryptor, given the current environment.
+	 * Syndication_Encryption constructor.
 	 *
-	 * @return Syndication_Encryptor|false
+	 * @param Syndication_Encryptor $encryptor Encryptor to be used.
 	 */
-	public static function get_encryptor() {
-		if ( isset( self::$encryptor ) && self::$encryptor instanceof Syndication_Encryptor ) {
-			return self::$encryptor;
-		}
+	public function __construct( Syndication_Encryptor $encryptor ) {
+		$this->encryptor = $encryptor;
+	}
 
-		return false;
+	/**
+	 * Returns the best possible Encryptor, given the current environment.
+	 *
+	 * @return Syndication_Encryptor
+	 */
+	public function get_encryptor() {
+		return $this->encryptor;
 	}
 
 	/**
 	 * Set the Encryptor that will be used for the encryption and decryption operations.
 	 *
 	 * @param Syndication_Encryptor $encryptor Encryptor to be used in the encryption.
 	 *
-	 * @return Syndication_Encryptor|false Returns the encryptor
+	 * @return Syndication_Encryptor Returns the encryptor
 	 */
-	public static function set_encryptor( $encryptor ) {
-		if ( $encryptor instanceof Syndication_Encryptor ) {
-			self::$encryptor = $encryptor;
-			return self::$encryptor;
-		}
-
-		return false;
+	public function set_encryptor( Syndication_Encryptor $encryptor ) {
+		$this->encryptor = $encryptor;
+		return $encryptor;
 	}
 
 	/**
@@ -48,8 +49,8 @@ public static function set_encryptor( $encryptor ) {
 	 *
 	 * @return false|string
 	 */
-	public static function encrypt( $data ) {
-		$encryptor = self::get_encryptor();
+	public function encrypt( $data ) {
+		$encryptor = $this->get_encryptor();
 		return $encryptor->encrypt( $data );
 	}
 
@@ -61,8 +62,8 @@ public static function encrypt( $data ) {
 	 *
 	 * @return false|array|object
 	 */
-	public static function decrypt( $data, $associative = true ) {
-		$encryptor = self::get_encryptor();
+	public function decrypt( $data, $associative = true ) {
+		$encryptor = $this->get_encryptor();
 		return $encryptor->decrypt( $data, $associative );
 	}
 

includes/push-syndicate-encryption.php

@@ -8,7 +8,8 @@
  * @return false|string
  */
 function push_syndicate_encrypt( $data ) {
-	return Syndication_Encryption::encrypt( $data );
+	global $push_syndication_encryption; // @todo: move from global to WP_Push_Syndication_Server attribute
+	return $push_syndication_encryption->encrypt( $data );
 }
 
 /**
@@ -20,5 +21,6 @@ function push_syndicate_encrypt( $data ) {
  * @return array|false|object
  */
 function push_syndicate_decrypt( $data, $associative = true ) {
-	return Syndication_Encryption::decrypt( $data, $associative );
+	global $push_syndication_encryption; // @todo: move from global to WP_Push_Syndication_Server attribute
+	return $push_syndication_encryption->decrypt( $data, $associative );
 }

push-syndication.php

@@ -41,16 +41,19 @@
 require __DIR__ . '/includes/class-syndication-site-auto-retry.php';
 new Failed_Syndication_Auto_Retry();
 
-// Load encryption classes
+// Load encryption classes.
 require_once dirname( __FILE__ ) . '/includes/class-syndication-encryption.php';
 require_once dirname( __FILE__ ) . '/includes/interface-syndication-encryptor.php';
 require_once dirname( __FILE__ ) . '/includes/class-syndication-encryptor-mcrypt.php';
 require_once dirname( __FILE__ ) . '/includes/class-syndication-encryptor-openssl.php';
 
 // On PHP 7.1 mcrypt is available, but will throw a deprecated error if its used. Therefore, checking for the
 // PHP version, instead of checking for mcrypt is a better approach.
-if ( version_compare( PHP_VERSION, '7.1', '<' ) ) {
-	Syndication_Encryption::set_encryptor( new Syndication_Encryptor_MCrypt() );
+if ( PHP_VERSION_ID < 70100 ) {
+	$syndication_encryption = new Syndication_Encryption( new Syndication_Encryptor_MCrypt() );
 } else {
-	Syndication_Encryption::set_encryptor( new Syndication_Encryptor_OpenSSL() );
+	$syndication_encryption = new Syndication_Encryption( new Syndication_Encryptor_OpenSSL() );
 }
+
+// @TODO: instead of saving this as a global, have it as an attribute of WP_Push_Syndication_Server
+$GLOBALS['push_syndication_encryption'] = $syndication_encryption;

tests/test-encryption.php

@@ -11,6 +11,7 @@ class EncryptionTest extends WPIntegrationTestCase {
 	private $simple_string;
 	private $complex_array;
 
+	private $syndication_encryption;
 
 	/**
 	 * Runs before the test, set-up.
@@ -30,6 +31,9 @@ public function setUp() {
 			1         => 20.04,
 			3         => true,
 		);
+
+		global $push_syndication_encryption;
+		$this->syndication_encryption = $push_syndication_encryption;
 	}
 
 	/**
@@ -38,7 +42,7 @@ public function setUp() {
 	 * @requires PHP < 7.1
 	 */
 	public function test_get_encryptor_before_php_71() {
-		$encryptor = \Syndication_Encryption::get_encryptor();
+		$encryptor = $this->syndication_encryption->get_encryptor();
 
 		// If PHP < 7.1, it should be using the mcrypt encryptor.
 		self::assertInstanceOf( \Syndication_Encryptor_MCrypt::class, $encryptor );
@@ -50,7 +54,7 @@ public function test_get_encryptor_before_php_71() {
 	 * @requires PHP >= 7.1
 	 */
 	public function test_get_encryptor_after_php_71() {
-		$encryptor = \Syndication_Encryption::get_encryptor();
+		$encryptor = $this->syndication_encryption->get_encryptor();
 
 		// Test if the Encryptor being used is the OpenSSL.
 		self::assertInstanceOf( \Syndication_Encryptor_OpenSSL::class, $encryptor );
@@ -60,11 +64,12 @@ public function test_get_encryptor_after_php_71() {
 	 * Test if setting the encryptor works as expected
 	 */
 	public function test_set_encryptor() {
-		$encryptor = \Syndication_Encryption::set_encryptor( new \Syndication_Encryptor_OpenSSL() );
-		self::assertInstanceOf( \Syndication_Encryptor_OpenSSL::class, $encryptor, 'assert if the encryptor is set' );
+		$new_encryptor = $this->syndication_encryption->set_encryptor( new \Syndication_Encryptor_OpenSSL() );
+		self::assertInstanceOf( \Syndication_Encryptor_OpenSSL::class, $new_encryptor, 'assert if the encryptor is set' );
 
-		$encryptor = \Syndication_Encryption::set_encryptor( new \stdClass() );
-		self::assertFalse( $encryptor, 'assert if invalid encryptor returns false' );
+		$encryptor = $this->syndication_encryption->get_encryptor();
+		self::assertInstanceOf( \Syndication_Encryptor_OpenSSL::class, $encryptor, 'assert if the encryptor is set' );
+		self::assertEquals( $new_encryptor, $encryptor, 'assert if the set encryptor is the same as the one retrieved' );
 	}
 
 	/**