Changeset 6173

Timestamp:

11/27/07 07:20:23 (1 year ago)

Author:

fabien

Message:

deprecated sfAction::getRequestMethods() and sfAction::getDefaultView() methods

Files:

• trunk/lib/action/sfAction.class.php (modified) (2 diffs)
• trunk/lib/filter/sfExecutionFilter.class.php (modified) (2 diffs)

trunk/lib/action/sfAction.class.php

@@ -278 +278 @@
-  public function getDefaultView()
-  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
-    return sfView::INPUT;
-  }
@@ -297 +302 @@
-  public function getRequestMethods()
-  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
-    return sfRequest::GET
-           | sfRequest::POST

trunk/lib/filter/sfExecutionFilter.class.php

@@ -35 +35 @@
-    $actionInstance = $this->context->getController()->getActionStack()->getLastEntry()->getActionInstance();
-
-
+, execute and render the view
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
-    {
-      $timer = sfTimerManager::getTimer(sprintf('Action "%s/%s"', $actionInstance->getModuleName(), $actionInstance->getActionName()));
-    }
-
-
+  
-
-
-
+
+
+
+
+
-      $timer->addTime();
-    }
-
-
-
+
-    {
-
-
-
-
-
-
-
-
+
+
-    }
-  }
@@ -76 +70 @@
-      // action in cache, so go to the view
-      return sfView::SUCCESS;
-    }
-
-    // get the request method
-    $method = $this->context->getRequest()->getMethod();
-    if (($actionInstance->getRequestMethods() & $method) != $method)
-    {
-      // this action will skip execution for this method
-      // get the default view
-      return $actionInstance->getDefaultView();
-    }
-