Merge branch 'master' of /home/rdb/DEV/PhpstormProjects/sysPass with conflicts.

This commit is contained in:
Rubén D
2019-01-15 16:21:15 +01:00
parent 12dc771f84
commit 1c9e5e48bf
290 changed files with 74421 additions and 44683 deletions

View File

@@ -1,98 +1,98 @@
<?php
/**
* sysPass
*
* @author nuxsmin
* @link http://syspass.org
* @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
* sysPass is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* sysPass is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*/
namespace SP\Http;
/**
* Class Message
*
* @package SP\Http
*/
class Message
{
const TYPE_OK = 0;
const TYPE_ERROR = 1;
const TYPE_WARNING = 2;
/**
* @var int
*/
protected $type = 0;
/**
* @var string
*/
protected $description;
/**
* @var string
*/
protected $hint;
/**
* @return int
*/
public function getType()
{
return $this->type;
}
/**
* @param int $type
*/
public function setType($type)
{
$this->type = $type;
}
/**
* @return string
*/
public function getDescription()
{
return $this->description;
}
/**
* @param string $description
*/
public function setDescription($description)
{
$this->description = $description;
}
/**
* @return string
*/
public function getHint()
{
return $this->hint;
}
/**
* @param string $hint
*/
public function setHint($hint)
{
$this->hint = $hint;
}
<?php
/**
* sysPass
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
* sysPass is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* sysPass is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*/
namespace SP\Http;
/**
* Class Message
*
* @package SP\Http
*/
final class Message
{
const TYPE_OK = 0;
const TYPE_ERROR = 1;
const TYPE_WARNING = 2;
/**
* @var int
*/
protected $type = 0;
/**
* @var string
*/
protected $description;
/**
* @var string
*/
protected $hint;
/**
* @return int
*/
public function getType()
{
return $this->type;
}
/**
* @param int $type
*/
public function setType($type)
{
$this->type = $type;
}
/**
* @return string
*/
public function getDescription()
{
return $this->description;
}
/**
* @param string $description
*/
public function setDescription($description)
{
$this->description = $description;
}
/**
* @return string
*/
public function getHint()
{
return $this->hint;
}
/**
* @param string $hint
*/
public function setHint($hint)
{
$this->hint = $hint;
}
}