diff --git a/lib/SimpleSAML/Utils/XML.php b/lib/SimpleSAML/Utils/XML.php index 992b1c4bc1bd6f034c419b5e451c52463cc86b66..c9b206a141c1b3d7ad6441397fc61d34050cdad7 100644 --- a/lib/SimpleSAML/Utils/XML.php +++ b/lib/SimpleSAML/Utils/XML.php @@ -404,7 +404,7 @@ class XML */ public static function isValid($xml, string $schema) { - if (!is_string($xml) && ! ($xml instanceof DOMDocument)) { + if (!is_string($xml) && !($xml instanceof DOMDocument)) { throw new \InvalidArgumentException('Invalid input parameters.'); } diff --git a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php index fe354e3adc89ff11081b64959cfadafb45fa9b2a..5558e12e66e0525f44311d7c14432794ca9a36d9 100644 --- a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php +++ b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php @@ -76,7 +76,10 @@ class SessionHandlerPHPTest extends ClearStateTestCase $headers = xdebug_get_headers(); $this->assertStringContainsString('SimpleSAML=1;', $headers[0]); - $this->assertMatchesRegularExpression('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[0]); + $this->assertMatchesRegularExpression( + '/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', + $headers[0] + ); $this->assertMatchesRegularExpression('/\b[Pp]ath=\/ourPath(;|$)/', $headers[0]); $this->assertMatchesRegularExpression('/\b[Dd]omain=example.com(;|$)/', $headers[0]); $this->assertMatchesRegularExpression('/\b[Ss]ecure(;|$)/', $headers[0]); diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php index 2fc35c22c61697e0f505f86070716cdcc88de122..0b497123ec61702db233d763804c65fe3fdf35e8 100644 --- a/tests/lib/SimpleSAML/Utils/HTTPTest.php +++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php @@ -488,7 +488,10 @@ class HTTPTest extends ClearStateTestCase $this->assertMatchesRegularExpression('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[0]); $this->assertStringContainsString('RawCookie=value%20;', $headers[1]); - $this->assertMatchesRegularExpression('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[1]); + $this->assertMatchesRegularExpression( + '/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', + $headers[1] + ); $this->assertMatchesRegularExpression('/\b[Pp]ath=\/ourPath(;|$)/', $headers[1]); $this->assertMatchesRegularExpression('/\b[Dd]omain=example.com(;|$)/', $headers[1]); $this->assertMatchesRegularExpression('/\b[Ss]ecure(;|$)/', $headers[1]); diff --git a/www/_include.php b/www/_include.php index eabeef4cfa471c588c1e09fe858246a586688c4c..c2da85ae2935983c9832ecb74a6b630e24e9a3a9 100644 --- a/www/_include.php +++ b/www/_include.php @@ -25,8 +25,13 @@ function SimpleSAML_exception_handler($exception) set_exception_handler('SimpleSAML_exception_handler'); // log full backtrace on errors and warnings -function SimpleSAML_error_handler($errno, $errstr, $errfile = null, $errline = 0, /** @scrutinizer ignore-unused */ $errcontext = null) -{ +function SimpleSAML_error_handler( + $errno, + $errstr, + $errfile = null, + $errline = 0, + /** @scrutinizer ignore-unused */ $errcontext = null +) { if (\SimpleSAML\Logger::isErrorMasked($errno)) { // masked error return false;