Development

Changeset 7757

You must first sign up to be able to contribute.

Changeset 7757

Show
Ignore:
Timestamp:
03/07/08 11:55:22 (6 months ago)
Author:
fabien
Message:

moved back helpers in lib/ as they won't be converted to classes for 1.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/autoload/sfCoreAutoload.class.php

    r7614 r7757  
    224224  'sfGenerator' => 'generator', 
    225225  'sfGeneratorManager' => 'generator', 
     226  'sfRichTextEditor' => 'helper', 
     227  'sfRichTextEditorFCK' => 'helper', 
     228  'sfRichTextEditorTinyMCE' => 'helper', 
    226229  'sfI18nApplicationExtract' => 'i18n/extract', 
    227230  'sfI18nExtract' => 'i18n/extract', 

  • branches/1.1/lib/config/sfLoader.class.php

    r7691 r7757  
    4949    } 
    5050 
    51     if ($bundledPluginDirs = glob(sfConfig::get('sf_symfony_lib_dir').'/plugins/*/lib/helper')) 
    52     { 
    53       $dirs = array_merge($dirs, $bundledPluginDirs);                                                                         // bundled plugins 
    54     } 
     51    $dirs[] = sfConfig::get('sf_symfony_lib_dir').'/helper';                      // symfony 
    5552 
    5653    return $dirs; 

  • branches/1.1/test/unit/helper/AssetHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 

  • branches/1.1/test/unit/helper/DateFormHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 

  • branches/1.1/test/unit/helper/DateHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 

  • branches/1.1/test/unit/helper/EscapingHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    1313require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php'); 

  • branches/1.1/test/unit/helper/FormHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 
    …… 
    153153$t->is(textarea_tag('name', null, array('size' => '5x20')), '<textarea name="name" id="name" rows="20" cols="5"></textarea>', 'textarea_tag() can take a "size" attribute'); 
    154154 
    155 require_once(sfConfig::get('sf_symfony_lib_dir').'/plugins/sfCompat10Plugin/lib/helper/sfRichTextEditor.class.php'); 
    156 require_once(sfConfig::get('sf_symfony_lib_dir').'/plugins/sfCompat10Plugin/lib/helper/sfRichTextEditorTinyMCE.class.php'); 
     155require_once(sfConfig::get('sf_symfony_lib_dir').'/helper/sfRichTextEditor.class.php'); 
     156require_once(sfConfig::get('sf_symfony_lib_dir').'/helper/sfRichTextEditorTinyMCE.class.php'); 
    157157sfConfig::set('sf_web_dir', dirname(__FILE__)); 
    158158sfConfig::set('sf_rich_text_js_dir', 'fixtures'); 

  • branches/1.1/test/unit/helper/NumberHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once(dirname(__FILE__).'/../../../lib/helper/NumberHelper.php'); 
    1313 

  • branches/1.1/test/unit/helper/ObjectHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313require_once(dirname(__FILE__).'/TestObject.php'); 

  • branches/1.1/test/unit/helper/TagHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 

  • branches/1.1/test/unit/helper/TextHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php'); 
    1313require_once(dirname(__FILE__).'/../../../lib/helper/TextHelper.php'); 

  • branches/1.1/test/unit/helper/UrlHelperTest.php

    r6483 r7757  
    99 */ 
    1010 
    11 require_once(dirname(__FILE__).'/../../../../../../test/bootstrap/unit.php'); 
     11require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 

  • branches/1.1/test/unit/view/escaper/sfOutputEscaperArrayDecoratorTest.php

    r6864 r7757  
    1616require_once(dirname(__FILE__).'/../../../../lib/view/escaper/sfOutputEscaperIteratorDecorator.class.php'); 
    1717 
    18 require_once(dirname(__FILE__).'/../../../../lib/plugins/sfCompat10Plugin/lib/helper/EscapingHelper.php'); 
     18require_once(dirname(__FILE__).'/../../../../lib/helper/EscapingHelper.php'); 
    1919require_once(dirname(__FILE__).'/../../../../lib/config/sfConfig.class.php'); 
    2020 

  • branches/1.1/test/unit/view/escaper/sfOutputEscaperObjectDecoratorTest.php

    r6864 r7757  
    1616require_once(dirname(__FILE__).'/../../../../lib/view/escaper/sfOutputEscaperIteratorDecorator.class.php'); 
    1717 
    18 require_once(dirname(__FILE__).'/../../../../lib/plugins/sfCompat10Plugin/lib/helper/EscapingHelper.php'); 
     18require_once(dirname(__FILE__).'/../../../../lib/helper/EscapingHelper.php'); 
    1919require_once(dirname(__FILE__).'/../../../../lib/config/sfConfig.class.php'); 
    2020 

  • branches/1.1/test/unit/view/escaper/sfOutputEscaperSafeTest.php

    r7120 r7757  
    1010 
    1111require_once(dirname(__FILE__).'/../../../../lib/vendor/lime/lime.php'); 
     12require_once(dirname(__FILE__).'/../../../../lib/helper/EscapingHelper.php'); 
    1213require_once(dirname(__FILE__).'/../../../../lib/view/escaper/sfOutputEscaperSafe.class.php'); 
    1314 

  • branches/1.1/test/unit/view/escaper/sfOutputEscaperTest.php

    r7120 r7757  
    1717require_once(dirname(__FILE__).'/../../../../lib/view/escaper/sfOutputEscaperSafe.class.php'); 
    1818 
    19 require_once(dirname(__FILE__).'/../../../../lib/plugins/sfCompat10Plugin/lib/helper/EscapingHelper.php'); 
     19require_once(dirname(__FILE__).'/../../../../lib/helper/EscapingHelper.php'); 
    2020require_once(dirname(__FILE__).'/../../../../lib/config/sfConfig.class.php'); 
    2121