diff vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php @ 13:5fb285c0d0e3

Update Drupal core to 8.4.7 via Composer. Security update; I *think* we've
been lucky to get away with this so far, as we don't support self-registration
which seems to be used by the so-called "drupalgeddon 2" attack that 8.4.5
was vulnerable to.

--- a/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php	Mon Apr 23 09:33:26 2018 +0100
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Parser;
 
@@ -11,7 +11,8 @@
 
 require_once __DIR__ . '/../ParserTest.php';
 
-class MultipleTest extends ParserTest {
+class MultipleTest extends ParserTest
+{
     // This provider is for the generic parser tests, just pick an arbitrary order here
     protected function getParser(Lexer $lexer) {
         return new Multiple([new Php5($lexer), new Php7($lexer)]);
@@ -59,9 +60,9 @@
                 '<?php $$a[0];',
                 $this->getPrefer5(),
                 [
-                    new Expr\Variable(
+                    new Stmt\Expression(new Expr\Variable(
                         new Expr\ArrayDimFetch(new Expr\Variable('a'), LNumber::fromString('0'))
-                    )
+                    ))
                 ]
             ],
             [
@@ -69,26 +70,27 @@
                 '<?php $$a[0];',
                 $this->getPrefer7(),
                 [
-                    new Expr\ArrayDimFetch(
+                    new Stmt\Expression(new Expr\ArrayDimFetch(
                         new Expr\Variable(new Expr\Variable('a')), LNumber::fromString('0')
-                    )
+                    ))
                 ]
             ],
         ];
     }
 
     public function testThrownError() {
-        $this->setExpectedException('PhpParser\Error', 'FAIL A');
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('FAIL A');
 
-        $parserA = $this->getMockBuilder('PhpParser\Parser')->getMock();
+        $parserA = $this->getMockBuilder(\PhpParser\Parser::class)->getMock();
         $parserA->expects($this->at(0))
             ->method('parse')->will($this->throwException(new Error('FAIL A')));
 
-        $parserB = $this->getMockBuilder('PhpParser\Parser')->getMock();
+        $parserB = $this->getMockBuilder(\PhpParser\Parser::class)->getMock();
         $parserB->expects($this->at(0))
             ->method('parse')->will($this->throwException(new Error('FAIL B')));
 
         $parser = new Multiple([$parserA, $parserB]);
         $parser->parse('dummy');
     }
-}
\ No newline at end of file
+}