mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-05 13:47:33 +02:00
Code Issues Releases Wiki Activity

removed NClass

Browse Source
This commit is contained in:
David Grudl
2007-12-11 07:28:55 +00:00
parent 2c8906e7c4
commit 041f059408
18 changed files with 109 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dibi/dibi.php
View File

@@ -32,7 +32,6 @@ if (version_compare(PHP_VERSION , '5.1.0', '<')) {
// nette libraries // nette libraries
if (!class_exists('NObject', FALSE)) { require_once __FILE__ . '/../libs/NObject.php'; } if (!class_exists('NObject', FALSE)) { require_once __FILE__ . '/../libs/NObject.php'; }
if (!class_exists('NClass', FALSE)) { require_once __FILE__ . '/../libs/NClass.php'; }
if (!class_exists('NException', FALSE)) { require_once __FILE__ . '/../libs/NException.php'; } if (!class_exists('NException', FALSE)) { require_once __FILE__ . '/../libs/NException.php'; }
// dibi libraries // dibi libraries
@@ -60,7 +59,7 @@ require_once __FILE__ . '/../libs/DibiVariable.php';
* @package dibi * @package dibi
* @version $Revision$ $Date$ * @version $Revision$ $Date$
*/ */
class dibi extends NClass class dibi
{ {
/** /**
* Column type in relation to PHP native type * Column type in relation to PHP native type
@@ -142,6 +141,16 @@ class dibi extends NClass
/**
* static class
*/
final public function __construct()
{
throw new LogicException("Cannot instantiate static class " . get_class($this));
}
/** /**
* Creates a new DibiConnection object and connects it to specified database * Creates a new DibiConnection object and connects it to specified database
* *
@@ -527,7 +536,7 @@ class dibi extends NClass
* Prints out a syntax highlighted version of the SQL command or DibiResult * Prints out a syntax highlighted version of the SQL command or DibiResult
* *
* @param string|DibiResult * @param string|DibiResult
* @param bool return or print? * @param bool return output instead of printing it?
* @return string * @return string
*/ */
public static function dump($sql = NULL, $return = FALSE) public static function dump($sql = NULL, $return = FALSE)

39
dibi/libs/NClass.php
View File

@@ -1,39 +0,0 @@
<?php
/**
* dibi - tiny'n'smart database abstraction layer
* ----------------------------------------------
*
* Copyright (c) 2005, 2007 David Grudl aka -dgx- (http://www.dgx.cz)
*
* This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt.
*
* For more information please see http://dibiphp.com/
*
* @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://nettephp.com/license Nette license
* @link http://nettephp.com/
* @package Nette
*/
/**
* NClass is the ultimate ancestor of all uninstantiable classes.
*
* @author David Grudl
* @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://nettephp.com/license Nette license
* @link http://nettephp.com/
* @package Nette
*/
abstract class NClass
{
final public function __construct()
{
throw new LogicException("Cannot instantiate static class " . get_class($this));
}
}

4
dibi/libs/NObject.php
View File

@@ -31,8 +31,8 @@
* methods as normal object variables. A property is defined by a getter method * methods as normal object variables. A property is defined by a getter method
* and optional setter method (no setter method means read-only property). * and optional setter method (no setter method means read-only property).
* <code> * <code>
* $val = $obj->Label; // equivalent to $val = $obj->getLabel(); * $val = $obj->label; // equivalent to $val = $obj->getLabel();
* $obj->Label = 'Nette'; // equivalent to $obj->setLabel('Nette'); * $obj->label = 'Nette'; // equivalent to $obj->setLabel('Nette');
* </code> * </code>
* Property names are case-sensitive, and they are written in the camelCaps * Property names are case-sensitive, and they are written in the camelCaps
* or PascalCaps. * or PascalCaps.