Development

Changeset 2794

You must first sign up to be able to contribute.

Changeset 2794

Show
Ignore:
Timestamp:
11/23/06 20:45:47 (2 years ago)
Author:
fabien
Message:

renamed activate to enabled (in cache.yml) and activated_modules to enabled_modules (in settings.yml) + fixed a bug in upgrade script

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/data/config/settings.yml

    r2679 r2794  
    5656    use_flash:              on 
    5757 
    58     activated_modules:      [default] 
     58    enabled_modules:        [default] 
    5959 
    6060    strip_comments:         on 

  • trunk/data/skeleton/app/app/config/cache.yml

    r1982 r2794  
    11default: 
    2   activate:    off 
     2  enabled:     off 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/data/skeleton/app/app/config/settings.yml

    r2679 r2794  
    7878#    use_flash:              on 
    7979# 
    80 #    activated_modules:      [default] 
     80#    enabled_modules:        [default] 
    8181# 
    8282#    strip_comments:         on 

  • trunk/data/tasks/sfPakeUpgrade.php

    r2734 r2794  
    5656  _upgrade_1_0_propel_model(); 
    5757 
     58  // migrate activate to enabled 
     59  _upgrade_1_0_activate(); 
     60 
    5861  // find all applications for this project 
    5962  $apps = pakeFinder::type('directory')->name(sfConfig::get('sf_app_module_dir_name'))->mindepth(1)->maxdepth(1)->relative()->in(sfConfig::get('sf_apps_dir_name')); 
    …… 
    178181      $count = 0; 
    179182      $content = str_replace($old, $new, $content, $count); 
     183      if ($count) 
     184      { 
     185        $updated = true; 
     186      } 
    180187      if ($count && !isset($seen[$old])) 
    181188      { 
    182         $updated = true; 
    183189        $seen[$old] = true; 
    184190        pake_echo_comment(sprintf('%s is deprecated', $old)); 
    …… 
    190196    { 
    191197      file_put_contents($php_file, $content); 
     198    } 
     199  } 
     200} 
     201 
     202function _upgrade_1_0_activate() 
     203{ 
     204  pake_echo_action('upgrade 1.0', 'migrate activate to enabled'); 
     205 
     206  $config_files = array( 
     207    'settings.yml' => array( 
     208      'activated_modules:' => 'enabled_modules:  ', 
     209    ), 
     210    'cache.yml' => array( 
     211      'activate:' => 'enabled: ', 
     212    ), 
     213    'apps/*/modules/*/validate/*.yml' => array( 
     214      'activate:' => 'enabled: ', 
     215    ), 
     216  ); 
     217  $seen = array(); 
     218  foreach ($config_files as $config_file => $changed) 
     219  { 
     220    list($dir, $config_file) = array(dirname($config_file), basename($config_file)); 
     221    $yml_files = pakeFinder::type('file')->name($config_file)->in(sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.$dir); 
     222    foreach ($yml_files as $yml_file) 
     223    { 
     224      $content = file_get_contents($yml_file); 
     225 
     226      $updated = false; 
     227      foreach ($changed as $old => $new) 
     228      { 
     229        $content = str_replace($old, $new, $content, $count); 
     230        if ($count) 
     231        { 
     232          $updated = true; 
     233        } 
     234        if ($count && !isset($seen[$config_file.$old])) 
     235        { 
     236          $seen[$config_file.$old] = true; 
     237 
     238          pake_echo_comment(sprintf('%s is deprecated in %s', $old, $config_file)); 
     239          pake_echo_comment(sprintf(' use %s', $new)); 
     240        } 
     241      } 
     242 
     243      if ($updated) 
     244      { 
     245        file_put_contents($yml_file, $content); 
     246      } 
    192247    } 
    193248  } 
    …… 
    216271      $count = 0; 
    217272      $content = str_replace($old, $new, $content, $count); 
     273      if ($count) 
     274      { 
     275        $updated = true; 
     276      } 
    218277      if ($count && !isset($seen[$old])) 
    219278      { 
    220         $updated = true; 
    221279        $seen[$old] = true; 
    222280        pake_echo_comment(sprintf('%s is deprecated', $old)); 
    …… 
    246304    $updated = false; 
    247305    $content = preg_replace_callback('/type\:(\s*)(.+)$/m', '_upgrade_1_0_cache_yml_callback', $content, -1, $count); 
     306    if ($count) 
     307    { 
     308      $updated = true; 
     309    } 
    248310    if ($count && !$seen) 
    249311    { 
    250       $updated = true; 
    251312      $seen = true; 
    252313      pake_echo_comment('"type" has been removed in cache.yml'); 
    …… 
    278339  foreach ($yml_files as $yml_file) 
    279340  { 
     341    $updated = false; 
    280342    foreach ($deprecated_str as $old => $new) 
    281343    { 
    …… 
    283345 
    284346      $count = 0; 
    285       $updated = false; 
    286347      $content = str_replace($old, $new, $content, $count); 
     348      if ($count) 
     349      { 
     350        $updated = true; 
     351      } 
    287352      if ($count && !isset($seen[$old])) 
    288353      { 
    289354        $seen[$old] = true; 
    290         $updated = true; 
    291355        pake_echo_comment(sprintf('%s() has been removed', $old)); 
    292356        pake_echo_comment(sprintf(' use %s()', $new)); 
    …… 
    323387      $count = 0; 
    324388      $content = str_replace($old, $new, $content, $count); 
     389      if ($count) 
     390      { 
     391        $updated = true; 
     392      } 
    325393      if ($count && !isset($seen[$old])) 
    326394      { 
    327         $updated = true; 
    328395        $seen[$old] = true; 
    329396        pake_echo_comment(sprintf('%s has been removed', $old)); 
    …… 
    361428    $count = 0; 
    362429    $content = preg_replace('#<\?php\s+(echo)?\s+include_javascripts\(\);?\s*\?>#', '', $content, -1, $count); 
     430    if ($count) 
     431    { 
     432      $updated = true; 
     433    } 
    363434    if ($count && !isset($seen['include_javascripts'])) 
    364435    { 
    365       $updated = true; 
    366436      $seen['include_javascripts'] = true; 
    367437      pake_echo_comment('include_javascripts() has been removed'); 
    …… 
    369439 
    370440    $content = preg_replace('#<\?php\s+(echo)?\s+include_stylesheets\(\);?\s*\?>#', '', $content, -1, $count); 
     441    if ($count) 
     442    { 
     443      $updated = true; 
     444    } 
    371445    if ($count && !isset($seen['include_stylesheets'])) 
    372446    { 
    373       $updated = true; 
    374447      $seen['include_stylesheets'] = true; 
    375448      pake_echo_comment('include_stylesheets() has been removed'); 
    …… 
    379452    { 
    380453      $content = str_replace($old, $new, $content, $count); 
     454      if ($count) 
     455      { 
     456        $updated = true; 
     457      } 
    381458      if ($count && !isset($seen[$old])) 
    382459      { 
    383         $updated = true; 
    384460        $seen[$old] = true; 
    385461        pake_echo_comment(sprintf('%s has been removed', $old)); 
    …… 
    522598    $content = str_replace('require_once \'model', 'require_once \'lib/model', $content, $count1); 
    523599    $content = str_replace('include_once \'model', 'include_once \'lib/model', $content, $count2); 
     600    if ($count1 || $count2) 
     601    { 
     602      $updated = true; 
     603    } 
    524604    if (($count1 || $count2) && !$seen) 
    525605    { 
    526       $updated = true; 
    527606      $seen = true; 
    528607      pake_echo_comment('model require must be lib/model/...'); 
    …… 
    555634    $updated = false; 
    556635    $content = str_replace('<database', '<database package="lib.model"', $content, $count); 
     636    if ($count) 
     637    { 
     638      $updated = true; 
     639    } 
    557640    if ($count && !$seen) 
    558641    { 
    559       $updated = true; 
    560642      $seen = true; 
    561643      pake_echo_comment('schema.xml must now have a database package'); 

  • trunk/doc/book/content/cache.txt

    r2034 r2794  
    1212The principle of HTML caching is simple: part or all of the HTML code that is sent to a user upon a request can be reused for a similar request, so this HTML code is stored in a special place (the `cache` folder in symfony), where the front controller will look for it before executing an action. If a cached version is found, it is sent without executing the action, thus greatly speeding up the process. If there is no cached version found, the action is executed, and its result (the view) is stored in the cache folder for future requests. 
    1313 
    14 As all the pages may contain dynamic information, the HTML cache is disabled by default. It is up to the site administrator to activate it in order to improve performance. 
     14As all the pages may contain dynamic information, the HTML cache is disabled by default. It is up to the site administrator to enable it in order to improve performance. 
    1515 
    1616Symfony handles four different types of HTML cache: 
    …… 
    2828--------------------- 
    2929 
    30 For each application of a project, the HTML cache mechanism can be activated or deactivated completely per environment. In the `settings.yml` configuration file, notice the `cache` parameter: 
     30For each application of a project, the HTML cache mechanism can be enabled or disabled completely per environment. In the `settings.yml` configuration file, notice the `cache` parameter: 
    3131 
    3232    prod: 
    …… 
    5757The result of the above-mentioned action is a processed template (`listSuccess.php`), and this is what is going to be cached. 
    5858 
    59 To activate the cache on such actions, simply add a `cache.yml` file in the `myproject/apps/myapp/modules/user/config/` directory, with the following content:  
     59To enable the cache on such actions, simply add a `cache.yml` file in the `myproject/apps/myapp/modules/user/config/` directory, with the following content:  
    6060 
    6161    list: 
    62       activate:   on 
     62      enabled     on 
    6363      type:       slot 
    6464     
    …… 
    7373 
    7474    show: 
    75       activate:   on 
     75      enabled:    on 
    7676      type:       slot 
    7777 
    …… 
    8888    <?php include_partial('mymodule/mypartial') ?> 
    8989 
    90 A partial is as easy to cache as an action. To activate it, create a `cache.yml` in the partial module `config/` directory (in the example above, in `modules/mymodule/config/`) and activate the cache for the partials by declaring their names with a leading underscore: 
     90A partial is as easy to cache as an action. To enable it, create a `cache.yml` in the partial module `config/` directory (in the example above, in `modules/mymodule/config/`) and enable the cache for the partials by declaring their names with a leading underscore: 
    9191 
    9292    _mypartial: 
    93       activate: on 
     93      enabled: on 
    9494     
    9595    all: 
    96       activate: off 
     96      enabled: off 
    9797 
    9898Now all the templates using this partial won't actually execute the PHP code of the partial, but use the cached version instead.  
    …… 
    113113 
    114114    _day: 
    115       activate: on 
     115      enabled: on 
    116116 
    117117>**Note**: Global components (the ones located in the application `templates/` directory) can be cached, provided you declare the activation in the application `cache.yml` file. 
    …… 
    127127 
    128128    show: 
    129       activate:   on 
     129      enabled:    on 
    130130      type:       page 
    131131       
    132132    list: 
    133       activate:   on 
     133      enabled:    on 
    134134      type:       page 
    135135     
    …… 
    194194 
    195195    list: 
    196       activate:   off 
     196      enabled:   off 
    197197 
    198198After requesting twice the `http://myapp.example.com/user/list` URL, notice that the second execution is faster than the first. However, the answer is not as fast as when the cache was set to `slot` or `page`, since the template is partially processed and the decoration is made for every request. 
    …… 
    335335### Staging environment 
    336336 
    337 The caching system is prone to new errors in the production environment that can't be detected in the development environment, since the HTML cache is deactivated by default in development. If you use the HTML cache, it is strongly recommended to add a new environment, that will be called `staging` here, which is a copy of the production environment (thus with cache activated) but with the web debug set to on. 
     337The caching system is prone to new errors in the production environment that can't be detected in the development environment, since the HTML cache is disabled by default in development. If you use the HTML cache, it is strongly recommended to add a new environment, that will be called `staging` here, which is a copy of the production environment (thus with cache enabled) but with the web debug set to on. 
    338338 
    339339To set it up, edit the `settings.yml` of your application and add at the top: 
    …… 
    360360After a bunch of flags, this debug box also displays the process duration. Go ahead, clear the cache and make some tests: the second time you request a page, depending on the complexity of the action and template, can be several times faster with caching turned on.         
    361361 
    362 To get more details about the caching impact, activate the debug mode by editing the `myapp_staging.php` and changing the `SF_DEBUG` value: 
     362To get more details about the caching impact, enable the debug mode by editing the `myapp_staging.php` and changing the `SF_DEBUG` value: 
    363363 
    364364    [php] 
    …… 
    390390### ETags 
    391391 
    392 When `ETag` is activated, the web server adds to the response a special header containing a md5 hash of the response itself.  
     392When `ETag` is enabled, the web server adds to the response a special header containing a md5 hash of the response itself.  
    393393 
    394394    ETag: "1A2Z3E4R5T6Y7U" 
    …… 
    396396The user's browser will store this hash, and send it again together with the request the next time it needs the same page. If the new hash shows that the page didn't change since the first request, the browser doesn't sent the response back. Instead, it just sends a '304: not modified' header. It saves cpu time (gzipping) and bandwidth (page transfer) for the server, and cpu time (page rendering) for the client. Overall, pages in cache with an etag are even faster to load than pages in cache without etag. 
    397397 
    398 In symfony, you activate the etags feature for the whole application in the `settings.yml`. Here is the default setting: 
     398In symfony, you enable the etags feature for the whole application in the `settings.yml`. Here is the default setting: 
    399399 
    400400    all: 
    …… 
    440440### Cache-Control 
    441441 
    442 Up to now, even by adding headers, the browser kept sending requests to the server even if it held a cached version of the page. There is a way to avoid that by adding `Cache-Control` and `Expires` headers to the response. These headers are deactivated by default in PHP, but symfony can override this behaviour to avoid unecessary requests to your server. 
     442Up to now, even by adding headers, the browser kept sending requests to the server even if it held a cached version of the page. There is a way to avoid that by adding `Cache-Control` and `Expires` headers to the response. These headers are disabled by default in PHP, but symfony can override this behaviour to avoid unecessary requests to your server. 
    443443 
    444444Beware that the major consequence of turning this mechanism on is that your server logs won't show all the requests issued by the users, but only the ones received. If the performance gets better, the apparent popularity of the site may decrease in the statistics. 

  • trunk/doc/book/content/configuration_practice.txt

    r2446 r2794  
    1919------------ 
    2020 
    21 The symfony configuration system is inspired by the way [Mojavi][3] handles configuration. Although not appreciated by everyone, this system is extremely powerful. 
     21The symfony configuration system is inspired by the way Mojavi handles configuration. Although not appreciated by everyone, this system is extremely powerful. 
    2222 
    2323Configuration is distributed into files, by subject. The files contain parameter definitions, or settings. 
    …… 
    6262* `routing.yml`: The routing rules, that allow transforming unreadable and unbookmarkable URLs into "smart" and explicit ones, are stored in this file. For new applications, a few default rules exist. See more in the [routing chapter](routing.txt). 
    6363* `settings.yml*`: The main settings of a symfony application are defined in this file. This is where you specify if your application has internationalization, its default language, the request timeout, whether caching is turned on or not, and whether routing is turned on. With a one line change in this file, you can shut down the application so you can perform maintenance or upgrade one of its components. This is a perfect example of the benefit of using a single front web controller. [_see more below_](#settings) 
    64 * `tidy.yml*`: If the use of [HTML Tidy][1] is activated in the `settings.yml`, then you can modify the options of this utility to alter the HTML code output to, for instance, re-indent the tags properly, or remove comments, or collapse all spaces and carriage returns to save bandwidth, or to correct missing closing tags that were missed by the developers. 
    6564* `view.yml`: The structure of the default View (name of the layout, title and metas, default .js and .css files to be included, name of the included slots, etc.) is set in this file. These settings can be overridden for each module. This file also defines the default value of the `meta` and `title` tags. [_see more below_](#view) 
    6665 
    …… 
    127126* `use_security`: If your application has restricted areas, authentication and credentials, set this parameter to `on` (see the [security chapter](security.txt) for more details) 
    128127* `compressed`: Activates the HTML compression to reduce bandwidth requirements and improve performance 
    129 * `tidy`: Activates the use of [HTML Tidy][1] 
    130128* `i18n`: Must be set to `on` for sites/applications available in multiple languages 
    131129* `default_culture`: Specifies the default parameter used to format dates, numbers, currencies (`en` in the default configuration) 
    …… 
    497495    [php] 
    498496    $myarray = sfYaml::load('/tmp/myfile.yml'); 
    499  
    500 [1]: http://www.w3.org/People/Raggett/tidy/ "HTML Tidy" 
    501 [2]: http://www.mojavi.org/                 "Mojavi" 
    502 [3]: http://www.mojavi.org/                 "Mojavi project" 

  • trunk/doc/book/content/fillin.txt

    r1284 r2794  
    2525But try to imagine more complicated cases, where the default value comes from the server, or where you have a radiobutton tag or a select tag. Handling all that becomes long and painful in the long run, especially if you have forms with a large number of controls. 
    2626 
    27 Symfony can handle repopulation automatically. To enable that behaviour, you just need to add a `filters.yml` in your module `config/` folder and activate the `sfFillInFormFilter`: 
     27Symfony can handle repopulation automatically. To enable that behaviour, you just need to add a `filters.yml` in your module `config/` folder and enable the `sfFillInFormFilter`: 
    2828 
    2929    myFillInFormFilter: 
    …… 
    4040 
    4141     fillin: 
    42       activate: on 
     42      enabled: on 
    4343 
    4444Filter parameters 
    …… 
    6565 
    6666     fillin: 
    67       activate: on 
     67      enabled: on 
    6868      param: 
    6969        name: search        # name of the form 

  • trunk/doc/book/content/plugin.txt

    r2082 r2794  
    6363### Module activation 
    6464 
    65 Some plugins contain a whole module. The only difference between module plugins and classical modules is that module plugins don't appear in the `myproject/apps/myapp/modules/` directory (to keep them easily upgradeable) and need to be activated in the `settings.yml` file: 
     65Some plugins contain a whole module. The only difference between module plugins and classical modules is that module plugins don't appear in the `myproject/apps/myapp/modules/` directory (to keep them easily upgradeable) and need to be enabled in the `settings.yml` file: 
    6666 
    6767    all: 
    6868      .settings: 
    69         activated_modules:  [default, sfMyPluginModule] 
     69        enabled_modules:  [default, sfMyPluginModule] 
    7070 
    7171This is to avoid that a plugin module becomes available by mistake for an application that doesn't require it, which could open a security breach. 
    …… 
    142142* **Model classes** in `myplugin/lib/model/` specialize the model classes generated by the Propel builder (in `myplugin/lib/model/om/` and `myplugin/lib/model/map/`). They are, of course, autoloaded. Beware that you cannot override the generated model classes of a plugin in your own project directories. 
    143143 
    144 * **Modules** provide new actions accessible from the outside, provided that you declare them in the `activated_module` setting in your application. Think about a plugin that provides frontend and backend modules. You will need to enable the frontend modules only in your `frontend` application, and the backend ones only in the `backend` application. This is why plugin modules are not activated by default. 
     144* **Modules** provide new actions accessible from the outside, provided that you declare them in the `enabled_module` setting in your application. Think about a plugin that provides frontend and backend modules. You will need to enable the frontend modules only in your `frontend` application, and the backend ones only in the `backend` application. This is why plugin modules are not enabled by default. 
    145145 
    146146* **Web** assets are made available to the server, by creating a symlink to the project `web/` directory, if the system allows it, or by copying the content of the module `web/` directory into the project one. Beware that the module assets are automatically supported only when you install a plugin via the command line. If the plugin is installed from an archive or a version control repository, the copy to the project `web/` directory has to be done by hand, and the README bundled with the plugin should mention it. 

  • trunk/doc/book/content/validate_form.txt

    r2709 r2794  
    333333 
    334334    fillin: 
    335       activate: on   # activate the form repopulation 
     335      enabled:  on   # enable the form repopulation 
    336336      param: 
    337337        name: test   # name of the form 
    …… 
    344344 
    345345     fillin: 
    346       activate: on 
     346      enabled: on 
    347347      param: 
    348348        name: test 
    …… 
    351351          htmlspecialchars: [comments] 
    352352 
    353 The repopulation feature is based on a filter called `sfFillInFormFilter`, and it means that you can take advantage of form repopulation even if you don't use the symfony validation files. To activate the filter, just add it to your `filters.yml` as you would do with a normal filter (see more in the [filter chapter](filters.txt)). 
     353The repopulation feature is based on a filter called `sfFillInFormFilter`, and it means that you can take advantage of form repopulation even if you don't use the symfony validation files. To enable the filter, just add it to your `filters.yml` as you would do with a normal filter (see more in the [filter chapter](filters.txt)). 
    354354 
    355355Complex validation needs 

  • trunk/lib/config/sfCacheConfigHandler.class.php

    r2319 r2794  
    8282    $data = array(); 
    8383 
    84     // activated? 
    85     $activate = $this->getConfigValue('activate', $actionName); 
     84    // enabled? 
     85    $enabled = $this->getConfigValue('enabled', $actionName); 
    8686 
    8787    // cache with or without loayout 
    …… 
    8989 
    9090    // lifetime 
    91     $lifeTime = !$activate ? '0' : $this->getConfigValue('lifetime', $actionName, '0'); 
     91    $lifeTime = !$enabled ? '0' : $this->getConfigValue('lifetime', $actionName, '0'); 
    9292 
    9393    // client_lifetime 
    94     $clientLifetime = !$activate ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime, '0'); 
     94    $clientLifetime = !$enabled ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime, '0'); 
    9595 
    9696    // contextual 

  • trunk/lib/controller/sfController.class.php

    r2750 r2794  
    6464   * @param boolean $throwExceptions whether to throw exceptions if the controller doesn't exist 
    6565   * 
    66    * @throws sfConfigurationException thrown if the module is not activated 
     66   * @throws sfConfigurationException thrown if the module is not enabled 
    6767   * @throws sfControllerException thrown if the controller doesn't exist and the $throwExceptions 
    6868   *                               parameter is set to true 
    …… 
    7373  { 
    7474    $dirs = sfLoader::getControllerDirs($moduleName); 
    75     foreach ($dirs as $dir => $checkActivated) 
    76     { 
    77       // plugin module activated? 
    78       if ($checkActivated && !in_array($moduleName, sfConfig::get('sf_activated_modules')) && is_readable($dir)) 
    79       { 
    80         $error = 'The module "%s" is not activated.'; 
     75    foreach ($dirs as $dir => $checkEnabled) 
     76    { 
     77      // plugin module enabled? 
     78      if ($checkEnabled && !in_array($moduleName, sfConfig::get('sf_enabled_modules')) && is_readable($dir)) 
     79      { 
     80        $error = 'The module "%s" is not enabled.'; 
    8181        $error = sprintf($error, $moduleName); 
    8282 

  • trunk/lib/filter/sfExecutionFilter.class.php

    r2666 r2794  
    191191  { 
    192192    // automatically register the fill in filter if it is not already loaded in the chain 
    193     if (isset($parameters['activate']) && $parameters['activate'] && !$filterChain->hasFilter('sfFillInFormFilter')) 
     193    if (isset($parameters['enabled']) && $parameters['enabled'] && !$filterChain->hasFilter('sfFillInFormFilter')) 
    194194    { 
    195195      // register the fill in form filter 

  • trunk/lib/test/sfTestBrowser.class.php

    r2748 r2794  
    188188    $cacheManager = $this->getContext()->getViewCacheManager(); 
    189189 
    190     // check that cache is activated 
     190    // check that cache is enabled 
    191191    if (!$cacheManager) 
    192192    { 

  • trunk/test/functional/fixtures/project/apps/backend/config/cache.yml

    r2217 r2794  
    11default: 
    2   activate:    off 
     2  enabled:     off 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/test/functional/fixtures/project/apps/backend/config/settings.yml

    r2459 r2794  
    7878#    use_flash:              on 
    7979# 
    80 #    activated_modules:      [default] 
     80#    enabled_modules:        [default] 
    8181# 
    8282#    strip_comments:         on 

  • trunk/test/functional/fixtures/project/apps/cache/config/cache.yml

    r2169 r2794  
    11default: 
    2   activate:    on 
     2  enabled:     on 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/test/functional/fixtures/project/apps/cache/config/settings.yml

    r2459 r2794  
    7878#    use_flash:              on 
    7979# 
    80 #    activated_modules:      [default] 
     80#    enabled_modules:        [default] 
    8181# 
    8282#    strip_comments:         on 

  • trunk/test/functional/fixtures/project/apps/cache/modules/cache/config/cache.yml

    r2558 r2794  
    11_contextualCacheableComponent: 
    2   activate:   on 
     2  enabled:    on 
    33  contextual: true 
    44 
    55_contextualComponent: 
    6   activate:   off 
     6  enabled:    off 
    77  contextual: true 
    88 
    99_cacheableComponent: 
    10   activate: on 
     10  enabled: on 
    1111 
    1212_component: 
    13   activate: off 
     13  enabled: off 
    1414 
    1515_contextualCacheablePartial: 
    16   activate:   on 
     16  enabled:    on 
    1717  contextual: true 
    1818 
    1919_contextualPartial: 
    20   activate:   off 
     20  enabled:    off 
    2121  contextual: true 
    2222 
    2323_cacheablePartial: 
    24   activate: on 
     24  enabled: on 
    2525 
    2626_partial: 
    27   activate: off 
     27  enabled: off 
    2828 
    2929multi: 
    30   activate: off 
     30  enabled: off 
    3131 
    3232multiBis: 
    33   activate: off 
     33  enabled: off 
    3434 
    3535specificCacheKey: 
    36   activate: off 
     36  enabled: off 
    3737 
    3838action: 
    39   activate:    on 
     39  enabled:     on 
    4040  with_layout: off 
    4141 

  • trunk/test/functional/fixtures/project/apps/cache/modules/nocache/config/cache.yml

    r2169 r2794  
    11all: 
    2   activate: off 
     2  enabled: off 

  • trunk/test/functional/fixtures/project/apps/crud/config/cache.yml

    r2126 r2794  
    11default: 
    2   activate:    off 
     2  enabled:     off 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/test/functional/fixtures/project/apps/crud/config/settings.yml

    r2459 r2794  
    7878#    use_flash:              on 
    7979# 
    80 #    activated_modules:      [default] 
     80#    enabled_modules:        [default] 
    8181# 
    8282#    strip_comments:         on 

  • trunk/test/functional/fixtures/project/apps/frontend/config/cache.yml

    r2069 r2794  
    11default: 
    2   activate:    off 
     2  enabled:     off 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/test/functional/fixtures/project/apps/frontend/config/settings.yml

    r2459 r2794  
    2323all: 
    2424  .settings: 
    25     activated_modules:      [default, autoloadPlugin] 
     25    enabled_modules:        [default, autoloadPlugin] 
    2626 
    2727#  .actions: 
    …… 
    8181#    use_flash:              on 
    8282# 
    83 #    activated_modules:      [default] 
     83#    enabled_modules:        [default] 
    8484# 
    8585#    strip_comments:         on 

  • trunk/test/functional/fixtures/project/apps/frontend/modules/validation/validate/index.yml

    r2586 r2794  
    77 
    88fillin: 
    9   activate: on 
     9  enabled: on 
    1010 
    1111names: 

  • trunk/test/functional/fixtures/project/apps/i18n/config/cache.yml

    r2740 r2794  
    11default: 
    2   activate:    off 
     2  enabled:     off 
    33  with_layout: false 
    44  lifetime:    86400 

  • trunk/test/functional/fixtures/project/apps/i18n/config/settings.yml

    r2750 r2794  
    7878#    use_flash:              on 
    7979# 
    80     activated_modules:      [default, sfI18NPlugin] 
     80    enabled_modules:        [default, sfI18NPlugin] 
    8181# 
    8282#    strip_comments:         on 

  • trunk/test/unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_all.yml

    r2218 r2794  
    1313    i18n:                   off 
    1414 
    15     activated_modules:      [default, user] 
     15    enabled_modules:       [default, user] 

  • trunk/test/unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_default.yml

    r2218 r2794  
    99    i18n:                   off 
    1010 
    11     activated_modules:      [default] 
     11    enabled_modules:       [default] 

  • trunk/test/unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_result.php

    r2386 r2794  
    77  'sf_available' => false, 
    88  'sf_i18n' => true, 
    9   'sf_activated_modules' => array ( 
     9  'sf_enabled_modules' => array ( 
    1010  0 => 'default', 
    1111  1 => 'user', 

  • trunk/test/unit/config/fixtures/sfValidatorConfigHandler/alternate_format.yml

    r2655 r2794  
    11fillin: 
    2   activate:      Yes 
     2  enabled:       Yes 
    33 
    44validators: 

  • trunk/test/unit/config/fixtures/sfValidatorConfigHandler/standard_format.yml

    r2655 r2794  
    33 
    44fillin: 
    5   activate:      Yes 
     5  enabled:       Yes 
    66 
    77names: