| @@ -129,7 +129,7 @@ | ||
| 129 | 129 | /** | 
| 130 | 130 | * Assigns a Smarty variable | 
| 131 | 131 | * | 
| 132 | - * @param array|string $name the template variable name(s) | |
| 132 | + * @param string $name the template variable name(s) | |
| 133 | 133 | * @param mixed $value the value to assign | 
| 134 | 134 | */ | 
| 135 | 135 | abstract protected function assign($name, $value); | 
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | /** | 
| 48 | 48 | * Gets the default route if no explicit route is requested. | 
| 49 | 49 | * | 
| 50 | - * @return callable | |
| 50 | + * @return string[] | |
| 51 | 51 | */ | 
| 52 | 52 | protected function getDefaultRoute() | 
| 53 | 53 |      { | 
| @@ -435,7 +435,7 @@ | ||
| 435 | 435 | } | 
| 436 | 436 | |
| 437 | 437 | /** | 
| 438 | - * @return callable | |
| 438 | + * @return string[] | |
| 439 | 439 | */ | 
| 440 | 440 | protected function getDefaultRoute() | 
| 441 | 441 |      { | 
| @@ -15,27 +15,20 @@ discard block | ||
| 15 | 15 | use Waca\Pages\PageEmailManagement; | 
| 16 | 16 | use Waca\Pages\PageExpandedRequestList; | 
| 17 | 17 | use Waca\Pages\PageJobQueue; | 
| 18 | -use Waca\Pages\RequestAction\PageCreateRequest; | |
| 19 | -use Waca\Pages\UserAuth\PageChangePassword; | |
| 20 | -use Waca\Pages\UserAuth\PageForgotPassword; | |
| 21 | 18 | use Waca\Pages\PageLog; | 
| 22 | -use Waca\Pages\UserAuth\PageLogin; | |
| 23 | -use Waca\Pages\UserAuth\PageLogout; | |
| 24 | 19 | use Waca\Pages\PageMain; | 
| 25 | -use Waca\Pages\UserAuth\PageOAuth; | |
| 26 | -use Waca\Pages\UserAuth\PageOAuthCallback; | |
| 27 | -use Waca\Pages\UserAuth\PagePreferences; | |
| 28 | -use Waca\Pages\Registration\PageRegisterStandard; | |
| 29 | -use Waca\Pages\Registration\PageRegisterOption; | |
| 30 | 20 | use Waca\Pages\PageSearch; | 
| 31 | 21 | use Waca\Pages\PageSiteNotice; | 
| 32 | 22 | use Waca\Pages\PageTeam; | 
| 33 | 23 | use Waca\Pages\PageUserManagement; | 
| 34 | 24 | use Waca\Pages\PageViewRequest; | 
| 35 | 25 | use Waca\Pages\PageWelcomeTemplateManagement; | 
| 26 | +use Waca\Pages\Registration\PageRegisterOption; | |
| 27 | +use Waca\Pages\Registration\PageRegisterStandard; | |
| 36 | 28 | use Waca\Pages\RequestAction\PageBreakReservation; | 
| 37 | 29 | use Waca\Pages\RequestAction\PageCloseRequest; | 
| 38 | 30 | use Waca\Pages\RequestAction\PageComment; | 
| 31 | +use Waca\Pages\RequestAction\PageCreateRequest; | |
| 39 | 32 | use Waca\Pages\RequestAction\PageCustomClose; | 
| 40 | 33 | use Waca\Pages\RequestAction\PageDeferRequest; | 
| 41 | 34 | use Waca\Pages\RequestAction\PageDropRequest; | 
| @@ -49,6 +42,13 @@ discard block | ||
| 49 | 42 | use Waca\Pages\Statistics\StatsTemplateStats; | 
| 50 | 43 | use Waca\Pages\Statistics\StatsTopCreators; | 
| 51 | 44 | use Waca\Pages\Statistics\StatsUsers; | 
| 45 | +use Waca\Pages\UserAuth\PageChangePassword; | |
| 46 | +use Waca\Pages\UserAuth\PageForgotPassword; | |
| 47 | +use Waca\Pages\UserAuth\PageLogin; | |
| 48 | +use Waca\Pages\UserAuth\PageLogout; | |
| 49 | +use Waca\Pages\UserAuth\PageOAuth; | |
| 50 | +use Waca\Pages\UserAuth\PageOAuthCallback; | |
| 51 | +use Waca\Pages\UserAuth\PagePreferences; | |
| 52 | 52 | use Waca\Tasks\IRoutedTask; | 
| 53 | 53 | use Waca\WebRequest; | 
| 54 | 54 | |
| @@ -11,9 +11,7 @@ | ||
| 11 | 11 | use Waca\DataObjects\Log; | 
| 12 | 12 | use Waca\DataObjects\User; | 
| 13 | 13 | use Waca\Fragments\NavigationMenuAccessControl; | 
| 14 | -use Waca\Helpers\HttpHelper; | |
| 15 | 14 | use Waca\Helpers\SearchHelpers\LogSearchHelper; | 
| 16 | -use Waca\IdentificationVerifier; | |
| 17 | 15 | use Waca\PdoDatabase; | 
| 18 | 16 | use Waca\Security\SecurityManager; | 
| 19 | 17 | |
| @@ -24,6 +24,10 @@ discard block | ||
| 24 | 24 | |
| 25 | 25 | trait NavigationMenuAccessControl | 
| 26 | 26 |  { | 
| 27 | + /** | |
| 28 | + * @param string $name | |
| 29 | + * @param boolean $value | |
| 30 | + */ | |
| 27 | 31 | protected abstract function assign($name, $value); | 
| 28 | 32 | |
| 29 | 33 | /** | 
| @@ -32,7 +36,7 @@ discard block | ||
| 32 | 36 | protected abstract function getSecurityManager(); | 
| 33 | 37 | |
| 34 | 38 | /** | 
| 35 | - * @param $currentUser | |
| 39 | + * @param \Waca\DataObjects\User $currentUser | |
| 36 | 40 | */ | 
| 37 | 41 | protected function setupNavMenuAccess($currentUser) | 
| 38 | 42 |      { | 
| @@ -44,6 +44,9 @@ discard block | ||
| 44 | 44 | } | 
| 45 | 45 | } | 
| 46 | 46 | |
| 47 | + /** | |
| 48 | + * @return string | |
| 49 | + */ | |
| 47 | 50 | protected abstract function getRegistrationTemplate(); | 
| 48 | 51 | |
| 49 | 52 | protected function isProtectedPage() | 
| @@ -70,12 +73,12 @@ discard block | ||
| 70 | 73 | } | 
| 71 | 74 | |
| 72 | 75 | /** | 
| 73 | - * @param $emailAddress | |
| 74 | - * @param $password | |
| 75 | - * @param $username | |
| 76 | + * @param null|string $emailAddress | |
| 77 | + * @param null|string $password | |
| 78 | + * @param null|string $username | |
| 76 | 79 | * @param $useOAuthSignup | 
| 77 | - * @param $confirmationId | |
| 78 | - * @param $onwikiUsername | |
| 80 | + * @param null|integer $confirmationId | |
| 81 | + * @param null|string $onwikiUsername | |
| 79 | 82 | * | 
| 80 | 83 | * @throws ApplicationLogicException | 
| 81 | 84 | */ | 
| @@ -233,6 +233,9 @@ | ||
| 233 | 233 | Logger::backgroundJobComplete($this->getDatabase(), $this->getJob()); | 
| 234 | 234 | } | 
| 235 | 235 | |
| 236 | + /** | |
| 237 | + * @param string $reason | |
| 238 | + */ | |
| 236 | 239 | protected function markCancelled($reason = null) | 
| 237 | 240 |      { | 
| 238 | 241 | $this->job->setStatus(JobQueue::STATUS_CANCELLED); | 
| @@ -105,6 +105,9 @@ discard block | ||
| 105 | 105 | return $this->getMediaWikiHelper()->checkAccountExists($name); | 
| 106 | 106 | } | 
| 107 | 107 | |
| 108 | + /** | |
| 109 | + * @param string $reason | |
| 110 | + */ | |
| 108 | 111 | protected function markFailed($reason = null) | 
| 109 | 112 |      { | 
| 110 | 113 | $this->request->setStatus(RequestStatus::HOSPITAL); | 
| @@ -116,7 +119,7 @@ discard block | ||
| 116 | 119 | } | 
| 117 | 120 | |
| 118 | 121 | /** | 
| 119 | - * @param $user | |
| 122 | + * @param User $user | |
| 120 | 123 | * | 
| 121 | 124 | * @throws ApplicationLogicException | 
| 122 | 125 | */ | 
| @@ -225,7 +225,7 @@ | ||
| 225 | 225 | } | 
| 226 | 226 | |
| 227 | 227 | /** | 
| 228 | - * @return mixed | |
| 228 | + * @return string | |
| 229 | 229 | */ | 
| 230 | 230 | public function getError() | 
| 231 | 231 |      { |