Development

Changeset 15803

You must first sign up to be able to contribute.

Changeset 15803

Show
Ignore:
Timestamp:
02/26/09 10:48:55 (1 year ago)
Author:
fabien
Message:

[1.0, 1.1, 1.2, 1.3] fixed typo + make sure fixtures are ordered (closes #5939)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/lib/addon/sfData.class.php

    r8288 r15803  
    109109    else if (is_dir($directory_or_file)) 
    110110    { 
    111       $fixture_files = sfFinder::type('file')->ignore_version_control()->name('*.yml')->in($directory_or_file); 
     111      $fixture_files = sfFinder::type('file')->ignore_version_control()->name('*.yml')->sort_by_name()->in($directory_or_file); 
    112112    } 
    113113    else 
  • branches/1.1/lib/addon/sfData.class.php

    r9083 r15803  
    109109    else if (is_dir($directory_or_file)) 
    110110    { 
    111       $fixture_files = sfFinder::type('file')->name('*.yml')->in($directory_or_file); 
     111      $fixture_files = sfFinder::type('file')->name('*.yml')->sort_by_name()->in($directory_or_file); 
    112112    } 
    113113    else 
  • branches/1.2/lib/addon/sfData.class.php

    r12695 r15803  
    100100    if (is_null($element)) 
    101101    { 
    102       $directory_or_file = sfConfig::get('sf_data_dir').'/fixtures'; 
     102      $element = sfConfig::get('sf_data_dir').'/fixtures'; 
    103103    } 
    104104 
     
    117117    else if (is_dir($element)) 
    118118    { 
    119       $files = sfFinder::type('file')->name('*.yml')->in($element); 
     119      $files = sfFinder::type('file')->name('*.yml')->sort_by_name()->in($element); 
    120120    } 
    121121    else 
  • branches/1.3/lib/addon/sfData.class.php

    r12695 r15803  
    100100    if (is_null($element)) 
    101101    { 
    102       $directory_or_file = sfConfig::get('sf_data_dir').'/fixtures'; 
     102      $element = sfConfig::get('sf_data_dir').'/fixtures'; 
    103103    } 
    104104 
     
    117117    else if (is_dir($element)) 
    118118    { 
    119       $files = sfFinder::type('file')->name('*.yml')->in($element); 
     119      $files = sfFinder::type('file')->name('*.yml')->sort_by_name()->in($element); 
    120120    } 
    121121    else 

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting.
Sensio Labs also supports several large Open-Source projects.