More internal updates due to API changes, Fixing tests

phar-io · May 17, 2020 · 6a47e4b · 6a47e4b
1 parent cd99bb0
commit 6a47e4b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/services/migration/ProjectPhiveXmlMigration.php b/src/services/migration/ProjectPhiveXmlMigration.php
@@ -21,6 +21,7 @@ public function getDescription(): string {
     }
 
     protected function doMigrate(Filename $legacy, Filename $new): void {
+        $new->getDirectory()->ensureExists();
         $new->putContent($legacy->read()->getContent());
     }
 

diff --git a/src/shared/Git.php b/src/shared/Git.php
@@ -15,7 +15,7 @@ public function __construct(Directory $workingDirectory) {
     }
 
     public function isRepository(Directory $directory): bool {
-        return \is_dir($directory . '/.git');
+        return \is_dir($directory->asString() . '/.git');
     }
 
     /**
@@ -25,9 +25,9 @@ public function getMostRecentTag(Directory $directory): string {
         if (!$this->isRepository($directory)) {
             throw new GitException(\sprintf('%s is not a git repository', $directory->asString()));
         }
-        \chdir($directory->__toString());
+        \chdir($directory->asString());
         $tag = @\exec('git describe --tags --always --dirty 2>' . $this->getDevNull(), $output, $returnCode);
-        \chdir($this->workingDirectory->__toString());
+        \chdir($this->workingDirectory->asString());
 
         if ($returnCode !== 0) {
             throw new GitException('Could not determine most recent tag');

diff --git a/tests/unit/shared/ComposerAliasTest.php b/tests/unit/shared/ComposerAliasTest.php
@@ -19,7 +19,7 @@ public function testThrowsExceptionIfAliasStartsWithASlash(): void {
 
     public function testToString(): void {
         $alias = new ComposerAlias('some/alias');
-        $this->assertSame('some/alias', $alias->__toString());
+        $this->assertSame('some/alias', $alias->asString());
     }
 
     public function testGetVendorReturnsExpectedValue(): void {

diff --git a/tests/unit/shared/PharRegistryTest.php b/tests/unit/shared/PharRegistryTest.php
@@ -50,7 +50,7 @@ public function testReturnsExpectedUsedPharsByDestination(): void {
 
         /** @var Directory|\PHPUnit_Framework_MockObject_MockObject $destination */
         $destination = $this->createMock(Directory::class);
-        $destination->method('__toString')
+        $destination->method('asString')
             ->willReturn('/vagrant/phive/tools');
 
         $expected = [

diff --git a/tests/unit/shared/environment/UnixoidEnvironmentTest.php b/tests/unit/shared/environment/UnixoidEnvironmentTest.php
@@ -61,7 +61,7 @@ public function getProxyProvider() {
 
     public function testGetHomeDirectory(): void {
         $env = new UnixoidEnvironment(['HOME' => __DIR__], $this->getExecutorMock());
-        $this->assertSame(__DIR__, (string)$env->getHomeDirectory());
+        $this->assertSame(__DIR__, $env->getHomeDirectory()->asString());
     }
 
     public function testGetProxyThrowsExceptionIfProxyIsNotSet(): void {