From ec7012214a693c8b3103377245a7d797cf8f9608 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 31 Mar 2017 13:45:22 +0200
Subject: [PATCH] explicitly declare method visibility
---
inc/Action/AbstractAction.php | 2 +-
inc/Action/Admin.php | 2 +-
inc/Action/Backlink.php | 2 +-
inc/Action/Check.php | 2 +-
inc/Action/Conflict.php | 2 +-
inc/Action/Denied.php | 2 +-
inc/Action/Diff.php | 2 +-
inc/Action/Draft.php | 2 +-
inc/Action/Draftdel.php | 2 +-
inc/Action/Edit.php | 4 +++-
inc/Action/Export.php | 2 +-
inc/Action/Index.php | 3 ++-
inc/Action/Locked.php | 2 +-
inc/Action/Login.php | 2 +-
inc/Action/Logout.php | 2 +-
inc/Action/Media.php | 2 +-
inc/Action/Plugin.php | 2 +-
inc/Action/Profile.php | 2 +-
inc/Action/ProfileDelete.php | 2 +-
inc/Action/Recent.php | 2 +-
inc/Action/Register.php | 2 +-
inc/Action/Resendpwd.php | 2 +-
inc/Action/Revert.php | 11 ++++++++---
inc/Action/Revisions.php | 2 +-
inc/Action/Save.php | 2 +-
inc/Action/Search.php | 2 +-
inc/Action/Show.php | 2 +-
inc/Action/Sitemap.php | 2 +-
inc/Action/Source.php | 2 +-
inc/Action/Subscribe.php | 2 +-
30 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/inc/Action/AbstractAction.php b/inc/Action/AbstractAction.php
index 747c20f2f..fe139892a 100644
--- a/inc/Action/AbstractAction.php
+++ b/inc/Action/AbstractAction.php
@@ -41,7 +41,7 @@ abstract class AbstractAction {
*
* @return int
*/
- abstract function minimumPermission();
+ abstract public function minimumPermission();
/**
* Check permissions are correct to run this action
diff --git a/inc/Action/Admin.php b/inc/Action/Admin.php
index dfe4e11be..b1f9095ee 100644
--- a/inc/Action/Admin.php
+++ b/inc/Action/Admin.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException;
class Admin extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['ismanager']) {
diff --git a/inc/Action/Backlink.php b/inc/Action/Backlink.php
index 007cc4bc4..0337917b3 100644
--- a/inc/Action/Backlink.php
+++ b/inc/Action/Backlink.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Backlink extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Check.php b/inc/Action/Check.php
index 38cfd5994..36ae8e8bd 100644
--- a/inc/Action/Check.php
+++ b/inc/Action/Check.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Check extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Conflict.php b/inc/Action/Conflict.php
index 9f01e9d3e..d880b5b28 100644
--- a/inc/Action/Conflict.php
+++ b/inc/Action/Conflict.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Conflict extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['exists']) {
return AUTH_EDIT;
diff --git a/inc/Action/Denied.php b/inc/Action/Denied.php
index ec2619f6d..c8e019262 100644
--- a/inc/Action/Denied.php
+++ b/inc/Action/Denied.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Denied extends AbstractAclAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Diff.php b/inc/Action/Diff.php
index 0ced9d824..b14b1d04e 100644
--- a/inc/Action/Diff.php
+++ b/inc/Action/Diff.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Diff extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Draft.php b/inc/Action/Draft.php
index 798ff789e..0346cae3b 100644
--- a/inc/Action/Draft.php
+++ b/inc/Action/Draft.php
@@ -13,7 +13,7 @@ namespace dokuwiki\Action;
class Draft extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['exists']) {
return AUTH_EDIT;
diff --git a/inc/Action/Draftdel.php b/inc/Action/Draftdel.php
index c2ee9aa53..a3e1f28e6 100644
--- a/inc/Action/Draftdel.php
+++ b/inc/Action/Draftdel.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Draftdel extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_EDIT;
}
diff --git a/inc/Action/Edit.php b/inc/Action/Edit.php
index 051a7496c..748351681 100644
--- a/inc/Action/Edit.php
+++ b/inc/Action/Edit.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Edit extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['exists']) {
return AUTH_READ; // we check again below
@@ -36,6 +36,7 @@ class Edit extends AbstractAction {
}
}
+ /** @inheritdoc */
public function preProcess() {
global $ID;
global $INFO;
@@ -82,6 +83,7 @@ class Edit extends AbstractAction {
lock($ID);
}
+ /** @inheritdoc */
public function tplContent() {
html_edit();
}
diff --git a/inc/Action/Export.php b/inc/Action/Export.php
index e27f67f57..1eec27ec3 100644
--- a/inc/Action/Export.php
+++ b/inc/Action/Export.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Export extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Index.php b/inc/Action/Index.php
index adb6c508a..c87a3f89c 100644
--- a/inc/Action/Index.php
+++ b/inc/Action/Index.php
@@ -12,10 +12,11 @@ namespace dokuwiki\Action;
class Index extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
+ /** @inheritdoc */
public function tplContent() {
global $IDX;
html_index($IDX);
diff --git a/inc/Action/Locked.php b/inc/Action/Locked.php
index 969c98976..3ff2c5b80 100644
--- a/inc/Action/Locked.php
+++ b/inc/Action/Locked.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Locked extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Login.php b/inc/Action/Login.php
index a46a2f0aa..982e3c7c2 100644
--- a/inc/Action/Login.php
+++ b/inc/Action/Login.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException;
class Login extends AbstractAclAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php
index 3622b5bd8..88f2673bd 100644
--- a/inc/Action/Logout.php
+++ b/inc/Action/Logout.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException;
class Logout extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Media.php b/inc/Action/Media.php
index c6186f934..77a2a6f0d 100644
--- a/inc/Action/Media.php
+++ b/inc/Action/Media.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Media extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Plugin.php b/inc/Action/Plugin.php
index fea45f3bb..c3e16bf87 100644
--- a/inc/Action/Plugin.php
+++ b/inc/Action/Plugin.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Plugin extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Profile.php b/inc/Action/Profile.php
index 24bd85fbf..6931a2589 100644
--- a/inc/Action/Profile.php
+++ b/inc/Action/Profile.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Profile extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/ProfileDelete.php b/inc/Action/ProfileDelete.php
index ee6262b17..40336fba1 100644
--- a/inc/Action/ProfileDelete.php
+++ b/inc/Action/ProfileDelete.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class ProfileDelete extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Recent.php b/inc/Action/Recent.php
index e32f225c6..39273b826 100644
--- a/inc/Action/Recent.php
+++ b/inc/Action/Recent.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Recent extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Register.php b/inc/Action/Register.php
index e2de119c9..50fa2894d 100644
--- a/inc/Action/Register.php
+++ b/inc/Action/Register.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Register extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Resendpwd.php b/inc/Action/Resendpwd.php
index 5614b465a..16548f383 100644
--- a/inc/Action/Resendpwd.php
+++ b/inc/Action/Resendpwd.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Resendpwd extends AbstractAclAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Revert.php b/inc/Action/Revert.php
index 5d86656c7..559121cce 100644
--- a/inc/Action/Revert.php
+++ b/inc/Action/Revert.php
@@ -15,7 +15,7 @@ use dokuwiki\Action\Exception\ActionException;
class Revert extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['ismanager']) {
return AUTH_EDIT;
@@ -24,8 +24,13 @@ class Revert extends AbstractAction {
}
}
- // fixme check for writability of the current page ($INFO might do it wrong and check the attic version)
-
+ /**
+ *
+ * @inheritdoc
+ * @throws ActionAbort
+ * @throws ActionException
+ * @todo check for writability of the current page ($INFO might do it wrong and check the attic version)
+ */
public function preProcess() {
if(!checkSecurityToken()) throw new ActionException();
diff --git a/inc/Action/Revisions.php b/inc/Action/Revisions.php
index 941fb6ec5..b8db531c7 100644
--- a/inc/Action/Revisions.php
+++ b/inc/Action/Revisions.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Revisions extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Save.php b/inc/Action/Save.php
index 328c218e0..dd6da567b 100644
--- a/inc/Action/Save.php
+++ b/inc/Action/Save.php
@@ -15,7 +15,7 @@ use dokuwiki\Action\Exception\ActionException;
class Save extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
global $INFO;
if($INFO['exists']) {
return AUTH_EDIT;
diff --git a/inc/Action/Search.php b/inc/Action/Search.php
index 32a36fca2..d4833f453 100644
--- a/inc/Action/Search.php
+++ b/inc/Action/Search.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort;
class Search extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Show.php b/inc/Action/Show.php
index 861a91b90..6dbe9a15c 100644
--- a/inc/Action/Show.php
+++ b/inc/Action/Show.php
@@ -18,7 +18,7 @@ namespace dokuwiki\Action;
class Show extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Sitemap.php b/inc/Action/Sitemap.php
index 6d72dd27b..025c5153c 100644
--- a/inc/Action/Sitemap.php
+++ b/inc/Action/Sitemap.php
@@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\FatalException;
class Sitemap extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_NONE;
}
diff --git a/inc/Action/Source.php b/inc/Action/Source.php
index 567ce21d5..fa3c88a4f 100644
--- a/inc/Action/Source.php
+++ b/inc/Action/Source.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Source extends AbstractAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php
index c90d73fdc..762c32783 100644
--- a/inc/Action/Subscribe.php
+++ b/inc/Action/Subscribe.php
@@ -12,7 +12,7 @@ namespace dokuwiki\Action;
class Subscribe extends AbstractUserAction {
/** @inheritdoc */
- function minimumPermission() {
+ public function minimumPermission() {
return AUTH_READ;
}
--
GitLab