Development

Changeset 23922

You must first sign up to be able to contribute.

Changeset 23922

Show
Ignore:
Timestamp:
11/14/09 15:58:38 (4 years ago)
Author:
fabien
Message:

[1.4] removed deprecated stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.4/CHANGELOG

    r23746 r23922  
    1 11/09/09: Version 1.3.0 beta2 
    2 ----------------------------- 
    3  
    4   * [23745] fixed issues in pagers, switched from IteratorAggregate to Iterator, simplified prevention of unnecessary queries, removed some whitespace 
    5   * [23744] refactored match_names in sfFinder so that it is more readable and perhaps even faster (fixes #6589, patch by Artyom Bisyarin) 
    6   * [23740] added errormessage when none of the tests passed to sfTestFunctionalTask or sfTestUnitTask are not found (fixes #6811) 
    7   * [23739] added hooks for specifying custom propel runtime and generator paths 
    8   * [23737] refactored propel initialization to `sfPropelPluginConfiguration`, cleaned up `sfPropelDatabase` to avoid creating multiple `PropelConfiguration` objects, removed Propel runtime classes from `sfAutoload` since Propel has its own autoloader, deprecated `sfPropel::import()` since `Propel::importClass()` allows autoloading 
    9   * [23720] preventing sendHttpHeaders to run multiple times. Once send the method will silently do nothing (closing #7553) 
    10   * [23709] added debug information for Propel in dev environment by default 
    11   * [23696] updated Propel sfWebDebugPanel to respect configuration done in DebugPDO 
    12   * [23692] now using propel 1.4.0 stable tag 
    13   * [23668] fixed doctrine form inheritance when the foreign key on one inheritance model references another inheritance model 
    14   * [23667] fixed default CRUD generate where file uploads were not taken care of 
    15   * [23651] made sfTask::getRouting() lazy 
    16   * [23600] added real cache key (including prefix) to the partial info panel to aid checking the cache. (closes #7520) 
    17   * [23568] added some more useful output to response tester's isValid method 
    18   * [23549] refactored the app:routes task to give a getRouting() method for all tasks 
    19   * [23545] refactor the project:send-emails task to give a getMailer() method for all tasks 
    20   * [23544] moved getMailer() method from sfAction to sfComponent 
    21   * [23539] Fix to Doctrine model building to allow packages 
    22   * [23527] cleaned up propel upgrade 
    23   * [23526] updated propel upgrade to be smarter and include consideration for nested set builders (closes #7475, closes #7476) 
    24   * [23520] references to external modules in bundled xhtml11 dtd 
    25   * [23518] fixed Cascade schema.yml across multiple plugins generates Plugin classes to wrong directory (closes #7481, thanks adrive) 
    26   * [23516] Added a test to check if the BaseForm class exists when building Doctrine or Propel forms (closes #7491) 
    27   * [23515] fixed Form Helper use of Rich Text Editors broken by changes in autoloader (closes #7498) 
    28   * [23437] fixed askAndValidate() typo (closes #7466) 
    29   * [23430] added hooks allowing to inject readymade config into routing 
    30   * [23394] fixed sfMixer hooks in propel peer classes 
    31   * [23382] added support for XSD and relaxNG to response validation 
    32   * [23380] bundled DTDs to avoid issuing requests to w3.org (closes #7445) 
    33   * [23378] added check for target directory before creating configuration cache in project:optimize, moved fs calls to filesystem object 
    34  
    35 10/26/09: Version 1.3.0 beta1 
    36 ----------------------------- 
    37  
    38   * [23362] reverted r22731 
    39   * [23361] fixed sfFormFilterDoctrine uses wrong method when filtering a fk with multiple values (closes #7409, thanks aarjona) 
    40   * [23360] fixed plugin tests added multiple times (closes #7082) 
    41   * [23358] fixed hook names sent to sfMixer from base peer classes 
    42   * [23357] tagged custom propel builders as deprecated 
    43   * [23355] fixed possible creation of inconsistent new lines in class manipulator (refs #7442) 
    44   * [23350] fixed null transport service name call 
    45   * [23346] fixed bootstrapping propel unit tests with correct include path 
    46   * [23344] made DateHelperTest more robust by using a single timestamp rather than letting date() obtain them on their own 
    47   * [23343] fixed phpdoc of sfTesterMailer (closes #7391) 
    48   * [23342] fixed margin on admin generator fieldset headings 
    49   * [23338] updated phpDoc of sfFilter:initialize to correctly state that no exceptions are thrown and true is always returned (closes #7426) 
    50   * [23336] getAllPluginPaths does not need to exclude version control files. Excluding them is slightly slower without benefit (refs #7433) 
    51   * [23334] WebDebug panels from Doctrine and Propel list ORM Version. (refs #7432) 
    52   * [23327] fixed sfFinder phpDoc and type comparison (closes #7435) 
    53   * [23322] added optional author argument to generate:project task 
    54   * [23320] added "symfony" to autoloader excludes for better BC (closes #7424, closes #7401) 
    55   * [23317] fixed creation of consolidated doctrine schema file may fail under certain circumstances (refs #7428) 
    56   * [23314] added doc tags for sfDoctrineRecord magic methods (closes #7064) 
    57   * [23310] added copyright notices to propel behaviors, remove some unneeded generated methods 
    58   * [23309] removed xslt from propel integration in favor of new build property for adding default behaviors 
    59   * [23308] added build of model to propel form and filter builds in propel:build task 
    60   * [23307] added parameters to the "symfony" propel behavior to disable the generation of forms and/or filters (refs #7139) 
    61   * [23306] ported symfony's custom propel builders to propel's new behaviors system 
    62   * [23296] Fixing issues caused by latest changes in Doctrine 1.2 
    63   * [23292] fixed sfPeerBuilder refers to variable in behaviours but it has changed to in propel 1.4 (closes #7414) 
    64   * [23234] further shortened plugin paths shown in test harness 
    65   * [23232] fixed unexpected removal of tokens in class manipulator, renamed vars per js parlance 
    66   * [23227] cleaned up render of phing errors 
    67   * [23220] enhanced sfTesterResponse with isValid() method for testing whether a response is well-formed and (optionally) validates against its doctype 
    68   * [23218] fixed identity check for windows color support (closes #7395) 
    69   * [23214] refactored sfForm::renderHiddenFields() so rendering of embedded hidden fields can be switched off, updated admin generators to do so (closes #7394) 
    70   * [23207] made generate:project orm option case insensitive 
    71   * [23205] fixed project autoloading in unit tests 
    72   * [23204] fixed iteration over a sfDoctrinePager object (closes #7355) 
    73   * [23203] fix exception in freshly generated app in an orm-less project 
    74   * [23201] cleaned up doctrine query debug to be a little easier to read 
    75   * [23200] added custom lime harness to cleanup output of plugin paths 
    76   * [23199] added upgrade for changed sfFormDoctrine method signature 
    77   * [23196] added form errors to WDT view panel (closes #7371) 
    78   * [23194] added a --actions-base-class options to tasks that generate modules (closes #5995) 
    79   * [23193] enhanced generate:app task to check for a skeleton in the directory in the project, similar to how generate:module works already 
    80   * [23187] added a way to pass form options to the getForm() method of [Module]GeneratorConfiguration class (closes #6065) 
    81   * [23186] fixed a notice (closes #7384) 
    82   * [23183] added support for colorized output under windows with ansicon (closes #7359) 
    83   * [23180] fixed phpdoc return value for findRoute (closes #7380) 
    84   * [23169] added bound validation on integer types (closes #7370) 
    85   * [23156] fixed implementation of data loader task in build tasks, fixed use of merged schema file in doctrine clean task, made deletion of old doctrine model and form files more precise in delete task 
    86   * [23117] fixed empty_value for generated propel validators (closes #7363) 
    87   * [23113] added additional Constant checking for delivery strategy in mailer. (fixes #7362 patch by Pascal) 
    88   * [23081] removed sf_doc_dir constant 
    89   * [23080] fixed cache option "vary" with custom values creates wrong cacheKey (closes #7354) 
    90   * [23079] fixed wrong class name generated for filter if not specified in generator.yml (closes #7327) 
    91   * [23077] added a new default_params options for sfObjectRouteCollection (closes #7331, patch from nicolas) 
    92   * [23076] fixed propel:build-all-load task (refs #7346) 
    93   * [23075] fixed error when passing an option that does not exist (refs #7346) 
    94   * [23073] added an exception in sfValidatorFile when file_uploads is disable in php.ini (closes #7345) 
    95   * [23064] added type hints to generated form classes (closes #6344) 
    96   * [23063] rewrote task autoloader initialization and reloading so autoload.yml is respected and newly-generated classes are immediately available (closes #5093) 
    97   * [23062] fixed placement of BaseFormFilterPropel (closes #6117) 
    98   * [23060] reverted r22929, fixed overridden class paths in sfSimpleAutoload (refs #7142, refs #7299) this fix also prevents lib files from being scanned for classes after each reload in doctrine:build --all, for example 
    99   * [23059] fixed schema merging when a schema file is empty (closes #7349) 
    100   * [23048] added configuration cascade to the merging of plugin and project doctrine schema files (closes #7342, closes #7344) 
    101   * [23047] switched doctrine external back to HEAD 
    102   * [23020] corrected doctrine task documentation 
    103   * [23019] cleaned up use of cli config in doctrine tasks, added method to doctrine base task to prepare project and plugin schema files for doctrine (refs #7306) 
    104   * [23018] changed new "smart" form filter logic to use validators rather than widgets when building the query, ported enhancement to propel (refs #7139) 
    105   * [23003] pegged Doctrine 1.2 revision until a migration strategy for its revision 6493 is in place or that change is reverted 
    106   * [22987] updated all references from Doctrine:: to Doctrine_Core:: to reflect latest change in Doctrine 1.2. While Doctrie:: exists for BC we perform better by using the new (closes #7332 patch by lsmith) 
    107   * [22983] Fixes for latest changes in Doctrine 1.2 
    108  
    109 10/12/09: Version 1.3.0 alpha2 
    110 ------------------------------ 
    111  
    112   * [22490] fixed catalonian admin gen translation (closes #7213) 
    113   * [22534] added directories generated by the core test suite 
    114   * [22569] Turning off Doctrine level validation by default since it is not integrated with forms validation (addresses #5215) 
    115   * [22575] Initial entry of doctrine:generate-migrations-diff task for Doctrine 1.2 
    116   * [22585] updated propel to 1.4, patched web debug logger to work with new logging mechanism (thanks francois) 
    117   * [22609] added accessor method for getting a particular embedded form 
    118   * [22691] moved code hooking cleanup method to ensure directory has been set (closes #7260) 
    119   * [22720] extended sfBrowser::click() to accept any CSS selector 
    120   * [22731] changed signature for project:optimize task so an environment name is passed first, then 0-n application names (breaks BC with alpha 1) 
    121   * [22748] fixed generation of form for doctrine models that utilize concrete inheritance (closes #7221) 
    122   * [22757] removed sfLoader from core compile 
    123   * [22759] fixed symfony coding standards in doctrine-generated model, table and migration classes 
    124   * [22770] sfDoctrineGenerateMigrationTask using $config information instead of hardcoded path 
    125   * [22795] fixed parsing of non-scalar parameters in doctrine WDT (closes #7252) 
    126   * [22796] fixed view WDT when log message type is not a classname (closes #7238) 
    127   * [22807] Switched Propel externals to HEAD 
    128   * [22810] Removed symfony's custom isPrimaryString column attribute (use Propel's primaryString column attribute for the exact same feature) 
    129   * [22811] added context.method_not_found event to facilitate the creation of lazy-loading factories 
    130   * [22812] Fixed a problem with propel.ini custom settings not being read correctly 
    131   * [22819] fixed sfAutoloadConfigHandler to work on windows (closes #7285, thanks andyr12345) 
    132   * [22820] fixed formatting of permissions task error 
    133   * [22827] fixed formatting of application option list when option has no shortcut 
    134   * [22859] added up, down and dry-run options to doctrine:migrate, rendered migration exceptions using symfony's formatter 
    135   * [22860] fixed Doctrine migration task either not using configured directory or not creating them 
    136   * [22870] fixed sendNextImmediately() method (closes #7266) 
    137   * [22873] fixed incorrect HTTP headers (closes #6966) 
    138   * [22876] fixed app.yml configuration cascade blocked by empty file (closes #7298) 
    139   * [22877] fixed i18n currencies order (closes #7244) 
    140   * [22890] Added support for Propel native behaviors 
    141   * [22894] deprecated ProjectConfiguration configureDoctrine and configureDoctrineConnection methods in favor of new doctrine.configure and doctrine.configure_connection events 
    142   * [22899] updated sfForm::renderHiddenFields() to include hidden fields from embedded forms (closes #6578) 
    143   * [22900] fixed broken form validation on concrete inheritance forms (closes #7253) 
    144   * [22904] updated doctrine clean task for better DRY with existing code 
    145   * [22910] made sfFormFilterDoctrine smarter so you don't need to modify getFields() to add a not-real column filter 
    146   * [22914] moved methods that don't need to be generated from generator templates to base classes, added abstract signatures for the rest. removed unused getConnection() method. 
    147   * [22917] abstracted methods from base ORM form classes to sfFormObject (refs #7140) 
    148   * [22918] cleaned up forms and yaml upgrades 
    149   * [22919] simplified creation of route collection name when creating a doctrine admin module, used plural option for route collection path prefix 
    150   * [22921] moved creation of doctrine model builder options and cli configuration arrays to plugin configuration class, added filtering through the event dispatcher via doctrine.filter_model_builder_options and doctrine.filter_cli_config events 
    151   * [22929] fixed forgetful autoloader when reloaded without an application configuration (closes #7142, closes #7299) 
    152   * [22930] fixed bug in the inheritance with the FormFilters (closes #7313) 
    153   * [22931] fixed wrong title url generated by sfWebDebugPanelCache (closes #7310) 
    154   * [22933] removed unnecessary conditional logic (closes #7320, thanks andyr12345) 
    155   * [22935] fixed sfMessageSource_MySQL produces blank white screen if mysql extension disabled (closes #7173) 
    156   * [22936] removed check for GET variables when checking whether a template is cachable, limited caching to GET requests (closes #4708) 
    157   * [22938] added Swift Mailer license in PEAR package.xml 
    158   * [22948] added filtering of phing arguments through propel.filter_phing_args event 
    159   * [22949] added propel:build task (refs #7139) 
    160   * [22955] enhanced propel WDT, fixed some typos (refs #7139) 
    161   * [22958] fixed blocked inheritance in doctrine forms (closes #7279) 
    162   * [22959] updated doctrine:build task so --db option builds sql 
    163  
    164 09/26/09: Version 1.3.0 alpha1 
    165 ------------------------------ 
    166  
    167 Please visit the following URLs for a description of changes: 
    168  
    169  * http://www.symfony-project.org/tutorial/1_3/en/whats-new 
    170  * http://www.symfony-project.org/tutorial/1_3/en/upgrade 
    171  * http://www.symfony-project.org/tutorial/1_3/en/deprecated 
     1--/--/09: Version 1.4.0 RC1 

  • branches/1.4/lib/action/sfAction.class.php

    r23810 r23922  
    356356 
    357357  /** 
    358    * Retrieves the default view to be executed when a given request is not served by this action. 
    359    * 
    360    * @return string A string containing the view name associated with this action 
    361    * 
    362    * @throws sfConfigurationException If compat_10 is not enabled 
    363    */ 
    364   public function getDefaultView() 
    365   { 
    366     if (!sfConfig::get('sf_compat_10')) 
    367     { 
    368       throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.'); 
    369     } 
    370  
    371     return sfView::INPUT; 
    372   } 
    373  
    374   /** 
    375    * Executes any post-validation error application logic. 
    376    * 
    377    * @return string A string containing the view name associated with this action 
    378    * 
    379    * @throws sfConfigurationException If compat_10 is not enabled 
    380    */ 
    381   public function handleError() 
    382   { 
    383     if (!sfConfig::get('sf_compat_10')) 
    384     { 
    385       throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.'); 
    386     } 
    387  
    388     return sfView::ERROR; 
    389   } 
    390  
    391   /** 
    392    * Validates manually files and parameters. 
    393    * 
    394    * @return bool true, if validation completes successfully, otherwise false. 
    395    * 
    396    * @throws sfConfigurationException If compat_10 is not enabled 
    397    */ 
    398   public function validate() 
    399   { 
    400     if (!sfConfig::get('sf_compat_10')) 
    401     { 
    402       throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.'); 
    403     } 
    404  
    405     return true; 
    406   } 
    407  
    408   /** 
    409358   * Returns the security configuration for this module. 
    410359   * 

  • branches/1.4/lib/action/sfComponent.class.php

    r23544 r23922  
    136136 
    137137  /** 
    138    * Displays a message as a short message in the sfWebDebug toolbar. 
    139    * 
    140    * @param string $message The message text 
    141    * 
    142    * @see sfWebDebug 
    143    */ 
    144   public function debugMessage($message) 
    145   { 
    146     if (sfConfig::get('sf_web_debug') && sfConfig::get('sf_logging_enabled')) 
    147     { 
    148       $this->dispatcher->notify(new sfEvent(null, 'application.log', array('This function is deprecated in favor of the logMessage function.', 'priority' => sfLogger::ERR))); 
    149     } 
    150   } 
    151  
    152   /** 
    153138   * Returns the value of a request parameter. 
    154139   * 

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

    r23205 r23922  
    222222    'sffilterconfighandler' => 'config/sfFilterConfigHandler.class.php', 
    223223    'sfgeneratorconfighandler' => 'config/sfGeneratorConfigHandler.class.php', 
    224     'sfloader' => 'config/sfLoader.class.php', 
    225224    'sfpluginconfiguration' => 'config/sfPluginConfiguration.class.php', 
    226225    'sfpluginconfigurationgeneric' => 'config/sfPluginConfigurationGeneric.class.php', 
    …… 
    232231    'sfviewconfighandler' => 'config/sfViewConfigHandler.class.php', 
    233232    'sfyamlconfighandler' => 'config/sfYamlConfigHandler.class.php', 
    234     'sfconsolecontroller' => 'controller/sfConsoleController.class.php', 
    235233    'sfcontroller' => 'controller/sfController.class.php', 
    236234    'sffrontwebcontroller' => 'controller/sfFrontWebController.class.php', 
    …… 
    292290    'sfformfield' => 'form/sfFormField.class.php', 
    293291    'sfformfieldschema' => 'form/sfFormFieldSchema.class.php', 
    294     'sfadmingenerator' => 'generator/sfAdminGenerator.class.php', 
    295     'sfcrudgenerator' => 'generator/sfCrudGenerator.class.php', 
    296292    'sfgenerator' => 'generator/sfGenerator.class.php', 
    297293    'sfgeneratormanager' => 'generator/sfGeneratorManager.class.php', 
    …… 
    352348    'sfpluginrestexception' => 'plugin/sfPluginRestException.class.php', 
    353349    'sfsymfonypluginmanager' => 'plugin/sfSymfonyPluginManager.class.php', 
    354     'sfconsolerequest' => 'request/sfConsoleRequest.class.php', 
    355350    'sfrequest' => 'request/sfRequest.class.php', 
    356351    'sfwebrequest' => 'request/sfWebRequest.class.php', 
    357     'sfconsoleresponse' => 'response/sfConsoleResponse.class.php', 
    358352    'sfresponse' => 'response/sfResponse.class.php', 
    359353    'sfwebresponse' => 'response/sfWebResponse.class.php', 
    360     'sfnorouting' => 'routing/sfNoRouting.class.php', 
    361354    'sfobjectroute' => 'routing/sfObjectRoute.class.php', 
    362355    'sfobjectroutecollection' => 'routing/sfObjectRouteCollection.class.php', 
    363     'sfpathinforouting' => 'routing/sfPathInfoRouting.class.php', 
    364356    'sfpatternrouting' => 'routing/sfPatternRouting.class.php', 
    365357    'sfrequestroute' => 'routing/sfRequestRoute.class.php', 
    …… 
    459451    'sfvalidatorcallback' => 'validator/sfValidatorCallback.class.php', 
    460452    'sfvalidatorchoice' => 'validator/sfValidatorChoice.class.php', 
    461     'sfvalidatorchoicemany' => 'validator/sfValidatorChoiceMany.class.php', 
    462453    'sfvalidatordate' => 'validator/sfValidatorDate.class.php', 
    463454    'sfvalidatordaterange' => 'validator/sfValidatorDateRange.class.php', 
    …… 
    492483    'sfwidgetformi18ndate' => 'widget/i18n/sfWidgetFormI18nDate.class.php', 
    493484    'sfwidgetformi18ndatetime' => 'widget/i18n/sfWidgetFormI18nDateTime.class.php', 
    494     'sfwidgetformi18nselectcountry' => 'widget/i18n/sfWidgetFormI18nSelectCountry.class.php', 
    495     'sfwidgetformi18nselectcurrency' => 'widget/i18n/sfWidgetFormI18nSelectCurrency.class.php', 
    496     'sfwidgetformi18nselectlanguage' => 'widget/i18n/sfWidgetFormI18nSelectLanguage.class.php', 
    497485    'sfwidgetformi18ntime' => 'widget/i18n/sfWidgetFormI18nTime.class.php', 
    498486    'sfwidget' => 'widget/sfWidget.class.php', 
    499487    'sfwidgetform' => 'widget/sfWidgetForm.class.php', 
    500488    'sfwidgetformchoice' => 'widget/sfWidgetFormChoice.class.php', 
    501     'sfwidgetformchoicemany' => 'widget/sfWidgetFormChoiceMany.class.php', 
    502489    'sfwidgetformdate' => 'widget/sfWidgetFormDate.class.php', 
    503490    'sfwidgetformdaterange' => 'widget/sfWidgetFormDateRange.class.php', 

  • branches/1.4/lib/config/config/module.yml

    r21884 r23922  
    22  enabled:          true 
    33  view_class:       sfPHP 
    4   is_internal:      false 

  • branches/1.4/lib/config/config/settings.yml

    r21884 r23922  
    3030    no_script_name:         false       # Enable the front controller name in generated URLs 
    3131 
    32     # Validation settings, used for error generation by the Validation helper 
    33     validation_error_prefix:    ' ↓ ' 
    34     validation_error_suffix:    '  ↓' 
    35     validation_error_class:     form_error 
    36     validation_error_id_prefix: error_for_ 
    37  
    3832    # Cache settings 
    3933    cache:                  false       # Enable the template cache 
    …… 
    4741 
    4842    # Assets paths 
    49     rich_text_js_dir:       js/tiny_mce 
    5043    admin_web_dir:          /sf/sf_admin 
    5144    web_debug_web_dir:      /sf/sf_web_debug 
    52     calendar_web_dir:       /sf/calendar 
    5345 
    5446    # Helpers included in all templates by default 
    55     standard_helpers:       [Partial, Cache, Form] 
     47    standard_helpers:       [Partial, Cache] 
    5648 
    5749    # Activated modules from plugins or from the symfony core 

  • branches/1.4/lib/config/sfApplicationConfiguration.class.php

    r22202 r23922  
    647647 
    648648  /** 
    649    * @deprecated 
    650    */ 
    651   public function loadPluginConfig() 
    652   { 
    653     $this->initializePlugins(); 
    654   } 
    655  
    656   /** 
    657649   * Returns the application name. 
    658650   * 

  • branches/1.4/lib/controller/sfController.class.php

    r23810 r23922  
    209209    require($this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml')); 
    210210 
    211     // check if this module is internal 
    212     if ($this->getActionStack()->getSize() == 1 && sfConfig::get('mod_'.strtolower($moduleName).'_is_internal') && !sfConfig::get('sf_test')) 
    213     { 
    214       throw new sfConfigurationException(sprintf('Action "%s" from module "%s" cannot be called directly.', $actionName, $moduleName)); 
    215     } 
    216  
    217211    // module enabled? 
    218212    if (sfConfig::get('mod_'.strtolower($moduleName).'_enabled')) 
    …… 
    372366 
    373367    return new $class($this->context, $moduleName, $actionName, $viewName); 
    374   } 
    375  
    376   /** 
    377    * [DEPRECATED] Sends and email. 
    378    * 
    379    * This methods calls a module/action with the sfMailView class. 
    380    * 
    381    * @param  string  $module  A module name 
    382    * @param  string  $action  An action name 
    383    * 
    384    * @return string The generated mail content 
    385    * 
    386    * @see sfMailView, getPresentationFor(), sfController 
    387    * @deprecated 1.1 
    388    */ 
    389   public function sendEmail($module, $action) 
    390   { 
    391     if (sfConfig::get('sf_logging_enabled')) 
    392     { 
    393       $this->dispatcher->notify(new sfEvent($this, 'application.log', array('sendEmail method is deprecated', 'priority' => sfLogger::ERR))); 
    394     } 
    395  
    396     return $this->getPresentationFor($module, $action, 'sfMail'); 
    397368  } 
    398369 

  • branches/1.4/lib/generator/sfGeneratorManager.class.php

    r23810 r23922  
    2828   * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance 
    2929   * @param string                 $basePath      The base path for file generation 
    30    * 
    31    * @see initialize() 
    3230   */ 
    3331  public function __construct(sfProjectConfiguration $configuration, $basePath = null) 
    …… 
    3533    $this->configuration = $configuration; 
    3634    $this->basePath = $basePath; 
    37   } 
    38  
    39   /** 
    40    * Initializes the sfGeneratorManager instance. 
    41    * 
    42    * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance 
    43    * @deprecated 
    44    */ 
    45   public function initialize(sfProjectConfiguration $configuration) 
    46   { 
    47     // DEPRECATED 
    4835  } 
    4936 

  • branches/1.4/lib/helper/AssetHelper.php

    r23810 r23922  
    364364  } 
    365365 
    366   if (!isset($options['alt']) && sfConfig::get('sf_compat_10')) 
    367   { 
    368     $path_pos = strrpos($source, '/'); 
    369     $dot_pos = strrpos($source, '.'); 
    370     $begin = $path_pos ? $path_pos + 1 : 0; 
    371     $nb_str = ($dot_pos ? $dot_pos : strlen($source)) - $begin; 
    372     $options['alt'] = ucfirst(substr($source, $begin, $nb_str)); 
    373   } 
    374  
    375366  if (isset($options['size'])) 
    376367  { 

  • branches/1.4/lib/helper/DebugHelper.php

    r23810 r23922  
    11<?php 
    2  
    3 function debug_message($message) 
    4 { 
    5   if (sfConfig::get('sf_web_debug') && sfConfig::get('sf_logging_enabled')) 
    6   { 
    7     sfContext::getInstance()->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array('This feature is deprecated in favor of the log_message helper.', 'priority' => sfLogger::ERR))); 
    8   } 
    9 } 
    102 
    113function log_message($message, $priority = 'info') 

  • branches/1.4/lib/log/sfVarLogger.class.php

    r20127 r23922  
    150150      'type'            => $type, 
    151151      'debug_backtrace' => $this->getDebugBacktrace(), 
    152  
    153       // deprecated - will be removed in symfony 1.4 
    154       'debug_stack'     => $this->getXDebugStack(), 
    155152    ); 
    156153  } 
    …… 
    191188    return $traces; 
    192189  } 
    193  
    194   /** 
    195    * Returns the xdebug stack. 
    196    * 
    197    * @return array The xdebug stack as an array 
    198    *  
    199    * @deprecated Use {@link getDebugBacktrace()} instead. Will be removed in symfony 1.4. 
    200    */ 
    201   protected function getXDebugStack() 
    202   { 
    203     // if we have xdebug and dev has not disabled the feature, add some stack information 
    204     if (!$this->xdebugLogging || !function_exists('xdebug_get_function_stack')) 
    205     { 
    206       return array(); 
    207     } 
    208  
    209     $debugStack = array(); 
    210     foreach (xdebug_get_function_stack() as $i => $stack) 
    211     { 
    212       if ( 
    213         (isset($stack['function']) && !in_array($stack['function'], array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug', 'log'))) 
    214         || !isset($stack['function']) 
    215       ) 
    216       { 
    217         $tmp = ''; 
    218         if (isset($stack['function'])) 
    219         { 
    220           $tmp .= sprintf('in "%s" ', $stack['function']); 
    221         } 
    222         $tmp .= sprintf('from "%s" line %s', $stack['file'], $stack['line']); 
    223         $debugStack[] = $tmp; 
    224       } 
    225     } 
    226  
    227     return $debugStack; 
    228   } 
    229190} 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-build-db'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'build-db'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-build-model'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'build-model'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-build-schema'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'build-schema'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-build-sql'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'build-sql'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php

    r23810 r23922  
    3232    )); 
    3333 
    34     $this->aliases = array(); 
    3534    $this->namespace = 'doctrine'; 
    3635    $this->name = 'create-model-tables'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php

    r23810 r23922  
    3737    )); 
    3838 
    39     $this->aliases = array('doctrine-dump-data'); 
    4039    $this->namespace = 'doctrine'; 
    4140    $this->name = 'data-dump'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php

    r23810 r23922  
    3838    )); 
    3939 
    40     $this->aliases = array('doctrine-load-data'); 
    4140    $this->namespace = 'doctrine'; 
    4241    $this->name = 'data-load'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php

    r23810 r23922  
    3131    )); 
    3232 
    33     $this->aliases = array(); 
    3433    $this->namespace = 'doctrine'; 
    3534    $this->name = 'delete-model-files'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php

    r23810 r23922  
    3939    )); 
    4040 
    41     $this->aliases = array('doctrine-dql'); 
    4241    $this->namespace = 'doctrine'; 
    4342    $this->name = 'dql'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php

    r23810 r23922  
    3434    )); 
    3535 
    36     $this->aliases = array('doctrine-drop-db'); 
    3736    $this->namespace = 'doctrine'; 
    3837    $this->name = 'drop-db'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php

    r23810 r23922  
    3838    )); 
    3939 
    40     $this->aliases = array('doctrine-generate-migration'); 
    4140    $this->namespace = 'doctrine'; 
    4241    $this->name = 'generate-migration'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-generate-migrations-db', 'doctrine-gen-migrations-from-db'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'generate-migrations-db'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array(); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'generate-migrations-diff'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-generate-migrations-models', 'doctrine-gen-migrations-from-models'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'generate-migrations-models'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php

    r23810 r23922  
    4545    )); 
    4646 
    47     $this->aliases = array('doctrine-generate-crud', 'doctrine:generate-crud'); 
    4847    $this->namespace = 'doctrine'; 
    4948    $this->name = 'generate-module'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php

    r23810 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('doctrine-insert-sql'); 
    3635    $this->namespace = 'doctrine'; 
    3736    $this->name = 'insert-sql'; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php

    r23810 r23922  
    4040    )); 
    4141 
    42     $this->aliases = array('doctrine-migrate'); 
    4342    $this->namespace = 'doctrine'; 
    4443    $this->name = 'migrate'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php

    r23849 r23922  
    3838    )); 
    3939 
    40     $this->aliases = array('propel-build-all-load'); 
    4140    $this->namespace = 'propel'; 
    4241    $this->name = 'build-all-load'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php

    r20867 r23922  
    3636    )); 
    3737 
    38     $this->aliases = array('propel-build-all'); 
    3938    $this->namespace = 'propel'; 
    4039    $this->name = 'build-all'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php

    r20867 r23922  
    3030    )); 
    3131 
    32     $this->aliases = array('propel-build-model'); 
    3332    $this->namespace = 'propel'; 
    3433    $this->name = 'build-model'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php

    r22278 r23922  
    3434    )); 
    3535 
    36     $this->aliases = array('propel-build-schema'); 
    3736    $this->namespace = 'propel'; 
    3837    $this->name = 'build-schema'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php

    r14299 r23922  
    3030    )); 
    3131 
    32     $this->aliases = array('propel-build-sql'); 
    3332    $this->namespace = 'propel'; 
    3433    $this->name = 'build-sql'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php

    r21908 r23922  
    3737    )); 
    3838 
    39     $this->aliases = array('propel-dump-data'); 
    4039    $this->namespace = 'propel'; 
    4140    $this->name = 'data-dump'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php

    r22422 r23922  
    3737    )); 
    3838 
    39     $this->aliases = array('propel-load-data'); 
    4039    $this->namespace = 'propel'; 
    4140    $this->name = 'data-load'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleTask.class.php

    r23194 r23922  
    4545    )); 
    4646 
    47     $this->aliases = array('propel-generate-crud', 'propel:generate-crud'); 
    4847    $this->namespace = 'propel'; 
    4948    $this->name = 'generate-module'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php

    r22691 r23922  
    3434    )); 
    3535 
    36     $this->aliases = array('propel-insert-sql'); 
    3736    $this->namespace = 'propel'; 
    3837    $this->name = 'insert-sql'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php

    r14972 r23922  
    2626  protected function configure() 
    2727  { 
    28     $this->aliases = array('propel-convert-yml-schema'); 
    2928    $this->namespace = 'propel'; 
    3029    $this->name = 'schema-to-xml'; 

  • branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php

    r14972 r23922  
    2626  protected function configure() 
    2727  { 
    28     $this->aliases = array('propel-convert-xml-schema'); 
    2928    $this->namespace = 'propel'; 
    3029    $this->name = 'schema-to-yml'; 

  • branches/1.4/lib/request/sfWebRequest.class.php

    r23810 r23922  
    366366 
    367367  /** 
    368    * Returns request method. 
    369    * 
    370    * @return string 
    371    */ 
    372   public function getMethodName() 
    373   { 
    374     if ($this->options['logging']) 
    375     { 
    376       $this->dispatcher->notify(new sfEvent($this, 'application.log', array('The "sfWebRequest::getMethodName()" method is deprecated, please use "getMethod()" instead.', 'priority' => sfLogger::WARNING))); 
    377     } 
    378  
    379     return $this->getMethod(); 
    380   } 
    381  
    382   /** 
    383368   * Returns the preferred culture for the current request. 
    384369   * 

  • branches/1.4/lib/task/cache/sfCacheClearTask.class.php

    r22180 r23922  
    3333    )); 
    3434 
    35     $this->aliases = array('cc', 'clear-cache'); 
     35    $this->aliases = array('cc'); 
    3636    $this->namespace = 'cache'; 
    3737    $this->name = 'clear'; 

  • branches/1.4/lib/task/generator/sfGenerateAppTask.class.php

    r23203 r23922  
    4747    )); 
    4848 
    49     $this->aliases = array('init-app'); 
    5049    $this->namespace = 'generate'; 
    5150    $this->name = 'app'; 

  • branches/1.4/lib/task/generator/sfGenerateModuleTask.class.php

    r13022 r23922  
    3131    )); 
    3232 
    33     $this->aliases = array('init-module'); 
    3433    $this->namespace = 'generate'; 
    3534    $this->name = 'module'; 

  • branches/1.4/lib/task/generator/sfGenerateProjectTask.class.php

    r23322 r23922  
    4646    )); 
    4747 
    48     $this->aliases = array('init-project'); 
    4948    $this->namespace = 'generate'; 
    5049    $this->name = 'project'; 

  • branches/1.4/lib/task/help/sfHelpTask.class.php

    r21908 r23922  
    3131      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'To output help as XML'), 
    3232    )); 
    33  
    34     $this->aliases = array('h'); 
    3533 
    3634    $this->briefDescription = 'Displays help for a task'; 

  • branches/1.4/lib/task/log/sfLogClearTask.class.php

    r8148 r23922  
    2424  protected function configure() 
    2525  { 
    26     $this->aliases = array('log-purge'); 
    2726    $this->namespace = 'log'; 
    2827    $this->name = 'clear'; 

  • branches/1.4/lib/task/log/sfLogRotateTask.class.php

    r9890 r23922  
    4040    )); 
    4141 
    42     $this->aliases = array('log-rotate'); 
    4342    $this->namespace = 'log'; 
    4443    $this->name = 'rotate'; 

  • branches/1.4/lib/task/plugin/sfPluginInstallTask.class.php

    r21908 r23922  
    3838    )); 
    3939 
    40     $this->aliases = array('plugin-install'); 
    4140    $this->namespace = 'plugin'; 
    4241    $this->name = 'install'; 

  • branches/1.4/lib/task/plugin/sfPluginListTask.class.php

    r7655 r23922  
    2626  protected function configure() 
    2727  { 
    28     $this->aliases = array('plugin-list'); 
    2928    $this->namespace = 'plugin'; 
    3029    $this->name = 'list'; 

  • branches/1.4/lib/task/plugin/sfPluginPublishAssetsTask.class.php

    r23810 r23922  
    3434    )); 
    3535 
    36     $this->aliases = array(); 
    3736    $this->namespace = 'plugin'; 
    3837    $this->name = 'publish-assets'; 

  • branches/1.4/lib/task/plugin/sfPluginUninstallTask.class.php

    r8474 r23922  
    3535    )); 
    3636 
    37     $this->aliases = array('plugin-uninstall'); 
    3837    $this->namespace = 'plugin'; 
    3938    $this->name = 'uninstall'; 

  • branches/1.4/lib/task/plugin/sfPluginUpgradeTask.class.php

    r8474 r23922  
    3636    )); 
    3737 
    38     $this->aliases = array('plugin-upgrade'); 
    3938    $this->namespace = 'plugin'; 
    4039    $this->name = 'upgrade'; 

  • branches/1.4/lib/task/project/sfProjectClearControllersTask.class.php

    r10582 r23922  
    2424  protected function configure() 
    2525  { 
    26     $this->aliases = array('clear-controllers'); 
    2726    $this->namespace = 'project'; 
    2827    $this->name = 'clear-controllers'; 

  • branches/1.4/lib/task/project/sfProjectDeployTask.class.php

    r23718 r23922  
    3838    )); 
    3939 
    40     $this->aliases = array('sync'); 
    4140    $this->namespace = 'project'; 
    4241    $this->name = 'deploy'; 

  • branches/1.4/lib/task/project/sfProjectDisableTask.class.php

    r20862 r23922  
    2929    )); 
    3030 
    31     $this->aliases = array('disable'); 
    3231    $this->namespace = 'project'; 
    3332    $this->name = 'disable'; 

  • branches/1.4/lib/task/project/sfProjectEnableTask.class.php

    r20862 r23922  
    2929    )); 
    3030 
    31     $this->aliases = array('enable'); 
    3231    $this->namespace = 'project'; 
    3332    $this->name = 'enable'; 

  • branches/1.4/lib/task/project/sfProjectPermissionsTask.class.php

    r22820 r23922  
    2828  protected function configure() 
    2929  { 
    30     $this->aliases = array('permissions', 'fix-perms'); 
    3130    $this->namespace = 'project'; 
    3231    $this->name = 'permissions'; 

  • branches/1.4/lib/task/sfFilesystem.class.php

    r19056 r23922  
    271271      } 
    272272    } 
    273   } 
    274  
    275   /** 
    276    * DEPRECATED: Executes a shell command. 
    277    * 
    278    * This method is deprecated. Use the more powerful execute() method instead. 
    279    * 
    280    * @param string $cmd  The command to execute on the shell 
    281    */ 
    282   public function sh($cmd) 
    283   { 
    284     $this->logSection('exec ', $cmd); 
    285  
    286     ob_start(); 
    287     passthru($cmd.' 2>&1', $return); 
    288     $content = ob_get_contents(); 
    289     ob_end_clean(); 
    290  
    291     if ($return > 0) 
    292     { 
    293       throw new sfException(sprintf('Problem executing command %s', "\n".$content)); 
    294     } 
    295  
    296     return $content; 
    297273  } 
    298274 

  • branches/1.4/lib/test/sfTestFunctionalBase.class.php

    r22945 r23922  
    350350 
    351351  /** 
    352    * Tests if the current request has been redirected. 
    353    * 
    354    * @deprecated since 1.2 
    355    * 
    356    * @param  bool $boolean  Flag for redirection mode 
    357    * 
    358    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    359    */ 
    360   public function isRedirected($boolean = true) 
    361   { 
    362     return $this->with('response')->isRedirected($boolean); 
    363   } 
    364  
    365   /** 
    366352   * Checks that the current response contains a given text. 
    367353   * 
    …… 
    381367 
    382368    return $this; 
    383   } 
    384  
    385   /** 
    386    * Test an status code for the current test browser. 
    387    * 
    388    * @deprecated since 1.2 
    389    * 
    390    * @param string Status code to check, default 200 
    391    * 
    392    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    393    */ 
    394   public function isStatusCode($statusCode = 200) 
    395   { 
    396     return $this->with('response')->isStatusCode($statusCode); 
    397   } 
    398  
    399   /** 
    400    * Tests whether or not a given string is in the response. 
    401    * 
    402    * @deprecated since 1.2 
    403    * 
    404    * @param string Text to check 
    405    * 
    406    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    407    */ 
    408   public function responseContains($text) 
    409   { 
    410     return $this->with('response')->contains($text); 
    411   } 
    412  
    413   /** 
    414    * Tests whether or not a given key and value exists in the current request. 
    415    * 
    416    * @deprecated since 1.2 
    417    * 
    418    * @param string $key 
    419    * @param string $value 
    420    * 
    421    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    422    */ 
    423   public function isRequestParameter($key, $value) 
    424   { 
    425     return $this->with('request')->isParameter($key, $value); 
    426   } 
    427  
    428   /** 
    429    * Tests for a response header. 
    430    * 
    431    * @deprecated since 1.2 
    432    * 
    433    * @param  string $key 
    434    * @param  string $value 
    435    * 
    436    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    437    */ 
    438   public function isResponseHeader($key, $value) 
    439   { 
    440     return $this->with('response')->isHeader($key, $value); 
    441   } 
    442  
    443   /** 
    444    * Tests for the user culture. 
    445    * 
    446    * @deprecated since 1.2 
    447    * 
    448    * @param  string $culture  The user culture 
    449    * 
    450    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    451    */ 
    452   public function isUserCulture($culture) 
    453   { 
    454     return $this->with('user')->isCulture($culture); 
    455   } 
    456  
    457   /** 
    458    * Tests for the request is in the given format. 
    459    * 
    460    * @deprecated since 1.2 
    461    * 
    462    * @param  string $format  The request format 
    463    * 
    464    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    465    */ 
    466   public function isRequestFormat($format) 
    467   { 
    468     return $this->with('request')->isFormat($format); 
    469   } 
    470  
    471   /** 
    472    * Tests that the current response matches a given CSS selector. 
    473    * 
    474    * @deprecated since 1.2 
    475    * 
    476    * @param  string $selector  The response selector or a sfDomCssSelector object 
    477    * @param  mixed  $value     Flag for the selector 
    478    * @param  array  $options   Options for the current test 
    479    * 
    480    * @return sfTestFunctionalBase The current sfTestFunctionalBase instance 
    481    */ 
    482   public function checkResponseElement($selector, $value = true, $options = array()) 
    483   { 
    484     return $this->with('response')->checkElement($selector, $value, $options); 
    485369  } 
    486370 

  • branches/1.4/lib/test/sfTesterResponse.class.php

    r23568 r23922  
    362362 
    363363  /** 
    364    * Tests whether or not a given string is in the response. 
    365    * 
    366    * @param string Text to check 
    367    * 
    368    * @return sfTestFunctionalBase|sfTester 
    369    */ 
    370   public function contains($text) 
    371   { 
    372     $this->tester->like($this->response->getContent(), '/'.preg_quote($text, '/').'/', sprintf('response contains "%s"', substr($text, 0, 40))); 
    373  
    374     return $this->getObjectToReturn(); 
    375   } 
    376  
    377   /** 
    378364   * Tests the response content against a regex. 
    379365   * 

  • branches/1.4/lib/util/sfContext.class.php

    r23810 r23922  
    305305  } 
    306306 
    307   public function retrieveObjects($class, $peerMethod) 
    308   { 
    309     $retrievingClass = 'sf'.ucfirst(sfConfig::get('sf_orm', 'propel')).'DataRetriever'; 
    310  
    311     return call_user_func(array($retrievingClass, 'retrieveObjects'), $class, $peerMethod); 
    312   } 
    313  
    314307  /** 
    315308   * Retrieve the database manager. 

  • branches/1.4/lib/util/sfNamespacedParameterHolder.class.php

    r9051 r23922  
    105105      $value = & $this->parameters[$ns][$name]; 
    106106    } 
    107     else if (isset($this->parameters[$ns])) 
    108     { 
    109       $value = sfToolkit::getArrayValueForPath($this->parameters[$ns], $name, $default); 
    110     } 
    111107    else 
    112108    { 
    …… 
    193189    } 
    194190 
    195     if (isset($this->parameters[$ns][$name])) 
    196     { 
    197       return true; 
    198     } 
    199     else if (isset($this->parameters[$ns])) 
    200     { 
    201       return sfToolkit::hasArrayValueForPath($this->parameters[$ns], $name); 
    202     } 
    203  
    204     return false; 
     191    return isset($this->parameters[$ns][$name]); 
    205192  } 
    206193 
    …… 
    240227      unset($this->parameters[$ns][$name]); 
    241228    } 
    242     else 
    243     { 
    244       $retval = sfToolkit::removeArrayValueForPath($this->parameters[$ns], $name, $default); 
    245     } 
    246229 
    247230    return $retval; 

  • branches/1.4/lib/util/sfParameterHolder.class.php

    r23810 r23922  
    5757    else 
    5858    { 
    59       $value = sfToolkit::getArrayValueForPath($this->parameters, $name, $default); 
     59      $value = $default; 
    6060    } 
    6161 
    …… 
    9292  public function has($name) 
    9393  { 
    94     if (array_key_exists($name, $this->parameters)) 
    95     { 
    96       return true; 
    97     } 
    98     else 
    99     { 
    100       return sfToolkit::hasArrayValueForPath($this->parameters, $name); 
    101     } 
    102  
    103     return false; 
     94    return array_key_exists($name, $this->parameters); 
    10495  } 
    10596 
    …… 
    121112      unset($this->parameters[$name]); 
    122113    } 
    123     else 
    124     { 
    125       $retval = sfToolkit::removeArrayValueForPath($this->parameters, $name, $default); 
    126     } 
    127114 
    128115    return $retval; 

  • branches/1.4/lib/util/sfToolkit.class.php

    r23810 r23922  
    692692 
    693693  /** 
    694    * DEPRECATED. Use sys_get_temp_dir() directly (available since PHP 5.2.1). 
    695    */ 
    696   public static function getTmpDir() 
    697   { 
    698     return sys_get_temp_dir(); 
    699   } 
    700  
    701   /** 
    702694   * Converts strings to UTF-8 via iconv. NB, the result may not by UTF-8 if the conversion failed. 
    703695   * 

  • branches/1.4/lib/validator/sfValidatorBase.class.php

    r22446 r23922  
    293293 
    294294  /** 
    295    * Sets the default invalid message. 
    296    * 
    297    * DEPRECATED. Use setDefaultMessage instead. 
    298    * 
    299    * @param string $message 
    300    */ 
    301   static public function setInvalidMessage($message) 
    302   { 
    303     self::setDefaultMessage('invalid', $message); 
    304   } 
    305  
    306   /** 
    307    * Sets the default required message. 
    308    * 
    309    * DEPRECATED. Use setDefaultMessage instead. 
    310    * 
    311    * @param string $message 
    312    */ 
    313   static public function setRequiredMessage($message) 
    314   { 
    315     self::setDefaultMessage('required', $message); 
    316   } 
    317  
    318   /** 
    319295   * Cleans the input value. 
    320296   * 

  • branches/1.4/lib/view/sfPHPView.class.php

    r23810 r23922  
    4343 
    4444    $helpers = array_unique(array_merge(array('Helper', 'Url', 'Asset', 'Tag', 'Escaping'), sfConfig::get('sf_standard_helpers'))); 
    45  
    46     // remove default Form helper if compat_10 is false 
    47     if (!sfConfig::get('sf_compat_10') && false !== $i = array_search('Form', $helpers)) 
    48     { 
    49       unset($helpers[$i]); 
    50     } 
    5145 
    5246    $this->context->getConfiguration()->loadHelpers($helpers); 

  • branches/1.4/test/unit/action/sfComponentTest.php

    r20780 r23922  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
     13require_once($_test_dir.'/unit/sfNoRouting.class.php'); 
    1314 
    1415$t = new lime_test(8); 

  • branches/1.4/test/unit/controller/sfWebControllerTest.php

    r19531 r23922  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
     13require_once($_test_dir.'/unit/sfNoRouting.class.php'); 
    1314 
    1415$t = new lime_test(19); 

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

    r22402 r23922  
    1616require_once(dirname(__FILE__).'/../../../lib/helper/AssetHelper.php'); 
    1717 
    18 $t = new lime_test(69); 
     18$t = new lime_test(68); 
    1919 
    2020class myRequest 
    …… 
    6868$t->is(_compute_public_path('foo?foo=bar', 'css', 'css'), '/css/foo.css?foo=bar', '_compute_public_path() takes into account query strings'); 
    6969 
    70 $compatMode = sfConfig::get('sf_compat_10'); 
    71 sfConfig::set('sf_compat_10', false); 
    7270// image_tag() 
    7371$t->diag('image_tag()'); 
    …… 
    8482$t->is(image_tag('test', array('alt_title' => 'Foo')), '<img src="/images/test.png" alt="Foo" title="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title'); 
    8583$t->is(image_tag('test', array('alt_title' => 'Foo', 'title' => 'Bar')), '<img title="Bar" src="/images/test.png" alt="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title'); 
    86 sfConfig::set('sf_compat_10', true); 
    87 $t->is(image_tag('test'), '<img src="/images/test.png" alt="Test" />', 'image_tag() creates alt attribute from filename if sf_compat_10 is on'); 
    88  
    89 sfConfig::set('sf_compat_10', $compatMode); 
    9084 
    9185// stylesheet_tag() 

  • branches/1.4/test/unit/util/sfNamespacedParameterHolderTest.php

    r19531 r23922  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    13 $t = new lime_test(54); 
     13$t = new lime_test(50); 
    1414 
    1515// ->clear() 
    …… 
    214214$t->diag('->serialize() ->unserialize()'); 
    215215$t->ok($ph == unserialize(serialize($ph)), 'sfNamespacedParameterHolder implements the Serializable interface'); 
    216  
    217 // Array path as a key 
    218 $t->diag('Array path as a key'); 
    219 $ph = new sfNamespacedParameterHolder(); 
    220 $ph->add(array('foo' => array('bar' => 'foo'))); 
    221 $t->is($ph->has('foo[bar]'), true, '->has() can takes a multi-array key'); 
    222 $t->is($ph->get('foo[bar]'), 'foo', '->has() can takes a multi-array key'); 
    223 $t->is($ph->remove('foo[bar]'), 'foo', '->remove() can takes a multi-array key'); 
    224 $t->is($ph->getAll(), array('foo' => array()), '->remove() can takes a multi-array key'); 

  • branches/1.4/test/unit/util/sfParameterHolderTest.php

    r19531 r23922  
    1111require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 
    1212 
    13 $t = new lime_test(28); 
     13$t = new lime_test(24); 
    1414 
    1515// ->clear() 
    …… 
    134134$t->diag('->serialize() ->unserialize()'); 
    135135$t->ok($ph == unserialize(serialize($ph)), 'sfParameterHolder implements the Serializable interface'); 
    136  
    137 // Array path as a key 
    138 $t->diag('Array path as a key'); 
    139 $ph = new sfParameterHolder(); 
    140 $ph->add(array('foo' => array('bar' => 'foo'))); 
    141 $t->is($ph->has('foo[bar]'), true, '->has() can takes a multi-array key'); 
    142 $t->is($ph->get('foo[bar]'), 'foo', '->has() can takes a multi-array key'); 
    143 $t->is($ph->remove('foo[bar]'), 'foo', '->remove() can takes a multi-array key'); 
    144 $t->is($ph->getAll(), array('foo' => array()), '->remove() can takes a multi-array key');