X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fnikic%2Fphp-parser%2Ftest%2FPhpParser%2FBuilder%2FParamTest.php;fp=vendor%2Fnikic%2Fphp-parser%2Ftest%2FPhpParser%2FBuilder%2FParamTest.php;h=d33189212ebec4f678f3c5233a71cff65105fc6b;hp=e67ae99f2164435004bc3873bed2268c5b82f970;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0

diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
index e67ae99f2..d33189212 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
@@ -1,12 +1,13 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar;
+use PHPUnit\Framework\TestCase;
 
-class ParamTest extends \PHPUnit_Framework_TestCase
+class ParamTest extends TestCase
 {
     public function createParamBuilder($name) {
         return new Param($name);
@@ -25,42 +26,42 @@ class ParamTest extends \PHPUnit_Framework_TestCase
     }
 
     public function provideTestDefaultValues() {
-        return array(
-            array(
+        return [
+            [
                 null,
                 new Expr\ConstFetch(new Node\Name('null'))
-            ),
-            array(
+            ],
+            [
                 true,
                 new Expr\ConstFetch(new Node\Name('true'))
-            ),
-            array(
+            ],
+            [
                 false,
                 new Expr\ConstFetch(new Node\Name('false'))
-            ),
-            array(
+            ],
+            [
                 31415,
                 new Scalar\LNumber(31415)
-            ),
-            array(
+            ],
+            [
                 3.1415,
                 new Scalar\DNumber(3.1415)
-            ),
-            array(
+            ],
+            [
                 'Hallo World',
                 new Scalar\String_('Hallo World')
-            ),
-            array(
-                array(1, 2, 3),
-                new Expr\Array_(array(
+            ],
+            [
+                [1, 2, 3],
+                new Expr\Array_([
                     new Expr\ArrayItem(new Scalar\LNumber(1)),
                     new Expr\ArrayItem(new Scalar\LNumber(2)),
                     new Expr\ArrayItem(new Scalar\LNumber(3)),
-                ))
-            ),
-            array(
-                array('foo' => 'bar', 'bar' => 'foo'),
-                new Expr\Array_(array(
+                ])
+            ],
+            [
+                ['foo' => 'bar', 'bar' => 'foo'],
+                new Expr\Array_([
                     new Expr\ArrayItem(
                         new Scalar\String_('bar'),
                         new Scalar\String_('foo')
@@ -69,13 +70,13 @@ class ParamTest extends \PHPUnit_Framework_TestCase
                         new Scalar\String_('foo'),
                         new Scalar\String_('bar')
                     ),
-                ))
-            ),
-            array(
+                ])
+            ],
+            [
                 new Scalar\MagicConst\Dir,
                 new Scalar\MagicConst\Dir
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -95,38 +96,37 @@ class ParamTest extends \PHPUnit_Framework_TestCase
             $type = $type->type;
         }
 
-        if ($expectedType instanceof Node\Name) {
-            $this->assertInstanceOf(get_class($expectedType), $type);
-            $this->assertEquals($expectedType, $type);
-        } else {
-            $this->assertSame($expectedType, $type);
-        }
+        $this->assertInstanceOf(get_class($expectedType), $type);
+        $this->assertEquals($expectedType, $type);
     }
 
     public function provideTestTypeHints() {
-        return array(
-            array('array', 'array'),
-            array('callable', 'callable'),
-            array('bool', 'bool'),
-            array('int', 'int'),
-            array('float', 'float'),
-            array('string', 'string'),
-            array('iterable', 'iterable'),
-            array('object', 'object'),
-            array('Array', 'array'),
-            array('CALLABLE', 'callable'),
-            array('Some\Class', new Node\Name('Some\Class')),
-            array('\Foo', new Node\Name\FullyQualified('Foo')),
-            array('self', new Node\Name('self')),
-            array('?array', new Node\NullableType('array')),
-            array('?Some\Class', new Node\NullableType(new Node\Name('Some\Class'))),
-            array(new Node\Name('Some\Class'), new Node\Name('Some\Class')),
-            array(new Node\NullableType('int'), new Node\NullableType('int')),
-            array(
+        return [
+            ['array', new Node\Identifier('array')],
+            ['callable', new Node\Identifier('callable')],
+            ['bool', new Node\Identifier('bool')],
+            ['int', new Node\Identifier('int')],
+            ['float', new Node\Identifier('float')],
+            ['string', new Node\Identifier('string')],
+            ['iterable', new Node\Identifier('iterable')],
+            ['object', new Node\Identifier('object')],
+            ['Array', new Node\Identifier('array')],
+            ['CALLABLE', new Node\Identifier('callable')],
+            ['Some\Class', new Node\Name('Some\Class')],
+            ['\Foo', new Node\Name\FullyQualified('Foo')],
+            ['self', new Node\Name('self')],
+            ['?array', new Node\NullableType(new Node\Identifier('array'))],
+            ['?Some\Class', new Node\NullableType(new Node\Name('Some\Class'))],
+            [new Node\Name('Some\Class'), new Node\Name('Some\Class')],
+            [
+                new Node\NullableType(new Node\Identifier('int')),
+                new Node\NullableType(new Node\Identifier('int'))
+            ],
+            [
                 new Node\NullableType(new Node\Name('Some\Class')),
                 new Node\NullableType(new Node\Name('Some\Class'))
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -139,7 +139,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \LogicException
-     * @expectedExceptionMessage Type must be a string, or an instance of Name or NullableType
+     * @expectedExceptionMessage Type must be a string, or an instance of Name, Identifier or NullableType
      */
     public function testInvalidTypeError() {
         $this->createParamBuilder('test')->setTypeHint(new \stdClass);
@@ -152,7 +152,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase
         ;
 
         $this->assertEquals(
-            new Node\Param('test', null, null, true),
+            new Node\Param(new Expr\Variable('test'), null, null, true),
             $node
         );
     }
@@ -164,7 +164,7 @@ class ParamTest extends \PHPUnit_Framework_TestCase
         ;
 
         $this->assertEquals(
-            new Node\Param('test', null, null, false, true),
+            new Node\Param(new Expr\Variable('test'), null, null, false, true),
             $node
         );
     }