CommonObject::isInt() decides whether a list-page column gets numeric search mode and is also used when resolving $this->id. The regex /(^int|int$)/ missed sized integer types such as tinyint(4) and bigint(20): they neither start nor end with "int". These types are not exotic: tinyint(4) is used in several core $fields definitions (societe, contact, entrepot, companypaymentmode, ...) and ModuleBuilder-generated tables use bigint(20) for rowid, so isInt() should recognise them rather than requiring callers to change the column type. The new regex /^(?:tiny|small|medium|big)?int|int$/ also handles smallint/mediumint with a size. Anchoring is preserved on purpose so that strings which merely contain "int" (e.g. sellist:Table:...) are still NOT matched, while the Dolibarr foreign-key syntax "integer:Class:path" keeps being detected. Signed-off-by: Jam Balaya <jambalaya.pyoncafe@outlook.jp>
154 lines
4.7 KiB
PHP
154 lines
4.7 KiB
PHP
<?php
|
|
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
|
* Copyright (C) 2023 Alexandre Janniaux <alexandre.janniaux@gmail.com>
|
|
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
|
*
|
|
* This program 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.
|
|
*
|
|
* 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
* or see https://www.gnu.org/
|
|
*/
|
|
|
|
/**
|
|
* \file test/phpunit/CommonObjectTest.php
|
|
* \ingroup test
|
|
* \brief PHPUnit test
|
|
* \remarks To run this script as CLI: phpunit filename.php
|
|
*/
|
|
|
|
global $conf,$user,$langs,$db;
|
|
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
|
|
//require_once 'PHPUnit/Autoload.php';
|
|
require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
|
|
require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php';
|
|
require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php';
|
|
require_once dirname(__FILE__).'/CommonClassTest.class.php';
|
|
|
|
if (empty($user->id)) {
|
|
print "Load permissions for admin user nb 1\n";
|
|
$user->fetch(1);
|
|
$user->loadRights();
|
|
}
|
|
$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
|
|
|
|
|
|
/**
|
|
* Class for PHPUnit tests
|
|
*
|
|
* @backupGlobals disabled
|
|
* @backupStaticAttributes enabled
|
|
* @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
|
|
*/
|
|
class CommonObjectTest extends CommonClassTest
|
|
{
|
|
/**
|
|
* testFetchUser
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testFetchUser()
|
|
{
|
|
global $conf,$user,$langs,$db;
|
|
$conf = $this->savconf;
|
|
$user = $this->savuser;
|
|
$langs = $this->savlangs;
|
|
$db = $this->savdb;
|
|
|
|
$localobject = new Commande($db);
|
|
$localobject->fetch(1);
|
|
|
|
$result = $localobject->fetch_user(1);
|
|
|
|
print __METHOD__." result=".$result."\n";
|
|
$this->assertLessThan($localobject->user->id, 0);
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* testFetchProject
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testFetchProject()
|
|
{
|
|
global $conf,$user,$langs,$db;
|
|
$conf = $this->savconf;
|
|
$user = $this->savuser;
|
|
$langs = $this->savlangs;
|
|
$db = $this->savdb;
|
|
|
|
$localobject = new Commande($db);
|
|
$localobject->fetch(1);
|
|
$result = $localobject->fetchProject();
|
|
|
|
print __METHOD__." result=".$result."\n";
|
|
$this->assertLessThanOrEqual($result, 0);
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* testFetchThirdParty
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testFetchThirdParty()
|
|
{
|
|
global $conf,$user,$langs,$db;
|
|
$conf = $this->savconf;
|
|
$user = $this->savuser;
|
|
$langs = $this->savlangs;
|
|
$db = $this->savdb;
|
|
|
|
$localobject = new Commande($db);
|
|
$localobject->fetch(1);
|
|
|
|
$result = $localobject->fetch_thirdparty();
|
|
|
|
print __METHOD__." result=".$result."\n";
|
|
$this->assertLessThanOrEqual($result, 0);
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* testIsInt
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testIsInt()
|
|
{
|
|
global $conf,$user,$langs,$db;
|
|
$conf = $this->savconf;
|
|
$user = $this->savuser;
|
|
$langs = $this->savlangs;
|
|
$db = $this->savdb;
|
|
|
|
$localobject = new Commande($db);
|
|
|
|
// Integer types, with or without a size/unsigned suffix, must be detected.
|
|
$this->assertTrue($localobject->isInt(array('type' => 'int')), 'int');
|
|
$this->assertTrue($localobject->isInt(array('type' => 'int(11)')), 'int(11)');
|
|
$this->assertTrue($localobject->isInt(array('type' => 'integer')), 'integer');
|
|
$this->assertTrue($localobject->isInt(array('type' => 'tinyint(4)')), 'tinyint(4)');
|
|
$this->assertTrue($localobject->isInt(array('type' => 'smallint(6)')), 'smallint(6)');
|
|
$this->assertTrue($localobject->isInt(array('type' => 'bigint(20)')), 'bigint(20)');
|
|
// Dolibarr foreign-key column syntax "integer:Class:path" must keep being detected.
|
|
$this->assertTrue($localobject->isInt(array('type' => 'integer:User:user/class/user.class.php')), 'integer:User:...');
|
|
|
|
// Non-integer types must not be detected, including strings that merely contain "int".
|
|
$this->assertFalse($localobject->isInt(array('type' => 'varchar(255)')), 'varchar(255)');
|
|
$this->assertFalse($localobject->isInt(array('type' => 'double(24,8)')), 'double(24,8)');
|
|
$this->assertFalse($localobject->isInt(array('type' => 'date')), 'date');
|
|
$this->assertFalse($localobject->isInt(array('type' => 'sellist:llx_c_typent:libelle:id')), 'sellist:...');
|
|
|
|
print __METHOD__." OK\n";
|
|
}
|
|
}
|