Row, ActiveRow: shows suggestions for undeclared columns

composer.json

@@ -17,7 +17,7 @@
  "php": ">=5.6.0",
  "ext-pdo": "*",
  "nette/caching": "~2.2",
- "nette/utils": "~2.2"
+ "nette/utils": "~2.4"
  },
  "require-dev": {
  "nette/tester": "~1.3",

src/Database/Row.php

@@ -18,7 +18,8 @@ class Row extends Nette\Utils\ArrayHash implements IRow
 
  public function __get($key)
  {
- throw new Nette\MemberAccessException("Cannot read an undeclared column '$key'.");
+ $hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys((array) $this), $key);
+ throw new Nette\MemberAccessException("Cannot read an undeclared column '$key'" . ($hint ? ", did you mean '$hint'?" : '.'));
  }
 
 

src/Database/Table/ActiveRow.php

@@ -288,7 +288,8 @@ public function &__get($key)
  }
 
  $this->removeAccessColumn($key);
- throw new Nette\MemberAccessException("Cannot read an undeclared column '$key'.");
+ $hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys($this->data), $key);
+ throw new Nette\MemberAccessException("Cannot read an undeclared column '$key'" . ($hint ? ", did you mean '$hint'?" : '.'));
  }
 
 

tests/Database/Row.phpt

@@ -28,7 +28,7 @@ test(function () use ($context) {
 
  Assert::error(function () use ($row) {
  $row->{2};
- }, Nette\MemberAccessException::class, "Cannot read an undeclared column '2'.");
+ }, Nette\MemberAccessException::class, "Cannot read an undeclared column '2', did you mean '123'?");
 
  Assert::error(function () use ($row) {
  $row[2];

tests/Database/Table/Table.basic.phpt

@@ -84,6 +84,10 @@ test(function () use ($connection, $structure) {
  $book->test;
  }, Nette\MemberAccessException::class, "Cannot read an undeclared column 'test'.");
 
+ Assert::exception(function () use ($book) {
+ $book->tilte;
+ }, Nette\MemberAccessException::class, "Cannot read an undeclared column 'tilte', did you mean 'title'?");
+
  Assert::exception(function () use ($book) {
  $book->ref('test');
  }, Nette\MemberAccessException::class, 'No reference found for $book->ref(test).');