Andreas Fischer
2986ea9d6d
Merge pull request #816 from terrafrost/small-tweaks
...
small CS changes
* terrafrost/small-tweaks:
small CS changes
2015-09-14 01:30:54 +02:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Andreas Fischer
71d7108d9a
Merge pull request #810 from GrahamForks/cs
...
PHPDoc Fixes And Others
* GrahamForks/cs:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:18:09 +02:00
terrafrost
8b8d7a5dcd
small CS changes
2015-09-13 18:13:35 -05:00
Graham Campbell
010c1285ba
Fixed another case
2015-09-06 23:05:41 +01:00
Graham Campbell
b1db7f05d9
Minor tweaks
2015-09-06 23:01:03 +01:00
Graham Campbell
06a1d3d981
Fixed error
2015-09-06 22:19:34 +01:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Graham Campbell
dd031a1702
PHPDoc fixes
2015-09-06 12:28:08 +01:00
Andreas Fischer
09ac065459
Merge branch '1.0' into 2.0
...
* 1.0:
Typo in variable name
2015-09-05 18:14:03 +02:00
Andreas Fischer
4f11a517bf
Merge pull request #808 from lem9/1.0
...
Typo in variable name
* lem9/1.0:
Typo in variable name
2015-09-05 18:14:02 +02:00
Marc Delisle
01e7c65f07
Typo in variable name
2015-09-05 12:13:11 -04:00
Andreas Fischer
864493bbf6
Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0
...
Switch to extension loaded (2.0)
* cweagans/switch-to-extension-loaded-2.0:
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:40 +02:00
Andreas Fischer
5cfa3a584e
Merge branch '1.0' into 2.0
...
* 1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
2015-09-04 15:05:22 +02:00
Andreas Fischer
e08e2fd300
Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
...
Switch to extension loaded (1.0)
* cweagans/switch-to-extension-loaded-1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30
Remove unnecessary parens
2015-09-02 15:22:37 -04:00
Andreas Fischer
40927a4033
Merge pull request #802 from GrahamForks/2.0-phpdoc
...
[2.0] PHPDoc Fixes
* GrahamForks/2.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:47:45 +02:00
Andreas Fischer
1aa911d4a3
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Random.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-09-02 20:47:28 +02:00
Andreas Fischer
e1bd0dfaf5
Merge pull request #801 from GrahamForks/1.0-phpdoc
...
[1.0] PHPDoc Fixes
* GrahamForks/1.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
9691924b31
Merge pull request #794 from cweagans/php7-random-bytes-2.0
...
Use random_bytes() when appropriate (2.0)
* cweagans/php7-random-bytes-2.0:
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:02 +02:00
Andreas Fischer
79e90801bc
Merge pull request #805 from bantu/travis-php-7.0-2.0
...
Backport to 2.0: Add PHP7 to Travis CI.
* bantu/travis-php-7.0-2.0:
Backport to 2.0: Add PHP7 to Travis CI.
2015-09-02 20:37:56 +02:00
Andreas Fischer
1b93e0bf38
Backport to 2.0: Add PHP7 to Travis CI.
...
Cherry pick of 2813e2cd3b
2015-09-02 20:26:11 +02:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +02:00
Andreas Fischer
04e68212fe
Merge pull request #789 from terrafrost/oid-changes
...
X509: add getOID() method
* terrafrost/oid-changes:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:05:53 +02:00
Andreas Fischer
07dd7955c4
Merge branch '1.0' into 2.0
...
* 1.0:
Test on php 5.5.9 too
2015-09-02 14:52:44 +02:00
Andreas Fischer
bdd6159d82
Merge pull request #797 from GrahamCampbell/patch-1
...
[1.0] Test on php 5.5.9 too
* GrahamCampbell/patch-1:
Test on php 5.5.9 too
2015-09-02 14:52:44 +02:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
Graham Campbell
429f08a4f4
Test on php 5.5.9 too
2015-09-01 23:12:58 +01:00
Cameron Eagans
2939322826
Remove duplicate allow_failures section
2015-09-01 15:08:20 -04:00
Cameron Eagans
465d1d975c
Test on PHP 7 & allow failures
2015-09-01 15:02:58 -04:00
Cameron Eagans
8a5dc21835
Coding standards fix
2015-09-01 15:00:57 -04:00
Cameron Eagans
bbbfc1795d
Switch from EngineException to Error
2015-09-01 14:56:06 -04:00
Cameron Eagans
08025c134d
Remove string assignment
2015-09-01 14:53:45 -04:00
Cameron Eagans
5a5edc7798
Use random_bytes() when appropriate.
2015-09-01 14:49:32 -04:00
Cameron Eagans
2b75c37cc9
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-01 14:32:22 -04:00
Cameron Eagans
78bac871af
Remove conditions for PHP < 5.3.0 for this branch
2015-09-01 14:22:22 -04:00
Cameron Eagans
df6b201ab9
Switch to extension_loaded('gmp')
2015-09-01 14:22:17 -04:00
Cameron Eagans
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
terrafrost
abbee318cc
X509: updates to getOID() as suggested by bantu
2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:39 +02:00
Andreas Fischer
e391fdbd27
Merge pull request #772 from terrafrost/x509_unit_test
...
Tests/X509: add unit test showing need for return by reference
* terrafrost/x509_unit_test:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:01:41 +02:00
Andreas Fischer
90a4007a93
Merge branch '1.0' into 2.0
...
* 1.0:
.travis.yml: Remove outdated comment about .scrutinizer.yml
2015-08-18 11:40:57 -04:00
Andreas Fischer
f7f93961a5
Merge pull request #780 from bantu/scrutinizer-comment-removal-travis-yml
...
.travis.yml: Remove outdated comment about .scrutinizer.yml
* bantu/scrutinizer-comment-removal-travis-yml:
.travis.yml: Remove outdated comment about .scrutinizer.yml
2015-08-18 11:40:56 -04:00
Andreas Fischer
de896a7169
.travis.yml: Remove outdated comment about .scrutinizer.yml
2015-08-18 00:36:36 -04:00
Andreas Fischer
93ab241c83
Merge pull request #779 from bantu/runkit-absolute-include
...
Make paths to runkit_import() absolute due to lack of include path.
* bantu/runkit-absolute-include:
Make paths to runkit_import() absolute due to lack of include path.
2015-08-18 00:19:44 -04:00
Andreas Fischer
af939f9aa5
Make paths to runkit_import() absolute due to lack of include path.
2015-08-18 00:00:47 -04:00
