Changeset 2969

Show
Ignore:
Timestamp:
10/01/08 09:48:27 (7 weeks ago)
Author:
felix
Message:

Merged revisions 2967-2968 via svnmerge from
http://svn.agavi.org/branches/1.0

........

r2967 | david | 2008-09-30 18:25:21 +0200 (Tue, 30 Sep 2008) | 1 line


merge [2947:2966/branches/0.11]

........

r2968 | david | 2008-09-30 19:17:55 +0200 (Tue, 30 Sep 2008) | 1 line


refs #867: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off

........

Location:
branches/felix-testing-implementation
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • branches/felix-testing-implementation

    • Property svnmerge-integrated changed from /branches/1.0:1-2892,2894-2964 /branches/dominik-validation-argument-sources:1-2901 to /branches/1.0:1-2892,2894-2968 /branches/dominik-validation-argument-sources:1-2901

  • branches/felix-testing-implementation/CHANGELOG

    r2965 r2969  
    55------------------------------- 
    66 
     7FIX: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off (#867) (David) 
    78FIX: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument (#865) (David) 
    89 

  • branches/felix-testing-implementation/src/config/AgaviConfigCache.class.php

    r2887 r2969  
    349349   
    350350  /** 
    351    * add the config handlers from the given config file 
     351   * Add the config handlers from the given config file. 
     352   * Existing handlers will not be overwritten. 
    352353   *  
    353    * existing handlers will not be overwritten 
    354    *  
    355    * @param      string the path to the config_handlers.xml 
     354   * @param      string The path to a config_handlers.xml file. 
    356355   *  
    357356   * @author     Felix Gilcher <felix.gilcher@bitextender.com> 
    358357   * @since      1.0.0 
    359    *  
    360358   */ 
    361359  public static function loadConfigHandlersFile($cfg) 
    362360  { 
    363     self::$handlers += include AgaviConfigCache::checkConfig($cfg); 
     361    self::$handlers = (array)self::$handlers + include(AgaviConfigCache::checkConfig($cfg)); 
    364362  } 
    365363 

  • branches/felix-testing-implementation/src/config/AgaviReturnArrayConfigHandler.class.php

    r2296 r2969  
    2929 * @version    $Id$ 
    3030 */ 
    31  
    3231class AgaviReturnArrayConfigHandler extends AgaviConfigHandler 
    3332{ 

  • branches/felix-testing-implementation/src/date/AgaviCalendar.class.php

    r2348 r2969  
    3737   * @since      0.11.0 
    3838   */ 
    39  
    4039  protected $translationManager; 
    4140 

  • branches/felix-testing-implementation/src/date/AgaviGregorianCalendar.class.php

    r2289 r2969  
    495495   * @since      0.11.0 
    496496   */ 
    497  
    498497  protected function handleGetMonthLength($extendedYear, $month) 
    499498  { 
    … …  
    527526   * @since      0.11.0 
    528527   */ 
    529  
    530528  protected function monthLength($month) 
    531529  { 
    … …  
    546544   * @since      0.11.0 
    547545   */ 
    548  
    549546  protected function monthLength1($month, $year) 
    550547  { 
    … …  
    562559   * @since      0.11.0 
    563560   */ 
    564  
    565561  protected function yearLength1($year) 
    566562  { 
    … …  
    577573   * @since      0.11.0 
    578574   */ 
    579  
    580575  protected function yearLength() 
    581576  { 
    … …  
    593588   * @since      0.11.0 
    594589   */ 
    595  
    596590  protected function pinDayOfMonth() 
    597591  { 
    … …  
    612606   * @since      0.11.0 
    613607   */ 
    614  
    615608  protected function getEpochDay() 
    616609  { 
    … …  
    630623   * @since      0.11.0 
    631624   */ 
    632  
    633625  protected function handleGetLimit($field, $limitType) 
    634626  { 
    … …  
    643635   * @since      0.11.0 
    644636   */ 
    645  
    646637  protected function handleGetExtendedYear() 
    647638  { 
    … …  
    682673   * @since      0.11.0 
    683674   */ 
    684  
    685675  protected function handleGetExtendedYearFromWeekFields($yearWoy, $woy) 
    686676  { 
    … …  
    700690   * @since      0.11.0 
    701691   */ 
    702  
    703692  protected function handleComputeFields($julianDay) 
    704693  { 

  • branches/felix-testing-implementation/src/date/AgaviTimeZoneDataParser.class.php

    r2259 r2969  
    2929 * @version    $Id$ 
    3030 */ 
    31  
    3231class AgaviTimeZoneDataParser 
    3332{ 

  • branches/felix-testing-implementation/src/validator/AgaviValidationManager.class.php

    r2902 r2969  
    2929 * @version    $Id$ 
    3030 */ 
    31  
    3231class AgaviValidationManager extends AgaviParameterHolder implements AgaviIValidatorContainer 
    3332{ 

  • branches/felix-testing-implementation/tests2/AgaviTestCase.class.php

    r2259 r2969  
    2626 * @version    $Id$ 
    2727 */ 
    28  
    2928class AgaviTestCase extends PHPUnit_Framework_TestCase 
    3029{