Merge remote-tracking branch 'upstream/master'

Author: thekid

src/main/php/lang/reflect/ClassParser.class.php

@@ -175,12 +175,13 @@ protected function valueOf($tokens, &$i, $context, $imports) {
           $code.= is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
         }
       }
-      ob_start();
       $func= eval('return '.$code.';');
-      $error= ob_get_clean();
       if (!($func instanceof \Closure)) {
-        preg_match("/(Parse.+) in .+.php/", $error, $m);
-        throw new IllegalStateException('In `'.$code.'`: '.$m[1]);
+        $error= error_get_last();
+        set_error_handler('__error', 0);
+        trigger_error('clear_last_error');
+        restore_error_handler();
+        throw new IllegalStateException('In `'.$code.'`: '.ucfirst($error['message']));
       }
       return $func;
     } else {

src/test/php/net/xp_framework/unittest/annotations/BrokenAnnotationTest.class.php

@@ -137,17 +137,17 @@ public function class_private_static_member() {
     $this->parse('#[@value(AnnotationParsingTest::$internal)]');
   }
 
-  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Parse error/')]
+  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Syntax error/')]
   public function function_without_braces() {
     $this->parse('#[@value(function)]');
   }
 
-  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Parse error/')]
+  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Syntax error/')]
   public function function_without_body() {
     $this->parse('#[@value(function())]');
   }
 
-  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Parse error/')]
+  #[@test, @expect(class= 'lang.ClassFormatException', withMessage= '/In `.+`: Syntax error/')]
   public function function_without_closing_curly() {
     $this->parse('#[@value(function() {)]');
   }

src/test/php/net/xp_framework/unittest/core/NewInstanceTest.class.php

@@ -147,7 +147,7 @@ public function missingMethodImplementationFatals() {
     ');
     $this->assertEquals(255, $r[0], 'exitcode');
     $this->assertTrue(
-      (bool)strstr($r[1].$r[2], 'Fatal error:'),
+      (bool)strstr($r[1].$r[2], 'Fatal error'),
       \xp::stringOf(['out' => $r[1], 'err' => $r[2]])
     );
   }
@@ -159,7 +159,7 @@ public function syntaxErrorFatals() {
     ');
     $this->assertEquals(255, $r[0], 'exitcode');
     $this->assertTrue(
-      (bool)strstr($r[1].$r[2], 'Parse error:'),
+      (bool)strstr($r[1].$r[2], 'Parse error'),
       \xp::stringOf(['out' => $r[1], 'err' => $r[2]])
     );
   }

tools/class-main.php

@@ -1,22 +1,24 @@
 <?php
 
-define('EPREPEND_IDENTIFIER', "\356\277\277");
 if (version_compare(PHP_VERSION, '5.4.0', '<')) {
   trigger_error('This version of the XP Framework requires PHP 5.4.0+, have PHP '.PHP_VERSION.PHP_EOL, E_USER_ERROR);
   exit(0x3d);
 }
 
-// {{{ internal string __output(string buf)
-//     Output handler. Checks for fatal errors
-function __output($buf) {
-  if (false === ($s= strpos($buf, EPREPEND_IDENTIFIER))) return $buf;
-  $l= strlen(EPREPEND_IDENTIFIER);
-  $e= strpos($buf, EPREPEND_IDENTIFIER, $s + $l);
-  $message= trim(substr($buf, $s + $l, $e - $l));
-  fputs(STDOUT, substr($buf, 0, $s));
-  fputs(STDERR, create(new Error($message))->toString());
-  fputs(STDOUT, substr($buf, $e + $l));
-  return '';
+// {{{ internal void __fatal
+function __fatal() {
+  static $types= array(
+    E_ERROR         => 'Fatal error',
+    E_USER_ERROR    => 'Fatal error',
+    E_PARSE         => 'Parse error',
+    E_COMPILE_ERROR => 'Compile error'
+  );
+
+  $e= error_get_last();
+  if (null !== $e && isset($types[$e['type']])) {
+    __error($e['type'], $e['message'], $e['file'], $e['line']);
+    create(new Error($types[$e['type']]))->printStackTrace();
+  }
 }
 // }}}
 
@@ -62,10 +64,9 @@ function __except($e) {
   }
 }
 
-ini_set('error_prepend_string', EPREPEND_IDENTIFIER);
-ini_set('error_append_string', EPREPEND_IDENTIFIER);
+ini_set('display_errors', 'false');
 set_exception_handler('__except');
-ob_start('__output');
+register_shutdown_function('__fatal');
 
 try {
   exit(\lang\XPClass::forName($argv[0])->getMethod('main')->invoke(null, array(array_slice($argv, 1))));