Upgrade to PhpUnit 8 and remove webmozart/asserts again

Author: alexander-schranz

.travis.yml

@@ -33,6 +33,6 @@ before_script:
     - bash tests/bin/travis_jackrabbit.sh
 
 script:
-  - vendor/bin/simple-phpunit
+  - vendor/bin/phpunit
   - php vendor/bin/phpspec run
   - php vendor/behat/behat/bin/behat --suite=$BEHAT_SUITE

phpunit.xml.dist

@@ -6,10 +6,6 @@
     bootstrap="vendor/autoload.php"
     >
 
-    <php>
-        <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
-    </php>
-
     <testsuites>
         <testsuite name="PHPCR Shell Test Suite">
             <directory>./tests</directory>

src/PHPCR/Shell/Test/CliContext.php

@@ -15,6 +15,7 @@
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;
+use PHPUnit\Framework\Assert;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
@@ -112,6 +113,6 @@ public function initializeDoctrineDbal()
      */
     public function theCommandShouldNotFail()
     {
-        \PHPUnit_Framework_Assert::assertEquals(0, $this->lastExitCode);
+        Assert::assertEquals(0, $this->lastExitCode);
     }
 }

src/PHPCR/Shell/Test/ContextBase.php

@@ -24,6 +24,7 @@
 use PHPCR\SimpleCredentials;
 use PHPCR\Util\NodeHelper;
 use PHPCR\Util\PathHelper;
+use PHPUnit\Framework\Assert;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
@@ -199,7 +200,7 @@ public function iShouldSeeATableContainingTheFollowingRows(TableNode $table)
             }
         }
 
