Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit 2add7ae

Browse files
dmetznerdmetzner
committed
SHARE-337/part2 Major Schema/Model Refactoring
1 parent 2feaf40 commit 2add7ae

File tree

113 files changed

+6776
-7311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+6776
-7311
lines changed

‎.github/workflows/create_pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: Clean old files
1919
run: |
20-
rm -rf .openapi-generator Api Controller DependencyInjection Model Resources Service Tests
20+
rm -rf .openapi-generator Api Controller DependencyInjection Model Resources Service Tests README.md
2121
2222
- name: Open API code generation
2323
run:

‎.openapi-generator/FILES‎

Lines changed: 58 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,56 @@
1111
./Controller/UserController.php
1212
./Controller/UtilityController.php
1313
./Model/BaseUser.php
14+
./Model/BasicUserDataResponse.php
1415
./Model/DryRun.php
15-
./Model/FeaturedProject.php
16-
./Model/JWTTokenResponse.php
17-
./Model/Login.php
18-
./Model/MediaCategories.php
19-
./Model/MediaCategory.php
20-
./Model/MediaFile.php
21-
./Model/MediaPackage.php
22-
./Model/MediaPackages.php
23-
./Model/Project.php
24-
./Model/ProjectUpload.php
25-
./Model/Register.php
26-
./Model/RegisterError.php
27-
./Model/UpdateUser.php
28-
./Model/UpdateUserAllOf.php
29-
./Model/UpdateUserError.php
30-
./Model/UploadError.php
31-
./Model/UserPrivateGet.php
32-
./Model/UserPublicGet.php
16+
./Model/ExtendedUserDataResponse.php
17+
./Model/FeaturedProjectResponse.php
18+
./Model/Flavor.php
19+
./Model/JWTResponse.php
20+
./Model/LoginRequest.php
21+
./Model/MediaCategoryResponse.php
22+
./Model/MediaFileResponse.php
23+
./Model/MediaPackageResponse.php
24+
./Model/ProjectResponse.php
25+
./Model/ProjectUploadRequest.php
26+
./Model/RegisterErrorResponse.php
27+
./Model/RegisterRequest.php
28+
./Model/UpdateUserErrorResponse.php
29+
./Model/UpdateUserRequest.php
30+
./Model/UpdateUserRequestAllOf.php
31+
./Model/UploadErrorResponse.php
3332
./Service/JmsSerializer.php
3433
./Service/SerializerInterface.php
3534
./Service/StrictJsonDeserializationVisitor.php
3635
./Service/SymfonyValidator.php
3736
./Service/TypeMismatchException.php
3837
./Service/ValidatorInterface.php
38+
./Tests/Api/AuthenticationApiInterfaceTest.php
39+
./Tests/Api/MediaLibraryApiInterfaceTest.php
40+
./Tests/Api/ProjectsApiInterfaceTest.php
41+
./Tests/Api/UserApiInterfaceTest.php
42+
./Tests/Api/UtilityApiInterfaceTest.php
3943
./Tests/AppKernel.php
4044
./Tests/Controller/ControllerTest.php
45+
./Tests/Model/BaseUserTest.php
46+
./Tests/Model/BasicUserDataResponseTest.php
47+
./Tests/Model/DryRunTest.php
48+
./Tests/Model/ExtendedUserDataResponseTest.php
49+
./Tests/Model/FeaturedProjectResponseTest.php
50+
./Tests/Model/FlavorTest.php
51+
./Tests/Model/JWTResponseTest.php
52+
./Tests/Model/LoginRequestTest.php
53+
./Tests/Model/MediaCategoryResponseTest.php
54+
./Tests/Model/MediaFileResponseTest.php
55+
./Tests/Model/MediaPackageResponseTest.php
56+
./Tests/Model/ProjectResponseTest.php
57+
./Tests/Model/ProjectUploadRequestTest.php
58+
./Tests/Model/RegisterErrorResponseTest.php
59+
./Tests/Model/RegisterRequestTest.php
60+
./Tests/Model/UpdateUserErrorResponseTest.php
61+
./Tests/Model/UpdateUserRequestAllOfTest.php
62+
./Tests/Model/UpdateUserRequestTest.php
63+
./Tests/Model/UploadErrorResponseTest.php
4164
./Tests/test_config.yml
4265
.coveralls.yml
4366
.gitignore
@@ -55,25 +78,24 @@ Resources/docs/Api/ProjectsApiInterface.md
5578
Resources/docs/Api/UserApiInterface.md
5679
Resources/docs/Api/UtilityApiInterface.md
5780
Resources/docs/Model/BaseUser.md
81+
Resources/docs/Model/BasicUserDataResponse.md
5882
Resources/docs/Model/DryRun.md
59-
Resources/docs/Model/FeaturedProject.md
60-
Resources/docs/Model/JWTTokenResponse.md
61-
Resources/docs/Model/Login.md
62-
Resources/docs/Model/MediaCategories.md
63-
Resources/docs/Model/MediaCategory.md
64-
Resources/docs/Model/MediaFile.md
65-
Resources/docs/Model/MediaPackage.md
66-
Resources/docs/Model/MediaPackages.md
67-
Resources/docs/Model/Project.md
68-
Resources/docs/Model/ProjectUpload.md
69-
Resources/docs/Model/Register.md
70-
Resources/docs/Model/RegisterError.md
71-
Resources/docs/Model/UpdateUser.md
72-
Resources/docs/Model/UpdateUserAllOf.md
73-
Resources/docs/Model/UpdateUserError.md
74-
Resources/docs/Model/UploadError.md
75-
Resources/docs/Model/UserPrivateGet.md
76-
Resources/docs/Model/UserPublicGet.md
83+
Resources/docs/Model/ExtendedUserDataResponse.md
84+
Resources/docs/Model/FeaturedProjectResponse.md
85+
Resources/docs/Model/Flavor.md
86+
Resources/docs/Model/JWTResponse.md
87+
Resources/docs/Model/LoginRequest.md
88+
Resources/docs/Model/MediaCategoryResponse.md
89+
Resources/docs/Model/MediaFileResponse.md
90+
Resources/docs/Model/MediaPackageResponse.md
91+
Resources/docs/Model/ProjectResponse.md
92+
Resources/docs/Model/ProjectUploadRequest.md
93+
Resources/docs/Model/RegisterErrorResponse.md
94+
Resources/docs/Model/RegisterRequest.md
95+
Resources/docs/Model/UpdateUserErrorResponse.md
96+
Resources/docs/Model/UpdateUserRequest.md
97+
Resources/docs/Model/UpdateUserRequestAllOf.md
98+
Resources/docs/Model/UploadErrorResponse.md
7799
autoload.php
78100
git_push.sh
79101
phpunit.xml.dist

