classes/Locator.php

@@ -133,13 +133,17 @@ class Locator {
         // Monolog require timezone to be set
         date_default_timezone_set($this->config->timeZone);
 
-        $logLevel = array_search($this->config->logLevel, \Monolog\Logger::getLevels());
+        //$logLevel = array_search($this->config->logLevel, \Monolog\Logger::getLevels());
+        $logLevel = array_search($this->config->logLevel, \Monolog\Level::NAMES);
+        print_r($logLevel);
 
         $this->serviceLogger = new \Monolog\Logger('serviceLogger');
-        $this->serviceLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->serviceLogFile, $logLevel));
+        //$this->serviceLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->serviceLogFile, $logLevel));
+        $this->serviceLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->serviceLogFile, \Monolog\Level::NAMES[$logLevel]));
 
         $this->auditLogger = new \Monolog\Logger('auditLogger');
-        $this->auditLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->auditLogFile, $logLevel));
+        //$this->auditLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->auditLogFile, $logLevel));
+        $this->auditLogger->pushHandler(new \Monolog\Handler\StreamHandler($this->config->auditLogFile, \Monolog\Level::NAMES[$logLevel]));
     }
 
 }

classes/login/GoogleLogin.php

@@ -26,7 +26,7 @@ class GoogleLogin extends LoginHandler {
         ));
 
         // Ask permission to obtain user email and profile information
-        $client->setScopes(array(\Google_Service_People::USERINFO_EMAIL, \Google_Service_People::USERINFO_PROFILE));
+        $client->setScopes(array(\Google_Service_PeopleService::USERINFO_EMAIL, \Google_Service_PeopleService::USERINFO_PROFILE));
 
         if (isset($_REQUEST['logout'])) {
             // Reset the access token stored into the session

composer.json

@@ -3,12 +3,12 @@
     "description": "Remote Authentication Portal",
     "license": "GPL-3.0-or-later",
     "require": {
-        "mikecao/flight": "1.3.7",
-        "google/apiclient": "2.1.3",
-        "monolog/monolog": "^1.22"
+        "mikecao/flight": "3.11.1",
+        "google/apiclient": "2.17.0",
+        "monolog/monolog": "^3.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.2"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "classmap": [

composer.json.bkp

+{
+    "name": "ia2/rap",
+    "description": "Remote Authentication Portal",
+    "license": "GPL-3.0-or-later",
+    "require": {
+        "mikecao/flight": "1.3.7",
+        "google/apiclient": "2.1.3",
+        "monolog/monolog": "^1.22"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.0"
+    },
+    "autoload": {
+        "classmap": [
+            "classes/"
+        ]
+    }
+}