Cleanup based on phpdoc output and file review

joomla-framework · Dec 2, 2013 · 972e24f · 972e24f
1 parent ab7c4bf
commit 972e24f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/Cipher/3DES.php b/Cipher/3DES.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher for Triple DES encryption, decryption and key generation.
+ * Cipher class for Triple DES encryption, decryption and key generation.
  *
  * @since 1.0
  */

diff --git a/Cipher/Blowfish.php b/Cipher/Blowfish.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher for Blowfish encryption, decryption and key generation.
+ * Cipher class for Blowfish encryption, decryption and key generation.
  *
  * @since 1.0
  */

diff --git a/Cipher/Mcrypt.php b/Cipher/Mcrypt.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher for mcrypt algorithm encryption, decryption and key generation.
+ * Cipher class for mcrypt algorithm encryption, decryption and key generation.
  *
  * @since 1.0
  */

diff --git a/Cipher/Rijndael256.php b/Cipher/Rijndael256.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher for Rijndael 256 encryption, decryption and key generation.
+ * Cipher class for Rijndael 256 encryption, decryption and key generation.
  *
  * @since 1.0
  */

diff --git a/Cipher/Simple.php b/Cipher/Simple.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher for Simple encryption, decryption and key generation.
+ * Cipher class for Simple encryption, decryption and key generation.
  *
  * @since 1.0
  */

diff --git a/CipherInterface.php b/CipherInterface.php
@@ -9,7 +9,7 @@
 namespace Joomla\Crypt;
 
 /**
- * JCrypt cipher interface.
+ * Joomla Framework Cipher interface.
  *
  * @since 1.0
  */

diff --git a/Crypt.php b/Crypt.php
@@ -92,7 +92,7 @@ public function generateKey(array $options = array())
  *
  * @param Key $key The key object to set.
  *
- * @return Key
+ * @return Crypt Instance of $this to allow chaining.
  *
  * @since 1.0
  */
@@ -110,7 +110,7 @@ public function setKey(Key $key)
  *
  * @return string Random binary data
  *
- * @since 1.0
+ * @since  1.0
  */
  public static function genRandomBytes($length = 16)
  {

diff --git a/Password/Simple.php b/Password/Simple.php
@@ -54,19 +54,19 @@ public function create($password, $type = null)
  case PasswordInterface::BLOWFISH:
  $salt = '$2y$' . str_pad($this->cost, 2, '0', STR_PAD_LEFT) . '$' . $this->getSalt(22);
 
- return crypt($password, $salt);
+  return crypt($password, $salt);
 
  case PasswordInterface::MD5:
  $salt = $this->getSalt(12);
 
  $salt = '$1$' . $salt;
 
- return crypt($password, $salt);
+  return crypt($password, $salt);
 
  case PasswordInterface::JOOMLA:
  $salt = $this->getSalt(32);
 
- return md5($password . $salt) . ':' . $salt;
+  return md5($password . $salt) . ':' . $salt;
 
  default:
  throw new \InvalidArgumentException(sprintf('Hash type %s is not supported', $type));
@@ -170,7 +170,7 @@ public function setDefaultType($type)
  /**
  * Gets the default type
  *
- * @return  string $type The default type
+ * @return string $type The default type
  *
  * @since 1.0
  */