Changeset 6514

Timestamp:

12/16/07 08:00:16 (2 years ago)

Author:

fabien

Message:

removed sfRenderingFilter

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)

trunk/data/config/core_compile.yml

@@ -12 +12 @@
-- %SF_SYMFONY_LIB_DIR%/filter/sfCommonFilter.class.php
-- %SF_SYMFONY_LIB_DIR%/filter/sfExecutionFilter.class.php
-- %SF_SYMFONY_LIB_DIR%/filter/sfRenderingFilter.class.php
-- %SF_SYMFONY_LIB_DIR%/filter/sfFilterChain.class.php
-- %SF_SYMFONY_LIB_DIR%/request/sfRequest.class.php

trunk/data/config/filters.yml

@@ -1 @@
-# rendering filter must be the first registered filter
-rendering:
-  class: sfRenderingFilter
-  param:
-    type: rendering
-
-# security filter must have a type of security
-security:

trunk/data/skeleton/app/app/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/lib/action/sfAction.class.php

@@ -131 +131 @@
-
-    $this->getController()->forward($module, $action);
+    $this->getResponse()->send();
-
-    throw new sfStopException();
@@ -190 +191 @@
-  {
-    $this->getController()->redirect($url, 0, $statusCode);
+    $this->getResponse()->send();
-
-    throw new sfStopException();

trunk/lib/config/sfFilterConfigHandler.class.php

@@ -62 +62 @@
-
-    $execution = false;
-    $rendering = false;
-
-    // let's do our fancy work
@@ -121 +120 @@
-        }
-
-        if ('rendering' == $type)
-        {
-          $rendering = true;
-        }
-
-        if ('execution' == $type)
-        {
@@ -131 +125 @@
-        }
-      }
-    }
-
-    if (!$rendering)
-    {
-      throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));
-    }
-

trunk/lib/controller/sfFrontWebController.class.php

@@ -47 +47 @@
-      // make the first request
-      $this->forward($moduleName, $actionName);
+
+      $this->context->getResponse()->send();
-    }
-    catch (sfException $e)

trunk/lib/exception/sfException.class.php

@@ -55 +55 @@
-      // clean current output buffer
-      while (@ob_end_clean());
-
-      ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
-
-      header('HTTP/1.0 500 Internal Server Error');

trunk/lib/filter/sfBasicSecurityFilter.class.php

@@ -72 +72 @@
-        // the user doesn't have access, exit stage left
-        $controller->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
+        $this->context->getResponse()->send();
-
-        throw new sfStopException();
@@ -80 +81 @@
-      // the user is not authenticated
-      $controller->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+      $this->context->getResponse()->send();
-
-      throw new sfStopException();

trunk/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/lib/util/sfBrowser.class.php

@@ -160 +160 @@
-    $response   = $this->context->getResponse();
-
-    // we register a fake rendering filter
-    sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));
-
-    $this->currentException = null;
-
@@ -524 +521 @@
-  }
-}
-
-class sfFakeRenderingFilter extends sfFilter
-{
-  public function execute($filterChain)
-  {
-    $filterChain->execute();
-
-    $this->context->getResponse()->sendContent();
-  }
-}

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

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/functional/fixtures/project/apps/frontend/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/functional/fixtures/project/apps/frontend/modules/configFiltersSimpleFilter/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/functional/fixtures/project/apps/i18n/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/functional/fixtures/project/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/functional/fixtures/project/plugins/sfConfigPlugin/config/filters.yml

@@ -1 @@
-rendering: ~
-security:  ~
-

trunk/test/unit/config/sfFilterConfigHandlerTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-8
+7
-
-$handler = new sfFilterConfigHandler();
@@ -35 +35 @@
-
-// no execution/rendering filter
-, 'rendering'
+
-{
-  $files = array(