[Fmsystem-commits] [15178] rental: type hinting

[sigurdne]

Revision: 15178
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15178
Author:   sigurdne
Date:     2016-05-19 14:43:47 +0000 (Thu, 19 May 2016)
Log Message:
-----------
rental: type hinting

Modified Paths:
--------------
    trunk/rental/inc/class.socontract.inc.php
    trunk/rental/inc/class.uiprice_item.inc.php
    trunk/rental/inc/model/class.composite.inc.php

Modified: trunk/rental/inc/class.socontract.inc.php
===================================================================
--- trunk/rental/inc/class.socontract.inc.php   2016-05-19 10:24:37 UTC (rev 
15177)
+++ trunk/rental/inc/class.socontract.inc.php   2016-05-19 14:43:47 UTC (rev 
15178)
@@ -384,7 +384,7 @@
                        return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
                }
 
-               public function get_id_field_name( $extended_info = false )
+               protected function get_id_field_name( $extended_info = false )
                {
                        if (!$extended_info)
                        {
@@ -402,7 +402,7 @@
                        return $ret;
                }
 
-               function populate( int $contract_id, &$contract )
+               protected function populate( int $contract_id, &$contract )
                {
 
                        if ($contract == null) // new contract
@@ -592,7 +592,7 @@
                 * @param $contract the contract to be updated
                 * @return result receipt from the db operation
                 */
-               function update( $contract )
+               protected function update( $contract )
                {
                        $id = intval($contract->get_id());
 
@@ -730,7 +730,7 @@
                 * @param $contract the contract to be added
                 * @return array result receipt from the db operation
                 */
-               function add( &$contract )
+               protected function add( &$contract )
                {
 
                        
$contract->set_id(self::get_new_id($contract->get_old_contract_id()));

Modified: trunk/rental/inc/class.uiprice_item.inc.php
===================================================================
--- trunk/rental/inc/class.uiprice_item.inc.php 2016-05-19 10:24:37 UTC (rev 
15177)
+++ trunk/rental/inc/class.uiprice_item.inc.php 2016-05-19 14:43:47 UTC (rev 
15178)
@@ -1,6 +1,5 @@
 <?php
        phpgw::import_class('rental.uicommon');
-       phpgw::import_class('rental.socontract');
        phpgw::import_class('rental.soprice_item');
        phpgw::import_class('rental.socontract_price_item');
        phpgw::import_class('rental.socontract');

Modified: trunk/rental/inc/model/class.composite.inc.php
===================================================================
--- trunk/rental/inc/model/class.composite.inc.php      2016-05-19 10:24:37 UTC 
(rev 15177)
+++ trunk/rental/inc/model/class.composite.inc.php      2016-05-19 14:43:47 UTC 
(rev 15178)
@@ -35,7 +35,7 @@
                 * 
                 * @param int $id the id of this composite
                 */
-               public function __construct( int $id = 0 )
+               public function __construct( int $id = null )
                {
                        parent::__construct($id);
                        $this->units = array();