@@ -481,7 +481,7 @@  | 
                                                    ||
| 481 | 481 | * 'client_error_msg' is set so it can be displayed by the  | 
                                                        
| 482 | 482 | * printOIDCErrorPage() function.  | 
                                                        
| 483 | 483 | *  | 
                                                        
| 484 | - * @return bool True if the various parameters related to the OIDC  | 
                                                        |
| 484 | + * @return null|boolean True if the various parameters related to the OIDC  | 
                                                        |
| 485 | 485 | * session are present. False otherwise.  | 
                                                        
| 486 | 486 | */  | 
                                                        
| 487 | 487 | function verifyOIDCParams()  | 
                                                        
@@ -4,10 +4,10 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | 8 | use CILogon\Service\DBService;  | 
                                                        
| 10 | 9 | use CILogon\Service\Loggit;  | 
                                                        
| 10 | +use CILogon\Service\Util;  | 
                                                        |
| 11 | 11 | |
| 12 | 12 | Util::startPHPSession();  | 
                                                        
| 13 | 13 | |
@@ -4,11 +4,11 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | -use CILogon\Service\PortalCookie;  | 
                                                        |
| 10 | 8 | use CILogon\Service\DBService;  | 
                                                        
| 11 | 9 | use CILogon\Service\Loggit;  | 
                                                        
| 10 | +use CILogon\Service\PortalCookie;  | 
                                                        |
| 11 | +use CILogon\Service\Util;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | Util::startPHPSession();  | 
                                                        
| 14 | 14 | |
@@ -137,6 +137,7 @@  | 
                                                    ||
| 137 | 137 | *  | 
                                                        
| 138 | 138 | * @param OAuth2Provider An exsiting OAuth2Provider object  | 
                                                        
| 139 | 139 | * @param League\OAuth2\Client\Token\AccessToken An oauth2 token  | 
                                                        
| 140 | + * @param OAuth2Provider $oauth2  | 
                                                        |
| 140 | 141 | * @return string A GitHub user's primary email address, or empty string  | 
                                                        
| 141 | 142 | * if no such email address exists.  | 
                                                        
| 142 | 143 | */  | 
                                                        
@@ -4,8 +4,8 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\OAuth2Provider;  | 
                                                        
| 8 | +use CILogon\Service\Util;  | 
                                                        |
| 9 | 9 | use League\OAuth2\Client\Token\AccessToken;  | 
                                                        
| 10 | 10 | |
| 11 | 11 | Util::startPHPSession();  | 
                                                        
@@ -4,10 +4,10 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | -use CILogon\Service\ShibError;  | 
                                                        |
| 10 | 8 | use CILogon\Service\Loggit;  | 
                                                        
| 9 | +use CILogon\Service\ShibError;  | 
                                                        |
| 10 | +use CILogon\Service\Util;  | 
                                                        |
| 11 | 11 | |
| 12 | 12 | Util::startPHPSession();  | 
                                                        
| 13 | 13 | |
@@ -4,9 +4,9 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | 8 | use CILogon\Service\PortalCookie;  | 
                                                        
| 9 | +use CILogon\Service\Util;  | 
                                                        |
| 10 | 10 | |
| 11 | 11 | Util::startPHPSession();  | 
                                                        
| 12 | 12 | |
@@ -4,12 +4,12 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | 8 | use CILogon\Service\DBService;  | 
                                                        
| 9 | +use CILogon\Service\Loggit;  | 
                                                        |
| 10 | 10 | use CILogon\Service\MyProxy;  | 
                                                        
| 11 | 11 | use CILogon\Service\TwoFactor;  | 
                                                        
| 12 | -use CILogon\Service\Loggit;  | 
                                                        |
| 12 | +use CILogon\Service\Util;  | 
                                                        |
| 13 | 13 | |
| 14 | 14 | Util::startPHPSession();  | 
                                                        
| 15 | 15 | |
@@ -4,9 +4,9 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | |
| 7 | -use CILogon\Service\Util;  | 
                                                        |
| 8 | 7 | use CILogon\Service\Content;  | 
                                                        
| 9 | 8 | use CILogon\Service\ShibError;  | 
                                                        
| 9 | +use CILogon\Service\Util;  | 
                                                        |
| 10 | 10 | |
| 11 | 11 | Util::startPHPSession();  | 
                                                        
| 12 | 12 | |