From bdad43aad944ea702ceb5ac092439fbe0786fb6e Mon Sep 17 00:00:00 2001 From: David Young Date: Wed, 20 Sep 2023 06:18:08 -0600 Subject: [PATCH] Updated to use Controller attribute (#38) --- .github/workflows/ci.yml | 2 ++ src/Auth/Api/Controllers/AuthController.php | 8 ++++---- src/Users/Api/Controllers/UserController.php | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5b055d..1e36316 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,8 @@ on: branches: - '*.x' pull_request: + schedule: + - cron: '0 0 * * *' jobs: ci: runs-on: ubuntu-latest diff --git a/src/Auth/Api/Controllers/AuthController.php b/src/Auth/Api/Controllers/AuthController.php index c41e441..145420d 100644 --- a/src/Auth/Api/Controllers/AuthController.php +++ b/src/Auth/Api/Controllers/AuthController.php @@ -4,20 +4,20 @@ namespace App\Auth\Api\Controllers; -use Aphiria\Api\Controllers\Controller; +use Aphiria\Api\Controllers\Controller as BaseController; use Aphiria\Authentication\Attributes\Authenticate; use Aphiria\Authentication\IAuthenticator; use Aphiria\Net\Http\IResponse; use Aphiria\Net\Http\Response; +use Aphiria\Routing\Attributes\Controller; use Aphiria\Routing\Attributes\Post; -use Aphiria\Routing\Attributes\RouteGroup; use Exception; /** * Defines the auth controller */ -#[RouteGroup('/auth')] -final class AuthController extends Controller +#[Controller('/auth')] +final class AuthController extends BaseController { /** * @param IAuthenticator $authenticator The authenticator diff --git a/src/Users/Api/Controllers/UserController.php b/src/Users/Api/Controllers/UserController.php index 056e90a..e0e1f23 100644 --- a/src/Users/Api/Controllers/UserController.php +++ b/src/Users/Api/Controllers/UserController.php @@ -4,7 +4,7 @@ namespace App\Users\Api\Controllers; -use Aphiria\Api\Controllers\Controller; +use Aphiria\Api\Controllers\Controller as BaseController; use Aphiria\Authentication\Attributes\Authenticate; use Aphiria\Authentication\IAuthenticator; use Aphiria\Authorization\Attributes\AuthorizeRoles; @@ -13,10 +13,10 @@ use Aphiria\Authorization\RequirementHandlerNotFoundException; use Aphiria\Net\Http\HttpException; use Aphiria\Net\Http\IResponse; +use Aphiria\Routing\Attributes\Controller; use Aphiria\Routing\Attributes\Delete; use Aphiria\Routing\Attributes\Get; use Aphiria\Routing\Attributes\Post; -use Aphiria\Routing\Attributes\RouteGroup; use App\Users\InvalidPageException; use App\Users\IUserService; use App\Users\NewUser; @@ -27,8 +27,8 @@ /** * Defines the user controller */ -#[RouteGroup('/users')] -final class UserController extends Controller +#[Controller('/users')] +final class UserController extends BaseController { /** * @param IUserService $users The user service