From 6c66ebf8066281e0fe013169ff86fe4f24be3234 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 5 Jan 2015 11:59:12 +0100
Subject: [PATCH] remove `util/typohelper.php` and call `php -l` in
 `util/typo.php` to check syntax errors

---
 util/typo.php       | 30 ++++++++++++------------------
 util/typohelper.php | 11 -----------
 2 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 util/typohelper.php

diff --git a/util/typo.php b/util/typo.php
index a8055c8418..0e2177c706 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,25 +12,28 @@
 	
 	$a = new App();
 
+	if(x($a->config,'php_path'))
+		$phpath = $a->config['php_path'];
+	else
+		$phpath = 'php';
+
+
 	echo "Directory: mod\n";
 	$files = glob('mod/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
 	}
 
 	echo "Directory: include\n";
 	$files = glob('include/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
 	}
     
     echo "Directory: object\n";
 	$files = glob('object/*.php');
 	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
 	}
 
 	echo "Directory: addon\n";
@@ -40,26 +43,17 @@
 		$addon = basename($dir);
 		$files = glob($dir . '/' . $addon . '.php');
 		foreach($files as $file) {
-			echo $file . "\n";
-			include_once($file);
+            passthru("$phpath -l $file", $ret); $ret===0 or die();
 		}
 	}
 
-	if(x($a->config,'php_path'))
-		$phpath = $a->config['php_path'];
-	else
-		$phpath = 'php';
 
 	echo "String files\n";
 
 	echo 'util/strings.php' . "\n";
-	include_once('util/strings.php');
-	echo count($a->strings) . ' strings' . "\n";
+    passthru("$phpath -l util/strings.php", $ret); $ret===0 or die();
 
 	$files = glob('view/*/strings.php');
-
 	foreach($files as $file) {
-		echo $file . "\n";
-	passthru($phpath . ' util/typohelper.php ' . $file);
-//		include_once($file);
+        passthru("$phpath -l $file", $ret); $ret===0 or die();
 	}
diff --git a/util/typohelper.php b/util/typohelper.php
deleted file mode 100644
index 589702a02a..0000000000
--- a/util/typohelper.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$str = <<< EOT
-	error_reporting(E_ERROR | E_WARNING | E_PARSE );
-	ini_set('display_errors', '1');
-	ini_set('log_errors','0');
-EOT;
-
-	$str .= str_replace('<?php', '', file_get_contents($argv[1]));
-	
-	eval($str);