Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/app/Athenia/Http/Middleware/LogMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ public function terminate(Request $request, Response $response)
'method' => $request->method(),
'url' => $request->fullUrl(),
'data' => $request->all(),
'headers' => $request->headers,
'headers' => $request->headers->all(),
'ip' => $request->ip()
],
'response' => [
'status' => $response->getStatusCode(),
'headers' => $response->headers,
'headers' => $response->headers->all(),
'content' => $response->getContent()
]
]);
Expand Down
2 changes: 0 additions & 2 deletions code/app/Athenia/Providers/BaseServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Support\ServiceProvider;
use Laracasts\Generators\GeneratorsServiceProvider;

abstract class BaseServiceProvider extends ServiceProvider
{
Expand Down Expand Up @@ -215,7 +214,6 @@ public function register(): void
public function registerEnvironmentSpecificProviders(): void
{
if ($this->app->environment() == 'local') {
$this->app->register(GeneratorsServiceProvider::class);
$this->app->register(IdeHelperServiceProvider::class);
}
}
Expand Down
66 changes: 0 additions & 66 deletions code/app/Models/User/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -453,70 +453,4 @@ public function buildModelValidationRules(...$params): array
],
];
}

/**
* Swagger definition below...
*
* @SWG\Definition(
* type="object",
* definition="User",
* @SWG\Property(
* property="id",
* type="integer",
* format="int32",
* description="The primary id of the model",
* readOnly=true
* ),
* @SWG\Property(
* property="created_at",
* type="string",
* format="date-time",
* description="UTC date of the time this was created",
* readOnly=true
* ),
* @SWG\Property(
* property="updated_at",
* type="string",
* format="date-time",
* description="UTC date of the time this was last updated",
* readOnly=true
* ),
* @SWG\Property(
* property="email",
* type="string",
* maxLength=120,
* description="The email address of this user"
* ),
* @SWG\Property(
* property="name",
* type="string",
* maxLength=120,
* description="The name of this user"
* ),
* @SWG\Property(
* property="password",
* type="string",
* minLength=6,
* description="The password for this user. This cannot be read, and it can only be set."
* ),
* @SWG\Property(
* property="roles",
* description="The roles that this user has.",
* type="array",
* @SWG\Items(ref="#/definitions/Role")
* ),
* @SWG\Property(
* property="created_articles",
* description="The articles that this user created.",
* type="array",
* @SWG\Items(ref="#/definitions/Articles")
* ),
* @SWG\Property(
* property="created_iterations",
* description="The iterations that this user created.",
* type="array",
* @SWG\Items(ref="#/definitions/Iterations")
* )
* )
*/
}
22 changes: 10 additions & 12 deletions code/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,28 @@
"type": "project",
"require": {
"php": ">=8.1.0",
"adminui/laravel-eloquent-joins": "^10.0",
"cartalyst/stripe-laravel": "^15.0",
"doctrine/dbal": "^3.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^10.0",
"adminui/laravel-eloquent-joins": "^11.0",
"cartalyst/stripe-laravel": "^16.0",
"guzzlehttp/guzzle": "^7.0",
"laravel/framework": "^11.0",
"laravel/tinker": "~2.0",
"php-open-source-saver/jwt-auth": "^2.0",
"predis/predis": "^2.0",
"pusher/pusher-php-server": "~7.0",
"roave/security-advisories": "dev-master",
"sebastian/diff": "^5.0",
"xantios/mimey": "^2.1",
"ext-zip": "*",
"sebastian/diff": "^6.0",
"xantios/mimey": "^2.0",
"ext-zip": "*",
"ext-imagick": "*"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.8",
"barryvdh/laravel-ide-helper": "^3.0",
"dg/bypass-finals": "^1.6",
"fakerphp/faker": "^1.14",
"filp/whoops": "~2.0",
"laracasts/generators": "^2.0",
"mockery/mockery": "~1.0",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0",
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^11.0",
"spatie/laravel-ignition": "^2.0",
"symfony/thanks": "^1.0"
},
Expand Down
Loading