‎Api/ApiServer.php‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?php
22
/**
3-
* ApiServer
3+
* ApiServer.
44
*
55
* PHP version 7.1.3
66
*
77
* @category Class
8-
* @package OpenAPI\Server\Api
8+
*
99
* @author OpenAPI Generator team
10-
* @link https://github.com/openapitools/openapi-generator
10+
*
11+
* @see https://github.com/openapitools/openapi-generator
1112
*/
1213

1314
/**
14-
* Catroweb API
15+
* Catroweb API.
1516
*
1617
* API for the Catrobat Share Platform
1718
*
1819
* The version of the OpenAPI document: v1.0.40
1920
* Contact: webmaster@catrobat.org
2021
* Generated by: https://github.com/openapitools/openapi-generator.git
21-
*
2222
*/
2323

2424
/**
@@ -30,51 +30,55 @@
3030
namespace OpenAPI\Server\Api;
3131

3232
/**
33-
* ApiServer Class Doc Comment
33+
* ApiServer Class Doc Comment.
3434
*
3535
* PHP version 5
3636
*
3737
* @category Class
38-
* @package OpenAPI\Server\Api
38+
*
3939
* @author OpenAPI Generator team
40-
* @link https://github.com/openapitools/openapi-generator
40+
*
41+
* @see https://github.com/openapitools/openapi-generator
4142
*/
4243
class ApiServer
4344
{
45+
/**
46+
* @var array
47+
*/
48+
private $apis = [];
4449

45-
/**
46-
* @var array
47-
*/
48-
private $apis = array();
49-
50-
/**
51-
* Adds an API handler to the server.
52-
*
53-
* @param string $api An API name of the handle
54-
* @param mixed $handler A handler to set for the given API
55-
*/
56-
public function addApiHandler($api, $handler)
50+
/**
51+
* Adds an API handler to the server.
52+
*
53+
* @param string $api An API name of the handle
54+
* @param mixed $handler A handler to set for the given API
55+
*/
56+
public function addApiHandler($api, $handler)
57+
{
58+
if (isset($this->apis[$api]))
5759
{
58-
if (isset($this->apis[$api])) {
59-
throw new \InvalidArgumentException('API has already a handler: '.$api);
60-
}
61-
62-
$this->apis[$api] = $handler;
60+
throw new \InvalidArgumentException('API has already a handler: '.$api);
6361
}
6462

65-
/**
66-
* Returns an API handler.
67-
*
68-
* @param string $api An API name of the handle
69-
* @return mixed Returns a handler
70-
* @throws \InvalidArgumentException When no such handler exists
71-
*/
72-
public function getApiHandler($api)
73-
{
74-
if (!isset($this->apis[$api])) {
75-
throw new \InvalidArgumentException('No handler for '.$api.' implemented.');
76-
}
63+
$this->apis[$api] = $handler;
64+
}
7765

78-
return $this->apis[$api];
66+
/**
67+
* Returns an API handler.
68+
*
69+
* @param string $api An API name of the handle
70+
*
71+
* @throws \InvalidArgumentException When no such handler exists
72+
*
73+
* @return mixed Returns a handler
74+
*/
75+
public function getApiHandler($api)
76+
{
77+
if (!isset($this->apis[$api]))
78+
{
79+
throw new \InvalidArgumentException('No handler for '.$api.' implemented.');
7980
}
81+
82+
return $this->apis[$api];
83+
}
8084
}

‎Api/AuthenticationApiInterface.php‎

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?php
22
/**
33
* AuthenticationApiInterface
4-
* PHP version 7.1.3
4+
* PHP version 7.1.3.
55
*
66
* @category Class
7-
* @package OpenAPI\Server
7+
*
88
* @author OpenAPI Generator team
9-
* @link https://github.com/openapitools/openapi-generator
9+
*
10+
* @see https://github.com/openapitools/openapi-generator
1011
*/
1112

1213
/**
13-
* Catroweb API
14+
* Catroweb API.
1415
*
1516
* API for the Catrobat Share Platform
1617
*
1718
* The version of the OpenAPI document: v1.0.40
1819
* Contact: webmaster@catrobat.org
1920
* Generated by: https://github.com/openapitools/openapi-generator.git
20-
*
2121
*/
2222

2323
/**
@@ -28,54 +28,46 @@
2828

2929
namespace OpenAPI\Server\Api;
3030

31-
use Symfony\Component\HttpFoundation\File\UploadedFile;
32-
use OpenAPI\Server\Model\JWTTokenResponse;
33-
use OpenAPI\Server\Model\Login;
31+
use OpenAPI\Server\Model\LoginRequest;
3432

3533
/**
36-
* AuthenticationApiInterface Interface Doc Comment
34+
* AuthenticationApiInterface Interface Doc Comment.
3735
*
3836
* @category Interface
39-
* @package OpenAPI\Server\Api
37+
*
4038
* @author OpenAPI Generator team
41-
* @link https://github.com/openapitools/openapi-generator
39+
*
40+
* @see https://github.com/openapitools/openapi-generator
4241
*/
4342
interface AuthenticationApiInterface
4443
{
44+
/**
45+
* Sets authentication method PandaAuth.
46+
*
47+
* @param string $value value of the PandaAuth authentication method
48+
*/
49+
public function setPandaAuth($value);
4550

46-
/**
47-
* Sets authentication method PandaAuth
48-
*
49-
* @param string $value Value of the PandaAuth authentication method.
50-
*
51-
* @return void
52-
*/
53-
public function setPandaAuth($value);
54-
55-
/**
56-
* Operation authenticationGet
57-
*
58-
* Check token
59-
*
60-
* @param integer $responseCode The HTTP response code to return
61-
* @param array $responseHeaders Additional HTTP headers to return with the response ()
62-
*
63-
* @return void
64-
*
65-
*/
66-
public function authenticationGet(&$responseCode, array &$responseHeaders);
51+
/**
52+
* Operation authenticationGet.
53+
*
54+
* Check token
55+
*
56+
* @param int $responseCode The HTTP response code to return
57+
* @param array $responseHeaders Additional HTTP headers to return with the response ()
58+
*/
59+
public function authenticationGet(&$responseCode, array &$responseHeaders);
6760

68-
/**
69-
* Operation authenticationPost
70-
*
71-
* Login
72-
*
73-
* @param OpenAPI\Server\Model\Login $login (required)
74-
* @param integer $responseCode The HTTP response code to return
75-
* @param array $responseHeaders Additional HTTP headers to return with the response ()
76-
*
77-
* @return OpenAPI\Server\Model\JWTTokenResponse
78-
*
79-
*/
80-
public function authenticationPost(Login $login, &$responseCode, array &$responseHeaders);
61+
/**
62+
* Operation authenticationPost.
63+
*
64+
* Login
65+
*
66+
* @param OpenAPI\Server\Model\LoginRequest $login_request (required)
67+
* @param int $responseCode The HTTP response code to return
68+
* @param array $responseHeaders Additional HTTP headers to return with the response ()
69+
*
70+
* @return OpenAPI\Server\Model\JWTResponse
71+
*/
72+
public function authenticationPost(LoginRequest $login_request, &$responseCode, array &$responseHeaders);
8173
}

0 commit comments

Comments
 (0)