wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18926 from nextcloud/fix/18689/int-array-access

Browse source 
Array access on int will fail on php7.4
This commit is contained in:
Joas Schilling 2020-02-06 21:31:03 +01:00 committed by GitHub
commit 3a0bfbd558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/AppFramework/OCS/BaseResponse.php
View file

@ -126,7 +126,7 @@ abstract class BaseResponse extends Response {
*/
protected function toXML(array $array, \XMLWriter $writer) {
foreach ($array as $k => $v) {
if ($k[0] === '@') {
if (\is_string($k) && strpos($k, '@') === 0) {
$writer->writeAttribute(substr($k, 1), $v);
continue;
}

62
tests/lib/AppFramework/OCS/BaseResponseTest.php Normal file
View file

@ -0,0 +1,62 @@
<?php
declare(strict_types=1);
/**
* @copyright 2020 Daniel Kesselberg <mail@danielkesselberg.de>
*
* @author 2020 Daniel Kesselberg <mail@danielkesselberg.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test\AppFramework\Middleware;
use OC\AppFramework\OCS\BaseResponse;
class BaseResponseTest extends \Test\TestCase {
public function testToXml(): void {
/** @var BaseResponse $response */
$response = $this->createMock(BaseResponse::class);
$writer = new \XMLWriter();
$writer->openMemory();
$writer->setIndent(false);
$writer->startDocument();
$data = [
'hello' => 'hello',
'information' => [
'@test' => 'some data',
'someElement' => 'withAttribute',
],
'value without key',
];
$this->invokePrivate($response, 'toXml', [$data, $writer]);
$writer->endDocument();
$this->assertEquals(
"<?xml version=\"1.0\"?>\n<hello>hello</hello><information test=\"some data\"><someElement>withAttribute</someElement></information><element>value without key</element>\n",
$writer->outputMemory(true)
);
}
}