Development

Changeset 29521

You must first sign up to be able to contribute.

Changeset 29521

Show
Ignore:
Timestamp:
05/19/10 13:47:56 (4 years ago)
Author:
fabien
Message:

[1.3, 1.4] fixed E_STRICT compatbility of some unit tests (closes #8522)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.3/lib/util/sfDomCssSelector.class.php

    r29158 r29521  
    199199              $attrName = $match[1]; 
    200200              $attrOperator = $match[2]; 
    201               $attrValue = $match[4] === '' ? $match[5] : $match[4]; 
     201              $attrValue = $match[4] === '' ? (isset($match[5]) ? $match[5] : '') : $match[4]; 
    202202 
    203203              switch ($attrOperator) 
  • branches/1.3/lib/util/sfNamespacedParameterHolder.class.php

    r9051 r29521  
    5353    if ($move) 
    5454    { 
    55       $values = $this->removeNamespace(); 
    56       $this->addByRef($values, $namespace); 
     55      if (null !== $values = $this->removeNamespace()) 
     56      { 
     57          $this->addByRef($values, $namespace); 
     58      } 
    5759    } 
    5860 
  • branches/1.3/lib/view/sfViewCacheManager.class.php

    r28785 r29521  
    386386    list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri); 
    387387 
     388    if (!isset($params['module'])) 
     389    { 
     390        return $defaultValue; 
     391    } 
     392 
    388393    $this->registerConfiguration($params['module']); 
    389394 
  • branches/1.3/test/unit/i18n/sfMessageSource_XLIFFTest.php

    r19777 r29521  
    2020// copy fixtures to tmp directory 
    2121copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml'); 
    22 copy(dirname(__FILE__).'/fixtures/invalid.xml', $temp.'/invalid.xml'); 
    2322 
    2423$source = sfMessageSource::factory('XLIFF', $temp); 
  • branches/1.4/lib/util/sfDomCssSelector.class.php

    r29158 r29521  
    186186              $attrName = $match[1]; 
    187187              $attrOperator = $match[2]; 
    188               $attrValue = $match[4] === '' ? $match[5] : $match[4]; 
     188              $attrValue = $match[4] === '' ? (isset($match[5]) ? $match[5] : '') : $match[4]; 
    189189 
    190190              switch ($attrOperator) 
  • branches/1.4/lib/util/sfNamespacedParameterHolder.class.php

    r23922 r29521  
    5353    if ($move) 
    5454    { 
    55       $values = $this->removeNamespace(); 
    56       $this->addByRef($values, $namespace); 
     55      if (null !== $values = $this->removeNamespace()) 
     56      { 
     57          $this->addByRef($values, $namespace); 
     58      } 
    5759    } 
    5860 
  • branches/1.4/lib/view/sfViewCacheManager.class.php

    r28785 r29521  
    386386    list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri); 
    387387 
     388    if (!isset($params['module'])) 
     389    { 
     390        return $defaultValue; 
     391    } 
     392 
    388393    $this->registerConfiguration($params['module']); 
    389394 
  • branches/1.4/test/unit/i18n/sfMessageSource_XLIFFTest.php

    r19777 r29521  
    2020// copy fixtures to tmp directory 
    2121copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml'); 
    22 copy(dirname(__FILE__).'/fixtures/invalid.xml', $temp.'/invalid.xml'); 
    2322 
    2423$source = sfMessageSource::factory('XLIFF', $temp);