-        \PHPUnit_Framework_Assert::assertGreaterThanOrEqual(count($expectedRows), $foundRows, $this->getOutput());
+        Assert::assertGreaterThanOrEqual(count($expectedRows), $foundRows, $this->getOutput());
     }
 
     /**
@@ -208,7 +209,7 @@ public function iShouldSeeATableContainingTheFollowingRows(TableNode $table)
     public function iShouldSeeTheFollowing(PyStringNode $string)
     {
         $output = $this->getOutput();
-        \PHPUnit_Framework_Assert::assertContains($string->getRaw(), $output);
+        Assert::assertContains($string->getRaw(), $output);
     }
 
     /**
@@ -217,7 +218,7 @@ public function iShouldSeeTheFollowing(PyStringNode $string)
     public function iShouldNotSeeTheFollowing(PyStringNode $string)
     {
         $output = $this->getOutput();
-        \PHPUnit_Framework_Assert::assertNotContains($string->getRaw(), $output);
+        Assert::assertNotContains($string->getRaw(), $output);
     }
 
     /**
@@ -248,7 +249,7 @@ public function theCommandShouldNotFail()
             throw new \Exception('Command failed: ('.$exitCode.') '.$this->getOutput());
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(0, $exitCode, 'Command exited with code: '.$exitCode);
+        Assert::assertEquals(0, $exitCode, 'Command exited with code: '.$exitCode);
     }
 
     /**
@@ -258,7 +259,7 @@ public function theCommandShouldFail()
     {
         $exitCode = $this->applicationTester->getLastExitCode();
 
-        \PHPUnit_Framework_Assert::assertNotEquals(0, $exitCode, 'Command exited with code '.$exitCode);
+        Assert::assertNotEquals(0, $exitCode, 'Command exited with code '.$exitCode);
     }
 
     /**
@@ -269,15 +270,15 @@ public function theCommandShouldFailWithMessage($arg1)
         $exitCode = $this->applicationTester->getLastExitCode();
         $output = $this->getOutput();
 
-        \PHPUnit_Framework_Assert::assertEquals($arg1, $output);
+        Assert::assertEquals($arg1, $output);
     }
 
     /**
      * @Given /^the file "([^"]*)" should exist$/
      */
     public function theFileShouldExist($arg1)
     {
-        \PHPUnit_Framework_Assert::assertTrue(file_exists($this->getWorkingFilePath($arg1)));
+        Assert::assertTrue(file_exists($this->getWorkingFilePath($arg1)));
     }
 
     /**
@@ -304,7 +305,7 @@ public function theFileExists($arg1)
     public function theOutputShouldContain(PyStringNode $string)
     {
         foreach ($string->getStrings() as $line) {
-            \PHPUnit_Framework_Assert::assertContains($line, $this->getOutput());
+            Assert::assertContains($line, $this->getOutput());
         }
     }
 
@@ -315,7 +316,7 @@ public function theNodeShouldNotExist($arg1)
     {
         $session = $this->getSession();
         $node = $session->getNode($arg1);
-        \PHPUnit_Framework_Assert::assertNull($node);
+        Assert::assertNull($node);
     }
 
     /**
@@ -326,7 +327,7 @@ public function theXpathCountIsInFile($arg1, $arg2, $arg3)
         $xpath = $this->getXPathForFile($arg3);
         $res = $xpath->query($arg1);
 
-        \PHPUnit_Framework_Assert::assertEquals($arg2, $res->length);
+        Assert::assertEquals($arg2, $res->length);
     }
 
     /**
@@ -363,7 +364,7 @@ public function iShouldNotBeLoggedIntoTheSession()
     {
         $this->executeCommand('session:info');
         $output = $this->getOutput();
-        \PHPUnit_Framework_Assert::assertRegExp('/live .*no/', $output);
+        Assert::assertRegExp('/live .*no/', $output);
     }
 
     /**
@@ -427,7 +428,7 @@ public function thereShouldExistANodeAtBefore($arg1, $arg2)
             throw new \Exception('Could not find child node '.$arg1);
         }
 
-        \PHPUnit_Framework_Assert::assertEquals($arg2, $afterNode->getPath());
+        Assert::assertEquals($arg2, $afterNode->getPath());
     }
 
     /**
@@ -530,7 +531,7 @@ public function thenIShouldBeLoggedInAs($arg1)
         $session = $this->getSession();
         $userId = $session->getUserID();
 
-        \PHPUnit_Framework_Assert::assertEquals($userId, $arg1);
+        Assert::assertEquals($userId, $arg1);
     }
 
     /**
@@ -690,7 +691,7 @@ public function theCurrentNodeShouldBe($arg1)
     {
         $this->executeCommand('shell:path:show');
         $cnp = $this->applicationTester->getLastLine();
-        \PHPUnit_Framework_Assert::assertEquals($arg1, $cnp, 'Current path is '.$arg1);
+        Assert::assertEquals($arg1, $cnp, 'Current path is '.$arg1);
     }
 
     /**
@@ -728,7 +729,7 @@ public function thePrimaryTypeOfShouldBe($arg1, $arg2)
         $session = $this->getSession();
         $node = $session->getNode($arg1);
         $primaryTypeName = $node->getPrimaryNodeType()->getName();
-        \PHPUnit_Framework_Assert::assertEquals($arg2, $primaryTypeName, 'Node type of '.$arg1.' is '.$arg2);
+        Assert::assertEquals($arg2, $primaryTypeName, 'Node type of '.$arg1.' is '.$arg2);
     }
 
     /**
@@ -745,7 +746,7 @@ public function theNodeAtShouldHaveThePropertyWithValue($arg1, $arg2, $arg3)
             $propertyValue = $propertyValue->getIdentifier();
         }
 
-        \PHPUnit_Framework_Assert::assertEquals($arg3, $propertyValue);
+        Assert::assertEquals($arg3, $propertyValue);
     }
 
     /**
@@ -761,7 +762,7 @@ public function theNodeAtShouldHaveThePropertyWithValueAtIndex($arg1, $arg2, $ar
         }
 
         $propertyType = $property->getValue();
-        \PHPUnit_Framework_Assert::assertEquals($arg3, $propertyType[$index]);
+        Assert::assertEquals($arg3, $propertyType[$index]);
     }
 
     /**
@@ -777,7 +778,7 @@ public function thePropertyShouldHaveType($arg1, $arg2)
             ));
         }
 
-        \PHPUnit_Framework_Assert::assertEquals($arg2, PropertyType::nameFromValue($property->getType()));
+        Assert::assertEquals($arg2, PropertyType::nameFromValue($property->getType()));
     }
 
     /**
@@ -793,8 +794,8 @@ public function thePropertyShouldHaveTypeAndValue($arg1, $arg2, $arg3)
             ));
         }
 
-        \PHPUnit_Framework_Assert::assertEquals($arg2, PropertyType::nameFromValue($property->getType()));
-        \PHPUnit_Framework_Assert::assertEquals($arg3, $property->getValue());
+        Assert::assertEquals($arg2, PropertyType::nameFromValue($property->getType()));
+        Assert::assertEquals($arg3, $property->getValue());
     }
 
     /**
@@ -864,7 +865,7 @@ public function theNodeShouldBeLocked($arg1)
         $lockManager = $workspace->getLockManager();
         $isLocked = $lockManager->isLocked($arg1);
 
-        \PHPUnit_Framework_Assert::assertTrue($isLocked);
+        Assert::assertTrue($isLocked);
     }
 
     /**
@@ -877,7 +878,7 @@ public function theNodeShouldNotBeLocked($arg1)
         $lockManager = $workspace->getLockManager();
         $isLocked = $lockManager->isLocked($arg1);
 
-        \PHPUnit_Framework_Assert::assertFalse($isLocked);
+        Assert::assertFalse($isLocked);
     }
 
     /**

tests/PHPCR/Shell/Helper/EditorHelperTest.php

@@ -18,7 +18,7 @@ class EditorHelperTest extends TestCase
 {
     protected $helper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->helper = new EditorHelper();
         putenv('EDITOR=cat');

tests/PHPCR/Shell/Helper/NodeHelperTest.php

@@ -19,7 +19,7 @@ class NodeHelperTest extends TestCase
 {
     protected $nodeHelper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->session = $this->prophesize('PHPCR\SessionInterface');
         $this->helper = new NodeHelper($this->session->reveal());

tests/PHPCR/Shell/Helper/TextHelperTest.php

@@ -18,7 +18,7 @@ class TextHelperTest extends TestCase
 {
     protected $textHelper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->textHelper = new TextHelper();
     }

tests/PHPCR/Shell/Phpcr/PhpcrSessionTest.php

@@ -17,7 +17,7 @@
 
 class PhpcrSessionTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->phpcr = $this->prophesize('PHPCR\SessionInterface');
         $this->session = new PhpcrSession($this->phpcr->reveal());