adjusted the Input clases for PSR2

They are now in their own namespace.
This commit is contained in:
Andreas Gohr 2019-02-19 20:39:13 +01:00
parent b196d8de5c
commit ccc4c71ca8
18 changed files with 442 additions and 357 deletions

View File

@ -140,7 +140,7 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase {
trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true);
global $INPUT;
$INPUT = new Input();
$INPUT = new \dokuwiki\Input\Input();
}
/**

View File

@ -4,6 +4,8 @@
* runtime inspection.
*/
use dokuwiki\Input\Input;
/**
* Helper class to execute a fake request
*/

View File

@ -1,5 +1,7 @@
<?php
use dokuwiki\Input\Input;
class Mock_Auth_Plugin extends DokuWiki_Auth_Plugin {
public $loggedOff = false;
@ -176,4 +178,4 @@ class auth_deleteprofile_test extends DokuWikiTest {
$INPUT->remove('confirm_delete');
$this->assertFalse(auth_deleteprofile());
}
}
}

View File

@ -1,7 +1,9 @@
<?php
use dokuwiki\Input\Input;
/**
* Tests for the Input class
* Tests for the dokuwiki\Input\Input class
*/
class input_test extends DokuWikiTest {

View File

@ -1,336 +0,0 @@
<?php
/**
* Encapsulates access to the $_REQUEST array, making sure used parameters are initialized and
* have the correct type.
*
* All function access the $_REQUEST array by default, if you want to access $_POST or $_GET
* explicitly use the $post and $get members.
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
class Input {
/** @var PostInput Access $_POST parameters */
public $post;
/** @var GetInput Access $_GET parameters */
public $get;
/** @var ServerInput Access $_SERVER parameters */
public $server;
protected $access;
/**
* @var Callable
*/
protected $filter;
/**
* Intilizes the Input class and it subcomponents
*/
public function __construct() {
$this->access = &$_REQUEST;
$this->post = new PostInput();
$this->get = new GetInput();
$this->server = new ServerInput();
}
/**
* Apply the set filter to the given value
*
* @param string $data
* @return string
*/
protected function applyfilter($data){
if(!$this->filter) return $data;
return call_user_func($this->filter, $data);
}
/**
* Return a filtered copy of the input object
*
* Expects a callable that accepts one string parameter and returns a filtered string
*
* @param Callable|string $filter
* @return Input
*/
public function filter($filter='stripctl'){
$this->filter = $filter;
$clone = clone $this;
$this->filter = '';
return $clone;
}
/**
* Check if a parameter was set
*
* Basically a wrapper around isset. When called on the $post and $get subclasses,
* the parameter is set to $_POST or $_GET and to $_REQUEST
*
* @see isset
* @param string $name Parameter name
* @return bool
*/
public function has($name) {
return isset($this->access[$name]);
}
/**
* Remove a parameter from the superglobals
*
* Basically a wrapper around unset. When NOT called on the $post and $get subclasses,
* the parameter will also be removed from $_POST or $_GET
*
* @see isset
* @param string $name Parameter name
*/
public function remove($name) {
if(isset($this->access[$name])) {
unset($this->access[$name]);
}
// also remove from sub classes
if(isset($this->post) && isset($_POST[$name])) {
unset($_POST[$name]);
}
if(isset($this->get) && isset($_GET[$name])) {
unset($_GET[$name]);
}
}
/**
* Access a request parameter without any type conversion
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return mixed
*/
public function param($name, $default = null, $nonempty = false) {
if(!isset($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if($nonempty && empty($value)) return $default;
return $value;
}
/**
* Sets a parameter
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value) {
$this->access[$name] = $value;
}
/**
* Get a reference to a request parameter
*
* This avoids copying data in memory, when the parameter is not set it will be created
* and intialized with the given $default value before a reference is returned
*
* @param string $name Parameter name
* @param mixed $default If parameter is not set, initialize with this value
* @param bool $nonempty Init with $default if parameter is set but empty()
* @return mixed (reference)
*/
public function &ref($name, $default = '', $nonempty = false) {
if(!isset($this->access[$name]) || ($nonempty && empty($this->access[$name]))) {
$this->set($name, $default);
}
return $this->access[$name];
}
/**
* Access a request parameter as int
*
* @param string $name Parameter name
* @param int $default Default to return if parameter isn't set or is an array
* @param bool $nonempty Return $default if parameter is set but empty()
* @return int
*/
public function int($name, $default = 0, $nonempty = false) {
if(!isset($this->access[$name])) return $default;
if(is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if($value === '') return $default;
if($nonempty && empty($value)) return $default;
return (int) $value;
}
/**
* Access a request parameter as string
*
* @param string $name Parameter name
* @param string $default Default to return if parameter isn't set or is an array
* @param bool $nonempty Return $default if parameter is set but empty()
* @return string
*/
public function str($name, $default = '', $nonempty = false) {
if(!isset($this->access[$name])) return $default;
if(is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if($nonempty && empty($value)) return $default;
return (string) $value;
}
/**
* Access a request parameter and make sure it is has a valid value
*
* Please note that comparisons to the valid values are not done typesafe (request vars
* are always strings) however the function will return the correct type from the $valids
* array when an match was found.
*
* @param string $name Parameter name
* @param array $valids Array of valid values
* @param mixed $default Default to return if parameter isn't set or not valid
* @return null|mixed
*/
public function valid($name, $valids, $default = null) {
if(!isset($this->access[$name])) return $default;
if(is_array($this->access[$name])) return $default; // we don't allow arrays
$value = $this->applyfilter($this->access[$name]);
$found = array_search($value, $valids);
if($found !== false) return $valids[$found]; // return the valid value for type safety
return $default;
}
/**
* Access a request parameter as bool
*
* Note: $nonempty is here for interface consistency and makes not much sense for booleans
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return bool
*/
public function bool($name, $default = false, $nonempty = false) {
if(!isset($this->access[$name])) return $default;
if(is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if($value === '') return $default;
if($nonempty && empty($value)) return $default;
return (bool) $value;
}
/**
* Access a request parameter as array
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return array
*/
public function arr($name, $default = array(), $nonempty = false) {
if(!isset($this->access[$name])) return $default;
if(!is_array($this->access[$name])) return $default;
if($nonempty && empty($this->access[$name])) return $default;
return (array) $this->access[$name];
}
/**
* Create a simple key from an array key
*
* This is useful to access keys where the information is given as an array key or as a single array value.
* For example when the information was submitted as the name of a submit button.
*
* This function directly changes the access array.
*
* Eg. $_REQUEST['do']['save']='Speichern' becomes $_REQUEST['do'] = 'save'
*
* This function returns the $INPUT object itself for easy chaining
*
* @param string $name
* @return Input
*/
public function extract($name){
if(!isset($this->access[$name])) return $this;
if(!is_array($this->access[$name])) return $this;
$keys = array_keys($this->access[$name]);
if(!$keys){
// this was an empty array
$this->remove($name);
return $this;
}
// get the first key
$value = array_shift($keys);
if($value === 0){
// we had a numeric array, assume the value is not in the key
$value = array_shift($this->access[$name]);
}
$this->set($name, $value);
return $this;
}
}
/**
* Internal class used for $_POST access in Input class
*/
class PostInput extends Input {
protected $access;
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct() {
$this->access = &$_POST;
}
/**
* Sets a parameter in $_POST and $_REQUEST
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value) {
parent::set($name, $value);
$_REQUEST[$name] = $value;
}
}
/**
* Internal class used for $_GET access in Input class
*/
class GetInput extends Input {
protected $access;
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct() {
$this->access = &$_GET;
}
/**
* Sets a parameter in $_GET and $_REQUEST
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value) {
parent::set($name, $value);
$_REQUEST[$name] = $value;
}
}
/**
* Internal class used for $_SERVER access in Input class
*/
class ServerInput extends Input {
protected $access;
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct() {
$this->access = &$_SERVER;
}
}

29
inc/Input/Get.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace dokuwiki\Input;
/**
* Internal class used for $_GET access in dokuwiki\Input\Input class
*/
class Get extends Input
{
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct()
{
$this->access = &$_GET;
}
/**
* Sets a parameter in $_GET and $_REQUEST
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value)
{
parent::set($name, $value);
$_REQUEST[$name] = $value;
}
}

287
inc/Input/Input.php Normal file
View File

@ -0,0 +1,287 @@
<?php
namespace dokuwiki\Input;
/**
* Encapsulates access to the $_REQUEST array, making sure used parameters are initialized and
* have the correct type.
*
* All function access the $_REQUEST array by default, if you want to access $_POST or $_GET
* explicitly use the $post and $get members.
*
* @author Andreas Gohr <andi@splitbrain.org>
*/
class Input
{
/** @var Post Access $_POST parameters */
public $post;
/** @var Get Access $_GET parameters */
public $get;
/** @var Server Access $_SERVER parameters */
public $server;
protected $access;
/**
* @var Callable
*/
protected $filter;
/**
* Intilizes the dokuwiki\Input\Input class and it subcomponents
*/
public function __construct()
{
$this->access = &$_REQUEST;
$this->post = new Post();
$this->get = new Get();
$this->server = new Server();
}
/**
* Apply the set filter to the given value
*
* @param string $data
* @return string
*/
protected function applyfilter($data)
{
if (!$this->filter) return $data;
return call_user_func($this->filter, $data);
}
/**
* Return a filtered copy of the input object
*
* Expects a callable that accepts one string parameter and returns a filtered string
*
* @param Callable|string $filter
* @return Input
*/
public function filter($filter = 'stripctl')
{
$this->filter = $filter;
$clone = clone $this;
$this->filter = '';
return $clone;
}
/**
* Check if a parameter was set
*
* Basically a wrapper around isset. When called on the $post and $get subclasses,
* the parameter is set to $_POST or $_GET and to $_REQUEST
*
* @see isset
* @param string $name Parameter name
* @return bool
*/
public function has($name)
{
return isset($this->access[$name]);
}
/**
* Remove a parameter from the superglobals
*
* Basically a wrapper around unset. When NOT called on the $post and $get subclasses,
* the parameter will also be removed from $_POST or $_GET
*
* @see isset
* @param string $name Parameter name
*/
public function remove($name)
{
if (isset($this->access[$name])) {
unset($this->access[$name]);
}
// also remove from sub classes
if (isset($this->post) && isset($_POST[$name])) {
unset($_POST[$name]);
}
if (isset($this->get) && isset($_GET[$name])) {
unset($_GET[$name]);
}
}
/**
* Access a request parameter without any type conversion
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return mixed
*/
public function param($name, $default = null, $nonempty = false)
{
if (!isset($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if ($nonempty && empty($value)) return $default;
return $value;
}
/**
* Sets a parameter
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value)
{
$this->access[$name] = $value;
}
/**
* Get a reference to a request parameter
*
* This avoids copying data in memory, when the parameter is not set it will be created
* and intialized with the given $default value before a reference is returned
*
* @param string $name Parameter name
* @param mixed $default If parameter is not set, initialize with this value
* @param bool $nonempty Init with $default if parameter is set but empty()
* @return mixed (reference)
*/
public function &ref($name, $default = '', $nonempty = false)
{
if (!isset($this->access[$name]) || ($nonempty && empty($this->access[$name]))) {
$this->set($name, $default);
}
return $this->access[$name];
}
/**
* Access a request parameter as int
*
* @param string $name Parameter name
* @param int $default Default to return if parameter isn't set or is an array
* @param bool $nonempty Return $default if parameter is set but empty()
* @return int
*/
public function int($name, $default = 0, $nonempty = false)
{
if (!isset($this->access[$name])) return $default;
if (is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if ($value === '') return $default;
if ($nonempty && empty($value)) return $default;
return (int)$value;
}
/**
* Access a request parameter as string
*
* @param string $name Parameter name
* @param string $default Default to return if parameter isn't set or is an array
* @param bool $nonempty Return $default if parameter is set but empty()
* @return string
*/
public function str($name, $default = '', $nonempty = false)
{
if (!isset($this->access[$name])) return $default;
if (is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if ($nonempty && empty($value)) return $default;
return (string)$value;
}
/**
* Access a request parameter and make sure it is has a valid value
*
* Please note that comparisons to the valid values are not done typesafe (request vars
* are always strings) however the function will return the correct type from the $valids
* array when an match was found.
*
* @param string $name Parameter name
* @param array $valids Array of valid values
* @param mixed $default Default to return if parameter isn't set or not valid
* @return null|mixed
*/
public function valid($name, $valids, $default = null)
{
if (!isset($this->access[$name])) return $default;
if (is_array($this->access[$name])) return $default; // we don't allow arrays
$value = $this->applyfilter($this->access[$name]);
$found = array_search($value, $valids);
if ($found !== false) return $valids[$found]; // return the valid value for type safety
return $default;
}
/**
* Access a request parameter as bool
*
* Note: $nonempty is here for interface consistency and makes not much sense for booleans
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return bool
*/
public function bool($name, $default = false, $nonempty = false)
{
if (!isset($this->access[$name])) return $default;
if (is_array($this->access[$name])) return $default;
$value = $this->applyfilter($this->access[$name]);
if ($value === '') return $default;
if ($nonempty && empty($value)) return $default;
return (bool)$value;
}
/**
* Access a request parameter as array
*
* @param string $name Parameter name
* @param mixed $default Default to return if parameter isn't set
* @param bool $nonempty Return $default if parameter is set but empty()
* @return array
*/
public function arr($name, $default = array(), $nonempty = false)
{
if (!isset($this->access[$name])) return $default;
if (!is_array($this->access[$name])) return $default;
if ($nonempty && empty($this->access[$name])) return $default;
return (array)$this->access[$name];
}
/**
* Create a simple key from an array key
*
* This is useful to access keys where the information is given as an array key or as a single array value.
* For example when the information was submitted as the name of a submit button.
*
* This function directly changes the access array.
*
* Eg. $_REQUEST['do']['save']='Speichern' becomes $_REQUEST['do'] = 'save'
*
* This function returns the $INPUT object itself for easy chaining
*
* @param string $name
* @return Input
*/
public function extract($name)
{
if (!isset($this->access[$name])) return $this;
if (!is_array($this->access[$name])) return $this;
$keys = array_keys($this->access[$name]);
if (!$keys) {
// this was an empty array
$this->remove($name);
return $this;
}
// get the first key
$value = array_shift($keys);
if ($value === 0) {
// we had a numeric array, assume the value is not in the key
$value = array_shift($this->access[$name]);
}
$this->set($name, $value);
return $this;
}
}

30
inc/Input/Post.php Normal file
View File

@ -0,0 +1,30 @@
<?php
namespace dokuwiki\Input;
/**
* Internal class used for $_POST access in dokuwiki\Input\Input class
*/
class Post extends Input
{
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct()
{
$this->access = &$_POST;
}
/**
* Sets a parameter in $_POST and $_REQUEST
*
* @param string $name Parameter name
* @param mixed $value Value to set
*/
public function set($name, $value)
{
parent::set($name, $value);
$_REQUEST[$name] = $value;
}
}

19
inc/Input/Server.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace dokuwiki\Input;
/**
* Internal class used for $_SERVER access in dokuwiki\Input\Input class
*/
class Server extends Input
{
/** @noinspection PhpMissingParentConstructorInspection
* Initialize the $access array, remove subclass members
*/
public function __construct()
{
$this->access = &$_SERVER;
}
}

View File

@ -3,7 +3,7 @@
namespace dokuwiki\Remote;
use DokuWiki_Remote_Plugin;
use Input;
use dokuwiki\Input\Input;
/**
* This class provides information about remote access to the wiki.
@ -245,7 +245,7 @@ class Api
{
global $conf;
global $USERINFO;
/** @var Input $INPUT */
/** @var \dokuwiki\Input\Input $INPUT */
global $INPUT;
if (!$conf['remote']) {

View File

@ -187,3 +187,67 @@ class JSON
return $this->decode($str);
}
}
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
class Input extends \dokuwiki\Input\Input {
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
public function __construct()
{
dbg_deprecated(\dokuwiki\Input\Input::class);
parent::__construct();
}
}
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
class PostInput extends \dokuwiki\Input\Post {
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
public function __construct()
{
dbg_deprecated(\dokuwiki\Input\Post::class);
parent::__construct();
}
}
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
class GetInput extends \dokuwiki\Input\Get {
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
public function __construct()
{
dbg_deprecated(\dokuwiki\Input\Get::class);
parent::__construct();
}
}
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
class ServerInput extends \dokuwiki\Input\Server {
/**
* @inheritdoc
* @deprecated 2019-02-19
*/
public function __construct()
{
dbg_deprecated(\dokuwiki\Input\Server::class);
parent::__construct();
}
}

View File

@ -3,7 +3,6 @@
* Initialize some defaults needed for DokuWiki
*/
/**
* timing Dokuwiki execution
*
@ -209,7 +208,7 @@ if($conf['compression'] == 'gz' && !DOKU_HAS_GZIP) {
// input handle class
global $INPUT;
$INPUT = new Input();
$INPUT = new \dokuwiki\Input\Input();
// initialize plugin controller
$plugin_controller = new $plugin_controller_class();

View File

@ -1,3 +0,0 @@
====== SPAM-ın qarşısı alındı ======
Sizin dəyişiklər **yaddaşa saxlanmadı**, çünki onların içində bir və ya daha çox içazəsiz sözlər var idi. Əgər siz wiki-yə spam əlavə etmək istəyirdinizsə, onda utanmırsız?! Əgər siz bunu səhv hesab edirsinizsə, onda administrator ilə əlaqə saxlayın.

View File

@ -1,3 +0,0 @@
====== СПАМ заблакаваны ======
Вашы змены **не** захаваны, так як яны ўтрымліваюць адзін ці больш забароненых слоў. Калі Вы спрабавалі дадаць спам у Вікі -- ай-яй-яй! Калі Вы лічыце, што гэта нейкая памылка, звярніцеся да адміністратара вікі.

View File

@ -1,3 +0,0 @@
====== Bloqueo por Correo-lixo ======
Os teus trocos **non** foron gardados porque conteñen unha ou varias verbas bloqueadas. Se tentaches deixar correo-lixo no wiki -- Estívoche ben! Se consideras que é un erro, contacta co administrador deste Wiki.

View File

@ -1,3 +0,0 @@
====== СПАМ заблокирован ======
Ваши изменения **не были** сохранены, так как они содержат одно или более запрещенных слов. Если Вы пытались добавить спам в Вики -- ай-яй-яй! Если Вы считаете, что это какая-то ошибка, обратитесь к администратору вики.

View File

@ -63,7 +63,6 @@ function load_autoload($name){
'cache_renderer' => DOKU_INC.'inc/cache.php',
'Doku_Event' => DOKU_INC.'inc/events.php',
'Doku_Event_Handler' => DOKU_INC.'inc/events.php',
'Input' => DOKU_INC.'inc/Input.class.php',
'JpegMeta' => DOKU_INC.'inc/JpegMeta.php',
'SimplePie' => DOKU_INC.'inc/SimplePie.php',
'FeedParser' => DOKU_INC.'inc/FeedParser.php',

View File

@ -14,7 +14,7 @@ session_write_close(); //close session
require_once(DOKU_INC.'inc/fetch.functions.php');
if (defined('SIMPLE_TEST')) {
$INPUT = new Input();
$INPUT = new \dokuwiki\Input\Input();
}
// BEGIN main