Merge pull request #79 from wp-cli/use-utils-esc_like

Use Utils\esc_like() and remove internal esc_like().

Author: schlessera

composer.json

@@ -17,14 +17,15 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
-        "psr-4": {"": "src/"},
+        "psr-4": {
+            "": "src/"
+        },
         "files": [ "db-command.php" ]
     },
-    "require": {
-        "wp-cli/wp-cli": "*"
-    },
+    "require": {},
     "require-dev": {
-        "behat/behat": "~2.5"
+        "behat/behat": "~2.5",
+        "wp-cli/wp-cli": "^1.5"
     },
     "extra": {
         "branch-alias": {

src/DB_Command.php

@@ -950,7 +950,7 @@ public function search( $args, $assoc_args ) {
 			}
 		} else {
 			$search_regex = '#' . preg_quote( $search, '#' ) . '#i';
-			$esc_like_search = '%' . self::esc_like( $search ) . '%';
+			$esc_like_search = '%' . Utils\esc_like( $search ) . '%';
 		}
 
 		$encoding = null;
@@ -1179,27 +1179,6 @@ private static function is_text_col( $type ) {
 		return false;
 	}
 
-	/**
-	 * Escapes a MySQL string for inclusion in a `LIKE` clause. BC wrapper around different WP versions of this.
-	 *
-	 * @param string $old String to escape.
-	 * @param string Escaped string.
-	 */
-	private static function esc_like( $old ) {
-		global $wpdb;
-
-		// Remove notices in 4.0 and support backwards compatibility
-		if ( method_exists( $wpdb, 'esc_like' ) ) {
-			// 4.0
-			$old = $wpdb->esc_like( $old );
-		} else {
-			// 3.9 or less
-			$old = like_escape( esc_sql( $old ) );
-		}
-
-		return $old;
-	}
-
 	/**
 	 * Escapes (backticks) MySQL identifiers (aka schema object names) - i.e. column names, table names, and database/index/alias/view etc names.
 	 * See https://dev.mysql.com/doc/refman/5.5/en/identifiers.html