🚿

Author: codemasher

src/Drivers/PostgreSQL.php

@@ -15,8 +15,9 @@
 use chillerlan\Database\Dialects\{Dialect, Postgres};
 use chillerlan\Database\Result;
 use Throwable;
+use PgSql\Connection;
 
-use function bin2hex, call_user_func_array, implode, in_array, is_bool, is_resource, pg_close, pg_connect,
+use function bin2hex, call_user_func_array, implode, in_array, is_bool, pg_close, pg_connect,
 	pg_execute, pg_field_type, pg_free_result, pg_prepare, pg_query, pg_version, preg_replace_callback;
 
 /**
@@ -27,16 +28,16 @@ final class PostgreSQL extends DriverAbstract{
 	/**
 	 * Holds the database resource object
 	 *
-	 * @var resource|null
+	 * @var \PgSql\Connection|resource|null
 	 */
-	private $db = null;
+	private ?Connection $db = null;
 
 	/**
 	 * @inheritdoc
 	 */
 	public function connect():DriverInterface{
 
-		if(is_resource($this->db)){
+		if($this->db !== null){
 			return $this;
 		}
 
@@ -69,19 +70,23 @@ public function connect():DriverInterface{
 	 */
 	public function disconnect():bool{
 
-		if(is_resource($this->db)){
-			return pg_close($this->db);
+		if($this->db !== null){
+			$ret = pg_close($this->db);
+
+			if($ret === true){
+				$this->db = null;
+			}
+
+			return $ret;
 		}
 
 		return true;
 	}
 
 	/**
 	 * @inheritdoc
-	 *
-	 * @return resource|null
 	 */
-	public function getDBResource(){
+	public function getDBResource():?Connection{
 		return $this->db;
 	}
 
@@ -97,7 +102,7 @@ public function getDialect():Dialect{
 	 */
 	public function getClientInfo():string{
 
-		if(!is_resource($this->db)){
+		if($this->db === null){
 			return 'disconnected, no info available';
 		}
 
@@ -111,7 +116,7 @@ public function getClientInfo():string{
 	 */
 	public function getServerInfo():string{
 
-		if(!is_resource($this->db)){
+		if($this->db === null){
 			return 'disconnected, no info available';
 		}
 

src/MonologHandler.php

@@ -14,7 +14,8 @@
 use InvalidArgumentException;
 use Monolog\Formatter\{FormatterInterface, ScalarFormatter};
 use Monolog\Handler\AbstractProcessingHandler;
-use Monolog\Logger;
+use Monolog\Level;
+use Monolog\LogRecord;
 use Throwable;
 use function strpos, trim;
 
@@ -32,7 +33,7 @@ class MonologHandler extends AbstractProcessingHandler{
 	/**
 	 * MonologHandler constructor
 	 */
-	public function __construct(Database $db, string $logTable, $level = Logger::DEBUG, bool $bubble = true){
+	public function __construct(Database $db, string $logTable, $level = Level::Debug, bool $bubble = true){
 		parent::__construct($level, $bubble);
 
 		$this->db = $db;
@@ -45,10 +46,10 @@ public function __construct(Database $db, string $logTable, $level = Logger::DEB
 	/**
 	 * @inheritDoc
 	 */
-	protected function write(array $record):void{
+	protected function write(LogRecord $record):void{
 		$this->db->insert
 			->into($this->logTable)
-			->values($record['formatted'])
+			->values($record->formatted)
 			->query()
 		;
 	}
@@ -59,10 +60,10 @@ protected function write(array $record):void{
 	protected function getRecordFormatter():FormatterInterface{
 		return new class() extends ScalarFormatter{
 
-			public function format(array $record):array{
+			public function format(LogRecord $record):array{
 				$result = [];
 
-				foreach($record as $key => $value){
+				foreach($record->toArray() as $key => $value){
 					if($key === 'level'){
 						continue;
 					}