Fix: Cannot instantiate abstract class

This commit is contained in:
Regis Houssin
2011-09-29 10:08:26 +02:00
parent 8dfa506a65
commit 8988d346d0
15 changed files with 20 additions and 82 deletions

View File

@@ -42,23 +42,6 @@ abstract class ActionsContactCardCommon
//! Error array
var $errors=array();
/**
* Constructor
*
* @param DoliDB $DB Handler acces base de donnees
* @param string $dirmodule Name of directory of module
* @param string $targetmodule Name of directory where canvas is stored
* @param string $canvas Name of canvas
* @param string $card Name of tab (sub-canvas)
*/
function __construct($DB, $dirmodule, $targetmodule, $canvas, $card)
{
$this->db = $DB;
$this->dirmodule = $dirmodule;
$this->targetmodule = $targetmodule;
$this->canvas = $canvas;
$this->card = $card;
}
/**
* Instantiation of DAO class

View File

@@ -31,17 +31,6 @@ abstract class Stats
protected $db;
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @return Stats
*/
function Stats($DB)
{
$this->db = $DB;
}
/**
* Return nb of entity by month for several years
*

View File

@@ -49,20 +49,7 @@ abstract class DolibarrModules
//! Tableau des documents ???
var $docs;
var $dbversion;
/**
* Constructor
*
* @param DoliDB $DB Database handler
*/
function DolibarrModules($DB)
{
$this->db = $DB ;
$this->dbversion = "-";
}
var $dbversion = "-";
/**
* Fonction d'activation. Insere en base les constantes et boites du module

View File

@@ -66,7 +66,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
* \brief Classe mere des modeles de numerotation des references de commandes
*/
class ModeleNumRefCommandes
abstract class ModeleNumRefCommandes
{
var $error='';

View File

@@ -60,7 +60,7 @@ abstract class ModeleDon extends CommonDocGenerator
* \class ModeleNumRefDons
* \brief Classe mere des modeles de numerotation des references des dons
*/
class ModeleNumRefDons
abstract class ModeleNumRefDons
{
var $error='';

View File

@@ -61,7 +61,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
* \class ModeleNumRefFactures
* \brief Classe mere des modeles de numerotation des references de facture
*/
class ModeleNumRefFactures
abstract class ModeleNumRefFactures
{
var $error='';

View File

@@ -60,7 +60,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
* \class ModeleNumRefFicheinter
* \brief Classe mere des modeles de numerotation des references de fiches d'intervention
*/
class ModeleNumRefFicheinter
abstract class ModeleNumRefFicheinter
{
var $error='';

View File

@@ -61,7 +61,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
* \class ModeleNumRefDeliveryOrder
* \brief Classe mere des modeles de numerotation des references de bon de livraison
*/
class ModeleNumRefDeliveryOrder
abstract class ModeleNumRefDeliveryOrder
{
var $error='';

View File

@@ -35,11 +35,6 @@ abstract class MailingTargets
var $db='';
var $error='';
function MailingTargets($DB)
{
$this->db=$DB;
}
/** \brief Renvoi un exemple de numerotation
* \return string Retourne la traduction de la cle MailingModuleDescXXX ou XXX nom du module, ou $this->desc si non trouve
*/

View File

@@ -77,8 +77,8 @@ class modPaypal extends DolibarrModules
// Dependencies
$this->depends = array(); // List of modules id that must be enabled if this module is enabled
$this->requiredby = array('modPaypalPlus'); // List of modules id to disable if this one is disabled
$this->phpmin = array(4,1); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(3,0,-2); // Minimum version of Dolibarr required by module
$this->phpmin = array(5,2); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module
$this->langfiles = array("paypal");
// Constants

View File

@@ -58,7 +58,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator
* \class ModeleNumRefProjects
* \brief Classe mere des modeles de numerotation des references de projets
*/
class ModeleNumRefProjects
abstract class ModeleNumRefProjects
{
var $error='';

View File

@@ -61,7 +61,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
* \class ModeleNumRefPropales
* \brief Classe mere des modeles de numerotation des references de propales
*/
class ModeleNumRefPropales
abstract class ModeleNumRefPropales
{
var $error='';

View File

@@ -65,7 +65,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
* \class ModeleNumRefSuppliersOrders
* \brief Classe mere des modeles de numerotation des references de commandes fournisseurs
*/
class ModeleNumRefSuppliersOrders
abstract class ModeleNumRefSuppliersOrders
{
var $error='';

View File

@@ -789,13 +789,14 @@ function UnActivate($value, $requiredby=1)
}
else
{
$genericMod = new DolibarrModules($db);
$genericMod->name=preg_replace('/^mod/i','',$modName);
$genericMod->style_sheet=1;
$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name ".$genericMod->name);
$genericMod->_remove();
// TODO Cannot instantiate abstract class
//$genericMod = new DolibarrModul($db);
//$genericMod->name=preg_replace('/^mod/i','',$modName);
//$genericMod->style_sheet=1;
//$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
//$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name " . $modName);
//$genericMod->_remove();
}
// Desactivation des modules qui dependent de lui

View File

@@ -42,24 +42,7 @@ abstract class ActionsCardCommon
var $error;
//! Error array
var $errors=array();
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param string $dirmodule Name of directory of module
* @param string $targetmodule Name of directory where canvas is stored
* @param string $canvas Name of canvas
* @param string $card Name of tab (sub-canvas)
*/
function __construct($DB, $dirmodule, $targetmodule, $canvas, $card)
{
$this->db = $DB;
$this->dirmodule = $dirmodule;
$this->targetmodule = $targetmodule;
$this->canvas = $canvas;
$this->card = $card;
}
/**
* Instantiation of DAO class