Skip to content

Commit

Permalink
Updated references to ActionMapping
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Manderson committed Oct 2, 2014
1 parent 870622c commit f002169
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/Action/RequestProcessor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ protected function processContent(\Symfony\Component\HttpFoundation\Request $req
* @exception IOException if an input/output error occurs
* @exception kernelException if a kernel exception occurs
*/
protected function processException(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Exception $exception, $form, \Phruts\Config\ActionConfig $mapping)
protected function processException(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Exception $exception, $form, \Phruts\Action\ActionMapping $mapping)
{
// Is there a defined handler for this exception?
$config = $mapping->findExceptionConfig(get_class($exception)); // ExceptionConfig
Expand Down Expand Up @@ -404,11 +404,11 @@ protected function processMapping(\Symfony\Component\HttpFoundation\Request $req
* processing
* @param \Symfony\Component\HttpFoundation\Response $response The kernel response we are
* creating
* @param \Phruts\Config\ActionConfig $mapping The mapping we are using
* @param \Phruts\Action\ActionMapping $mapping The mapping we are using
* @return boolean
*
*/
protected function processRoles(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ActionConfig $mapping)
protected function processRoles(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\ActionMapping $mapping)
{
// Is this action protected by role requirements?
$roles = $mapping->getRoleNames();
Expand Down Expand Up @@ -453,10 +453,10 @@ protected function processRoles(\Symfony\Component\HttpFoundation\Request $reque
* processing
* @param \Symfony\Component\HttpFoundation\Response $response The kernel response we are
* creating
* @param \Phruts\Config\ActionConfig $mapping The mapping we are using
* @param \Phruts\Action\ActionMapping $mapping The mapping we are using
* @return \Phruts\Action\AbstractActionForm
*/
protected function processActionForm(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ActionConfig $mapping)
protected function processActionForm(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\ActionMapping $mapping)
{
// Create (if necessary a form bean to use)
$instance = \Phruts\Util\RequestUtils::createActionForm($request, $mapping, $this->moduleConfig, $this->actionKernel);
Expand Down Expand Up @@ -491,10 +491,10 @@ protected function processActionForm(\Symfony\Component\HttpFoundation\Request $
* creating
* @param \Phruts\Action\AbstractActionForm $form The ActionForm instance we are
* populating
* @param \Phruts\Config\ActionConfig $mapping The ActionMapping we are using
* @param \Phruts\Action\ActionMapping $mapping The ActionMapping we are using
* @throws \Phruts\Exception - If thrown by \Phruts\Util\RequestUtils->populate()
*/
protected function processPopulate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Config\ActionConfig $mapping)
protected function processPopulate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Action\ActionMapping $mapping)
{
if (is_null($form)) {
return;
Expand Down Expand Up @@ -537,7 +537,7 @@ protected function processPopulate(\Symfony\Component\HttpFoundation\Request $re
* @param \Phruts\Action\ActionMapping $mapping The \Phruts\Config\ActionConfig we are using
* @return boolean
*/
protected function processValidate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Config\ActionConfig $mapping)
protected function processValidate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Action\ActionMapping $mapping)
{
if (is_null($form)) {
return true;
Expand Down Expand Up @@ -609,10 +609,10 @@ protected function processValidate(\Symfony\Component\HttpFoundation\Request $re
* processing
* @param \Symfony\Component\HttpFoundation\Response $response The kernel response we are
* creating
* @param \Phruts\Config\ActionConfig $mapping The \Phruts\Config\ActionConfig we are using
* @param \Phruts\Action\ActionMapping $mapping The \Phruts\Config\ActionConfig we are using
* @return boolean
*/
protected function processForward(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ActionConfig $mapping)
protected function processForward(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\ActionMapping $mapping)
{
// Are we going to processing this request?
$forward = $mapping->getForward();
Expand All @@ -639,10 +639,10 @@ protected function processForward(\Symfony\Component\HttpFoundation\Request $req
* processing
* @param \Symfony\Component\HttpFoundation\Response $response The kernel response we are
* creating
* @param \Phruts\Config\ActionConfig $mapping The \Phruts\Config\ActionConfig we are using
* @param \Phruts\Action\ActionMapping $mapping The \Phruts\Config\ActionConfig we are using
* @return boolean
*/
protected function processInclude(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ActionConfig $mapping)
protected function processInclude(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\ActionMapping $mapping)
{
// Are we going to processing this request?
$include = $mapping->getInclude();
Expand All @@ -667,10 +667,10 @@ protected function processInclude(\Symfony\Component\HttpFoundation\Request $req
* processing
* @param \Symfony\Component\HttpFoundation\Response $response The kernel response we are
* creating
* @param \Phruts\Config\ActionConfig $mapping The mapping we are using
* @param \Phruts\Action\ActionMapping $mapping The mapping we are using
* @return \Phruts\Config\ForwardConfig
*/
protected function processActionCreate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ActionConfig $mapping)
protected function processActionCreate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\ActionMapping $mapping)
{
// Acquire the Action instance we will be using (if there is one)
$className = $mapping->getType();
Expand Down Expand Up @@ -725,12 +725,12 @@ protected function processActionCreate(\Symfony\Component\HttpFoundation\Request
* @param \Phruts\Action $action The Action instance to be used
* @param \Phruts\Action\AbstractActionForm $form The ActionForm instance to pass to
* this Action
* @param \Phruts\Config\ActionConfig $mapping The \Phruts\Config\ActionConfig instance to
* @param \Phruts\Action\ActionMapping $mapping The \Phruts\Config\ActionConfig instance to
* pass to this Action
* @return \Phruts\Config\ForwardConfig
* @throws \Phruts\Exception
*/
protected function processActionPerform(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\Action $action, $form, \Phruts\Config\ActionConfig $mapping)
protected function processActionPerform(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\Action $action, $form, \Phruts\Action\ActionMapping $mapping)
{
try {
return $action->execute($mapping, $form, $request, $response);
Expand Down

0 comments on commit f002169

Please sign in to comment.