Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / psy / psysh / test / CodeCleaner / FunctionContextPassTest.php

diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php
similarity index 51%
rename from vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php
rename to vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php
index 2dd89043177fdb3528c03289a9fd4cd060fe8c42..851eb2284eb3f19e764dfe78b8d0172a8fe5b396 100644 (file)
--- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/FunctionContextPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/FunctionContextPassTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2017 Justin Hileman
+ * (c) 2012-2018 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,16 +11,13 @@
 
 namespace Psy\Test\CodeCleaner;
 
-use PhpParser\NodeTraverser;
 use Psy\CodeCleaner\FunctionContextPass;
 
 class FunctionContextPassTest extends CodeCleanerTestCase
 {
     public function setUp()
     {
-        $this->pass      = new FunctionContextPass();
-        $this->traverser = new NodeTraverser();
-        $this->traverser->addVisitor($this->pass);
+        $this->setPass(new FunctionContextPass());
     }
 
     /**
@@ -28,19 +25,16 @@ class FunctionContextPassTest extends CodeCleanerTestCase
      */
     public function testProcessStatementPasses($code)
     {
-        $stmts = $this->parse($code);
-        $this->traverser->traverse($stmts);
-
-        // @todo a better thing to assert here?
+        $this->parseAndTraverse($code);
         $this->assertTrue(true);
     }
 
     public function validStatements()
     {
-        return array(
-            array('function foo() { yield; }'),
-            array('if (function(){ yield; })'),
-        );
+        return [
+            ['function foo() { yield; }'],
+            ['if (function(){ yield; })'],
+        ];
     }
 
     /**
@@ -49,19 +43,14 @@ class FunctionContextPassTest extends CodeCleanerTestCase
      */
     public function testInvalidYield($code)
     {
-        if (version_compare(PHP_VERSION, '5.4', '<')) {
-            $this->markTestSkipped();
-        }
-
-        $stmts = $this->parse($code);
-        $this->traverser->traverse($stmts);
+        $this->parseAndTraverse($code);
     }
 
     public function invalidYieldStatements()
     {
-        return array(
-            array('yield'),
-            array('if (yield)'),
-        );
+        return [
+            ['yield'],
+            ['if (yield)'],
+        ];
     }
 }