fix conflict

Professionali · May 30, 2013 · cab45e8 · cab45e8
2 parents db30514 + 118c25b
commit cab45e8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,5 @@
-debuger
-=======
+Debuger
+=======
+
+Обработчик ошибок и вывод дампа переменных
+
diff --git a/debuger.php b/debuger.php
@@ -8,41 +8,34 @@
  * @version   0.2
  */
 
-//if(!isset($_SERVER["SCRIPT_NAME"]) || strpos($_SERVER["SCRIPT_NAME"], 'main.php')!==false) {
 
-	error_reporting(E_ALL);
+error_reporting(E_ALL);
+include_once 'Debug/Processor.php';
 
-	include_once 'Debug/Processor.php';
+Debug_Processor::getInstance(array(
+	'errors'  => array('Database', 'Error'/*, 'Silent'*/),
+	'plugins' => array('Array', 'Object', 'Image'),
+	'view'    => (PHP_SAPI != 'cli') ? 'Html' : 'Cli',
+	'trace_exclude' => array(
+		array('class' => 'Cms_Profiler_Adapter_Page', 'function' => 'errorHandler'),
+	)
+));
 
-	Debug_Processor::getInstance(
-		array(
-			'errors'  => array('Database', 'Error'/*, 'Silent'*/),
-			'plugins' => array('Array', 'Object', 'Image'),
-			'view'    => isset($_SERVER['SERVER_PROTOCOL']) ? 'Html' : 'Cli',
-			'trace_exclude' => array(
-				array('class'=>'Cms_Profiler_Adapter_Page', 'function'=>'errorHandler'),
-			)
-		)
-	);
-
-	/**
-	 * Функция вывода отладочной информации
-	 *
-	 * @param mixed   $arg    Иследуемая переменная
-	 * @param boolean $return Возврат результата
-	 * @param boolean $stop   Прекращение исполнения
-	 */
-	function p($arg=null, $return=false, $stop=false) {
-		$debugger = Debug_Processor::getInstance();
-		if($return) {
-			return $debugger->dump($arg);
-		} else {
-			if ($stop) {
-				die ($debugger->dump($arg));
-			} else {
-				print $debugger->dump($arg);
-			}
-		}
-		return '';
+/**
+ * Функция вывода отладочной информации
+ *
+ * @param mixed   $arg    Иследуемая переменная
+ * @param boolean $return Возврат результата
+ * @param boolean $stop   Прекращение исполнения
+ */
+function p($arg = null, $return = false, $stop = false) {
+	$dump = Debug_Processor::getInstance()->dump($arg);
+	if ($return) {
+		return $dump;
+	} elseif ($stop) {
+		exit($dump);
+	} else {
+		print $dump;
 	}
-//}
+	return '';
+}
diff --git a/test.php b/test.php
@@ -11,7 +11,6 @@
 
 include 'debugger.php';
 
-//include '../lib/debuger/_init.php';
 
 interface bar {}
 interface bar2 {}
@@ -20,12 +19,12 @@ class foo2 {}
 class foo3 extends foo2 {}
 
 final class foo extends foo3 implements bar, bar2 {
-	private $a=null;
+	private $a = null;
 	protected $b = 0;
 	public $c = '';
 
 	public function __construct() {}
-	public function test($a,$b,array$c=array()) {
+	public function test($a, $b, array $c = array()) {
 		return self::bar($c);
 	}
 	private static function bar($e){
@@ -53,22 +52,17 @@ function aaaa() {
 $obj = new foo();
 $obj->test('Привет', 2, array(null));
 
-/*
-p(
-	array(
-		'boolean'  => true,
-		'integer'  => 999,
-		'float'    => pi(),
-		'string'   => 'test',
-		'array'    => array(0,null=>null,'d'=>1, 'tag'=>"<b>test</b>", 'tag'=>"<b>test</b>", 'cli'=>"\x1b[41m\n\t\r"),
-		'object'   => new foo(),
-		'resource' => imagecreatetruecolor(14 , 14),
-		'null'     => null,
-		'ar'       => array(0,1,2,'asda','',null,pi(),false,true,array(array(array(array(array(array(array(array(array()))))))))),
-	)
-);
-*/
-
-
-
-print "\n";
+p(array(
+	'boolean'  => true,
+	'integer'  => 999,
+	'float'    => pi(),
+	'string'   => 'test',
+	'array'    => array(0,null=>null,'d'=>1, 'tag'=>"<b>test</b>", 'tag'=>"<b>test</b>", 'cli'=>"\x1b[41m\n\t\r"),
+	'object'   => new foo(),
+	'resource' => imagecreatetruecolor(14 , 14),
+	'null'     => null,
+	'ar'       => array(0,1,2,'asda','',null,pi(),false,true,array(array(array(array(array(array(array(array(array()))))))))),
+));
+
+
+print "\n";