Merge pull request #10

Updated CI tools

Author: bastianschwarz

.idea/deployer.base.iml

@@ -15,6 +15,7 @@
     "symfony/console": "^6.1"
   },
   "require-dev": {
+    "mockery/mockery": "^1.5",
     "roave/security-advisories": "dev-latest"
   },
   "autoload": {

.idea/php.xml

@@ -15,9 +15,9 @@
   ~   limitations under the License.
   -->
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.5" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.2.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer-unused" version="^0.8" installed="0.8.5" location="./tools/composer-unused.phar" copy="true"/>
-  <phar name="composer-require-checker" version="^4.1.0" installed="4.3.0" location="./tools/composer-require-checker" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
+  <phar name="phpunit" version="^10.0" installed="10.0.15" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.8.0" location="./tools/psalm" copy="true"/>
+  <phar name="composer-unused" version="^0.8" installed="0.8.6" location="./tools/composer-unused.phar" copy="true"/>
+  <phar name="composer-require-checker" version="^4.0" installed="4.5.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.19" location="./tools/infection" copy="true"/>
 </phive>

composer.json

@@ -72,7 +72,7 @@ public function host(string ...$hostname) : Host|array {
       /**
        * We need to hack a little since ObjectProxy doesn't expose the contained objects
        *
-       * @psalm-suppress PossiblyInvalidFunctionCall,InaccessibleProperty
+       * @psalm-suppress PossiblyInvalidFunctionCall,InaccessibleProperty,PossiblyNullFunctionCall
        */
       $hostOrHosts = array_values(
         array_filter(
@@ -113,7 +113,7 @@ public function localhost(string ...$hostname) : Localhost|array {
       /**
        * We need to hack a little since ObjectProxy doesn't expose the contained objects
        *
-       * @psalm-suppress PossiblyInvalidFunctionCall,InaccessibleProperty
+       * @psalm-suppress PossiblyInvalidFunctionCall,InaccessibleProperty,PossiblyNullFunctionCall
        */
       $localhost = array_values(
         array_filter(

phive.xml

@@ -16,9 +16,10 @@
   -->
 <phpunit
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
   colors="true"
   bootstrap="./bootstrap.php"
+  cacheDirectory="../.cache/phpunit"
 >
   <coverage>
     <include>

src/functions/All.php

@@ -21,10 +21,14 @@
 use de\codenamephp\deployer\base\functions\iUpload;
 use de\codenamephp\deployer\base\task\deploy\updateCode\UploadTransferables;
 use de\codenamephp\deployer\base\transferable\iTransferable;
+use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
 final class UploadTransferablesTest extends TestCase {
 
+  use MockeryPHPUnitIntegration;
+
   private UploadTransferables $sut;
 
   protected function setUp() : void {
@@ -35,15 +39,10 @@ protected function setUp() : void {
   }
 
   public function test__invoke() : void {
-    $this->sut->deployerFunctions = $this->createMock(iUpload::class);
-    $this->sut->deployerFunctions
-      ->expects(self::exactly(3))
-      ->method('upload')
-      ->withConsecutive(
-        ['local path 1', 'remote path 1', ['config 1']],
-        ['local path 2', 'remote path 2', ['config 2']],
-        ['local path 3', 'remote path 3', ['config 3']],
-      );
+    $this->sut->deployerFunctions = Mockery::mock(iUpload::class);
+    $this->sut->deployerFunctions->allows('upload')->with('local path 1', 'remote path 1', ['config 1'])->once()->ordered();
+    $this->sut->deployerFunctions->allows('upload')->with('local path 2', 'remote path 2', ['config 2'])->once()->ordered();
+    $this->sut->deployerFunctions->allows('upload')->with('local path 3', 'remote path 3', ['config 3'])->once()->ordered();
 
     $transferable1 = $this->createMock(iTransferable::class);
     $transferable1->expects(self::once())->method('getLocalPath')->willReturn('local path 1');

test/phpunit.dist.xml

@@ -24,10 +24,13 @@
 use de\codenamephp\deployer\base\task\media\Copy;
 use de\codenamephp\deployer\base\transferable\iTransferable;
 use Deployer\Host\Host;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
 final class CopyTest extends TestCase {
 
+  use MockeryPHPUnitIntegration;
+
   private Copy $sut;
 
   protected function setUp() : void {
@@ -83,27 +86,16 @@ public function test__invoke() : void {
     $transferable2->expects(self::once())->method('getConfig')->willReturn(['options' => ['options2_1', 'options2_2']]);
     $this->sut->setTransferables($transferable1, $transferable2);
 
-    $deployerFunctions = $this->createMock(iAll::class);
-    $deployerFunctions->expects(self::once())->method('getOption')->with(Copy::OPTION_SOURCE_HOST)->willReturn(1234);
-    $deployerFunctions->expects(self::once())->method('firstHost')->with('1234')->willReturn($sourceHost);
-    $deployerFunctions->expects(self::once())->method('currentHost')->willReturn($targetHost);
-    $deployerFunctions
-      ->expects(self::exactly(4))
-      ->method('parseOnHost')
-      ->withConsecutive(
-        [$sourceHost, 'source_path_1'],
-        [$targetHost, 'target_path_1'],
-        [$sourceHost, 'source_path_2'],
-        [$targetHost, 'target_path_2'],
-      )
-      ->willReturnOnConsecutiveCalls('parsed_source_path_1', 'parsed_target_path_1', 'parsed_source_path_2', 'parsed_target_path_2');
-    $deployerFunctions
-      ->expects(self::exactly(2))
-      ->method('runLocally')
-      ->withConsecutive(
-        ['ssh source_ssh_arguments source_connection_string "rsync -e \'ssh -o StrictHostKeyChecking=no target_ssh_arguments\' -azP options1_1 options1_2 parsed_source_path_1 target_connection_string:parsed_target_path_1"'],
-        ['ssh source_ssh_arguments source_connection_string "rsync -e \'ssh -o StrictHostKeyChecking=no target_ssh_arguments\' -azP options2_1 options2_2 parsed_source_path_2 target_connection_string:parsed_target_path_2"']
-      );
+    $deployerFunctions = \Mockery::mock(iAll::class);
+    $deployerFunctions->allows('getOption')->once()->with(Copy::OPTION_SOURCE_HOST)->andReturn(1234);
+    $deployerFunctions->allows('firstHost')->once()->with('1234')->andReturn($sourceHost);
+    $deployerFunctions->allows('currentHost')->once()->andReturn($targetHost);
+    $deployerFunctions->allows('parseOnHost')->once()->ordered()->with($sourceHost, 'source_path_1')->andReturn('parsed_source_path_1');
+    $deployerFunctions->allows('parseOnHost')->once()->ordered()->with($targetHost, 'target_path_1')->andReturn('parsed_target_path_1');
+    $deployerFunctions->allows('runLocally')->once()->ordered()->with('ssh source_ssh_arguments source_connection_string "rsync -e \'ssh -o StrictHostKeyChecking=no target_ssh_arguments\' -azP options1_1 options1_2 parsed_source_path_1 target_connection_string:parsed_target_path_1"');
+    $deployerFunctions->allows('parseOnHost')->once()->ordered()->with($sourceHost, 'source_path_2')->andReturn('parsed_source_path_2');
+    $deployerFunctions->allows('parseOnHost')->once()->ordered()->with($targetHost, 'target_path_2')->andReturn('parsed_target_path_2');
+    $deployerFunctions->allows('runLocally')->once()->ordered()->with('ssh source_ssh_arguments source_connection_string "rsync -e \'ssh -o StrictHostKeyChecking=no target_ssh_arguments\' -azP options2_1 options2_2 parsed_source_path_2 target_connection_string:parsed_target_path_2"');
     $this->sut->deployerFunctions = $deployerFunctions;
 
     $this->sut->__invoke();

test/task/deploy/updateCode/UploadTransferablesTest.php

@@ -21,10 +21,13 @@
 use de\codenamephp\deployer\base\functions\iDownload;
 use de\codenamephp\deployer\base\task\media\Pull;
 use de\codenamephp\deployer\base\transferable\iTransferable;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
 final class PullTest extends TestCase {
 
+  use MockeryPHPUnitIntegration;
+
   private Pull $sut;
 
   protected function setUp() : void {
@@ -60,15 +63,10 @@ public function test__invoke() : void {
       $this->createConfiguredMock(iTransferable::class, ['getLocalPath' => 'local3', 'getRemotePath' => 'remote3', 'getConfig' => ['config3']]),
     );
 
-    $this->sut->deployerFunctions = $this->createMock(iDownload::class);
-    $this->sut->deployerFunctions
-      ->expects(self::exactly(3))
-      ->method('download')
-      ->withConsecutive(
-        ['remote1', 'local1', ['config1']],
-        ['remote2', 'local2', ['config2']],
-        ['remote3', 'local3', ['config3']],
-      );
+    $this->sut->deployerFunctions = \Mockery::mock(iDownload::class);
+    $this->sut->deployerFunctions->allows('download')->once()->ordered()->with('remote1', 'local1', ['config1']);
+    $this->sut->deployerFunctions->allows('download')->once()->ordered()->with('remote2', 'local2', ['config2']);
+    $this->sut->deployerFunctions->allows('download')->once()->ordered()->with('remote3', 'local3', ['config3']);
 
     $this->sut->__invoke();
   }

test/task/media/CopyTest.php

@@ -21,10 +21,14 @@
 use de\codenamephp\deployer\base\hostCheck\iHostCheck;
 use de\codenamephp\deployer\base\task\media\Push;
 use de\codenamephp\deployer\base\transferable\iTransferable;
+use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
 final class PushTest extends TestCase {
 
+  use MockeryPHPUnitIntegration;
+
   private Push $sut;
 
   protected function setUp() : void {
@@ -59,15 +63,10 @@ public function test__invoke() : void {
     $this->sut->hostCheck = $this->createMock(iHostCheck::class);
     $this->sut->hostCheck->expects(self::once())->method('check');
 
-    $this->sut->deployerFunctions = $this->createMock(iUpload::class);
-    $this->sut->deployerFunctions
-      ->expects(self::exactly(3))
-      ->method('upload')
-      ->withConsecutive(
-        ['local1', 'remote1', ['config1']],
-        ['local2', 'remote2', ['config2']],
-        ['local3', 'remote3', ['config3']],
-      );
+    $this->sut->deployerFunctions = Mockery::mock(iUpload::class);
+    $this->sut->deployerFunctions->allows('upload')->once()->ordered()->with('local1', 'remote1', ['config1']);
+    $this->sut->deployerFunctions->allows('upload')->once()->ordered()->with('local2', 'remote2', ['config2']);
+    $this->sut->deployerFunctions->allows('upload')->once()->ordered()->with('local3', 'remote3', ['config3']);
 
     $this->sut->__invoke();
   }