From aac5ae993243def7a89fa220477dda2777e7b4fa Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sun, 23 Jun 2013 01:57:48 +0200
Subject: [PATCH] typos

---
 composer.json                              |  2 +-
 dibi/dibi.php                              | 20 +++++++++++---------
 examples/connecting-to-databases.php       |  4 ++--
 examples/database-reflection.php           |  4 ++--
 examples/dumping-sql-and-result-set.php    |  4 ++--
 examples/fetching-examples.php             |  4 ++--
 examples/importing-dump-from-file.php      |  4 ++--
 examples/nette-debug-and-exceptions.php    |  4 ++--
 examples/nette-debug-and-variables.php     |  4 ++--
 examples/query-language-and-conditions.php |  4 ++--
 examples/query-language-basic-examples.php |  4 ++--
 examples/result-set-data-types.php         | 22 ++++++++++------------
 examples/using-datetime.php                |  4 ++--
 examples/using-extension-methods.php       |  4 ++--
 examples/using-fluent-syntax.php           |  4 ++--
 examples/using-limit-and-offset.php        |  4 ++--
 examples/using-logger.php                  |  4 ++--
 examples/using-profiler.php                |  4 ++--
 examples/using-substitutions.php           |  4 ++--
 examples/using-transactions.php            |  4 ++--
 20 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/composer.json b/composer.json
index 814badc..cbbf986 100644
--- a/composer.json
+++ b/composer.json
@@ -16,4 +16,4 @@
 	"autoload": {
 		"classmap": ["dibi/"]
 	}
-}
\ No newline at end of file
+}
diff --git a/dibi/dibi.php b/dibi/dibi.php
index 11d90e5..953e2f3 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -631,7 +631,7 @@ class dibi
 			} else {
 				$sql = htmlSpecialChars($sql);
 				$sql = preg_replace_callback($highlighter, array('dibi', 'highlightCallback'), $sql);
-				echo '<pre class="dump">', trim($sql), "</pre>\n";
+				echo '<pre class="dump">', trim($sql), "</pre>\n\n";
 			}
 		}
 
@@ -646,34 +646,36 @@ class dibi
 
 	private static function highlightCallback($matches)
 	{
-		if (!empty($matches[1])) // comment
+		if (!empty($matches[1])) { // comment
 			return '<em style="color:gray">' . $matches[1] . '</em>';
 
-		if (!empty($matches[2])) // error
+		} elseif (!empty($matches[2])) { // error
 			return '<strong style="color:red">' . $matches[2] . '</strong>';
 
-		if (!empty($matches[3])) // most important keywords
+		} elseif (!empty($matches[3])) { // most important keywords
 			return '<strong style="color:blue">' . $matches[3] . '</strong>';
 
-		if (!empty($matches[4])) // other keywords
+		} elseif (!empty($matches[4])) { // other keywords
 			return '<strong style="color:green">' . $matches[4] . '</strong>';
+		}
 	}
 
 
 
 	private static function cliHighlightCallback($matches)
 	{
-		if (!empty($matches[1])) // comment
+		if (!empty($matches[1])) { // comment
 			return "\033[1;30m" . $matches[1] . "\033[0m";
 
-		if (!empty($matches[2])) // error
+		} elseif (!empty($matches[2])) { // error
 			return "\033[1;31m" . $matches[2] . "\033[0m";
 
-		if (!empty($matches[3])) // most important keywords
+		} elseif (!empty($matches[3])) { // most important keywords
 			return "\033[1;34m" . $matches[3] . "\033[0m";
 
-		if (!empty($matches[4])) // other keywords
+		} elseif (!empty($matches[4])) { // other keywords
 			return "\033[1;32m" . $matches[4] . "\033[0m";
+		}
 	}
 
 }
diff --git a/examples/connecting-to-databases.php b/examples/connecting-to-databases.php
index 5ff08b8..16a5c4f 100644
--- a/examples/connecting-to-databases.php
+++ b/examples/connecting-to-databases.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 // connects to SQlite using dibi class
diff --git a/examples/database-reflection.php b/examples/database-reflection.php
index 5d0b29e..839f11e 100644
--- a/examples/database-reflection.php
+++ b/examples/database-reflection.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/dumping-sql-and-result-set.php b/examples/dumping-sql-and-result-set.php
index 7732dd6..1373d18 100644
--- a/examples/dumping-sql-and-result-set.php
+++ b/examples/dumping-sql-and-result-set.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/fetching-examples.php b/examples/fetching-examples.php
index df56686..cb23e31 100644
--- a/examples/fetching-examples.php
+++ b/examples/fetching-examples.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 ndebug();
 
