Use directory utils

Author: AydinHassan

test/Solution/DirectorySolutionTest.php

@@ -3,8 +3,10 @@
 namespace PhpSchool\PhpWorkshopTest\Solution;
 
 use InvalidArgumentException;
+use PhpSchool\PhpWorkshop\Exercise\TemporaryDirectoryTrait;
 use PhpSchool\PhpWorkshop\Solution\DirectorySolution;
 use PhpSchool\PhpWorkshop\Utils\Path;
+use PhpSchool\PhpWorkshop\Utils\System;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -17,14 +19,15 @@ class DirectorySolutionTest extends TestCase
 
     public function setUp(): void
     {
-        $this->tempPath = sprintf('%s/%s', realpath(sys_get_temp_dir()), $this->getName());
+        $this->tempPath = System::tempDir($this->getName());
         @mkdir($this->tempPath);
     }
 
     public function tearDown(): void
     {
         $fileSystem = new Filesystem();
-        $fileSystem->remove(Path::join(realpath(sys_get_temp_dir()), 'php-school'));
+
+        $fileSystem->remove(System::tempDir('php-school'));
         $fileSystem->remove($this->tempPath);
     }
 

test/Solution/InTempSolutionMapperTest.php

@@ -2,29 +2,30 @@
 
 declare(strict_types=1);
 
-namespace Solution;
+namespace PhpSchool\PhpWorkshopTest\Solution;
 
 use PhpSchool\PhpWorkshop\Solution\InTempSolutionMapper;
 use PhpSchool\PhpWorkshop\Utils\Path;
+use PhpSchool\PhpWorkshop\Utils\System;
 use PHPUnit\Framework\TestCase;
 
 class InTempSolutionMapperTest extends TestCase
 {
     public function testFileMapping(): void
     {
-        $filePath  = Path::join(realpath(sys_get_temp_dir()), 'test.file');
+        $filePath = System::tempDir('test.file');
         touch($filePath);
 
         $mappedFile = InTempSolutionMapper::mapFile($filePath);
 
         self::assertFileExists($mappedFile);
         self::assertNotSame($filePath, $mappedFile);
-        self::assertStringContainsString(realpath(sys_get_temp_dir()), $mappedFile);
+        self::assertStringContainsString(System::tempDir(), $mappedFile);
     }
 
     public function testDirectoryMapping(): void
     {
-        $tempDir = Path::join(realpath(sys_get_temp_dir()), bin2hex(random_bytes(10)));
+        $tempDir = System::tempDir(bin2hex(random_bytes(10)));
         $file  = Path::join($tempDir, 'test.file');
         $inner = Path::join($tempDir, 'innerDir');
         $innerFile  = Path::join($inner, 'test.file');
@@ -45,39 +46,39 @@ public function testDirectoryMapping(): void
 
     public function testMappingIsDeterministicTempDir(): void
     {
-        $filePath  = Path::join(realpath(sys_get_temp_dir()), 'test.file');
+        $filePath = System::tempDir('test.file');
         touch($filePath);
 
         $dirName = bin2hex(random_bytes(10));
-        $tempDir = Path::join(realpath(sys_get_temp_dir()), $dirName);
+        $tempDir = System::tempDir($dirName);
         @mkdir($tempDir);
 
         $fileHash = md5($filePath);
         $dirHash = md5($tempDir);
 
         self::assertSame(
             InTempSolutionMapper::mapFile($filePath),
-            Path::join(realpath(sys_get_temp_dir()), 'php-school', $fileHash, 'test.file')
+            Path::join(System::tempDir(), 'php-school', $fileHash, 'test.file')
         );
 
         self::assertNotSame(
             InTempSolutionMapper::mapDirectory($tempDir),
-            Path::join(realpath(sys_get_temp_dir()), 'php-school', $dirHash, $dirName)
+            Path::join(System::tempDir(), 'php-school', $dirHash, $dirName)
         );
     }
 
     public function testContentsAreNotOverwroteIfExists(): void
     {
-        $filePath = Path::join(realpath(sys_get_temp_dir()), 'test.file');
+        $filePath = System::tempDir('test.file');
         file_put_contents($filePath, 'Old contents');
 
         $dirName = bin2hex(random_bytes(10));
-        $tempDir = Path::join(realpath(sys_get_temp_dir()), $dirName);
+        $tempDir = System::tempDir($dirName);
         mkdir($tempDir);
         file_put_contents(Path::join($tempDir, 'test.file'), 'Old contents');
 
-        $tempFilePath = Path::join(realpath(sys_get_temp_dir()), 'php-school', md5($filePath), 'test.file');
-        $tempDirPath = Path::join(realpath(sys_get_temp_dir()), 'php-school', md5($tempDir), $dirName);
+        $tempFilePath = Path::join(System::tempDir(), 'php-school', md5($filePath), 'test.file');
+        $tempDirPath = Path::join(System::tempDir(), 'php-school', md5($tempDir), $dirName);
 
         file_put_contents($tempFilePath, 'Fresh contents');
         mkdir($tempDirPath, 0777, true);