Skip to content

Commit

Permalink
Merge pull request #1 from dealnews/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
brianlmoon authored Sep 5, 2024
2 parents d8c391c + 9895ac9 commit f76f362
Show file tree
Hide file tree
Showing 20 changed files with 58 additions and 66 deletions.
4 changes: 4 additions & 0 deletions src/CatchErrors.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
* @author Brian Moon <[email protected]>
* @copyright 1997-Present DealNews.com, Inc
* @package DealNews\TestHelpers
*
* @phan-suppress PhanUnreferencedClass
*/
trait CatchErrors {

public function setUp(): void {
// @phan-suppress-next-line PhanTraitParentReference
parent::setUp();
set_error_handler(
static function ($errno, $errstr) {
Expand All @@ -22,6 +25,7 @@ static function ($errno, $errstr) {
}

public function tearDown(): void {
// @phan-suppress-next-line PhanTraitParentReference
parent::tearDown();
restore_error_handler();
}
Expand Down
2 changes: 2 additions & 0 deletions src/Fixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public function assertSameData(mixed $expected, mixed $actual, string $message =
$actual = $this->sortKeysRecursive($actual);
}

// @phan-suppress-next-line PhanUndeclaredMethod
$this->assertSame($expected, $actual, $message);
}

Expand All @@ -76,6 +77,7 @@ public function getFixtureFile(string $fixture): string {
}

$file = realpath(self::$fixture_directory . "/$fixture");
// @phan-suppress-next-line PhanUndeclaredMethod
$this->assertTrue(!empty($file) && file_exists($file), "Fixture $fixture does not exist");

return $file;
Expand Down
1 change: 1 addition & 0 deletions src/Guzzle.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public function makeGuzzleMock($codes, array $fixtures, array &$container): Guzz
$responses = [];

if (is_array($codes)) {
// @phan-suppress-next-line PhanUndeclaredMethod
$this->assertEquals(count($codes), count($fixtures), 'When using an array of codes, the number of codes must match the number of fixtures');
}

Expand Down
28 changes: 28 additions & 0 deletions src/TmpDir.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace DealNews\TestHelpers;

/**
* Creates a temporary directory with a random name and returns it
*
* @author Brian Moon <[email protected]>
* @copyright 1997-Present DealNews.com, Inc
* @package DealNews\TestHelpers
*/
trait TmpDir {

public function tmpDir(?string $base_dir = null): string {

$base_dir ??= sys_get_temp_dir();

do {
$success = false;
$dir = $base_dir . '/' . hash('sha256', (random_bytes(32)));
if (!file_exists($dir)) {
$success = mkdir($dir, recursive: true);
}
} while (!$success);

return $dir;
}
}
25 changes: 0 additions & 25 deletions tests.old/bootstrap.php

This file was deleted.

3 changes: 0 additions & 3 deletions tests.old/etc/config.d/01-config.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests.old/etc/config.d/02-config.env

This file was deleted.

4 changes: 0 additions & 4 deletions tests.old/etc/config.d/03-config.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions tests.old/etc/config.d/04-config.json

This file was deleted.

3 changes: 0 additions & 3 deletions tests.old/etc/config.env

This file was deleted.

4 changes: 0 additions & 4 deletions tests.old/etc/config.ini

This file was deleted.

5 changes: 0 additions & 5 deletions tests.old/etc/config.json

This file was deleted.

4 changes: 0 additions & 4 deletions tests.old/etc/config.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions tests.old/etc/config_env_file.ini

This file was deleted.

3 changes: 0 additions & 3 deletions tests.old/etc/get_config_bad.ini

This file was deleted.

1 change: 0 additions & 1 deletion tests.old/etc/get_config_bad.json

This file was deleted.

1 change: 0 additions & 1 deletion tests.old/etc/get_config_bad.txt

This file was deleted.

1 change: 0 additions & 1 deletion tests.old/etc/get_config_bad.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions tests.old/etc/get_config_test.ini

This file was deleted.

23 changes: 23 additions & 0 deletions tests/TmpDirTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace DealNews\TestHelpers\Tests;

use \DealNews\TestHelpers\TmpDir;

class TmpDirTest extends \PHPUnit\Framework\TestCase {

use TmpDir;

public function testTmpDir() {
$dir = $this->tmpDir();

$this->assertTrue(is_dir($dir));

$dir2 = $this->tmpDir($dir);

$this->assertTrue(is_dir($dir2));

rmdir($dir2);
rmdir($dir);
}
}

0 comments on commit f76f362

Please sign in to comment.