Merge pull request #773 from xwp/bugfix/issue-754

Fix uppercase values being inserted into Connector column

Author: Luke Carbis

classes/class-connector.php

@@ -93,8 +93,7 @@ public function action_links( $links, $record ) {
 	 * @return bool
 	 */
 	public function log( $message, $args, $object_id, $context, $action, $user_id = null ) {
-		$class     = get_called_class();
-		$connector = str_replace( array( 'WP_Stream\\', 'Connector_' ), array( '', '' ), $class );
+		$connector = $this->name;
 
 		$data = apply_filters(
 			'wp_stream_log_data',

classes/class-install.php

@@ -24,7 +24,7 @@ class Install {
 
 	/**
 	 * Holds version of database at last update
-]	 *
+	 *
 	 * @var string
 	 */
 	public $db_version;
@@ -113,11 +113,7 @@ public function check() {
 		if ( ! $update ) {
 			$this->update_required = true;
 			$this->success_db      = $this->update( $this->db_version, $this->plugin->get_version(), array( 'type' => 'auto' ) );
-
-			return;
-		}
-
-		if ( 'update_and_continue' === $update ) {
+		} elseif ( 'update_and_continue' === $update ) {
 			$this->success_db = $this->update( $this->db_version, $this->plugin->get_version(), array( 'type' => 'user' ) );
 		}
 
@@ -333,7 +329,7 @@ public function prompt_update_status() {
 		<div class="updated">
 			<form method="post" action="<?php echo esc_url( remove_query_arg( 'wp_stream_update' ) ) ?>" style="display:inline;">
 				<p><strong><?php esc_html_e( 'Update Complete', 'stream' ) ?></strong></p>
-				<p><?php esc_html_e( sprintf( 'Your Stream database has been successfully updated from %1$s to %2$s!', esc_html( $this->db_version ), esc_html( WP_Stream::VERSION ) ), 'stream' ) ?></p>
+				<p><?php esc_html_e( sprintf( 'Your Stream database has been successfully updated from %1$s to %2$s!', esc_html( $this->db_version ), esc_html( $this->plugin->get_version() ) ), 'stream' ) ?></p>
 				<?php submit_button( esc_html__( 'Continue', 'stream' ), 'secondary', false ) ?>
 			</form>
 		</div>
@@ -353,6 +349,7 @@ public function prompt_update_status() {
 	public function db_update_versions() {
 		$db_update_versions = array(
 			'3.0.0' /* @version 3.0.0 Drop the stream_context table, changes to stream table */,
+			'3.0.2' /* @version 3.0.2 Fix uppercase values in stream table, connector column */,
 		);
 
 		/**

includes/db-updates.php

@@ -1,4 +1,32 @@
 <?php
+/**
+ * Version 3.0.2
+ *
+ * @param string $db_version
+ * @param string $current_version
+ *
+ * @return string
+ */
+function wp_stream_update_302( $db_version, $current_version ) {
+	global $wpdb;
+
+	$plugin = wp_stream_get_instance();
+	$prefix = $plugin->install->table_prefix;
+
+	$stream_entries = $wpdb->get_results( "SELECT * FROM {$prefix}stream" );
+	foreach ( $stream_entries as $entry ) {
+		$class = 'Connector_' . $entry->context;
+		if ( class_exists( $class ) ) {
+			$connector = new $class();
+			$wpdb->update( $prefix . 'stream', array( 'connector' => $connector->name ), array( 'ID' => $entry->ID ) );
+		} else {
+			$wpdb->update( $prefix . 'stream', array( 'connector' => strtolower( $entry->connector ) ), array( 'ID' => $entry->ID ) );
+		}
+	}
+
+	return $current_version;
+}
+
 /**
  * Version 3.0.0
  *

tests/tests/test-class-connector.php

@@ -72,7 +72,7 @@ public function test_log() {
 		$this->assertNotEmpty( $result );
 
 		$this->assertEquals( sprintf( $message, $percent_failure, $hours_remaining ), $result->summary );
-		$this->assertEquals( 'Maintenance', $result->connector );
+		$this->assertEquals( 'maintenance', $result->connector );
 		$this->assertEquals( 'ae35', $result->context );
 		$this->assertEquals( 'simulate_fault', $result->action );
 	}

tests/tests/test-class-db.php

@@ -70,7 +70,7 @@ public function test_insert() {
 				$this->assertTrue( $dummy_time > 0 );
 				$this->assertTrue( $result_time > 0 );
 				$this->assertTrue( $result_time - $dummy_time < 2 );
-				$this->assertTrue( $result_time - $dummy_time >= 0 );
+				$this->assertTrue( $result_time - $dummy_time >= -2 );
 			} else {
 				$this->assertEquals( $dummy_value, $stream_result[ $dummy_key ] );
 			}