diff --git a/.htaccess b/.htaccess index fd7bd29..856fd32 100644 --- a/.htaccess +++ b/.htaccess @@ -39,6 +39,14 @@ AddEncoding gzip svgz php_value mbstring.http_input pass php_value mbstring.http_output pass php_flag mbstring.encoding_translation off + + # Assertions. + # By default PHP has these turned on. Production sites should turn these off. + # While assertions can be turned off at run time, we need to have this setting + # in place immediately to catch an assertions thrown before the settings file + # can be loaded. + php_value assert.active 1 + # To enable them, change 0 to 1. Recommended for dev sites. # Requires mod_expires to be enabled. diff --git a/core/lib/Drupal/Component/Fault/Assertion.php b/core/lib/Drupal/Component/Fault/Assertion.php new file mode 100644 index 0000000..743fbd3 --- /dev/null +++ b/core/lib/Drupal/Component/Fault/Assertion.php @@ -0,0 +1,109 @@ +errorLocation['line'] + . ' in file ' + . $this->errorLocation['file'] + . ' -- asserted: ' + . $this->code + . ' -- comment: ' . $this->message; + } + + /** + * Implements BaseFaultHandler::verboseResponse. + */ + protected function verboseResponse() { + $this->printHtmlStart(); ?> + + +

Assertion Failure

+
+ code) : +?> +

Assertion: code; ?>

+ + WARNING: The Assert statement was passed a non-string + value. Whatever expression was sent to it will be evaluated regardless of + whether assert functions are turned on or off. In order to preserve system + efficiency it is imperative that you encapsulate the expression in a string + to be evaluated by assert rather than passing an expression to it. + +

Comment: message; ?>

+ reference['error']) : +?> +

Reference: reference['error'] ?>

+ +
+

Failure Location

+

File: errorLocation['file']; ?>

+

Line: errorLocation['line']; ?>

+ errorLocation['class']) : +?> +

Class: + + errorLocation['class']; ?> + +

+

Method: + + errorLocation['method']; ?> + +

+ errorLocation['method']) : +?> +

Function: + + errorLocation['method'] ?> + +

+ +

Global Scope

+ +
+

Stack Trace

