Merge branch 'develop-v4' into fix/add-label-to-network

Author: mbtamuli

php/EE/Model/Base.php

@@ -17,13 +17,18 @@ abstract class Base {
 	/**
 	 * @var string Primary key of current model
 	 */
-	protected static $primary_key;
+	protected static $primary_key = 'id';
 
 	/**
 	 * @var string It will contain an array of all fields that are present in database in table
 	 */
 	protected $fields;
 
+	/**
+	 * @var bool Weather the model needs timestamp whenever it's updated
+	 */
+	protected static $needs_update_timestamp = false;
+
 	/**
 	 * Base constructor.
 	 *
@@ -161,13 +166,13 @@ public static function create( $columns = [] ) {
 	 * Returns all model with condition
 	 *
 	 * @param string|array $column Column to search in
-	 * @param string|int   $value  Value to match
+	 * @param string       $value  Value to match
 	 *
 	 * @throws \Exception
 	 *
 	 * @return array
 	 */
-	public static function where( $column, $value ) {
+	public static function where( $column, $value='' ) {
 		return static::many_array_to_model(
 			EE::db()
 				->table( static::$table )
@@ -240,11 +245,15 @@ public function __unset( $name ) {
 	 * @return bool Model saved successfully
 	 */
 	public function save() {
-		$fields = array_merge(
-			$this->fields, [
-				'modified_on' => date( 'Y-m-d H:i:s' ),
-			]
-		);
+		$fields = $this->fields;
+
+		if ( static::$needs_update_timestamp ) {
+			$fields = array_merge(
+				$fields, [
+					'modified_on' => date( 'Y-m-d H:i:s' ),
+				]
+			);
+		}
 
 		$primary_key_column = static::$primary_key;
 

php/class-ee-db.php

@@ -118,6 +118,15 @@ private static function create_required_tables() {
 			FOREIGN KEY (site_url) REFERENCES sites(site_url)
 		);';
 
+		$query .= 'CREATE TABLE auth_users (
+			id INTEGER,
+			site_url VARCHAR NOT NULL,
+			username VARCHAR NOT NULL,
+			password VARCHAR NOT NULL,
+			scope    VARCHAR NOT NULL,
+			PRIMARY KEY (id)
+		);';
+
 		try {
 			self::$pdo->exec( $query );
 		} catch ( PDOException $exception ) {
@@ -187,6 +196,10 @@ private function common_retrieval_function() {
 	 *         [ 'id', '<', 100 ],
 	 *         [ 'name', 'ee' ]
 	 *      ])
+	 *   or where([
+	 *         'id' => 100,
+	 *         'name' => 'ee',
+	 *      ])
 	 *
 	 * Supported operators are: '=', '<', '>', '<=', '>=', '==', '!=', '<>', 'like', 'in'
 	 *
@@ -201,8 +214,15 @@ public function where( ...$args ) {
 		$conditions = [];
 
 		if ( 'array' === gettype( $args[0] ) ) {
-			foreach ( $args[0] as $condition ) {
-				$conditions[] = $this->get_where_fragment( $condition );
+			if ( \EE\Utils\is_assoc( $args[0] ) ) {
+				$condition_keys = array_keys( $args[0] );
+				foreach ( $condition_keys as $key ) {
+					$conditions[] = $this->get_where_fragment( [ $key, $args[0][ $key ] ] );
+				}
+			} else {
+				foreach ( $args[0] as $condition ) {
+					$conditions[] = $this->get_where_fragment( $condition );
+				}
 			}
 		} else {
 			$conditions[] = $this->get_where_fragment( $args );

php/class-ee.php

@@ -1,10 +1,10 @@
 <?php
 
-use \EE\ExitException;
-use \EE\Dispatcher;
-use \EE\FileCache;
-use \EE\Process;
-use \EE\Utils;
+use EE\Dispatcher;
+use EE\ExitException;
+use EE\FileCache;
+use EE\Process;
+use EE\Utils;
 use Mustangostang\Spyc;
 
 /**
@@ -919,20 +919,6 @@ public static function exec( $command, $echo_stdout = false, $echo_stderr = fals
 	 * @return int|ProcessRun The command exit status, or a ProcessRun instance
 	 */
 	public static function launch_self( $command, $args = array(), $assoc_args = array(), $exit_on_error = true, $return_detailed = false, $runtime_args = array() ) {
-		$reused_runtime_args = array(
-			'path',
-			'url',
-			'user',
-		);
-
-		foreach ( $reused_runtime_args as $key ) {
-			if ( isset( $runtime_args[ $key ] ) ) {
-				$assoc_args[ $key ] = $runtime_args[ $key ];
-			} elseif ( $value = self::get_runner()->config[ $key ] ) {
-				$assoc_args[ $key ] = $value;
-			}
-		}
-
 		$php_bin = escapeshellarg( Utils\get_php_binary() );
 
 		$script_path = $GLOBALS['argv'][0];

php/utils.php

@@ -4,11 +4,10 @@
 
 namespace EE\Utils;
 
-use \Composer\Semver\Comparator;
-use \Composer\Semver\Semver;
-use \EE;
-use \EE\Dispatcher;
-use \EE\Iterators\Transform;
+use Composer\Semver\Comparator;
+use Composer\Semver\Semver;
+use EE;
+use EE\Iterators\Transform;
 
 const PHAR_STREAM_PREFIX = 'phar://';
 
@@ -423,6 +422,27 @@ function make_progress_bar( $message, $count, $interval = 100 ) {
 	return new \cli\progress\Bar( $message, $count, $interval );
 }
 
+/**
+ * Checks if an array is associative array
+ *
+ * @param array $arr array to check
+ *
+ * @return bool
+ */
+function is_assoc( $arr ) {
+
+	$is_assoc = false;
+
+	foreach ( $arr as $key => $value ) {
+		if ( is_string( $key ) ) {
+			$is_assoc = true;
+			break;
+		}
+	}
+
+	return $is_assoc;
+}
+
 function parse_url( $url ) {
 	$url_parts = \parse_url( $url );