Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge svn trunk into git master
Browse files Browse the repository at this point in the history
- Merged at revision when 1.10.7 was tagged

Conflicts:
	documentation/manual/de/module_specs/Zend_Feed_Reader.xml
	library/Zend/Acl.php
	library/Zend/Amf/Server.php
	library/Zend/Application/Bootstrap/BootstrapAbstract.php
	library/Zend/Application/Resource/Exception.php
	library/Zend/Auth/Adapter/DbTable.php
	library/Zend/Cache/Backend/Static.php
	library/Zend/Cache/Core.php
	library/Zend/Cache/Frontend/Capture.php
	library/Zend/Cache/Frontend/Class.php
	library/Zend/Cache/Frontend/Function.php
	library/Zend/Captcha/Image.php
	library/Zend/Crypt/DiffieHellman.php
	library/Zend/Crypt/Math/BigInteger.php
	library/Zend/Crypt/Rsa/Key/Private.php
	library/Zend/Db/Table/Rowset/Abstract.php
	library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php
	library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php
	library/Zend/Feed/Pubsubhubbub/Publisher.php
	library/Zend/Feed/Pubsubhubbub/Subscriber.php
	library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
	library/Zend/Feed/Reader.php
	library/Zend/Feed/Reader/Extension/EntryAbstract.php
	library/Zend/Feed/Reader/FeedSet.php
	library/Zend/Feed/Writer/Deleted.php
	library/Zend/Feed/Writer/Entry.php
	library/Zend/Feed/Writer/Feed/FeedAbstract.php
	library/Zend/File/Transfer/Adapter/Http.php
	library/Zend/Filter/Compress/Rar.php
	library/Zend/Gdata/App/Base.php
	library/Zend/Http/Client/Adapter/Socket.php
	library/Zend/Ldap.php
	library/Zend/Ldap/Attribute.php
	library/Zend/Ldap/Node.php
	library/Zend/Loader/PluginLoader.php
	library/Zend/Locale/Format.php
	library/Zend/Log.php
	library/Zend/Log/Writer/Abstract.php
	library/Zend/Mail/Protocol/Abstract.php
	library/Zend/Oauth/Client.php
	library/Zend/Oauth/Config.php
	library/Zend/Oauth/Consumer.php
	library/Zend/Oauth/Http.php
	library/Zend/Oauth/Http/Utility.php
	library/Zend/Oauth/Signature/Plaintext.php
	library/Zend/Oauth/Signature/SignatureAbstract.php
	library/Zend/Oauth/Token.php
	library/Zend/Oauth/Token/AuthorizedRequest.php
	library/Zend/OpenId.php
	library/Zend/Paginator/SerializableLimitIterator.php
	library/Zend/Pdf.php
	library/Zend/Pdf/FileParser/Image/Png.php
	library/Zend/Pdf/Filter/Ascii85.php
	library/Zend/Pdf/Resource/Image/Png.php
	library/Zend/Queue/Stomp/Frame.php
	library/Zend/Service/Amazon/S3.php
	library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
	library/Zend/Service/Twitter.php
	library/Zend/Service/WindowsAzure/Storage.php
	library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
	library/Zend/Session.php
	library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
	library/Zend/Tool/Project/Provider/Manifest.php
	library/Zend/Translate.php
	library/Zend/Translate/Adapter.php
	library/Zend/Translate/Adapter/Gettext.php
	library/Zend/Validate/Alnum.php
	library/Zend/Validate/Alpha.php
	library/Zend/Validate/Barcode.php
	library/Zend/Validate/Callback.php
	library/Zend/Validate/CreditCard.php
	library/Zend/Validate/Date.php
	library/Zend/Validate/Db/Abstract.php
	library/Zend/Validate/Digits.php
	library/Zend/Validate/EmailAddress.php
	library/Zend/Validate/File/Crc32.php
	library/Zend/Validate/File/ExcludeExtension.php
	library/Zend/Validate/File/Extension.php
	library/Zend/Validate/File/Hash.php
	library/Zend/Validate/File/ImageSize.php
	library/Zend/Validate/File/IsCompressed.php
	library/Zend/Validate/File/IsImage.php
	library/Zend/Validate/File/Md5.php
	library/Zend/Validate/File/MimeType.php
	library/Zend/Validate/File/Sha1.php
	library/Zend/Validate/File/Size.php
	library/Zend/Validate/File/WordCount.php
	library/Zend/Validate/Float.php
	library/Zend/Validate/Hex.php
	library/Zend/Validate/Hostname.php
	library/Zend/Validate/Int.php
	library/Zend/Validate/Ip.php
	library/Zend/Validate/Isbn.php
	library/Zend/Validate/NotEmpty.php
	library/Zend/Validate/PostCode.php
	library/Zend/Validate/Regex.php
	library/Zend/Validate/Sitemap/Changefreq.php
	library/Zend/Validate/Sitemap/Lastmod.php
	library/Zend/Validate/Sitemap/Loc.php
	library/Zend/Validate/Sitemap/Priority.php
	library/Zend/Validate/StringLength.php
	library/Zend/View/Helper/HeadTitle.php
	tests/Zend/Acl/AclTest.php
	tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php
	tests/Zend/Application/Resource/CacheManagerTest.php
	tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php
	tests/Zend/Cache/CoreTest.php
	tests/Zend/Captcha/ImageTest.php
	tests/Zend/Db/Adapter/Pdo/PgsqlTest.php
	tests/Zend/Db/Profiler/FirebugTest.php
	tests/Zend/Db/Table/Rowset/TestCommon.php
	tests/Zend/Feed/Pubsubhubbub/Model/SubscriptionTest.php
	tests/Zend/Feed/Pubsubhubbub/Subscriber/CallbackTest.php
	tests/Zend/Feed/Reader/Entry/RssTest.php
	tests/Zend/Feed/Reader/Feed/RssTest.php
	tests/Zend/Filter/InputTest.php
	tests/Zend/Filter/NormalizedToLocalizedTest.php
	tests/Zend/Loader/PluginLoaderTest.php
	tests/Zend/Locale/DataTest.php
	tests/Zend/Locale/FormatTest.php
	tests/Zend/Log/LogTest.php
	tests/Zend/Log/Writer/AbstractTest.php
	tests/Zend/Log/Writer/MailTest.php
	tests/Zend/Log/Writer/SyslogTest.php
	tests/Zend/Oauth/OauthTest.php
	tests/Zend/Paginator/_files/test.sqlite
	tests/Zend/PaginatorTest.php
	tests/Zend/Service/Amazon/OnlineTest.php
	tests/Zend/Service/Amazon/S3/StreamTest.php
	tests/Zend/Service/SlideShareTest.php
	tests/Zend/Session/SaveHandler/DbTableTest.php
	tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
	tests/Zend/Test/PHPUnit/_files/application/views/scripts/zend-test-php-unit-foo/baz.phtml
	tests/Zend/Validate/DigitsTest.php
	tests/Zend/Validate/File/ImageSizeTest.php
	tests/Zend/Validate/File/IsCompressedTest.php
	tests/Zend/Validate/File/IsImageTest.php
	tests/Zend/Validate/File/MimeTypeTest.php
	tests/Zend/Validate/NotEmptyTest.php
	tests/Zend/Validate/Sitemap/ChangefreqTest.php
	tests/Zend/Validate/Sitemap/LastmodTest.php
	tests/Zend/Validate/Sitemap/LocTest.php
	tests/Zend/Validate/Sitemap/PriorityTest.php
  • Loading branch information