diff --git a/examples/importing-dump-from-file.php b/examples/importing-dump-from-file.php
index c9bd4b5..f1863d3 100644
--- a/examples/importing-dump-from-file.php
+++ b/examples/importing-dump-from-file.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/nette-debug-and-exceptions.php b/examples/nette-debug-and-exceptions.php
index d4b5554..e585d8a 100644
--- a/examples/nette-debug-and-exceptions.php
+++ b/examples/nette-debug-and-exceptions.php
@@ -10,8 +10,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 // enable Nette Debugger
diff --git a/examples/nette-debug-and-variables.php b/examples/nette-debug-and-variables.php
index 9d209cf..8403c40 100644
--- a/examples/nette-debug-and-variables.php
+++ b/examples/nette-debug-and-variables.php
@@ -12,8 +12,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 // enable Nette Debugger
diff --git a/examples/query-language-and-conditions.php b/examples/query-language-and-conditions.php
index 79b267b..4bcb5dc 100644
--- a/examples/query-language-and-conditions.php
+++ b/examples/query-language-and-conditions.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/query-language-basic-examples.php b/examples/query-language-basic-examples.php
index 51e63bf..ab038d7 100644
--- a/examples/query-language-basic-examples.php
+++ b/examples/query-language-basic-examples.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
diff --git a/examples/result-set-data-types.php b/examples/result-set-data-types.php
index 116922a..5ba9c3a 100644
--- a/examples/result-set-data-types.php
+++ b/examples/result-set-data-types.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 ndebug();
 date_default_timezone_set('Europe/Prague');
@@ -27,11 +27,10 @@ $res->setType('customer_id', Dibi::INTEGER)
 
 dump( $res->fetch() );
 // outputs:
-// object(DibiRow)#3 (3) {
-//     customer_id => int(1)
-//     name =>  string(11) "Dave Lister"
-//     added =>  object(DateTime53) {}
-// }
+// DibiRow(3) {
+//    customer_id => 1
+//    name => "Dave Lister" (11)
+//    added => "2007-03-11 17:20:03" (19)
 
 
 
@@ -40,8 +39,7 @@ $res = dibi::query('SELECT * FROM [customers]');
 
 dump( $res->fetch() );
 // outputs:
-// object(DibiRow)#3 (3) {
-//     customer_id => int(1)
-//     name =>  string(11) "Dave Lister"
-//     added =>  string(15) "17:20 11.3.2007"
-// }
+// DibiRow(3) {
+//    customer_id => 1
+//    name => "Dave Lister" (11)
+//    added => "2007-03-11 17:20:03" (19)
diff --git a/examples/using-datetime.php b/examples/using-datetime.php
index 2c02223..288df95 100644
--- a/examples/using-datetime.php
+++ b/examples/using-datetime.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
diff --git a/examples/using-extension-methods.php b/examples/using-extension-methods.php
index b91a040..b454ab2 100644
--- a/examples/using-extension-methods.php
+++ b/examples/using-extension-methods.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 ndebug();
 
diff --git a/examples/using-fluent-syntax.php b/examples/using-fluent-syntax.php
index 592dbcf..b71df30 100644
--- a/examples/using-fluent-syntax.php
+++ b/examples/using-fluent-syntax.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
diff --git a/examples/using-limit-and-offset.php b/examples/using-limit-and-offset.php
index e29054c..12ac8bd 100644
--- a/examples/using-limit-and-offset.php
+++ b/examples/using-limit-and-offset.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/using-logger.php b/examples/using-logger.php
index ed6df20..ba22ab8 100644
--- a/examples/using-logger.php
+++ b/examples/using-logger.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 date_default_timezone_set('Europe/Prague');
 
diff --git a/examples/using-profiler.php b/examples/using-profiler.php
index ea17115..ddbbb62 100644
--- a/examples/using-profiler.php
+++ b/examples/using-profiler.php
@@ -6,8 +6,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/using-substitutions.php b/examples/using-substitutions.php
index 6a9e51d..e47d7ca 100644
--- a/examples/using-substitutions.php
+++ b/examples/using-substitutions.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(
diff --git a/examples/using-transactions.php b/examples/using-transactions.php
index b5525bf..0302f6a 100644
--- a/examples/using-transactions.php
+++ b/examples/using-transactions.php
@@ -4,8 +4,8 @@
 
 <?php
 
-require_once 'Nette/Debugger.php';
-require_once '../dibi/dibi.php';
+require dirname(__FILE__) . '/Nette/Debugger.php';
+require dirname(__FILE__) . '/../dibi/dibi.php';
 
 
 dibi::connect(array(