Merge pull request #14 from researchgate/upgrade-to-php-timer-5

Update phpunit/php-timer to 4.x/5.x

Author: mdio

.gitignore

@@ -3,3 +3,4 @@
 /build/
 /composer.lock
 composer.phar
+/.phpunit.result.cache

composer.json

@@ -11,7 +11,7 @@
     "require": {
         "php": "^7.1",
         "symfony/console" : "^2.1|^3.0|^4.0|^5.0",
-        "phpunit/php-timer": "^2.0"
+        "phpunit/php-timer": "^4.0|^5.0"
     },
     "autoload" : {
         "psr-4" : {
@@ -22,6 +22,6 @@
         "phpnsc"
     ],
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.0"
     }
 }

src/Command.php

@@ -10,7 +10,7 @@
 
 namespace rg\tools\phpnsc;
 
-use SebastianBergmann\Timer\Timer;
+use SebastianBergmann\Timer\ResourceUsageFormatter;
 use Symfony\Component\Console;
 use Symfony\Component\Console\Application;
 
@@ -99,7 +99,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
         }
 
         $outputClass->printAll();
-        $outputClass->writeln(Timer::resourceUsage());
+        $outputClass->writeln((new ResourceUsageFormatter())->resourceUsageSinceStartOfRequest());
 
         return $foundError ? 1 : 0;
     }

test/rg/tools/phpnsc/ClassScannerTest.php

@@ -1,10 +1,7 @@
 <?php
-namespace rg\test\tools\phpnsc;
+namespace rg\tools\phpnsc;
 
 use PHPUnit\Framework\TestCase;
-use rg\tools\phpnsc\ClassScanner;
-use rg\tools\phpnsc\ConsoleOutput;
-use rg\tools\phpnsc\FilesystemAccess;
 use Symfony\Component\Console\Output\NullOutput;
 
 class ClassScannerTest extends TestCase
@@ -19,7 +16,7 @@ class ClassScannerTest extends TestCase
      */
     private $classScanner;
 
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
         $output = new NullOutput();
         $outputClass = new ConsoleOutput($output);

test/rg/tools/phpnsc/ConfigTest.php

@@ -1,26 +1,20 @@
 <?php
-namespace rg\test\tools\phpnsc;
+namespace rg\tools\phpnsc;
 
 use PHPUnit\Framework\TestCase;
-use rg\tools\phpnsc\Config;
-use rg\tools\phpnsc\FilesystemAccess;
 
 class ConfigTest extends TestCase
 {
-    /**
-     * @var FilesystemMock
-     */
-    private $filesystem;
 
     /**
      * @var Config
      */
     private $config;
 
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
-        $this->filesystem = new FilesystemMock('/root/folder');
-        $this->config = new Config($this->filesystem);
+        $filesystem = new FilesystemMock('/root/folder');
+        $this->config = new Config($filesystem);
     }
 
     public function testLoadConfig() {
@@ -36,7 +30,7 @@ public function testLoadConfig() {
 
 class FilesystemMock extends FilesystemAccess
 {
-    public function getFile($filename) {
+    public function getFile($filename): string {
         return '{
     "vendor" : "researchgate",
     "folders" : {

test/rg/tools/phpnsc/DirectoryScannerTest.php

@@ -1,32 +1,21 @@
 <?php
-namespace rg\test\tools\phpnsc;
+namespace rg\tools\phpnsc;
 
 use PHPUnit\Framework\TestCase;
-use rg\tools\phpnsc\DirectoryScanner;
-use rg\tools\phpnsc\FilesystemAccess;
 
 class DirectoryScannerTest extends TestCase
 {
-    /**
-     * @var FilesystemMock
-     */
-    private $filesystem;
 
     /**
      * @var DirectoryScanner
      */
     private $directoryScanner;
 
-    /**
-     * @var string
-     */
-    private $root;
-
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
-        $this->filesystem = new DirectoryScannerFilesystemMock('/root/folder');
-        $this->root = '/root/folder';
-        $this->directoryScanner = new DirectoryScanner($this->filesystem, $this->root, '/');
+        $filesystem = new DirectoryScannerFilesystemMock('/root/folder');
+        $root = '/root/folder';
+        $this->directoryScanner = new DirectoryScanner($filesystem, $root, '/');
     }
 
     public function testReadDirectory() {
@@ -103,11 +92,11 @@ public function openDirectory($directory) {
         return isset($this->filesystem[$directory]) ? $handle : false;
     }
 
-    public function closeDirectory($handle) {
+    public function closeDirectory($handle): bool {
         return true;
     }
 
-    public function isDir($path) {
+    public function isDir($path): bool {
         return isset($this->filesystem[$path]);
     }
 

test/rg/tools/phpnsc/NamespaceDependencyCheckerTest.php

@@ -1,31 +1,18 @@
 <?php
-namespace rg\test\tools\phpnsc;
+namespace rg\tools\phpnsc;
 
 use PHPUnit\Framework\TestCase;
-use rg\tools\phpnsc\ClassScanner;
-use rg\tools\phpnsc\FilesystemAccess;
-use rg\tools\phpnsc\NamespaceDependencyChecker;
-use rg\tools\phpnsc\Output;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class NamespaceDependencyCheckerTest extends TestCase
 {
-    /**
-     * @var ClassModifierFilesystemMock
-     */
-    private $filesystem;
 
     /**
      * @var array
      */
     private $files;
 
-    /**
-     * @var ClassScanner
-     */
-    private $classScanner;
-
     /**
      * @var NamespaceDependencyChecker
      */
@@ -36,15 +23,15 @@ class NamespaceDependencyCheckerTest extends TestCase
      */
     private $outputClass;
 
-    protected function setUp() {
+    protected function setUp(): void {
         parent::setUp();
         $output = new NullOutput();
         $this->outputClass = new DependencyCheckerOutputMock($output);
-        $this->filesystem = new ClassModifierFilesystemMock('/root/folder');
-        $this->files = array_keys($this->filesystem->filesystem);
-        $this->classScanner = new ClassScanner($this->filesystem, $this->outputClass);
-        $this->classScanner->parseFilesForClassesAndInterfaces($this->files, '/root/folder', 'vendor');
-        $this->dependencyChecker = new NamespaceDependencyChecker($this->filesystem, $this->classScanner, 'vendor', '/root/folder', $this->outputClass);
+        $filesystem = new ClassModifierFilesystemMock('/root/folder');
+        $this->files = array_keys($filesystem->filesystem);
+        $classScanner = new ClassScanner($filesystem, $this->outputClass);
+        $classScanner->parseFilesForClassesAndInterfaces($this->files, '/root/folder', 'vendor');
+        $this->dependencyChecker = new NamespaceDependencyChecker($filesystem, $classScanner, 'vendor', '/root/folder', $this->outputClass);
     }
 
     public function testModifyFiles() {

test/rg/tools/phpnsc/NamespaceStringTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace rg\test\tools\phpnsc;
+namespace rg\tools\phpnsc;
 
 use PHPUnit\Framework\TestCase;
-use rg\tools\phpnsc\NamespaceString;
 
 class NamespaceStringTest extends TestCase {
+
     public function testCreateNamespaceString() {
         $namespaceVendor = 'vendor';
         $root = '/root/folder';