uses Nette\SmartObject & StaticClass

Author: dg

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -15,8 +15,10 @@
 /**
  * Debug panel for Nette\Database.
  */
-class ConnectionPanel extends Nette\Object implements Tracy\IBarPanel
+class ConnectionPanel implements Tracy\IBarPanel
 {
+	use Nette\SmartObject;
+
 	/** @var int */
 	public $maxQueries = 100;
 

src/Database/Connection.php

@@ -15,8 +15,10 @@
 /**
  * Represents a connection between PHP and a database server.
  */
-class Connection extends Nette\Object
+class Connection
 {
+	use Nette\SmartObject;
+
 	/** @var callable[]  function (Connection $connection); Occurs after connection is established */
 	public $onConnect;
 

src/Database/Context.php

@@ -14,8 +14,10 @@
 /**
  * Database context.
  */
-class Context extends Nette\Object
+class Context
 {
+	use Nette\SmartObject;
+
 	/** @var Connection */
 	private $connection;
 

src/Database/Conventions/StaticConventions.php

@@ -7,15 +7,17 @@
 
 namespace Nette\Database\Conventions;
 
+use Nette;
 use Nette\Database\IConventions;
-use Nette\Object;
 
 
 /**
  * Conventions based on static definition.
  */
-class StaticConventions extends Object implements IConventions
+class StaticConventions implements IConventions
 {
+	use Nette\SmartObject;
+
 	/** @var string */
 	protected $primary;
 

src/Database/Drivers/MsSqlDriver.php

@@ -13,8 +13,9 @@
 /**
  * Supplemental MS SQL database driver.
  */
-class MsSqlDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class MsSqlDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
 
 	public function convertException(\PDOException $e)
 	{

src/Database/Drivers/MySqlDriver.php

@@ -13,8 +13,10 @@
 /**
  * Supplemental MySQL database driver.
  */
-class MySqlDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class MySqlDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
+
 	const ERROR_ACCESS_DENIED = 1045;
 	const ERROR_DUPLICATE_ENTRY = 1062;
 	const ERROR_DATA_TRUNCATED = 1265;

src/Database/Drivers/OciDriver.php

@@ -13,8 +13,10 @@
 /**
  * Supplemental Oracle database driver.
  */
-class OciDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class OciDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
+
 	/** @var Nette\Database\Connection */
 	private $connection;
 

src/Database/Drivers/OdbcDriver.php

@@ -13,8 +13,9 @@
 /**
  * Supplemental ODBC database driver.
  */
-class OdbcDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class OdbcDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
 
 	public function convertException(\PDOException $e)
 	{

src/Database/Drivers/PgSqlDriver.php

@@ -13,8 +13,10 @@
 /**
  * Supplemental PostgreSQL database driver.
  */
-class PgSqlDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class PgSqlDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
+
 	/** @var Nette\Database\Connection */
 	private $connection;
 

src/Database/Drivers/SqliteDriver.php

@@ -13,8 +13,10 @@
 /**
  * Supplemental SQLite3 database driver.
  */
-class SqliteDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class SqliteDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
+
 	/** @var Nette\Database\Connection */
 	private $connection;
 

src/Database/Drivers/SqlsrvDriver.php

@@ -13,8 +13,10 @@
 /**
  * Supplemental SQL Server 2005 and later database driver.
  */
-class SqlsrvDriver extends Nette\Object implements Nette\Database\ISupplementalDriver
+class SqlsrvDriver implements Nette\Database\ISupplementalDriver
 {
+	use Nette\SmartObject;
+
 	/** @var Nette\Database\Connection */
 	private $connection;
 

src/Database/Helpers.php

@@ -16,6 +16,8 @@
  */
 class Helpers
 {
+	use Nette\StaticClass;
+
 	/** @var int maximum SQL length */
 	public static $maxLength = 100;
 

src/Database/ResultSet.php

@@ -14,8 +14,10 @@
 /**
  * Represents a result set.
  */
-class ResultSet extends Nette\Object implements \Iterator, IRowContainer
+class ResultSet implements \Iterator, IRowContainer
 {
+	use Nette\SmartObject;
+
 	/** @var Connection */
 	private $connection;
 

src/Database/SqlLiteral.php

@@ -13,8 +13,10 @@
 /**
  * SQL literal value.
  */
-class SqlLiteral extends Nette\Object
+class SqlLiteral
 {
+	use Nette\SmartObject;
+
 	/** @var string */
 	private $value;
 

src/Database/SqlPreprocessor.php

@@ -13,8 +13,10 @@
 /**
  * SQL preprocessor.
  */
-class SqlPreprocessor extends Nette\Object
+class SqlPreprocessor
 {
+	use Nette\SmartObject;
+
 	/** @var Connection */
 	private $connection;
 

src/Database/Structure.php

@@ -13,8 +13,10 @@
 /**
  * Cached reflection of database structure.
  */
-class Structure extends Nette\Object implements IStructure
+class Structure implements IStructure
 {
+	use Nette\SmartObject;
+
 	/** @var Connection */
 	protected $connection;
 

src/Database/Table/Selection.php

@@ -16,8 +16,10 @@
  * Filtered table representation.
  * Selection is based on the great library NotORM http://www.notorm.com written by Jakub Vrana.
  */
-class Selection extends Nette\Object implements \Iterator, IRowContainer, \ArrayAccess, \Countable
+class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 {
+	use Nette\SmartObject;
+
 	/** @var Context */
 	protected $context;
 

src/Database/Table/SqlBuilder.php

@@ -19,8 +19,9 @@
  * Builds SQL query.
  * SqlBuilder is based on great library NotORM http://www.notorm.com written by Jakub Vrana.
  */
-class SqlBuilder extends Nette\Object
+class SqlBuilder
 {
+	use Nette\SmartObject;
 
 	/** @var string */
 	protected $tableName;