diff --git a/README.md b/README.md index 47e5d68..da2b250 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ this commit: `force-push` or `branch`, accommodating different workflow preferences. See example of deployed artifact -in [Artefact branches](https://github.com/drevops/git-artifact-destination/branches). +in [Artifact branches](https://github.com/drevops/git-artifact-destination/branches). ## Modes @@ -96,7 +96,7 @@ in your repository with the following content: ```php gitSetDst($remote); $this->showInfo(); - $this->prepareArtefact(); + $this->prepareArtifact(); if ($this->needsPush) { $this->doPush(); @@ -224,7 +224,7 @@ public function artifact(string $remote, array $opts = [ * * @throws \Exception */ - protected function prepareArtefact(): void + protected function prepareArtifact(): void { $this->gitSwitchToBranch($this->src, $this->artifactBranch, true); @@ -340,7 +340,7 @@ protected function resolveOptions(array $options): void protected function showInfo(): void { $this->writeln('----------------------------------------------------------------------'); - $this->writeln(' Artefact information'); + $this->writeln(' Artifact information'); $this->writeln('----------------------------------------------------------------------'); $this->writeln(' Build timestamp: '.date('Y/m/d H:i:s', $this->now)); $this->writeln(' Mode: '.$this->mode); @@ -358,7 +358,7 @@ protected function showInfo(): void protected function dumpReport(): void { $lines[] = '----------------------------------------------------------------------'; - $lines[] = ' Artefact report'; + $lines[] = ' Artifact report'; $lines[] = '----------------------------------------------------------------------'; $lines[] = ' Build timestamp: '.date('Y/m/d H:i:s', $this->now); $lines[] = ' Mode: '.$this->mode; diff --git a/tests/Functional/AbstractFunctionalTestCase.php b/tests/Functional/AbstractFunctionalTestCase.php index 8c6cd12..4a0adcb 100644 --- a/tests/Functional/AbstractFunctionalTestCase.php +++ b/tests/Functional/AbstractFunctionalTestCase.php @@ -20,7 +20,7 @@ abstract class AbstractFunctionalTestCase extends AbstractTestCase protected $currentBranch; /** - * Artefact branch. + * Artifact branch. * * @var string */ diff --git a/tests/Functional/BranchTest.php b/tests/Functional/BranchTest.php index b2846fc..ee7f725 100644 --- a/tests/Functional/BranchTest.php +++ b/tests/Functional/BranchTest.php @@ -10,7 +10,7 @@ * @group integration * * @covers \DrevOps\Robo\GitTrait - * @covers \DrevOps\Robo\ArtefactTrait + * @covers \DrevOps\Robo\ArtifactTrait * @covers \DrevOps\Robo\FilesystemTrait */ class BranchTest extends AbstractFunctionalTestCase diff --git a/tests/Functional/ForcePushTest.php b/tests/Functional/ForcePushTest.php index 73bc479..c86f8ac 100644 --- a/tests/Functional/ForcePushTest.php +++ b/tests/Functional/ForcePushTest.php @@ -12,7 +12,7 @@ * @SuppressWarnings(PHPMD.TooManyPublicMethods) * * @covers \DrevOps\Robo\GitTrait - * @covers \DrevOps\Robo\ArtefactTrait + * @covers \DrevOps\Robo\ArtifactTrait * @covers \DrevOps\Robo\FilesystemTrait */ class ForcePushTest extends AbstractFunctionalTestCase diff --git a/tests/Functional/GeneralTest.php b/tests/Functional/GeneralTest.php index 720ecd5..c287ec0 100644 --- a/tests/Functional/GeneralTest.php +++ b/tests/Functional/GeneralTest.php @@ -9,7 +9,7 @@ * * @group integration * - * @covers \DrevOps\Robo\ArtefactTrait + * @covers \DrevOps\Robo\ArtifactTrait * @covers \DrevOps\Robo\FilesystemTrait */ class GeneralTest extends AbstractFunctionalTestCase @@ -39,7 +39,7 @@ public function testInfo(): void $this->gitCreateFixtureCommits(1); $output = $this->runBuild(); - $this->assertStringContainsString('Artefact information', $output); + $this->assertStringContainsString('Artifact information', $output); $this->assertStringContainsString('Mode: force-push', $output); $this->assertStringContainsString('Source repository: '.$this->src, $output); $this->assertStringContainsString('Remote repository: '.$this->dst, $output); @@ -85,7 +85,7 @@ public function testReport(): void $this->assertFileExists($report); $output = file_get_contents($report); - $this->assertStringContainsString('Artefact report', (string) $output); + $this->assertStringContainsString('Artifact report', (string) $output); $this->assertStringContainsString(sprintf('Source repository: %s', $this->src), (string) $output); $this->assertStringContainsString(sprintf('Remote repository: %s', $this->dst), (string) $output); $this->assertStringContainsString(sprintf('Remote branch: %s', $this->currentBranch), (string) $output); diff --git a/tests/Functional/TagTest.php b/tests/Functional/TagTest.php index cc780c3..ba80aeb 100644 --- a/tests/Functional/TagTest.php +++ b/tests/Functional/TagTest.php @@ -10,7 +10,7 @@ * @group integration * * @covers \DrevOps\Robo\GitTrait - * @covers \DrevOps\Robo\ArtefactTrait + * @covers \DrevOps\Robo\ArtifactTrait * @covers \DrevOps\Robo\FilesystemTrait */ class TagTest extends AbstractFunctionalTestCase diff --git a/tests/Unit/AbstractUnitTestCase.php b/tests/Unit/AbstractUnitTestCase.php index a05e3c2..8486727 100644 --- a/tests/Unit/AbstractUnitTestCase.php +++ b/tests/Unit/AbstractUnitTestCase.php @@ -2,7 +2,7 @@ namespace DrevOps\Robo\Tests\Unit; -use DrevOps\Robo\ArtefactTrait; +use DrevOps\Robo\ArtifactTrait; use DrevOps\Robo\Tests\AbstractTestCase; /** @@ -22,7 +22,7 @@ protected function setUp(): void { parent::setUp(); - $this->mock = $this->getMockForTrait(ArtefactTrait::class); + $this->mock = $this->getMockForTrait(ArtifactTrait::class); $this->callProtectedMethod($this->mock, 'fsSetRootDir', [$this->fixtureDir]); } } diff --git a/tests/Unit/ExcludeTest.php b/tests/Unit/ExcludeTest.php index 3e7c602..854ed75 100644 --- a/tests/Unit/ExcludeTest.php +++ b/tests/Unit/ExcludeTest.php @@ -9,7 +9,7 @@ * * @group unit * - * @covers \DrevOps\Robo\ArtefactTrait + * @covers \DrevOps\Robo\ArtifactTrait */ class ExcludeTest extends AbstractUnitTestCase {