Skip to content

Commit dd3fba6

Browse files
committed
events: added default values & removed magic
1 parent 94caf0b commit dd3fba6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"php": ">=7.2 <8.1",
1919
"ext-pdo": "*",
2020
"nette/caching": "^3.0",
21-
"nette/utils": "^3.1"
21+
"nette/utils": "^3.2.1"
2222
},
2323
"require-dev": {
2424
"nette/tester": "^2.0",

src/Database/Connection.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace Nette\Database;
1111

1212
use Nette;
13+
use Nette\Utils\Arrays;
1314
use PDO;
1415
use PDOException;
1516

@@ -22,10 +23,10 @@ class Connection
2223
use Nette\SmartObject;
2324

2425
/** @var callable[]&(callable(Connection $connection): void)[]; Occurs after connection is established */
25-
public $onConnect;
26+
public $onConnect = [];
2627

2728
/** @var callable[]&(callable(Connection $connection, ResultSet|DriverException $result): void)[]; Occurs after query is executed */
28-
public $onQuery;
29+
public $onQuery = [];
2930

3031
/** @var array */
3132
private $params;
@@ -76,7 +77,7 @@ public function connect(): void
7677
$this->driver = new $class;
7778
$this->preprocessor = new SqlPreprocessor($this);
7879
$this->driver->initialize($this, $this->options);
79-
$this->onConnect($this);
80+
Arrays::invoke($this->onConnect, $this);
8081
}
8182

8283

@@ -186,10 +187,10 @@ public function query(string $sql, ...$params): ResultSet
186187
try {
187188
$result = new ResultSet($this, $this->sql, $params);
188189
} catch (PDOException $e) {
189-
$this->onQuery($this, $e);
190+
Arrays::invoke($this->onQuery, $this, $e);
190191
throw $e;
191192
}
192-
$this->onQuery($this, $result);
193+
Arrays::invoke($this->onQuery, $this, $result);
193194
return $result;
194195
}
195196

0 commit comments

Comments
 (0)