+ + trace); ?> + trace as &$level) { + unset($level['args']); + } + var_dump($this->trace); +endif; ?> + + '', + 'line' => '', + 'class' => '', + 'method' => '' + ]; + + /** + * Reference information for the fault. + */ + protected $reference = [ + 'error' => '', + 'class' => '', + 'method' => '' + ]; + + /** + * Fault code. + */ + protected $code; + + /** + * Fault message. + */ + protected $message; + + /** + * Fault backtrace. + */ + protected $trace; + + /** + * The verbose HTML response method. + */ + abstract protected function verboseResponse(); + + /** + * The log message string for the Fault. + */ + abstract protected function composeLogEntry(); + + /** + * Return a Fault Response object. + * + * The FaultSetup class does the favor of normalizing the argument order from + * the three possible. + */ + public function __construct($file, $line, $code, $message, $trace, $option = NULL) { + // Remember that raising an assertion while evaluating an assertion will + // cause a segmentation fault in the PHP engine. This assertion however + // cannot be fulfilled by a call under that circumstance UNLESS invoked + // by a handle function other than the one in FaultSetup. + assert('\\Drupal\\Component\\Fault\\Assertion::validCaller()', 'This class can only be used by other classes in the Fault Component'); + + // Find Drupal root from here - we don't know if DRUPAL_ROOT is defined. + $this->root = dirname(dirname(dirname(dirname(dirname(__DIR__))))); + + // Remove the root from the error file string to reduce verbosity. There is + // no security advantage in doing this. + $this->errorLocation['file'] = substr($file, strlen($this->root)); + + // This maps straightforwardly. + $this->errorLocation['line'] = $line; + + // For assertions 'code' means the PHP string of code that evaluated to + // 'false' and triggered the assert failure. For errors and exceptions this + // is an error code with an associated PHP constant such as E_ERROR. + $this->code = $code; + + // Parse out the trace to find the class and method location of the + // fault and remove the section of the trace from this namespace. + $this->parseTrace($trace, $file, $line); + + // Now break down the error message string, extracting any reference link + // that it might contain at its start. + $this->parseMessage($message); + + } + + /** + * Parse out any link at the start of the message. + */ + protected function parseMessage($message) { + + // First look for http which indicates the author of the fault throw has + // a page in mind to show explaining what's going on - this will occur for + // third party modules. + if (strpos($message, 'http') === 0) { + $this->reference['error'] = substr($message, 0, strpos($message, ' ')); + $this->message = substr($message, strpos($message, ' ') + 1); + } + // API: which is shorthand for the online api reference. + elseif (strpos($message, 'api://') === 0) { + $this->reference['error'] = str_replace('api://', static::API, substr($message, 0, strpos($message, ' '))); + $this->message = substr($message, strpos($message, ' ') + 1); + } + // node: which is shorthand for a drupal issue node. + elseif (strpos($message, 'node://') === 0) { + $this->reference['error'] = str_replace('node://', 'http://www.drupal.org/node/', substr($message, 0, strpos($message, ' '))); + $this->message = substr($message, strpos($message, ' ') + 1); + } + // At this point we presume that there is no error link to present, so pass + // along whatever message we got. + else { + $this->message = $message; + } + } + + /** + * Make sure the backtrace starts from the class and method of the fault. + */ + protected function parseTrace(array $trace, $file, $line) { + + // Traverse the stack until we find the error point. + // Works with assertion, need to test for exceptions and errors. + while ($frame = array_shift($trace)) { + if (isset($frame['file']) && isset($frame['line']) && $frame['file'] === $file && $frame['line'] === $line) { + break; + } + } + + // Now set the pointers to the class and method of the fault. + if (count($trace) > 0) { + if (isset($trace[0]['class'])) { + $this->errorLocation['class'] = $trace[0]['class']; + } + $this->errorLocation['method'] = $trace[0]['function']; + } + + // Assemble the path to the API page for the class and method of the fault. + if ($this->errorLocation['class']) { + $this->reference['class'] = $this->getApiPageForClass($this->errorLocation['file'], $this->errorLocation['class']); + $this->reference['method'] = $this->getApiPageForMethod($this->errorLocation['file'], $this->errorLocation['class'], $this->errorLocation['method']); + } + // Or just the method. + else { + $this->reference['method'] = $this->getApiPageForFunction($file, $function); + } + + $this->trace = $trace; + + } + + /** + * Return the Drupal API path for a class. + */ + protected function getApiPageForClass($file, $class) { + return static::API + . str_replace("/", '!', $file) + . '/class/' . $class . '/8'; + } + + /** + * Return the Drupal API path for a method. + */ + protected function getApiPageForMethod($file, $class, $method) { + return static::API + . str_replace("/", '!', $file) + . '/function/' . $class + . '%3A%3A' . $method . '/8'; + } + + /** + * Return the Drupal API path for a function. + */ + protected function getApiPageForFunction($file, $function) { + return static::API + . str_replace("/", '!', $file) + . '/function/' . $function . '/8'; + } + + /** + * Resolve the fault. + */ + public function resolve() { + $this->clearBuffers(); + $this->log(); + + if ($this->isXmlHttpRequest()) { + $this->jsonRespond(); + } + elseif (PHP_SAPI === 'cli' && !isset($_SERVER['DRUPAL_FAULT_COMPONENT_IN_TEST_MODE'])) { + $this->terminalRespond(); + } + else { + $this->htmlRespond(); + } + } + + /** + * Send Fault response to a Javascript. + */ + protected function jsonRespond() { + $this->sendHeaders('application/json; charset=utf-8'); + echo $this->composeLogEntry(); + } + + /** + * Send the terminal response directly to stdout. + */ + protected function terminalRespond() { + $stdout = fopen('php://stdout', 'w'); + fwrite($stdout, $this->composeLogEntry()); + fclose($stout); + } + + /** + * Log the error both to the PHP engine log and to the system log. + */ + protected function log() { + if (!isset($_SERVER['DRUPAL_FAULT_COMPONENT_IN_TEST_MODE'])) { + $entry = addslashes($this->composeLogEntry()); + openlog('Drupal 8', LOG_PERROR, LOG_USER); + syslog(LOG_ERR, $entry); + closelog(); + error_log($entry); + } + } + + /** + * Determine if this script was requested by Javascript. + */ + protected function isXmlHttpRequest() { + return (isset($_SERVER) && isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'); + } + + /** + * Clear and disable the output buffers if not testing. + */ + protected function clearBuffers() { + if (!isset($_SERVER['DRUPAL_FAULT_COMPONENT_IN_TEST_MODE'])) { + while (@ob_get_level()) { + @ob_end_clean(); + } + } + } + + /** + * Respond to a fault encountered while processing an HTTP request for HTML. + */ + protected function htmlRespond() { + + $this->sendHeaders('text/html; charset=utf-8'); + + // PHP's error display level determines how much information we give. + if (ini_get('display_errors')) { + $this->verboseResponse(); + } + else { + $this->quietResponse(); + } + } + + /** + * A quiet response. + * + * Since, in theory, faults can happen in production, the developer can + * provide an html file to be displayed in place of the system default. It + * must be an HTML file - in order to prevent further errors we load the file + * with file_get_contents and echo out whatever is in it. + */ + protected function quietResponse() { + + $template = FaultSetup::getQuietResponseHtml(); + + if ($template) { + print (file_get_contents($template)); + } + else { + $this->printHtmlStart(); + print << +

System Error

+

The system has encountered an error and the administrator has configured + the server not to publicly report the nature of the error, though it has + been logged.

+ + +HTML; + } + } + + /** + * The start of an HTML response. + */ + protected function printHtmlStart() { + echo << + + + System Error + + +HTML; + + } + + /** + * Send the correct response headers for a fault response. + */ + protected function sendHeaders($type) { + if (headers_sent()) { + return; + } + + header('Content-Type: ' . $type); + + // Somewhat redundant - browsers shouldn't cache 500 class responses anyway. + header("Cache-Control: no-cache, must-revalidate"); + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); + + // Status return. + header($_SERVER["SERVER_PROTOCOL"] . " 503 Service Unavailable"); + + } + +} diff --git a/core/lib/Drupal/Component/Fault/FaultException.php b/core/lib/Drupal/Component/Fault/FaultException.php new file mode 100644 index 0000000..dd8538b --- /dev/null +++ b/core/lib/Drupal/Component/Fault/FaultException.php @@ -0,0 +1,12 @@ +resolve(); + } + + /** + * Get the HTML for a quiet response. + */ + public static function getQuietResponseHtml() { + return static::$html; + } + + /** + * Set the HTML file path for a quiet response. + */ + public static function setQuietResponseHtml($html) { + assert('file_exists($html)', 'Invalid File'); + static::$html = $html; + } + +} diff --git a/core/lib/Drupal/Component/Fault/sad-droop.svg b/core/lib/Drupal/Component/Fault/sad-droop.svg new file mode 100644 index 0000000..f9bcfb2 --- /dev/null +++ b/core/lib/Drupal/Component/Fault/sad-droop.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/core/tests/Drupal/Tests/AssertionException.php b/core/tests/Drupal/Tests/AssertionException.php new file mode 100644 index 0000000..c459f4d --- /dev/null +++ b/core/tests/Drupal/Tests/AssertionException.php @@ -0,0 +1,13 @@ +startAssertionHandling(); + * parent::setUp(); + * } + * @endcode + */ +trait AssertionTestingTrait { + + /** + * Flag assertion handler to throw an exception on raise, ending the test. + */ + protected $dieOnRaise = FALSE; + + /** + * Collections of captured assertions. + */ + protected $assertionsRaised = []; + + /** + * Errors Expected. + * + * This flag prevents the tearDown from checking for unaccounted assertions. + * after an error throw. + */ + protected $thereWillBeErrors = FALSE; + + /** + * Callback handler for assert raises during testing. + */ + public function assertCallbackHandle($file, $line, $code, $message) { + + // We print out this warning during test development, and since the + // automated tests run in strict mode it will cause a test failure. + if (!$code) { + print ('Assertions should always be strings! Even though PHP permits + other argument types, those arguments will be evaluated which causes + a loss of performance.'); + } + + // Usually we want to let the code continue evaluating as it is going to + // do when assertions are turned off just to make sure the code doesn't + // enter a fatal condition. However, some assertions are guarding against + // Fatal conditions anyway and there will be no way to recover from these + // failures. When testing these assertions, set the dieOnRaise flag which + // causes the exception throw here. + if ($this->dieOnRaise) { + throw new AssertionException($message); + } + + // Otherwise we log the assertion as thrown and let the code continue. + // However, be aware we assert that this array is empty during tear down. + // If it isn't the test will fail. + $this->assertionsRaised[] = $message; + + // Inform PHP we've successfully completed our handling of the assert fail. + return TRUE; + } + + /** + * Start assertion handling for the test. + */ + protected function startAssertionHandling() { + assert_options(ASSERT_WARNING, FALSE); + assert_options(ASSERT_CALLBACK, [$this, 'assertCallbackHandle']); + $this->assertionsRaised = []; + return false; + } + + /** + * Suspend assertion handling. + */ + protected function suspendAssertionHandling() { + assert_options(ASSERT_WARNING, TRUE); + assert_options(ASSERT_CALLBACK, NULL); + $this->assertionsRaised = []; + } + + /** + * {@inheritdoc} + * + * Drupal Unit test has no tear down and since this trait will most + * frequently be applied to its children we just go ahead and define this + * method. Reminder - if you need to define this method in your test you'll + * need to alias this function when you bind in the trait. + */ + protected function tearDown() { + + // If an error was expected and indeed thrown there will be no chance to + // clear out the assertion log before we reach this function, so set the + // flag to skip the assertions check. + // + // Only use this when testing errors that you are raising yourself with + // trigger error (and that itself should be rare). In other cases go ahead + // and catch the assertion by setting the dieOnRaise flag. + if ($this->thereWillBeErrors) { + $this->assertionsRaised = []; + $this->thereWillBeErrors = FALSE; + } + + $this->assertEmpty($this->assertionsRaised, + 'Unaccounted for assert fails found at test conclusion: ' . implode(', ', $this->assertionsRaised)); + $this->suspendAssertionHandling(); + $this->dieOnRaise = FALSE; + } + + /** + * Check if the assertions specified where raised. + * + * This function can be overloaded. Assertions should be passed in the order + * they are expected to occur. After being accounted for the assertion count + * is reset. + */ + protected function assertAssertionsRaised() { + $this->assertEquals(func_get_args(), $this->assertionsRaised); + $this->assertionsRaised = []; + } + + /** + * Insure no assertions where thrown. Called during teardown, but you may + * wish to call it at other times. + */ + protected function assertAssertionNotRaised() { + $this->assertEmpty($this->assertionsRaised); + } + +} diff --git a/core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php b/core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php new file mode 100644 index 0000000..8d4efc4 --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php @@ -0,0 +1,94 @@ +startAssertionHandling(); + parent::setUp(); + } + + /** + * Test the constructor to make sure it asserts it shouldn't be called. + */ + public function testConstructor() { + // Flag to the AssertionHandler that it is to spit out HTML anyway, leave + // the buffers alone, and not log anything. + $_SERVER['DRUPAL_FAULT_COMPONENT_IN_TEST_MODE'] = TRUE; + + // Turn error display off, see if the Handler goes to silent mode. + ini_set('display_errors', 0); + + // Also test to see if an override will be returned. + FaultSetup::setQuietResponseHtml(dirname(__FILE__) . '/results/assertionHandlerTest4.txt'); + + $response = new AssertionHandler(__FILE__, 42, 'FALSE', 'node://66 test2', [ + [ + 'file' => __FILE__, + 'line' => 42, + 'function' => 'assert', + 'class' => 'Moo', + ], + [ + 'file' => 'check', + 'line' => 12, + 'function' => 'clear', + 'class' => 'Woo' + ] + ]); + $this->assertAssertionsRaised('This class can only be used by other classes in the Fault Component'); + + ob_start(); + $response->resolve(); + $this->assertEquals(trim(file_get_contents(dirname(__FILE__) . '/results/assertionHandlerTest4.txt')), + trim(ob_get_clean()) + ); + + ini_set('display_errors', 1); + + // JSON Response. + $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; + + $response = new AssertionHandler(__FILE__, 42, 'FALSE', 'node://66 test2', [ + [ + 'file' => __FILE__, + 'line' => 42, + 'function' => 'assert', + 'class' => 'Moo', + ], + [ + 'file' => 'check', + 'line' => 12, + 'function' => 'clear', + 'class' => 'Woo' + ] + ]); + $this->assertAssertionsRaised('This class can only be used by other classes in the Fault Component'); + + ob_start(); + $response->resolve(); + $this->assertEquals('Assert Failure line 42 in file /core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php -- asserted: FALSE -- comment: test2', + ob_get_clean() + ); + + } + +} diff --git a/core/tests/Drupal/Tests/Component/Fault/AssertionTest.php b/core/tests/Drupal/Tests/Component/Fault/AssertionTest.php new file mode 100644 index 0000000..10fc90b --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/AssertionTest.php @@ -0,0 +1,215 @@ + 'foo'], + ['function' => 'moo'] + ]); + } + + /** + * Test the throw of an error when the assert is made outside of any function. + * + * @expectedException \Drupal\Component\Fault\FaultException + * + * @expectedExceptionMessage Why are you asserting this in the global namespace??? + */ + public function testValidCallerExceptionNotGlobal() { + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'] + ]); + } + + /** + * Test the analysis of stackframes. + */ + public function testValidCallerAnalysis() { + // Call in same class. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'caller', 'class' => 'A\\B\\C'] + ]) + ); + + // Call in same namespace. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'caller', 'class' => 'A\\B\\D'] + ]) + ); + + // Call in child namespace. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'caller', 'class' => 'A\\B\\D\\E'] + ]) + ); + + // Call in parent namespace. + $this->assertFalse( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'caller', 'class' => 'A\\D'] + ]) + ); + + // Call from global namespace. + $this->assertFalse( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'caller', 'class' => 'D'] + ]) + ); + + // A child class will have to be in the same namepace to function. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'callee', 'class' => 'A\\B\\D'], + ['function' => 'callee', 'class' => 'A\\B\\E'], + ['function' => 'caller', 'class' => 'A\\B\\F'] + ]) + ); + + // Or in a child namespace. The scope governance is that of the class + // making the assertion. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'callee', 'class' => 'A\\B\\D\\E'], + ['function' => 'callee', 'class' => 'A\\B\\F\\G\\E'], + ['function' => 'caller', 'class' => 'A\\B\\F\\G'] + ]) + ); + + // An extender class from a foreign namespace allows calls from the original + // namespace. + $this->assertTrue( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'callee', 'class' => 'A\\D\\E'], + ['function' => 'caller', 'class' => 'A\\B\\F\\G'] + ]) + ); + + // But will not allow calls from a new namespace. + $this->assertFalse( + Assertion::validCaller('', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'callee', 'class' => 'A\\D\\E'], + ['function' => 'caller', 'class' => 'A\\F\\G'] + ]) + ); + + // Test scope argument. + $this->assertTrue( + Assertion::validCaller('A\\F', [ + ['function' => 'foo'], + ['function' => 'assert'], + ['function' => 'callee', 'class' => 'A\\B\\C'], + ['function' => 'callee', 'class' => 'A\\D\\E'], + ['function' => 'caller', 'class' => 'A\\F\\G'] + ]) + ); + + } + + /** + * Test the collectionOf method. + */ + public function testCollectionOf() { + // We don't need a test mock - the internal ArrayObject will work just fine. + $this->assertTrue( + Assertion::collectionOf([ + new ArrayObject(), + new ArrayObject() + ], 'ArrayObject') + ); + + $this->assertFalse( + Assertion::collectionOf([ + new ArrayObject(), + [] + ], 'ArrayObject') + ); + + $this->assertTrue( + Assertion::collectionOf(new ArrayObject([ + new ArrayObject(), + new ArrayObject() + ]), 'ArrayObject') + ); + + $this->assertFalse( + Assertion::collectionOf(new ArrayObject([ + new ArrayObject(), + [] + ]), 'ArrayObject') + ); + + // Non traversables fail. + $this->assertFalse( + Assertion::collectionOf('string', 'ArrayObject') + ); + + $this->assertFalse( + Assertion::collectionOf(new \stdClass(), 'ArrayObject') + ); + + // Empty collections fail. + $this->assertFalse( + Assertion::collectionOf([], 'ArrayObject') + ); + + } + +} diff --git a/core/tests/Drupal/Tests/Component/Fault/FaultSetupTest.php b/core/tests/Drupal/Tests/Component/Fault/FaultSetupTest.php new file mode 100644 index 0000000..79022d4 --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/FaultSetupTest.php @@ -0,0 +1,68 @@ +startAssertionHandling(); + parent::setUp(); + } + + /** + * Test the static start method. + */ + public function testStart() { + // Assertions already on, so the method should detect this and set its + // handler up. It also activates assert_bail. + FaultSetup::start(); + $this->assertEquals(['Drupal\\Component\\Fault\\FaultSetup', 'handleAssert'], assert_options(ASSERT_CALLBACK)); + $this->assertEquals(1, assert_options(ASSERT_BAIL)); + + // Reset and disable assertions momentarily. + assert_options(ASSERT_CALLBACK, NULL); + assert_options(ASSERT_ACTIVE, 0); + + // Now test to see if the method does nothing as it should when assert + // active = 0 + FaultSetup::start(); + $this->assertEquals(0, assert_options(ASSERT_ACTIVE)); + $this->assertEquals(NULL, assert_options(ASSERT_CALLBACK)); + + // Restore test environment defaults. + assert_options(ASSERT_ACTIVE, 1); + assert_options(ASSERT_BAIL, 0); + } + + /** + * Test the assertion that quiet response is receiving a valid file path. + */ + public function testSetQuietResponseHtml() { + FaultSetup::setQuietResponseHtml('not/a/valid/path.html'); + $this->assertAssertionsRaised('Invalid File'); + + // It doesn't test if the file is html, just that it exists, so test + // it against self. + FaultSetup::setQuietResponseHtml(__FILE__); + + // The check that assertions weren't thrown will be done by tear down. + } + +} diff --git a/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest1.txt b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest1.txt new file mode 100644 index 0000000..f92c8b5 --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest1.txt @@ -0,0 +1,63 @@ + + + + System Error + + + +

Assertion Failure

+
+ WARNING: The Assert statement was passed a non-string + value. Whatever expression was sent to it will be evaluated regardless of + whether assert functions are turned on or off. In order to preserve system + efficiency it is imperative that you encapsulate the expression in a string + to be evaluated by assert rather than passing an expression to it. +

Comment: test

+

Reference: http://www.drupal.org

+
+

Failure Location

+

File: /core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php

+

Line: 42

+

Class: + + Woo +

+

Method: + + foo +

+
+

Stack Trace

+ array(1) { + [0] => + array(4) { + 'file' => + string(5) "check" + 'line' => + int(12) + 'function' => + string(3) "foo" + 'class' => + string(3) "Woo" + } +} + + diff --git a/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest2.txt b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest2.txt new file mode 100644 index 0000000..9c27f95 --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest2.txt @@ -0,0 +1,59 @@ + + + + System Error + + + +

Assertion Failure

+
+

Assertion: FALSE

+

Comment: test2

+

Reference: http://www.drupal.org/node/66

+
+

Failure Location

+

File: /core/tests/Drupal/Tests/Component/Fault/AssertionHandlerTest.php

+

Line: 42

+

Class: + + Woo +

+

Method: + + clear +

+
+

Stack Trace

+ array(1) { + [0] => + array(4) { + 'file' => + string(5) "check" + 'line' => + int(12) + 'function' => + string(5) "clear" + 'class' => + string(3) "Woo" + } +} + + diff --git a/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest3.txt b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest3.txt new file mode 100644 index 0000000..0b7b0e9 --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest3.txt @@ -0,0 +1,30 @@ + + + + System Error + + +

System Error

+

The system has encountered an error and the administrator has configured + the server not to publicly report the nature of the error, though it has + been logged.

+ + diff --git a/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest4.txt b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest4.txt new file mode 100644 index 0000000..5539b9a --- /dev/null +++ b/core/tests/Drupal/Tests/Component/Fault/results/assertionHandlerTest4.txt @@ -0,0 +1 @@ +Hello World! diff --git a/core/tests/Drupal/Tests/ToStringMock.php b/core/tests/Drupal/Tests/ToStringMock.php new file mode 100644 index 0000000..eacea64 --- /dev/null +++ b/core/tests/Drupal/Tests/ToStringMock.php @@ -0,0 +1,33 @@ +string = strval($string); + } + + /** + * {@inheritdoc} + */ + public function __toString() { + return $this->string; + } + +} diff --git a/index.php b/index.php index a44e5c5..e4de701 100644 --- a/index.php +++ b/index.php @@ -10,14 +10,16 @@ use Drupal\Core\DrupalKernel; use Drupal\Core\Site\Settings; +use Drupal\Component\Fault\FaultSetup; use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; $autoloader = require_once 'autoload.php'; -try { +FaultSetup::start(); +try { $request = Request::createFromGlobals(); $kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod'); $response = $kernel