- Object renamed to TexyObject

jkrcma · Sep 5, 2008 · 7f2c44b · 7f2c44b
1 parent 7e6478e
commit 7f2c44b
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 23 deletions.
diff --git a/texy/libs/TexyHandlerInvocation.php b/texy/libs/TexyHandlerInvocation.php
@@ -27,7 +27,7 @@
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-final class TexyHandlerInvocation extends /*Nette::*/Object
+final class TexyHandlerInvocation extends TexyObject
 {
 	/** @var array of callbacks */
 	private $handlers;

diff --git a/texy/libs/TexyHtml.php b/texy/libs/TexyHtml.php
@@ -34,7 +34,7 @@
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-class TexyHtml extends /*Nette::*/Object implements ArrayAccess, /* Countable, */ IteratorAggregate
+class TexyHtml extends TexyObject implements ArrayAccess, /* Countable, */ IteratorAggregate
 {
 	/** @var string  element's name */
 	private $name;

diff --git a/texy/libs/TexyModifier.php b/texy/libs/TexyModifier.php
@@ -35,7 +35,7 @@
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-final class TexyModifier extends /*Nette::*/Object
+final class TexyModifier extends TexyObject
 {
 	/** @var string */
 	public $id;

diff --git a/texy/libs/TexyModule.php b/texy/libs/TexyModule.php
@@ -27,7 +27,7 @@
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-abstract class TexyModule extends /*Nette::*/Object
+abstract class TexyModule extends TexyObject
 {
 	/** @var Texy */
 	protected $texy;

diff --git a/texy/Nette/Object.php → texy/libs/TexyObject.php b/texy/Nette/Object.php → texy/libs/TexyObject.php
@@ -1,27 +1,29 @@
 <?php
 
 /**
- * Nette Framework
+ * Texy! - web text markup-language
+ * --------------------------------
  *
  * Copyright (c) 2004, 2008 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "Nette license" that is bundled
+ * This source file is subject to the GNU GPL license that is bundled
  * with this package in the file license.txt.
  *
- * For more information please see http://nettephp.com
+ * For more information please see http://texy.info
  *
  * @copyright  Copyright (c) 2004, 2008 David Grudl
- * @license    http://nettephp.com/license  Nette license
- * @link       http://nettephp.com
- * @category   Nette
- * @package    Nette
+ * @license    GNU GENERAL PUBLIC LICENSE version 2 or 3
+ * @link       http://texy.info
+ * @package    Texy
+ * @version    $Id$
  */
 
-/*namespace Nette;*/
 
 
 /**
- * Nette::Object is the ultimate ancestor of all instantiable classes.
+ * TexyObject is the ultimate ancestor of all instantiable classes.
+ *
+ * TexyObject is copy of Nette::Object from Nette Framework (http://nettephp.com).
  *
  * It defines some handful methods and enhances object core of PHP:
  *   - access to undeclared members throws exceptions
@@ -58,9 +60,9 @@
  *
  * @author     David Grudl
  * @copyright  Copyright (c) 2004, 2008 David Grudl
- * @package    Nette
+ * @package    Texy
  */
-abstract class Object
+abstract class TexyObject
 {
 	/** @var array (method => array(type => callback)) */
 	private static $extMethods;

diff --git a/texy/libs/TexyParser.php b/texy/libs/TexyParser.php
@@ -27,7 +27,7 @@
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-class TexyParser extends /*Nette::*/Object
+class TexyParser extends TexyObject
 {
 	/** @var Texy */
 	protected $texy;

diff --git a/texy/modules/TexyImageModule.php b/texy/modules/TexyImageModule.php
@@ -337,7 +337,7 @@ public function solve($invocation, TexyImage $image, $link)
 /**
  * @package Texy
  */
-final class TexyImage extends /*Nette::*/Object
+final class TexyImage extends TexyObject
 {
 	/** @var string  base image URL */
 	public $URL;

diff --git a/texy/modules/TexyLinkModule.php b/texy/modules/TexyLinkModule.php
@@ -452,7 +452,7 @@ private function textualUrl($link)
 /**
  * @package Texy
  */
-final class TexyLink extends /*Nette::*/Object
+final class TexyLink extends TexyObject
 {
 	/** @see $type */
 	const

diff --git a/texy/netterobots.txt b/texy/netterobots.txt
@@ -1,2 +1 @@
-Disallow: /Nette
 Disallow: /modules
diff --git a/texy/texy.php b/texy/texy.php
@@ -38,11 +38,9 @@
 }
 
 
-// nette libraries
-if (!class_exists(/*Nette::*/'Object', FALSE)) { require_once dirname(__FILE__) . '/Nette/Object.php'; }
-
 // Texy! libraries
 require_once dirname(__FILE__) . '/libs/RegExp.Patterns.php';
+require_once dirname(__FILE__) . '/libs/TexyObject.php';
 require_once dirname(__FILE__) . '/libs/TexyHtml.php';
 require_once dirname(__FILE__) . '/libs/TexyModifier.php';
 require_once dirname(__FILE__) . '/libs/TexyModule.php';
@@ -133,7 +131,7 @@ class InvalidStateException extends RuntimeException {}
  * @copyright  Copyright (c) 2004, 2008 David Grudl
  * @package    Texy
  */
-class Texy extends /*Nette::*/Object
+class Texy extends TexyObject
 {
 	// configuration directives
 	const ALL = TRUE;