Make EE compatible with PHP 8.0

77ethers · Jun 17, 2021 · 41cb2cc · 41cb2cc
1 parent 721ed0b
commit 41cb2cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.1"
+            "php": "7.3"
         },
         "sort-packages": true
     },
@@ -39,7 +39,7 @@
         "easyengine/site-type-php": "v1.4.0",
         "easyengine/site-type-wp": "v1.4.0",
         "monolog/monolog": "1.24.0",
-        "mustache/mustache": "2.12.0",
+        "mustache/mustache": "2.13.0",
         "rmccue/requests": "1.8.0",
         "symfony/config": "3.4.18",
         "symfony/console": "3.4.35",

diff --git a/php/EE/Runner.php b/php/EE/Runner.php
@@ -538,15 +538,15 @@ public function in_color() {
 	}
 
 	public function init_colorization() {
-		if ( 'auto' === $this->config['color'] ) {
+		if ( ! isset( $this->config['color'] ) || 'auto' === $this->config['color'] ) {
 			$this->colorize = ( ! \EE\Utils\isPiped() && ! \EE\Utils\is_windows() );
 		} else {
 			$this->colorize = $this->config['color'];
 		}
 	}
 
 	public function init_logger() {
-		if ( $this->config['quiet'] ) {
+		if ( isset( $this->config['quiet'] ) && $this->config['quiet'] ) {
 			$logger = new \EE\Loggers\Quiet;
 		} else {
 			$logger = new \EE\Loggers\Regular( $this->in_color() );

diff --git a/php/class-ee-db.php b/php/class-ee-db.php
@@ -391,7 +391,7 @@ public function update( $values ) {
 		$set_bindings   = array_values( $values );
 		$where_bindings = $this->where['bindings'];
 
-		$set_clause = implode( $set_keys, ' = ?, ' ) . ' = ?';
+		$set_clause = implode( ' = ?, ', $set_keys) . ' = ?';
 
 		$query         = "UPDATE $this->tables SET $set_clause{$this->where['query_string']}";
 		$pdo_statement = self::$pdo->query( $query );