Skip to content

fix: file getinfo null on no upload #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralflang merged 2 commits into from
Apr 20, 2026
Merged

fix: file getinfo null on no upload #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93262d8
fix: Restore original behavior of getInfo() for 'file" variable type
amulet1 Apr 19, 2026
3664ff0
test: Add regression test against the File behaviour change
ralflang Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions lib/Horde/Form/Type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,23 +1180,25 @@ public function isValid($var, $vars, $value, $message)

public function getInfo($vars, $var, $info)
{
$info = [];
$name = $var->getVarName();
try {
$GLOBALS['browser']->wasFileUploaded($name);
/**
* WARNING: Horde_Util::dispelMagicQuotes() removed in PSR-4 version
* Magic quotes are obsolete in PHP 8+. Remove this call.
*/
$info['name'] = Horde_Util::dispelMagicQuotes($_FILES[$name]['name']);
$info['type'] = $_FILES[$name]['type'];
$info['tmp_name'] = $_FILES[$name]['tmp_name'];
$info['file'] = $_FILES[$name]['tmp_name'];
$info['error'] = $_FILES[$name]['error'];
$info['size'] = $_FILES[$name]['size'];
return [
/**
* WARNING: Horde_Util::dispelMagicQuotes() removed in PSR-4 version
* Magic quotes are obsolete in PHP 8+. Remove this call.
*/
'name' => Horde_Util::dispelMagicQuotes($_FILES[$name]['name']),
'type' => $_FILES[$name]['type'],
'tmp_name' => $_FILES[$name]['tmp_name'],
'file' => $_FILES[$name]['tmp_name'],
'error' => $_FILES[$name]['error'],
'size' => $_FILES[$name]['size'],
];
} catch (Horde_Browser_Exception $e) {
}
return $info;

return null;
}

/**
Expand Down
25 changes: 13 additions & 12 deletions src/V3/FileVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,25 @@ public function isValid(Horde_Variables $vars, $value): bool
//TODO: Rename back to getInfo() after the V3 transition
protected function getInfoV3($vars)
{
$info = [];
$name = $this->getVarName();
try {
$GLOBALS['browser']->wasFileUploaded($name);
/**
* WARNING: Horde_Util::dispelMagicQuotes() removed in PSR-4 version
* Magic quotes are obsolete in PHP 8+. Remove this call.
*/
$info['name'] = Horde_Util::dispelMagicQuotes($_FILES[$name]['name']);
$info['type'] = $_FILES[$name]['type'];
$info['tmp_name'] = $_FILES[$name]['tmp_name'];
$info['file'] = $_FILES[$name]['tmp_name'];
$info['error'] = $_FILES[$name]['error'];
$info['size'] = $_FILES[$name]['size'];
return [
/**
* WARNING: Horde_Util::dispelMagicQuotes() removed in PSR-4 version
* Magic quotes are obsolete in PHP 8+. Remove this call.
*/
'name' => Horde_Util::dispelMagicQuotes($_FILES[$name]['name']),
'type' => $_FILES[$name]['type'],
'tmp_name' => $_FILES[$name]['tmp_name'],
'file' => $_FILES[$name]['tmp_name'],
'error' => $_FILES[$name]['error'],
'size' => $_FILES[$name]['size'],
];
} catch (Horde_Browser_Exception $e) {
}

return $info;
return null;
}

/**
Expand Down
16 changes: 16 additions & 0 deletions test/stubs/HordeStubs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,22 @@ class Horde_Form_Translation extends Horde_Translation_Autodetect
class Horde_Exception extends Exception {}
}

// Horde_Browser_Exception stub
if (!class_exists('Horde_Browser_Exception')) {
class Horde_Browser_Exception extends Exception {}
}

// Horde_Util stub
if (!class_exists('Horde_Util')) {
class Horde_Util
{
public static function dispelMagicQuotes($input)
{
return $input;
}
}
}

// PEAR stub for legacy error handling
if (!class_exists('PEAR')) {
class PEAR
Expand Down
140 changes: 140 additions & 0 deletions test/unit/Type/FileTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<?php

declare(strict_types=1);

/**
* Tests for file type getInfo() behavior.
*
* Verifies that getInfo() returns null (not empty array) when no file
* was uploaded, and returns file metadata array on successful upload.
*
* Copyright 2026 Horde LLC (http://www.horde.org/)
*
* See the enclosed file LICENSE for license information (LGPL-2.1).
*
* @category Horde
* @package Form
* @subpackage UnitTests
* @license http://www.horde.org/licenses/lgpl21 LGPL-2.1
*/

