Make tests compatible with latest version

Author: johnstevenson

tests/ClassTest.php

@@ -11,11 +11,11 @@
 
 namespace Composer\XdebugHandler\Tests;
 
-use Composer\XdebugHandler\Tests\Helpers\BaseTestCase;
 use Composer\XdebugHandler\Tests\Helpers\LoggerFactory;
 use Composer\XdebugHandler\XdebugHandler;
+use PHPUnit\Framework\TestCase;
 
-class ClassTest extends BaseTestCase
+class ClassTest extends TestCase
 {
     /**
      * @return void
@@ -37,32 +37,20 @@ public function testConstructorThrowsOnInvalidEnvPrefix()
     }
 
     /**
-     * @dataProvider setterProvider     *
-     * @param string $setter
-     * @param \Psr\Log\AbstractLogger|string|null $value
-     *
      * @return void
      */
-    public function testSettersAreFluent($setter, $value)
+    public function testSettersAreFluent()
     {
         $xdebug = new XdebugHandler('myapp');
 
-        $params = null !== $value ? array($value) : array();
-        $result = BaseTestCase::safeCall($xdebug, $setter, $params, $this);
-        self::assertInstanceOf(get_class($xdebug), $result);
-    }
+        $result = $xdebug->setLogger(LoggerFactory::createLogger());
+        self::assertInstanceOf(get_class($xdebug), $result, 'setLogger');
 
-    /**
-     * @return array<string, mixed[]>
-     */
-    public function setterProvider()
-    {
-        // $setter, $value
-        return array(
-            'setLogger' => array('setLogger', LoggerFactory::createLogger()),
-            'setMainScript' => array('setMainScript', '--'),
-            'setPersistent' => array('setPersistent', null),
-        );
+        $result = $xdebug->setMainScript('--');
+        self::assertInstanceOf(get_class($xdebug), $result, 'setMainScript');
+
+        $result = $xdebug->setPersistent();
+        self::assertInstanceOf(get_class($xdebug), $result, 'setPersistent');
     }
 
     /**

tests/bootstrap_phpstan.php

@@ -1,13 +1,29 @@
 <?php
+/**
+ * Provides flexibilty for using either simple-phpunit or phpunit
+ */
 
 $vendorBin = __DIR__.'/../vendor/bin';
+
+// See if we using simple-phpunit
 $path = realpath($vendorBin.'/simple-phpunit');
 
-if (!file_exists($vendorBin.'/phpunit') && $path !== false) {
-    passthru(escapeshellarg($path).' install');
+if ($path !== false) {
+    // simple-phpunit will update the .phpunit symlink/junction
+    $phpunit = escapeshellarg(PHP_BINARY).' '.escapeshellarg($path);
+    passthru($phpunit.' install');
 
     $autoloader = $vendorBin.'/.phpunit/phpunit/vendor/autoload.php';
-    if (file_exists($autoloader)) {
-        require $autoloader;
+    if (!file_exists($autoloader)) {
+        echo 'Cannot run PHPStan: simple-phpunit did not install PHPUnit as expected'.PHP_EOL;
+        exit(1);
     }
+
+    include $autoloader;
+    return;
+}
+
+if (realpath($vendorBin.'/phpunit') === false) {
+    echo 'Cannot run PHPStan: PHPUnit has not been installed'.PHP_EOL;
+    exit(1);
 }