change const values to consts

cpliakas · Jan 3, 2021 · b10a1d9 · b10a1d9
1 parent a30864e
commit b10a1d9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 31 deletions.
diff --git a/rector.php b/rector.php
@@ -31,7 +31,7 @@
         PrivatizeFinalClassMethodRector::class => [__DIR__ . '/tests/GitWorkingCopyTest.php'],
 
         // buggy
-        ChangeReadOnlyVariableWithDefaultValueToConstantRector::class,
+        // ChangeReadOnlyVariableWithDefaultValueToConstantRector::class,
         RemoveUnusedClassConstantRector::class,
     ]);
 };
diff --git a/tests/GitWorkingCopyTest.php b/tests/GitWorkingCopyTest.php
@@ -20,6 +20,25 @@ final class GitWorkingCopyTest extends AbstractGitWrapperTestCase
      */
     private const REMOTE_REPO_DIR = 'build/test/remote';
 
+    /**
+     * @var string
+     */
+    private const DIRECTORY = 'build/tests/wc_init';
+
+    /**
+     * @var string
+     */
+    private const PATCH = <<<CODE_SAMPLE
+diff --git a/FileCreatedByPatch.txt b/FileCreatedByPatch.txt
+new file mode 100644
+index 0000000..dfe437b
+--- /dev/null
++++ b/FileCreatedByPatch.txt
+@@ -0,0 +1 @@
++contents
+
+CODE_SAMPLE;
+
     /**
      * @var string
      */
@@ -37,14 +56,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Create the local repository.
+        // Create the local repository
         $this->gitWrapper->init(self::REPO_DIR, [
             'bare' => true,
         ]);
-
-        // Clone the local repository.
-        $directory = 'build/tests/wc_init';
-        $git = $this->gitWrapper->cloneRepository('file://' . realpath(self::REPO_DIR), $directory);
+        $git = $this->gitWrapper->cloneRepository('file://' . realpath(self::REPO_DIR), self::DIRECTORY);
 
         // prevent local user.* override
         $this->currentUserEmail = $git->config('user.email');
@@ -54,10 +70,10 @@ protected function setUp(): void
         $git->config('user.name', self::CONFIG_NAME);
 
         // Create the initial structure.
-        FileSystem::write($directory . '/change.me', "unchanged\n");
-        $this->filesystem->touch($directory . '/move.me');
-        $this->filesystem->mkdir($directory . '/a.directory', 0755);
-        $this->filesystem->touch($directory . '/a.directory/remove.me');
+        FileSystem::write(self::DIRECTORY . '/change.me', "unchanged\n");
+        $this->filesystem->touch(self::DIRECTORY . '/move.me');
+        $this->filesystem->mkdir(self::DIRECTORY . '/a.directory', 0755);
+        $this->filesystem->touch(self::DIRECTORY . '/a.directory/remove.me');
 
         // Initial commit.
         $git->add('*');
@@ -68,7 +84,7 @@ protected function setUp(): void
 
         // Create a branch, add a file.
         $branch = 'test-branch';
-        FileSystem::write($directory . '/branch.txt', $branch . PHP_EOL);
+        FileSystem::write(self::DIRECTORY . '/branch.txt', $branch . PHP_EOL);
         $git->checkoutNewBranch($branch);
         $git->add('branch.txt');
         $git->commit('Committed testing branch.');
@@ -80,7 +96,7 @@ protected function setUp(): void
         $git->tag('test-tag');
         $git->pushTags();
 
-        $this->filesystem->remove($directory);
+        $this->filesystem->remove(self::DIRECTORY);
     }
 
     /**
@@ -189,18 +205,7 @@ public function testGitAdd(): void
     public function testGitApply(): void
     {
         $git = $this->getWorkingCopy();
-
-        $patch = <<<CODE_SAMPLE
-diff --git a/FileCreatedByPatch.txt b/FileCreatedByPatch.txt
-new file mode 100644
-index 0000000..dfe437b
---- /dev/null
-+++ b/FileCreatedByPatch.txt
-@@ -0,0 +1 @@
-+contents
-
-CODE_SAMPLE;
-        FileSystem::write(self::WORKING_DIR . '/patch.txt', $patch);
+        FileSystem::write(self::WORKING_DIR . '/patch.txt', self::PATCH);
         $git->apply('patch.txt');
 
         // PHPUnit 8.5 compatible

diff --git a/tests/GitWrapperTest.php b/tests/GitWrapperTest.php
@@ -11,11 +11,25 @@
 
 final class GitWrapperTest extends AbstractGitWrapperTestCase
 {
+    /**
+     * @var string
+     */
+    private const BINARY = '/path/to/binary';
+
+    /**
+     * @var string
+     */
+    private const BAD_KEY = './tests/id_rsa_bad';
+
+    /**
+     * @var string
+     */
+    private const BAD_WRAPPER = './tests/dummy-wrapper-bad.sh';
+
     public function testSetGitBinary(): void
     {
-        $binary = '/path/to/binary';
-        $this->gitWrapper->setGitBinary($binary);
-        $this->assertSame($binary, $this->gitWrapper->getGitBinary());
+        $this->gitWrapper->setGitBinary(self::BINARY);
+        $this->assertSame(self::BINARY, $this->gitWrapper->getGitBinary());
     }
 
     public function testSetDispatcher(): void
@@ -90,15 +104,13 @@ public function testSetPrivateKeyWrapper(): void
     public function testSetPrivateKeyError(): void
     {
         $this->expectException(GitException::class);
-        $badKey = './tests/id_rsa_bad';
-        $this->gitWrapper->setPrivateKey($badKey);
+        $this->gitWrapper->setPrivateKey(self::BAD_KEY);
     }
 
     public function testSetPrivateKeyWrapperError(): void
     {
         $this->expectException(GitException::class);
-        $badWrapper = './tests/dummy-wrapper-bad.sh';
-        $this->gitWrapper->setPrivateKey('./tests/id_rsa', 22, $badWrapper);
+        $this->gitWrapper->setPrivateKey('./tests/id_rsa', 22, self::BAD_WRAPPER);
     }
 
     public function testUnsetPrivateKey(): void