Adds typehints for optional params

cammanderson · Sep 23, 2014 · 65b5491 · 65b5491
1 parent 662dd3c
commit 65b5491
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/Action.php b/src/Action.php
@@ -78,7 +78,7 @@ public function setActionKernel(\Phruts\Action\ActionKernel $actionKernel)
 	 * @return \Phruts\Config\ForwardConfig
 	 * @throws \Exception - if the application business logic throws an exception
 	 */
-    public function execute(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
+    public function execute(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
     {
         return null; // Override this method to provide functionality
     }
@@ -209,7 +209,7 @@ protected function saveErrors(\Symfony\Component\HttpFoundation\Request $request
      *
      * @since Struts 1.2.7
      */
-    protected function saveErrorsSession(\Symfony\Component\HttpFoundation\Session\Session $session, $errors)
+    protected function saveErrorsSession(\Symfony\Component\HttpFoundation\Session\Session $session, \Phruts\Action\ActionMessages $errors = null)
     {
         // Remove the error attribute if none are required
         if (($errors == null) || $errors->isEmpty()) {
@@ -232,7 +232,7 @@ protected function saveErrorsSession(\Symfony\Component\HttpFoundation\Session\S
 	 * @param \Phruts\Action\ActionMessages errors  Errors object
 	 * @since Struts 1.2.1
 	 */
-    protected function addErrors(\Symfony\Component\HttpFoundation\Request $request, $errors)
+    protected function addErrors(\Symfony\Component\HttpFoundation\Request $request, \Phruts\Action\ActionMessages $errors = null)
     {
         if ($errors == null) {
             //	bad programmer! *slap*
@@ -270,7 +270,7 @@ protected function addErrors(\Symfony\Component\HttpFoundation\Request $request,
      *
      * @since Struts 1.1
      */
-    protected function saveMessages(\Symfony\Component\HttpFoundation\Request $request, $messages)
+    protected function saveMessages(\Symfony\Component\HttpFoundation\Request $request, \Phruts\Action\ActionMessages $messages = null)
     {
         // Remove any messages attribute if none are required
         if (($messages == null) || $messages->isEmpty()) {
@@ -295,7 +295,7 @@ protected function saveMessages(\Symfony\Component\HttpFoundation\Request $reque
      *
      * @since Struts 1.2
      */
-    protected function saveMessagesSession(\Symfony\Component\HttpFoundation\Session\Session $session, $messages)
+    protected function saveMessagesSession(\Symfony\Component\HttpFoundation\Session\Session $session, \Phruts\Action\ActionMessages $messages = null)
     {
         // Remove any messages attribute if none are required
         if (($messages == null) || $messages->isEmpty()) {

diff --git a/src/Action/RequestProcessor.php b/src/Action/RequestProcessor.php
@@ -495,7 +495,7 @@ protected function processActionForm(\Symfony\Component\HttpFoundation\Request $
 	 * @param \Phruts\Config\ActionConfig $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, $form, \Phruts\Config\ActionConfig $mapping)
+    protected function processPopulate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Config\ActionConfig $mapping)
     {
         if (is_null($form)) {
             return;
@@ -538,7 +538,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, $form, \Phruts\Config\ActionConfig $mapping)
+    protected function processValidate(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Action\AbstractActionForm $form = null, \Phruts\Config\ActionConfig $mapping)
     {
         if (is_null($form)) {
             return true;
@@ -755,7 +755,7 @@ protected function processActionPerform(\Symfony\Component\HttpFoundation\Reques
 	 * @param \Phruts\Config\ForwardConfig $forward The ForwardConfig controlling
 	 * where we go next
 	 */
-    protected function processForwardConfig(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, $forward)
+    protected function processForwardConfig(\Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, \Phruts\Config\ForwardConfig $forward = null)
     {
         if (is_null($forward)) {
             return;

diff --git a/src/Actions/ActionDispatcher.php b/src/Actions/ActionDispatcher.php
@@ -64,7 +64,7 @@ class ActionDispatcher extends \Phruts\Action
 	 * @return ForwardConfig
 	 * @exception Exception if an exception occurs
 	 */
-    public function execute(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
+    public function execute(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
     {
         //$log = \Phruts\Utils\LoggerManager::getLogger(__CLASS__);
 
@@ -106,7 +106,7 @@ public function execute(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Co
 	 * "Bad Request" error.
 	 *
 	 */
-    protected function unspecified(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
+    protected function unspecified(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
     {
         $message = $this->getActionKernel()->getInternal()->getMessage("dispatch.parameter", $mapping->getPath(), $mapping->getParameter());
         //$log = \Phruts\Utils\LoggerManager::getRootLogger();
@@ -123,7 +123,7 @@ protected function unspecified(\Phruts\Config\ActionConfig $mapping, $form, \Sym
 	 * Dispatch to the specified method.
 	 * @return \Phruts\Config\ActionConfig
 	 */
-    protected function dispatchMethod(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, $name)
+    protected function dispatchMethod(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response, $name)
     {
         //$log = \Phruts\Utils\LoggerManager::getRootLogger();
 
@@ -162,7 +162,7 @@ protected function dispatchMethod(\Phruts\Config\ActionConfig $mapping, $form, \
      * they wish to provide default behavior different than returning null.
      * @since Struts 1.2.0
      */
-    protected function cancelled(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
+    protected function cancelled(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
     {
         return null;
     }

diff --git a/src/Actions/ForwardAction.php b/src/Actions/ForwardAction.php
@@ -7,7 +7,7 @@
 class ForwardAction extends \Phruts\Action {
     public function execute(
         \Phruts\Config\ActionConfig $mapping,
-        $form,
+        \Phruts\Action\AbstractActionForm $form = null,
         \Symfony\Component\HttpFoundation\Request $request,
         \Symfony\Component\HttpFoundation\Response $response
     ) {

diff --git a/src/Actions/SwitchAction.php b/src/Actions/SwitchAction.php
@@ -23,7 +23,7 @@
 class SwitchAction extends \Phruts\Action
 {
     // See superclass for Doc
-    public function execute(\Phruts\Config\ActionConfig $mapping, $form, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
+    public function execute(\Phruts\Config\ActionConfig $mapping, \Phruts\Action\AbstractActionForm $form = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response)
     {
         //$log = \Phruts\Utils\LoggerManager::getLogger( __CLASS__);