Changeset 6514
- Timestamp:
- 12/16/07 08:00:16 (7 months ago)
- Files:
-
- trunk/data/config/core_compile.yml (modified) (1 diff)
- trunk/data/config/filters.yml (modified) (1 diff)
- trunk/data/skeleton/app/app/config/filters.yml (modified) (1 diff)
- trunk/lib/action/sfAction.class.php (modified) (2 diffs)
- trunk/lib/config/sfFilterConfigHandler.class.php (modified) (3 diffs)
- trunk/lib/controller/sfFrontWebController.class.php (modified) (1 diff)
- trunk/lib/exception/sfException.class.php (modified) (1 diff)
- trunk/lib/filter/sfBasicSecurityFilter.class.php (modified) (2 diffs)
- trunk/lib/filter/sfRenderingFilter.class.php (deleted)
- trunk/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/filters.yml (modified) (1 diff)
- trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/filters.yml (modified) (1 diff)
- trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml (modified) (1 diff)
- trunk/lib/task/project/upgrade1.1/sfRenderingFilterUpgrade.class.php (added)
- trunk/lib/util/sfBrowser.class.php (modified) (2 diffs)
- trunk/test/functional/fixtures/project/apps/cache/config/filters.yml (modified) (1 diff)
- trunk/test/functional/fixtures/project/apps/frontend/config/filters.yml (modified) (1 diff)
- trunk/test/functional/fixtures/project/apps/frontend/modules/configFiltersSimpleFilter/config/filters.yml (modified) (1 diff)
- trunk/test/functional/fixtures/project/apps/i18n/config/filters.yml (modified) (1 diff)
- trunk/test/functional/fixtures/project/config/filters.yml (modified) (1 diff)
- trunk/test/functional/fixtures/project/plugins/sfConfigPlugin/config/filters.yml (modified) (1 diff)
- trunk/test/unit/config/sfFilterConfigHandlerTest.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/data/config/core_compile.yml
r5320 r6514 12 12 - %SF_SYMFONY_LIB_DIR%/filter/sfCommonFilter.class.php 13 13 - %SF_SYMFONY_LIB_DIR%/filter/sfExecutionFilter.class.php 14 - %SF_SYMFONY_LIB_DIR%/filter/sfRenderingFilter.class.php15 14 - %SF_SYMFONY_LIB_DIR%/filter/sfFilterChain.class.php 16 15 - %SF_SYMFONY_LIB_DIR%/request/sfRequest.class.php trunk/data/config/filters.yml
r6509 r6514 1 # rendering filter must be the first registered filter2 rendering:3 class: sfRenderingFilter4 param:5 type: rendering6 7 1 # security filter must have a type of security 8 2 security: trunk/data/skeleton/app/app/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/lib/action/sfAction.class.php
r6223 r6514 131 131 132 132 $this->getController()->forward($module, $action); 133 $this->getResponse()->send(); 133 134 134 135 throw new sfStopException(); … … 190 191 { 191 192 $this->getController()->redirect($url, 0, $statusCode); 193 $this->getResponse()->send(); 192 194 193 195 throw new sfStopException(); trunk/lib/config/sfFilterConfigHandler.class.php
r6500 r6514 62 62 63 63 $execution = false; 64 $rendering = false;65 64 66 65 // let's do our fancy work … … 121 120 } 122 121 123 if ('rendering' == $type)124 {125 $rendering = true;126 }127 128 122 if ('execution' == $type) 129 123 { … … 131 125 } 132 126 } 133 }134 135 if (!$rendering)136 {137 throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));138 127 } 139 128 trunk/lib/controller/sfFrontWebController.class.php
r5139 r6514 47 47 // make the first request 48 48 $this->forward($moduleName, $actionName); 49 50 $this->context->getResponse()->send(); 49 51 } 50 52 catch (sfException $e) trunk/lib/exception/sfException.class.php
r6513 r6514 55 55 // clean current output buffer 56 56 while (@ob_end_clean()); 57 58 ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');59 57 60 58 header('HTTP/1.0 500 Internal Server Error'); trunk/lib/filter/sfBasicSecurityFilter.class.php
r5002 r6514 72 72 // the user doesn't have access, exit stage left 73 73 $controller->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action')); 74 $this->context->getResponse()->send(); 74 75 75 76 throw new sfStopException(); … … 80 81 // the user is not authenticated 81 82 $controller->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action')); 83 $this->context->getResponse()->send(); 82 84 83 85 throw new sfStopException(); trunk/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/lib/util/sfBrowser.class.php
r6459 r6514 160 160 $response = $this->context->getResponse(); 161 161 162 // we register a fake rendering filter163 sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));164 165 162 $this->currentException = null; 166 163 … … 524 521 } 525 522 } 526 527 class sfFakeRenderingFilter extends sfFilter528 {529 public function execute($filterChain)530 {531 $filterChain->execute();532 533 $this->context->getResponse()->sendContent();534 }535 }trunk/test/functional/fixtures/project/apps/cache/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/functional/fixtures/project/apps/frontend/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/functional/fixtures/project/apps/frontend/modules/configFiltersSimpleFilter/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/functional/fixtures/project/apps/i18n/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/functional/fixtures/project/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/functional/fixtures/project/plugins/sfConfigPlugin/config/filters.yml
r6509 r6514 1 rendering: ~2 1 security: ~ 3 2 trunk/test/unit/config/sfFilterConfigHandlerTest.php
r2661 r6514 11 11 require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 12 12 13 $t = new lime_test( 8, new lime_output_color());13 $t = new lime_test(7, new lime_output_color()); 14 14 15 15 $handler = new sfFilterConfigHandler(); … … 35 35 36 36 // no execution/rendering filter 37 foreach (array('execution' , 'rendering') as $key)37 foreach (array('execution') as $key) 38 38 { 39 39 $files = array(