Merge remote-tracking branch 'origin/plugin-arch' into plugin-arch

# Conflicts:
#	src/Tools/Generator.php
This commit is contained in:
shalvah
2019-09-02 21:51:34 +01:00
12 changed files with 35 additions and 27 deletions

View File

@@ -30,7 +30,7 @@ class TestController extends Controller
*/
public function withGroupOverride()
{
return "Group B, baby!";
return 'Group B, baby!';
}
/**
@@ -66,7 +66,7 @@ class TestController extends Controller
}
/**
* Endpoint with body parameters
* Endpoint with body parameters.
*
* @bodyParam user_id int required The id of the user. Example: 9
* @bodyParam room_id string The id of the room.

View File

@@ -29,7 +29,7 @@ class GenerateDocumentationTest extends TestCase
public function tearDown()
{
Utils::deleteDirectoryAndContents('/public/docs');
Utils::deleteDirectoryAndContents('/public/docs');
}
/**

View File

@@ -453,7 +453,7 @@ abstract class GeneratorTestCase extends TestCase
$this->assertEquals(200, $response['status']);
$this->assertSame(
$response['content'],
'{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},' .
'{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},'.
'{"id":1,"description":"Welcome on this test versions","name":"TestName"}]}'
);
}
@@ -472,7 +472,7 @@ abstract class GeneratorTestCase extends TestCase
$this->assertEquals(200, $response['status']);
$this->assertSame(
$response['content'],
'{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},' .
'{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},'.
'{"id":1,"description":"Welcome on this test versions","name":"TestName"}]}'
);
}
@@ -610,7 +610,7 @@ abstract class GeneratorTestCase extends TestCase
public function can_parse_response_file_tag()
{
// copy file to storage
$filePath = __DIR__ . '/../Fixtures/response_test.json';
$filePath = __DIR__.'/../Fixtures/response_test.json';
$fixtureFileJson = file_get_contents($filePath);
copy($filePath, storage_path('response_test.json'));
@@ -635,7 +635,7 @@ abstract class GeneratorTestCase extends TestCase
public function can_add_or_replace_key_value_pair_in_response_file()
{
// copy file to storage
$filePath = __DIR__ . '/../Fixtures/response_test.json';
$filePath = __DIR__.'/../Fixtures/response_test.json';
$fixtureFileJson = file_get_contents($filePath);
copy($filePath, storage_path('response_test.json'));
@@ -660,10 +660,10 @@ abstract class GeneratorTestCase extends TestCase
public function can_parse_multiple_response_file_tags_with_status_codes()
{
// copy file to storage
$successFilePath = __DIR__ . '/../Fixtures/response_test.json';
$successFilePath = __DIR__.'/../Fixtures/response_test.json';
$successFixtureFileJson = file_get_contents($successFilePath);
copy($successFilePath, storage_path('response_test.json'));
$errorFilePath = __DIR__ . '/../Fixtures/response_error_test.json';
$errorFilePath = __DIR__.'/../Fixtures/response_error_test.json';
$errorFixtureFileJson = file_get_contents($errorFilePath);
copy($errorFilePath, storage_path('response_error_test.json'));