Andreas Fischer
1c923576c6
NET_SSH2_ -> self::
2015-01-04 11:38:03 +01:00
Andreas Fischer
ec21aa23f1
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:36:14 +01:00
Andreas Fischer
8fae19a024
Merge pull request #581 from cnelissen/ReplaceGetClassFix
...
Replaced get_class() calls with instanceof operators
* cnelissen/ReplaceGetClassFix:
Revert changes for abstract methods in Base class
Replaced get_class() calls with instanceof operators
2015-01-03 17:22:39 +01:00
Clint Nelissen
d4f04bcab1
Revert changes for abstract methods in Base class
2014-12-29 08:54:45 -08:00
terrafrost
472e006b6c
SSH2: update conditions under which _disconnect's code is executed
2014-12-29 08:37:44 -06:00
Andreas Fischer
f2134aa4b2
Merge branch 'master' into php5
...
* master:
"@access static" isn't a thing
2014-12-27 20:25:04 +01:00
Andreas Fischer
c3a8f98dcb
Merge pull request #586 from GrahamForks/access-fix
...
"@access static" isn't a thing
* GrahamForks/access-fix:
"@access static" isn't a thing
2014-12-27 20:24:27 +01:00
Graham Campbell
bd0537fec5
"@access static" isn't a thing
2014-12-27 15:38:14 +00:00
Andreas Fischer
6205531907
Merge branch 'master' into php5
...
* master:
Fix undefined $raw error
2014-12-26 10:48:16 +01:00
Andreas Fischer
471cb1dfb0
Merge pull request #583 from bantu/SSH1UndefinedVariableFix
...
Fix undefined $raw error
* bantu/SSH1UndefinedVariableFix:
Fix undefined $raw error
2014-12-26 10:47:51 +01:00
Clint Nelissen
01d7c96a11
Fix undefined $raw error
2014-12-26 10:37:46 +01:00
Clint Nelissen
f3565346fa
Replaced get_class() calls with instanceof operators
2014-12-24 13:07:14 -08:00
Andreas Fischer
a272b58322
Merge pull request #551 from bantu/2.0-code-sniffer
...
Code Sniffer rules witnessing PSR-4 and related goals
* bantu/2.0-code-sniffer:
Remove side-effects from test files.
Do not require test classes to be namespaced.
Add code sniffer rules for 2.0 goals.
2014-12-17 05:03:45 +01:00
Andreas Fischer
ffb2fcab80
Remove side-effects from test files.
2014-12-17 04:50:18 +01:00
Andreas Fischer
218f151693
Do not require test classes to be namespaced.
2014-12-17 04:06:36 +01:00
Andreas Fischer
b5227ddb67
Add code sniffer rules for 2.0 goals.
2014-12-17 04:06:36 +01:00
Andreas Fischer
96172d4ac5
Merge pull request #569 from cnelissen/NamespaceCryptPackage
...
Namespaced Crypt Package (Final)
* cnelissen/NamespaceCryptPackage:
Namespaced Crypt Package
2014-12-17 02:54:30 +01:00
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
Andreas Fischer
6c1695c9a2
Merge pull request #555 from cnelissen/NamespaceNetPackage
...
Namespace net package
* cnelissen/NamespaceNetPackage:
Rebased
Temporary constant fix
Updated unit tests
Namespaced classes
2014-12-16 00:05:09 +01:00
Clint Nelissen
c1f647c77d
Rebased
2014-12-15 14:33:25 -08:00
Clint Nelissen
dfb8d52806
Temporary constant fix
2014-12-15 14:29:34 -08:00
Clint Nelissen
794fcb7ee8
Updated unit tests
2014-12-15 14:29:34 -08:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08:00
Andreas Fischer
2871cce58d
Merge pull request #567 from cnelissen/NamespaceSystemPackage
...
Namespace system package #2
* cnelissen/NamespaceSystemPackage:
Namespaced classes
2014-12-15 23:17:09 +01:00
Clint Nelissen
fddf20f89c
Namespaced classes
2014-12-15 09:25:46 -08:00
Andreas Fischer
16503848a4
Merge branch 'master' into php5
...
* master:
Run HHVM tests in parallel.
2014-12-14 01:51:44 +01:00
Andreas Fischer
eefcb55138
Merge pull request #565 from bantu/hhvm-parallel
...
Run HHVM tests in parallel.
* bantu/hhvm-parallel:
Run HHVM tests in parallel.
2014-12-14 01:51:38 +01:00
Andreas Fischer
10050c1748
Run HHVM tests in parallel.
2014-12-14 01:27:57 +01:00
Andreas Fischer
768ac083dc
Merge pull request #564 from bantu/engine-back-to-mode
...
Use _MODE instead of the incorrect _ENGINE.
* bantu/engine-back-to-mode:
Use _MODE instead of the incorrect _ENGINE.
2014-12-12 22:22:39 +01:00
Andreas Fischer
30ef0e164f
Merge branch 'master' into php5
...
* master:
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:23 +01:00
Andreas Fischer
956660e9b9
Merge pull request #562 from bantu/properly-skip-SFTPLargeFileTest
...
Properly skip SFTPLargeFileTest when environment variables not defined.
* bantu/properly-skip-SFTPLargeFileTest:
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:07 +01:00
Andreas Fischer
46075077ac
Merge branch 'master' into php5
...
* master:
Update Code Sniffer to version 1.5.6
2014-12-12 22:21:54 +01:00
Andreas Fischer
93213ccc70
Merge pull request #563 from bantu/code-sniffer-1.5.6
...
Update Code Sniffer to version 1.5.6
* bantu/code-sniffer-1.5.6:
Update Code Sniffer to version 1.5.6
2014-12-12 22:21:13 +01:00
Andreas Fischer
de69f3b83f
Use _MODE instead of the incorrect _ENGINE.
...
Partially reverts 0305a4827c
2014-12-12 20:15:43 +01:00
Clint Nelissen
0547d182fc
Update Code Sniffer to version 1.5.6
2014-12-12 19:44:25 +01:00
Andreas Fischer
f1865af505
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 19:38:04 +01:00
Andreas Fischer
3f912eed59
Merge pull request #554 from cnelissen/NamespaceFilePackage
...
Namespace file package
* cnelissen/NamespaceFilePackage:
Namespaced classes
2014-12-12 17:55:44 +01:00
Andreas Fischer
e0f8892521
Make SFTPLargeFileTest compatible with php5 branch.
2014-12-12 17:46:43 +01:00
Andreas Fischer
81ae4c924e
Merge branch 'master' into php5
...
* master:
SFTP: Add test for put() from local file.
2014-12-12 17:39:20 +01:00
Andreas Fischer
a98714031c
Merge pull request #458 from bantu/sftp-put-from-local
...
SFTP: Add test for put() from local file.
* bantu/sftp-put-from-local:
SFTP: Add test for put() from local file.
2014-12-12 17:39:15 +01:00
Andreas Fischer
ca4bcc180e
SFTP: Add test for put() from local file.
2014-12-12 17:09:55 +01:00
Andreas Fischer
609532df25
Merge branch 'master' into php5
...
* master:
Setup SSH key and agent for travis user.
Add a functional test case for SSH2 login using Agent.
2014-12-12 12:48:26 +01:00
Andreas Fischer
6d42873b87
Merge pull request #552 from bantu/ssh2-agent-login-test
...
SSH2 Agent Login Test
* bantu/ssh2-agent-login-test:
Setup SSH key and agent for travis user.
Add a functional test case for SSH2 login using Agent.
2014-12-12 12:48:21 +01:00
Andreas Fischer
fa410ab2e8
Setup SSH key and agent for travis user.
2014-12-12 12:32:44 +01:00
Andreas Fischer
2b1a0229e1
Merge branch 'master' into php5
...
* master:
Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
Conflicts:
tests/PhpseclibFunctionalTestCase.php
2014-12-12 12:17:57 +01:00
Andreas Fischer
5a0c27a725
Merge pull request #560 from bantu/php-5.2-functional-gmp
...
Make SCP test on 5.2 run by allowing bcmath.
* bantu/php-5.2-functional-gmp:
Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
2014-12-12 12:16:50 +01:00
Andreas Fischer
ce2c7c7591
Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
2014-12-12 11:59:51 +01:00
Andreas Fischer
be7e2e48ef
Merge branch 'master' into php5
...
* master:
2014-12-10 02:10:11 +01:00
Andreas Fischer
68633d9b30
Merge pull request #550 from bantu/fix-547-php5
...
Change copyright years from roman numeral to decimal numbers for php5.
* bantu/fix-547-php5:
Change copyright years from roman numeral to decimal numbers for php5.
Change copyright years from roman numeral to decimal numbers.
2014-12-10 02:10:05 +01:00
Andreas Fischer
80ba3cd54a
Merge pull request #549 from bantu/fix-547
...
Change copyright years from roman numeral to decimal numbers.
* bantu/fix-547:
Change copyright years from roman numeral to decimal numbers.
2014-12-10 02:09:57 +01:00
