From: Gunnar Wrobel Date: Wed, 17 Nov 2010 15:30:46 +0000 (+0100) Subject: Updated package.xml and some phpdoc. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=417f746fa5364af90d28ab3572354e155434b597;p=horde.git Updated package.xml and some phpdoc. --- diff --git a/framework/Secret/package.xml b/framework/Secret/package.xml index ae9aaaf2a..28cce4128 100644 --- a/framework/Secret/package.xml +++ b/framework/Secret/package.xml @@ -1,13 +1,9 @@ - + Secret pear.horde.org Secret Encryption API - The Horde_Secret:: package provides an API for encrypting and decrypting small pieces of data with the use of a shared key. - + The Horde_Secret:: package provides an API for encrypting and decrypting small pieces of data with the use of a shared key. Chuck Hagenbuch chuck @@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> slusarz@horde.org yes - 2010-03-19 + 2010-11-17 + 0.1.0 0.1.0 @@ -30,13 +27,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Remove dependency on Horde_Core. + +* Remove dependency on Horde_Core. * Throw exceptions on error. * Convert to OO-interface. - * Use PEAR's Crypt_Blowfish to encrypt data. + * Use PEAR's Crypt_Blowfish to encrypt data. - + @@ -45,6 +43,18 @@ http://pear.php.net/dtd/package-2.0.xsd"> + + + + + + + + + + + + @@ -68,23 +78,29 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - + + + + + + - 2008-12-11 - 0.0.3 - 0.0.2 + 0.0.1 + 0.0.1 alpha alpha + 2003-07-05 LGPL - * Initial Horde 4 package. + +Initial release as a PEAR package + 2006-05-08 @@ -98,22 +114,42 @@ http://pear.php.net/dtd/package-2.0.xsd"> alpha LGPL - - Converted to package.xml 2.0 for pear.horde.org + +- Converted to package.xml 2.0 for pear.horde.org - Return false instead of generating encryption errors if $key is empty (Bug #5925). + 2008-12-11 - 0.0.1 - 0.0.1 + 0.0.3 + 0.0.2 alpha alpha - 2003-07-05 LGPL - Initial release as a PEAR package + +* Initial Horde 4 package. + + + + + 0.1.0 + 0.1.0 + + + beta + beta + + 2010-11-17 + LGPL + +* Remove dependency on Horde_Core. + * Throw exceptions on error. + * Convert to OO-interface. + * Use PEAR's Crypt_Blowfish to encrypt data. diff --git a/framework/Secret/test/Horde/Secret/AllTests.php b/framework/Secret/test/Horde/Secret/AllTests.php index 1d6e62d7a..43c4d54bf 100644 --- a/framework/Secret/test/Horde/Secret/AllTests.php +++ b/framework/Secret/test/Horde/Secret/AllTests.php @@ -2,11 +2,14 @@ /** * All tests for the Horde_Secret package. * - * @category Horde - * @package Secret - * @author Michael Slusarz - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Secret + * PHP version 5 + * + * @category Horde + * @package Secret + * @subpackage UnitTests + * @author Michael Slusarz + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Secret */ /** diff --git a/framework/Secret/test/Horde/Secret/Autoload.php b/framework/Secret/test/Horde/Secret/Autoload.php index b617b13ea..95d230dbc 100644 --- a/framework/Secret/test/Horde/Secret/Autoload.php +++ b/framework/Secret/test/Horde/Secret/Autoload.php @@ -2,28 +2,20 @@ /** * Setup autoloading for the tests. * - * @category Horde - * @package Secret - * @author Michael Slusarz - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Secret + * PHP version 5 + * + * @category Horde + * @package Secret + * @subpackage UnitTests + * @author Michael Slusarz + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Secret */ -if (!spl_autoload_functions()) { - spl_autoload_register( - create_function( - '$class', - '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class);' - . '$err_mask = E_ALL ^ E_WARNING;' - . '$oldErrorReporting = error_reporting($err_mask);' - . 'include "$filename.php";' - . 'error_reporting($oldErrorReporting);' - ) - ); -} +require_once 'Horde/Test/Autoload.php'; /** Catch strict standards */ error_reporting(E_ALL | E_STRICT); /** Needed for PEAR_Error. */ -@require_once 'PEAR.php'; +require_once 'PEAR.php'; diff --git a/framework/Secret/test/Horde/Secret/Class/SecretTest.php b/framework/Secret/test/Horde/Secret/Class/SecretTest.php deleted file mode 100644 index 0f99ba7bf..000000000 --- a/framework/Secret/test/Horde/Secret/Class/SecretTest.php +++ /dev/null @@ -1,64 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Secret - */ - -/** - * Prepare the test setup. - */ -require_once dirname(__FILE__) . '/../Autoload.php'; - -/** - * Test the secret class. - * - * Copyright 2009-2010 The Horde Project (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. - * - * @category Horde - * @package Secret - * @author Michael Slusarz - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Secret - */ - -class Horde_Secret_Class_SecretTest extends PHPUnit_Framework_TestCase -{ - public function test8BitKey() - { - $secret = new Horde_Secret(); - - $key = "\x88"; - $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; - - $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); - } - - public function test64BitKey() - { - $secret = new Horde_Secret(); - - $key = "\x00\x00\x00\x00\x00\x00\x00\x00"; - $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; - - $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); - } - - public function test128BitKey() - { - $secret = new Horde_Secret(); - - $key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"; - $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; - - $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); - } - -} diff --git a/framework/Secret/test/Horde/Secret/Unit/SecretTest.php b/framework/Secret/test/Horde/Secret/Unit/SecretTest.php new file mode 100644 index 000000000..7d988c870 --- /dev/null +++ b/framework/Secret/test/Horde/Secret/Unit/SecretTest.php @@ -0,0 +1,68 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Secret + */ + +/** + * Prepare the test setup. + */ +require_once dirname(__FILE__) . '/../Autoload.php'; + +/** + * Test the secret class. + * + * Copyright 2009-2010 The Horde Project (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. + * + * @category Horde + * @package Secret + * @subpackage UnitTests + * @author Michael Slusarz + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Secret + */ + +class Horde_Secret_Unit_SecretTest extends PHPUnit_Framework_TestCase +{ + public function test8BitKey() + { + $secret = new Horde_Secret(); + + $key = "\x88"; + $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; + + $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); + } + + public function test64BitKey() + { + $secret = new Horde_Secret(); + + $key = "\x00\x00\x00\x00\x00\x00\x00\x00"; + $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; + + $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); + } + + public function test128BitKey() + { + $secret = new Horde_Secret(); + + $key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"; + $plaintext = "\x00\x00\x00\x00\x00\x00\x00\x00"; + + $this->assertEquals($plaintext, $secret->read($key, $secret->write($key, $plaintext))); + } + +}