X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Ftypo.php;h=313033f3e5a1885ac740790dda476504ccb1ee12;hb=695094f9aa3db6aa55ce1790493db2b13317e8d0;hp=bb2fc67c9f687ccfc21a1c5b55e3e08c8f507829;hpb=5389efffa9c8d2da40bf6ea448562ae67538e0d4;p=friendica.git

diff --git a/util/typo.php b/util/typo.php
old mode 100644
new mode 100755
index bb2fc67c9f..313033f3e5
--- a/util/typo.php
+++ b/util/typo.php
@@ -1,58 +1,79 @@
+#!/usr/bin/env php
 <?php
-	// Tired of chasing typos and finding them after a commit. 
-	// Run this from cmdline in basedir and quickly see if we've 
-	// got any parse errors in our application files.
 
+// Tired of chasing typos and finding them after a commit.
+// Run this from cmdline in basedir and quickly see if we've
+// got any parse errors in our application files.
 
-	error_reporting(E_ERROR | E_WARNING | E_PARSE );
-	ini_set('display_errors', '1');
-	ini_set('log_errors','0');
+use Friendica\App;
 
-	include 'boot.php';
-	
-	$a = new App();
+error_reporting(E_ERROR | E_WARNING | E_PARSE);
+ini_set('display_errors', '1');
+ini_set('log_errors', '0');
 
-	echo "Directory: mod\n";
-	$files = glob('mod/*.php');
-	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
-	}
+include 'boot.php';
 
-	echo "Directory: include\n";
-	$files = glob('include/*.php');
-	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
-	}
+if (empty($a)) {
+	$a = new App(dirname(__DIR__));
+}
+
+if (x($a->config, 'php_path')) {
+	$phpath = $a->config['php_path'];
+} else {
+	$phpath = 'php';
+}
 
-	echo "Directory: addon\n";
-	$dirs = glob('addon/*');
+echo 'Directory: src' . PHP_EOL;
+$Iterator = new RecursiveDirectoryIterator('src');
 
-	foreach($dirs as $dir) {
-		$addon = basename($dir);
-		$files = glob($dir . '/' . $addon . '.php');
-		foreach($files as $file) {
-			echo $file . "\n";
-			include_once($file);
-		}
+foreach (new RecursiveIteratorIterator($Iterator) as $file) {
+	if (substr($file, -4) === '.php') {
+		passthru("$phpath -l $file", $ret);
+		$ret === 0 || die();
 	}
+}
 
-	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) {
+	passthru("$phpath -l $file", $ret);
+	$ret === 0 || die();
+}
 
-	echo "String files\n";
+echo "Directory: include\n";
+$files = glob('include/*.php');
+foreach ($files as $file) {
+	passthru("$phpath -l $file", $ret);
+	$ret === 0 || die();
+}
 
-	echo 'util/strings.php' . "\n";
-	include_once('util/strings.php');
-	echo count($a->strings) . ' strings' . "\n";
+echo "Directory: object\n";
+$files = glob('object/*.php');
+foreach ($files as $file) {
+	passthru("$phpath -l $file", $ret);
+	$ret === 0 || die();
+}
 
-	$files = glob('view/*/strings.php');
+echo "Directory: addon\n";
+$dirs = glob('addon/*');
 
-	foreach($files as $file) {
-		echo $file . "\n";
-	passthru($phpath . ' util/typohelper.php ' . $file);
-//		include_once($file);
+foreach ($dirs as $dir) {
+	$addon = basename($dir);
+	$files = glob($dir . '/' . $addon . '.php');
+	foreach ($files as $file) {
+		passthru("$phpath -l $file", $ret);
+		$ret === 0 || die();
 	}
+}
+
+echo "String files\n";
+
+echo 'util/strings.php' . "\n";
+passthru("$phpath -l util/strings.php", $ret);
+$ret === 0 || die();
+
+$files = glob('view/lang/*/strings.php');
+foreach ($files as $file) {
+	passthru("$phpath -l $file", $ret);
+	$ret === 0 || die();
+}