mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 13:38:32 +01:00
Code Issues Projects Releases Wiki Activity

MDL-71395 core: fix bug in google lib wrapper

Browse Source 
because of changes in PHP8 the '' == 0 is no longer true and the error in the google api wrapper was discovered
This commit is contained in:
Marina Glancy 2021-05-06 13:44:30 +02:00
parent d7d609162e
commit 5148d33fa1
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/google/curlio.php
View File

@ -124,7 +124,7 @@ class moodle_google_curlio extends Google_IO_Curl {
$curlerrornum = $curl->get_errno();
$curlerror = $curl->error;
if ($respdata != CURLE_OK) {
if ($curlerrornum != CURLE_OK) {
throw new Google_IO_Exception($curlerror);
}

40
lib/tests/googlelib_test.php Normal file
View File

@ -0,0 +1,40 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Tests for google library
*
* @package core
* @copyright 2021 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_googlelib_testcase extends advanced_testcase {
public function test_invalid_google_api_key() {
global $CFG;
require_once($CFG->libdir . '/google/lib.php');
$client = get_google_client();
$client->setDeveloperKey('invalid');
$client->setScopes(array(Google_Service_YouTube::YOUTUBE_READONLY));
$service = new Google_Service_YouTube($client);
try {
$service->videoCategories->listVideoCategories('snippet', ['regionCode' => 'us']);
$this->fail('Exception expected');
} catch (Google_Service_Exception $e) {
$this->assertMatchesRegularExpression('/API key not valid/', $e->getMessage());
}
}
}