weierophinney committed Jul 29, 2010
4 parents 342e692 + f6db918 + 371f1d2 + 83e7d99 commit 3629096
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/DiffieHellman.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function __construct($prime, $generator, $privateKey = null, $privateKeyT
{
$this->setPrime($prime);
$this->setGenerator($generator);
if (!is_null($privateKey)) {
if ($privateKey !== null) {
$this->setPrivateKey($privateKey, $privateKeyType);
}
$this->setBigIntegerMath();
Expand Down Expand Up @@ -176,7 +176,7 @@ public function setPublicKey($number, $type = self::NUMBER)
*/
public function getPublicKey($type = self::NUMBER)
{
if (is_null($this->_publicKey)) {
if ($this->_publicKey === null)) {
throw new DiffieHellmanException('A public key has not yet been generated using a prior call to generateKeys()');
}
if ($type == self::BINARY) {
Expand Down
4 changes: 2 additions & 2 deletions src/Math/BigInteger.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class BigInteger implements BigInteger\BigIntegerCapable
*/
public function __construct($extension = null)
{
if (!is_null($extension) && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
if ($extension !== null && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
throw new BigInteger\Exception('Invalid extension type; please use one of bcmath, gmp or bigint');
}
$this->_loadAdapter($extension);
Expand Down Expand Up @@ -220,7 +220,7 @@ public function hexToDecimal($operand)
*/
protected function _loadAdapter($extension = null)
{
if (is_null($extension)) {
if ($extension === null) {
if (extension_loaded('gmp')) {
$extension = 'gmp';
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/Math/BigInteger/Bcmath.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ public function integerToBinary($operand)
$cmp = bccomp($operand, 0);
$return = '';
if ($cmp == 0) {
return (chr(0));
return "\0";
}
while (bccomp($operand, 0) > 0) {
$return = chr(bcmod($operand, 256)) . $return;
$operand = bcdiv($operand, 256);
}
if (ord($return[0]) > 127) {
$return = chr(0) . $return;
$return = "\0" . $return;
}
return $return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Rsa.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public function generateKeys(array $configargs = null)
{
$config = null;
$passPhrase = null;
if (!is_null($configargs)) {
if ($configargs !== null) {
if (isset($configargs['passPhrase'])) {
$passPhrase = $configargs['passPhrase'];
unset($configargs['passPhrase']);
Expand Down
2 changes: 1 addition & 1 deletion src/Rsa/PrivateKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected function _parse($passPhrase)

public function getPublicKey()
{
if (is_null($this->_publicKey)) {
if ($this->_publicKey === null) {
$this->_publicKey = new PublicKey($this->_details['key']);
}
return $this->_publicKey;
Expand Down

0 comments on commit 3629096

Please sign in to comment.