Skip to content

Commit

Permalink
Revert "Change deprecation tags to match new project standard"
Browse files Browse the repository at this point in the history
This reverts commit afe8370.
  • Loading branch information
mbabker committed Dec 10, 2016
1 parent 348a11a commit ada638c
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 47 deletions.
8 changes: 4 additions & 4 deletions Cipher/3DES.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
* Cipher class for Triple DES encryption, decryption and key generation.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
class Cipher_3DES extends Cipher_Mcrypt
{
/**
* @var integer The mcrypt cipher constant.
* @see https://www.php.net/manual/en/mcrypt.ciphers.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $type = MCRYPT_3DES;

/**
* @var integer The mcrypt block cipher mode.
* @see https://www.php.net/manual/en/mcrypt.constants.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $mode = MCRYPT_MODE_CBC;

/**
* @var string The JCrypt key type for validation.
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $keyType = '3des';
}
8 changes: 4 additions & 4 deletions Cipher/Blowfish.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
* Cipher class for Blowfish encryption, decryption and key generation.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
class Cipher_Blowfish extends Cipher_Mcrypt
{
/**
* @var integer The mcrypt cipher constant.
* @see https://www.php.net/manual/en/mcrypt.ciphers.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $type = MCRYPT_BLOWFISH;

/**
* @var integer The mcrypt block cipher mode.
* @see https://www.php.net/manual/en/mcrypt.constants.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $mode = MCRYPT_MODE_CBC;

/**
* @var string The JCrypt key type for validation.
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $keyType = 'blowfish';
}
18 changes: 9 additions & 9 deletions Cipher/Mcrypt.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
* Cipher class for mcrypt algorithm encryption, decryption and key generation.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
abstract class Cipher_Mcrypt implements CipherInterface
{
/**
* @var integer The mcrypt cipher constant.
* @see https://www.php.net/manual/en/mcrypt.ciphers.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $type;

/**
* @var integer The mcrypt block cipher mode.
* @see https://www.php.net/manual/en/mcrypt.constants.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $mode;

/**
* @var string The JCrypt key type for validation.
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $keyType;

Expand All @@ -44,7 +44,7 @@ abstract class Cipher_Mcrypt implements CipherInterface
*
* @since 1.0
* @throws \RuntimeException
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function __construct()
{
Expand All @@ -64,7 +64,7 @@ public function __construct()
*
* @since 1.0
* @throws \InvalidArgumentException
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function decrypt($data, Key $key)
{
Expand All @@ -90,7 +90,7 @@ public function decrypt($data, Key $key)
*
* @since 1.0
* @throws \InvalidArgumentException
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function encrypt($data, Key $key)
{
Expand All @@ -114,7 +114,7 @@ public function encrypt($data, Key $key)
* @return Key
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function generateKey(array $options = array())
{
Expand Down Expand Up @@ -148,7 +148,7 @@ public function generateKey(array $options = array())
* @see https://en.wikipedia.org/wiki/PBKDF2
* @see https://www.ietf.org/rfc/rfc2898.txt
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function pbkdf2($p, $s, $kl, $c = 10000, $a = 'sha256')
{
Expand Down
8 changes: 4 additions & 4 deletions Cipher/Rijndael256.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
* Cipher class for Rijndael 256 encryption, decryption and key generation.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
class Cipher_Rijndael256 extends Cipher_Mcrypt
{
/**
* @var integer The mcrypt cipher constant.
* @see https://www.php.net/manual/en/mcrypt.ciphers.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $type = MCRYPT_RIJNDAEL_256;

/**
* @var integer The mcrypt block cipher mode.
* @see https://www.php.net/manual/en/mcrypt.constants.php
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $mode = MCRYPT_MODE_CBC;

/**
* @var string The JCrypt key type for validation.
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
protected $keyType = 'rijndael256';
}
16 changes: 8 additions & 8 deletions Cipher/Simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Cipher class for Simple encryption, decryption and key generation.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
class Cipher_Simple implements CipherInterface
{
Expand All @@ -26,7 +26,7 @@ class Cipher_Simple implements CipherInterface
*
* @since 1.0
* @throws \InvalidArgumentException
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function decrypt($data, Key $key)
{
Expand Down Expand Up @@ -68,7 +68,7 @@ public function decrypt($data, Key $key)
*
* @since 1.0
* @throws \InvalidArgumentException
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function encrypt($data, Key $key)
{
Expand Down Expand Up @@ -108,7 +108,7 @@ public function encrypt($data, Key $key)
* @return Key
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
public function generateKey(array $options = array())
{
Expand All @@ -130,7 +130,7 @@ public function generateKey(array $options = array())
* @return string
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
private function _getRandomKey($length = 256)
{
Expand All @@ -156,7 +156,7 @@ private function _getRandomKey($length = 256)
* @return integer
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
private function _hexToInt($s, $i)
{
Expand Down Expand Up @@ -237,7 +237,7 @@ private function _hexToInt($s, $i)
* @return array An array of integers.
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
private function _hexToIntArray($hex)
{
Expand All @@ -261,7 +261,7 @@ private function _hexToIntArray($hex)
* @return string
*
* @since 1.0
* @deprecated 1.3.0 Use \Joomla\Crypt\Cipher_Crypto instead
* @deprecated 2.0 Use \Joomla\Crypt\Cipher_Crypto instead
*/
private function _intToHex($i)
{
Expand Down
18 changes: 9 additions & 9 deletions Password/Simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
* Joomla Framework Password Crypter
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
class Simple implements PasswordInterface
{
/**
* @var integer The cost parameter for hashing algorithms.
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
protected $cost = 10;

/**
* @var string The default hash type
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
protected $defaultType = '$2y$';

Expand All @@ -43,7 +43,7 @@ class Simple implements PasswordInterface
*
* @since 1.0
* @throws \InvalidArgumentException
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
public function create($password, $type = null)
{
Expand Down Expand Up @@ -86,7 +86,7 @@ public function create($password, $type = null)
* @return void
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
public function setCost($cost)
{
Expand All @@ -101,7 +101,7 @@ public function setCost($cost)
* @return string The string of random characters.
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
protected function getSalt($length)
{
Expand All @@ -121,7 +121,7 @@ protected function getSalt($length)
* @return boolean True if the password is valid, false otherwise.
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
public function verify($password, $hash)
{
Expand Down Expand Up @@ -171,7 +171,7 @@ public function verify($password, $hash)
* @return void
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
public function setDefaultType($type)
{
Expand All @@ -187,7 +187,7 @@ public function setDefaultType($type)
* @return string $type The default type
*
* @since 1.0
* @deprecated 1.3.0 Use PHP 5.5's native password hashing API
* @deprecated 2.0 Use PHP 5.5's native password hashing API
*/
public function getDefaultType()
{
Expand Down
Loading

0 comments on commit ada638c

Please sign in to comment.