Andreas Fischer
aecf89c031
Merge branch 'master' into php5
...
* master:
Drop meaningless, outdated, inconsistent version tags in doc blocks.
2014-03-13 00:03:38 +01:00
Andreas Fischer
b77b26f692
Merge pull request #288 from bantu/drop-meaningless-version-tags
...
Drop version tags from doc blocks.
* bantu/drop-meaningless-version-tags:
Drop meaningless, outdated, inconsistent version tags in doc blocks.
2014-03-13 00:03:21 +01:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Andreas Fischer
cb56e676dc
Merge branch 'master' into php5
...
* master:
Tests for bug280.
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:05:17 +01:00
Andreas Fischer
5dcc63ef6c
Merge pull request #283 from bantu/tests-bug280
...
Tests for bug280 [use of $callback()]
* bantu/tests-bug280:
Tests for bug280.
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:05:11 +01:00
Andreas Fischer
aa64ddfd4d
Merge pull request #280 from nickygerritsen/master
...
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
* nickygerritsen/master:
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:01:14 +01:00
Andreas Fischer
90ff32d56d
Tests for bug280.
2014-03-06 11:55:14 +01:00
Andreas Fischer
e4d0906cee
Merge branch 'master' into php5
...
* master:
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-06 10:46:26 +01:00
Andreas Fischer
60e2bfc073
Merge pull request #282 from vlajos/typofixes-20140305
...
typo fixes
* vlajos/typofixes-20140305:
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-06 10:46:18 +01:00
Veres Lajos
930a3fb4d2
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-05 23:41:20 +00:00
Nicky Gerritsen
b5e579f6c0
Also replace this with call_user_func
2014-03-05 18:38:33 +01:00
Nicky Gerritsen
97d1e75a51
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-05 15:44:17 +01:00
Andreas Fischer
d2d3c4605d
Merge branch 'master' into php5
...
* master:
Mark SSH2 Test as Incomplete on Travis PHP 5.3.3 and below for now.
Add basic SSH2 functional test as an example.
Extract phpunit call to run-phpunit.sh
Introduce abstract class for functional tests.
2014-03-04 18:21:08 +01:00
Andreas Fischer
8b068b1df0
Merge pull request #278 from bantu/functional-tests
...
Introduce functional tests (SSH2 as an example)
* bantu/functional-tests:
Mark SSH2 Test as Incomplete on Travis PHP 5.3.3 and below for now.
Add basic SSH2 functional test as an example.
Extract phpunit call to run-phpunit.sh
Introduce abstract class for functional tests.
2014-03-04 18:21:01 +01:00
Andreas Fischer
3d3d55b407
Mark SSH2 Test as Incomplete on Travis PHP 5.3.3 and below for now.
2014-03-04 14:56:42 +01:00
Andreas Fischer
00c19f4cc1
Add basic SSH2 functional test as an example.
2014-03-03 02:14:27 +01:00
Andreas Fischer
dbcba51198
Extract phpunit call to run-phpunit.sh
2014-03-03 02:14:27 +01:00
Andreas Fischer
ea31d9d38c
Introduce abstract class for functional tests.
2014-03-03 01:34:43 +01:00
Andreas Fischer
201b55866e
Merge branch 'master' into php5
...
* master:
Remove HTML from BigInteger code example.
2014-03-01 01:40:53 +01:00
Andreas Fischer
c1597f4533
Remove HTML from BigInteger code example.
2014-03-01 01:40:28 +01:00
Andreas Fischer
907f062096
Merge branch 'master' into php5
...
* master:
Set permissions of phpseclib/Crypt/RC2.php to 644.
2014-03-01 00:57:05 +01:00
Andreas Fischer
f744fbbcc9
Set permissions of phpseclib/Crypt/RC2.php to 644.
2014-03-01 00:56:08 +01:00
Andreas Fischer
2785826d94
Merge branch 'master' into php5
...
* master:
composer: add System to psr-0 autoload section
update README.md to show latest version
SSH_Agent: a few changes per bantu
2014-02-28 23:17:46 +01:00
terrafrost
0ea31d9b65
composer: add System to psr-0 autoload section
2014-02-28 10:05:05 -06:00
terrafrost
76c9692908
update README.md to show latest version
2014-02-22 19:03:22 -06:00
terrafrost
b3a1f52bff
SSH_Agent: a few changes per bantu
2014-02-21 23:15:24 -06:00
Andreas Fischer
88e6eef90f
Merge branch 'master' into php5
...
* master:
Add newline at EOF to phpseclib/System/SSH_Agent.php.
SSH_Agent: phpdoc updates
SSH_Agent: misc updates
SSH2: add ssh-agent support
2014-02-21 19:42:36 +01:00
Andreas Fischer
e08c7244e2
Add newline at EOF to phpseclib/System/SSH_Agent.php.
2014-02-21 19:22:09 +01:00
Andreas Fischer
053a9ac9af
Merge pull request #265 from terrafrost/ssh-agent
...
SSH2: add ssh-agent support
* terrafrost/ssh-agent:
SSH_Agent: phpdoc updates
SSH_Agent: misc updates
SSH2: add ssh-agent support
2014-02-21 19:17:51 +01:00
terrafrost
b4b93b80f5
SSH_Agent: phpdoc updates
2014-02-20 13:38:07 -06:00
terrafrost
405ff3f7b4
SSH_Agent: misc updates
2014-02-19 10:13:54 -06:00
Andreas Fischer
68fecc6431
Merge branch 'master' into php5
...
* master:
Apply coding guidelines (with exceptions) to the tests directory.
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
Use exclude instead of changing severity.
Add build directory.
2014-02-17 18:54:12 +01:00
Andreas Fischer
8dc659d694
Merge pull request #269 from bantu/code-sniffer-tests
...
Apply Code Sniffer to tests folder
* bantu/code-sniffer-tests:
Apply coding guidelines (with exceptions) to the tests directory.
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
Use exclude instead of changing severity.
Add build directory.
2014-02-17 18:53:54 +01:00
Andreas Fischer
ef528ea879
Apply coding guidelines (with exceptions) to the tests directory.
2014-02-15 20:05:30 +01:00
Andreas Fischer
9cb25c3032
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
2014-02-15 19:40:19 +01:00
Andreas Fischer
6e851baca0
Use exclude instead of changing severity.
2014-02-15 19:16:21 +01:00
Andreas Fischer
6fc22d5405
Add build directory.
2014-02-15 18:51:09 +01:00
Andreas Fischer
757018d4aa
Merge branch 'master' into php5
...
* master:
Add Travis CI PHP 5.6 environment.
2014-02-13 23:34:17 +01:00
Andreas Fischer
b03100601b
Merge pull request #268 from bantu/travis/php-5.6
...
Add Travis CI PHP 5.6 environment.
* bantu/travis/php-5.6:
Add Travis CI PHP 5.6 environment.
2014-02-13 23:34:10 +01:00
Andreas Fischer
741d638447
Add Travis CI PHP 5.6 environment.
2014-02-13 22:50:04 +01:00
Andreas Fischer
51d30ed66f
Merge branch 'master' into php5
...
* master:
CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:52 +01:00
Andreas Fischer
a7106a737e
Merge pull request #266 from bantu/cs-endfile-newline
...
CS: Each file MUST end with exactly one newline character
* bantu/cs-endfile-newline:
CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:44 +01:00
Andreas Fischer
56f1ada5c1
CS: Each file MUST end with exactly one newline character
2014-02-10 14:51:35 +01:00
terrafrost
e90648c7a5
SSH2: add ssh-agent support
2014-02-10 00:04:16 -06:00
Andreas Fischer
addd2ac320
Merge branch 'master' into php5
...
* master:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:46 +01:00
Andreas Fischer
f4dbcb1b78
Merge pull request #264 from terrafrost/exit-status
...
SSH2: ignore exit_status channel requests
* terrafrost/exit-status:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:36 +01:00
terrafrost
cd9801db8a
SSH2: ignore exit_status channel requests
...
Fixes #258
2014-02-02 23:42:06 -06:00
Andreas Fischer
34e3aef6aa
Merge branch 'master' into php5
...
* master:
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
Conflicts:
composer.json
2014-01-30 15:22:26 +01:00
Andreas Fischer
8664b69e10
Merge pull request #256 from bantu/fix-php-compat-description
...
PHP_Compat is required when the PHP version below 4.3.3 (not above or eq...
* bantu/fix-php-compat-description:
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
2014-01-30 15:21:47 +01:00
Andreas Fischer
f79d662401
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
2014-01-30 03:11:43 +01:00