Skip to content

Commit de2de8f

Browse files
committed
Fix compatibility with PHP 7.2, uncompatible with nette 2.3 and less.
1 parent c054240 commit de2de8f

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"issues": "https://github.com/XRuff/BaseDbModel/issues"
1414
},
1515
"require": {
16-
"nette/database": "~2.3",
17-
"nette/utils": "~2.3"
16+
"nette/database": "~2.4",
17+
"nette/utils": "~2.4"
1818
},
1919
"require-dev": {
20-
"nette/database": "~2.3",
21-
"nette/utils": "~2.3",
20+
"nette/database": "~2.4",
21+
"nette/utils": "~2.4",
2222
"nette/tester": "~1.1.0",
23-
"tracy/tracy": "2.3.*",
23+
"tracy/tracy": "2.4.*",
2424
"vanio/coding-standards": "^0.1@dev"
2525
},
2626
"autoload": {

src/BaseDbModel.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
*
1212
* @property-read Nette\Database\Table\Selection $table
1313
*/
14-
abstract class BaseDbModel extends Nette\Object
14+
abstract class BaseDbModel
1515
{
16+
use Nette\Smart<;
17+
1618
/** @var string */
1719
const TABLE_NAME_SEPARATOR = '_';
1820

@@ -55,8 +57,8 @@ public function __construct(Context $db, $tableName = null)
5557
*/
5658
protected function formatTableNameFromClass()
5759
{
58-
$shorName = $this->getReflection()->getShortName();
59-
$name = substr($shorName, 0, strrpos($shorName, 'Repository'));
60+
$shorName = substr(strrchr(get_class($this), "\\"), 1);
61+
$name = substr($shorName, 0, strrpos($shorName, 'Repository'));
6062
return strtolower(Strings::replace($name, '#(?<!^)([A-Z])#', self::TABLE_NAME_SEPARATOR . '\\1'));
6163
}
6264

0 commit comments

Comments
 (0)