opensourcemirror
/
swagger-php
mirror of https://github.com/zircote/swagger-php.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #884 from snake14/jacobr-finder-files 

Changed the Util finder method to force a provided instance of Finder…
This commit is contained in:
Martin Rademacher 2020-12-18 14:17:35 +13:00 committed by GitHub
parent aceaa95586 ec1530d9ca
commit 4931df2e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Util.php
View File

@ -68,7 +68,8 @@ class Util
public static function finder($directory, $exclude = null, $pattern = null): Finder
{
if ($directory instanceof Finder) {
return $directory;
// Make sure that the provided Finder only finds files and follows symbolic links.
return $directory->files()->followLinks();
} else {
$finder = new Finder();
$finder->sortByName();

16
tests/UtilTest.php
View File

@ -7,6 +7,7 @@
namespace OpenApi\Tests;
use OpenApi\Util;
use Symfony\Component\Finder\Finder;
class UtilTest extends OpenApiTestCase
{
@ -36,4 +37,19 @@ class UtilTest extends OpenApiTestCase
{
$this->assertSame('/blogs/{blog_id}/new~posts', Util::refDecode('~1blogs~1{blog_id}~1new~0posts'));
}
public function testFinder()
{
// Create a finder for one of the example directories that has a subdirectory.
$finder = (new Finder())->in(__DIR__.'/../Examples/using-traits');
$this->assertGreaterThan(0, iterator_count($finder), 'There should be at least a few files and a directory.');
$finder_array = \iterator_to_array($finder);
$directory_path = __DIR__.'/../Examples/using-traits/Decoration';
$this->assertArrayHasKey($directory_path, $finder_array, 'The directory should be a path in the finder.');
// Use the Util method that should set the finder to only find files, since swagger-php only needs files.
$finder_result = Util::finder($finder);
$this->assertGreaterThan(0, iterator_count($finder_result), 'There should be at least a few file paths.');
$finder_result_array = \iterator_to_array($finder_result);
$this->assertArrayNotHasKey($directory_path, $finder_result_array, 'The directory should not be a path in the finder.');
}
}