Merge pull request #3 from TDannhauer/master

Make lib/Page/*.Page.php compatible with PHP 8.2
horde · May 19, 2023 · 49bf81a · 49bf81a
2 parents b5f2941 + 54e00e9
commit 49bf81a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git a/lib/Page/AddPage.php b/lib/Page/AddPage.php
@@ -54,8 +54,11 @@ public function __construct($newpage)
 
     /**
      * Bail out if there's no page name.
+     *
+     * $param integer $mode    The page render mode.
+     * $param array   $params  Any page parameters.
      */
-    public function preDisplay()
+    public function preDisplay($mode, $params)
     {
         if (!strlen($this->referrer())) {
             $GLOBALS['notification']->push(_("Page name must not be empty"));

diff --git a/lib/Page/AttachedFiles.php b/lib/Page/AttachedFiles.php
@@ -52,9 +52,11 @@ public function __construct($referrer)
     /**
      * Returns the current user's permissions for the referring page.
      *
+     * @param  string $pageName  The page name (unused in this method).
+     *
      * @return integer  The permissions bitmask.
      */
-    public function getPermissions()
+    public function getPermissions($pageName = null)
     {
         return parent::getPermissions($this->referrer());
     }

diff --git a/lib/Page/DeletePage.php b/lib/Page/DeletePage.php
@@ -45,18 +45,23 @@ public function __construct($referrer)
     /**
      * Retrieve this user's permissions for the referring page.
      *
+     * @param  string $pageName  The page name (unused in this method).
+     *
      * @return integer  The permissions bitmask.
      */
-    public function getPermissions()
+    public function getPermissions($pageName = null)
     {
         return parent::getPermissions($this->referrer());
     }
 
     /**
      * Send them back whence they came if they aren't allowed to
      * delete this page.
+     *
+     * $param integer $mode    The page render mode.
+     * $param array   $params  Any page parameters.
      */
-    public function preDisplay()
+    public function preDisplay($mode, $params)
     {
         $page = Wicked_Page::getPage($this->referrer());
         if (!$page->allows(Wicked::MODE_REMOVE)) {

diff --git a/lib/Page/EditPage.php b/lib/Page/EditPage.php
@@ -83,8 +83,11 @@ public function getPermissions($pageName = null)
     /**
      * Send them back whence they came if they aren't allowed to edit
      * this page.
+     *
+     * $param integer $mode    The page render mode.
+     * $param array   $params  Any page parameters.
      */
-    public function preDisplay()
+    public function preDisplay($mode, $params)
     {
         if (!$this->allows(Wicked::MODE_EDIT)) {
             Wicked::url($this->referrer(), true)->redirect();

diff --git a/lib/Page/MergeOrRename.php b/lib/Page/MergeOrRename.php
@@ -79,9 +79,11 @@ public function allows($mode)
     /**
      * Retrieve this user's permissions for the referring page.
      *
+     * @param  string $pageName  The page name (unused in this method).
+     *
      * @return integer  The permissions bitmask.
      */
-    public function getPermissions()
+    public function getPermissions($pageName = null)
     {
         return parent::getPermissions($this->referrer());
     }

diff --git a/lib/Page/NewPage.php b/lib/Page/NewPage.php
@@ -55,18 +55,23 @@ public function __construct($referrer)
     /**
      * Retrieve this user's permissions for the referring page.
      *
+     * @param  string $pageName  The page name (unused in this method).
+     *
      * @return integer  The permissions bitmask.
      */
-    public function getPermissions()
+    public function getPermissions($pageName = null)
     {
         return parent::getPermissions($this->referrer());
     }
 
     /**
      * Send them back whence they came if they aren't allowed to edit
      * this page.
+     *
+     * $param integer $mode    The page render mode.
+     * $param array   $params  Any page parameters.
      */
-    public function preDisplay()
+    public function preDisplay($mode, $params)
     {
         if (!strlen($this->referrer())) {
             $GLOBALS['notification']->push(_("Page name must not be empty"));

diff --git a/lib/Page/RevertPage.php b/lib/Page/RevertPage.php
@@ -45,18 +45,23 @@ public function __construct($referrer)
     /**
      * Retrieve this user's permissions for the referring page.
      *
+     * @param  string $pageName  The page name (unused in this method).
+     *
      * @return integer  The permissions bitmask.
      */
-    public function getPermissions()
+    public function getPermissions($pageName = null)
     {
         return parent::getPermissions($this->referrer());
     }
 
     /**
      * Send them back whence they came if they aren't allowed to
      * edit this page.
+     *
+     * $param integer $mode    The page render mode.
+     * $param array   $params  Any page parameters.
      */
-    public function preDisplay()
+    public function preDisplay($mode, $params)
     {
         $page = Wicked_Page::getPage($this->referrer());
         if (!$page->allows(Wicked::MODE_EDIT)) {