namespace Horde\Form\Test\Unit\Type;

use Horde_Browser_Exception;
use Horde_Form_Type_file;
use Horde_Form_Variable;
use Horde_Variables;
use Horde\Form\V3\FileVariable;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;

#[CoversClass(Horde_Form_Type_file::class)]
#[CoversClass(FileVariable::class)]
class FileTypeTest extends TestCase
{
private function makeBrowserStub(bool $hasFile): object
{
return new class ($hasFile) {
public function __construct(private bool $hasFile) {}

public function wasFileUploaded(string $name): void
{
if (!$this->hasFile) {
throw new Horde_Browser_Exception('No file uploaded');
}
}
};
}

protected function tearDown(): void
{
unset($GLOBALS['browser']);
}

// ========================================================================
// Legacy Horde_Form_Type_file tests
// ========================================================================

public function testLegacyGetInfoReturnsNullWhenNoFileUploaded(): void
{
$GLOBALS['browser'] = $this->makeBrowserStub(false);

$type = new Horde_Form_Type_file();
$var = new Horde_Form_Variable('Upload', 'upload_field', $type, false);
$vars = new Horde_Variables([]);

$result = $type->getInfo($vars, $var, null);

$this->assertNull($result);
}

public function testLegacyGetInfoReturnsFileArrayOnUpload(): void
{
$GLOBALS['browser'] = $this->makeBrowserStub(true);
$_FILES['upload_field'] = [
'name' => 'test.pdf',
'type' => 'application/pdf',
'tmp_name' => '/tmp/php1234',
'error' => 0,
'size' => 12345,
];

$type = new Horde_Form_Type_file();
$var = new Horde_Form_Variable('Upload', 'upload_field', $type, false);
$vars = new Horde_Variables([]);

$result = $type->getInfo($vars, $var, null);

$this->assertIsArray($result);
$this->assertSame('test.pdf', $result['name']);
$this->assertSame('application/pdf', $result['type']);
$this->assertSame('/tmp/php1234', $result['tmp_name']);
$this->assertSame('/tmp/php1234', $result['file']);
$this->assertSame(0, $result['error']);
$this->assertSame(12345, $result['size']);

unset($_FILES['upload_field']);
}

// ========================================================================
// V3 FileVariable tests
// ========================================================================

public function testV3GetInfoReturnsNullWhenNoFileUploaded(): void
{
$GLOBALS['browser'] = $this->makeBrowserStub(false);

$var = new FileVariable('Upload', 'upload_field', false);
$vars = new Horde_Variables([]);

$result = $var->getInfo($vars);

$this->assertNull($result);
}

public function testV3GetInfoReturnsFileArrayOnUpload(): void
{
$GLOBALS['browser'] = $this->makeBrowserStub(true);
$_FILES['upload_field'] = [
'name' => 'report.xlsx',
'type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'tmp_name' => '/tmp/php5678',
'error' => 0,
'size' => 98765,
];

$var = new FileVariable('Upload', 'upload_field', false);
$vars = new Horde_Variables([]);

$result = $var->getInfo($vars);

$this->assertIsArray($result);
$this->assertSame('report.xlsx', $result['name']);
$this->assertSame('/tmp/php5678', $result['tmp_name']);
$this->assertSame('/tmp/php5678', $result['file']);
$this->assertSame(0, $result['error']);
$this->assertSame(98765, $result['size']);

unset($_FILES['upload_field']);
}
}
Loading