terrafrost
a74aa9efbe
composer.json: rm bom
2015-08-03 23:48:03 -05:00
terrafrost
33685080fb
Merge branch '1.0' into 2.0
...
Conflicts:
composer.json
2015-08-03 23:23:10 -05:00
terrafrost
844134df95
update phpseclib to 1.0.0
2015-08-03 21:22:12 -05:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
00f17aa956
Update PHP Code Sniffer to 2.3.3
2015-07-17 12:57:04 +02:00
terrafrost
3cb685337a
composer.json: update PHP_Compat requirements
2015-05-24 12:10:12 -05:00
Andreas Fischer
578be7f30a
Merge branch '1.0' into 2.0
...
* 1.0:
PHP 5.2 is not supported by travis anymore
Updated dependencies
Removed old branch alias
Conflicts:
composer.json
composer.lock
2015-02-08 16:58:37 +01:00
Graham Campbell
790463cbc7
Removed old branch alias
2015-02-07 15:35:37 +00:00
Andreas Fischer
3f7dc96a2b
composer.json: Remove PSR0 autoload statements.
2015-01-28 13:52:42 +01:00
Andreas Fischer
293df05546
Require PHP 5.3.3 since that is the lowest version we are running tests on.
2015-01-06 20:55:36 +01:00
Andreas Fischer
74d0b8ccce
Merge branch 'master' into php5
...
* master:
Updated dependencies
Conflicts:
composer.lock
2014-12-03 12:30:55 +01:00
Graham Campbell
91511b7c5c
Updated dependencies
2014-12-02 21:25:47 +00:00
Andreas Fischer
cd10ded72e
Merge pull request #508 from cnelissen/RandomAsClass
...
Promote Crypt/Random.php to a fully qualified class
* cnelissen/RandomAsClass:
Removed includes for Random.php and fixed up user_error message
Renamed Random::crypt_random_string to Random::string
Regenerated lock file
Namespaced Crypt\Random
Code sniff fix
Initial commit
Conflicts:
composer.lock
2014-12-02 21:56:21 +01:00
Andreas Fischer
946aa08aec
Merge pull request #515 from GrahamCampbell/patch-1
...
Alias the php5 branch as 2.0.x for now
* GrahamCampbell/patch-1:
Alias the php5 branch as 2.0.x for now
2014-12-02 21:50:38 +01:00
Andreas Fischer
885359bf21
Merge branch 'master' into php5
...
* master:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
Conflicts:
composer.lock
2014-12-02 21:41:01 +01:00
Andreas Fischer
cd6e50bfb9
Update phpunit/phpunit to 4.3.*
2014-12-02 21:23:58 +01:00
Andreas Fischer
a71ace33ad
Update sami/sami to 2.*
2014-12-02 21:23:40 +01:00
Graham Campbell
0cbfbbbdf9
Alias the php5 branch as 2.0.x for now
2014-12-02 19:47:06 +00:00
Clint Nelissen
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08:00
Andreas Fischer
01a176b3d3
Merge branch 'master' into php5
...
* master:
Add api target to phing build script.
Add sami configuration file.
Add sami/sami 1.* as a development dependency.
Conflicts:
composer.lock
2014-07-20 21:22:19 +02:00
Andreas Fischer
3c9614991a
Add sami/sami 1.* as a development dependency.
2014-07-19 00:57:13 +02:00
Andreas Fischer
42faf9e767
Depend on PHP 5.3.2 accordingly.
2014-06-19 16:16:20 +02:00
Andreas Fischer
68ade659ba
Add PSR4 namespace to composer.json.
2014-06-02 20:17:18 +02:00
Andreas Fischer
61b0fe2ddf
Merge branch 'master' into php5
...
* master:
Run Code Sniffer via phing.
Depend on phing/phing build script.
Conflicts:
composer.lock
2014-04-12 19:33:05 +02:00
Andreas Fischer
8c9b7083d8
Depend on phing/phing build script.
2014-04-12 07:47:26 +02:00
Andreas Fischer
7b7cc829d9
Merge branch 'master' into php5
...
* master:
Update composer before using it. Fixes openssl for https error.
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:54:55 +02:00
Andreas Fischer
86d7c6830c
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 04:28:11 +02: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
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
Graham Campbell
1c2796e3eb
Cleaned up whitespace
2014-01-18 17:29:25 +00:00
Andreas Fischer
bdf4f8f58c
Merge branch 'master' into php5
...
* master:
Add people from AUTHORS to composer.json.
2013-11-29 23:07:18 +01:00
Andreas Fischer
c85aa97d5e
Merge pull request #182 from bantu/composer-json-authors
...
Add people from AUTHORS to composer.json.
* bantu/composer-json-authors:
Add people from AUTHORS to composer.json.
2013-11-29 23:07:12 +01:00
Andreas Fischer
7500eedfd6
Merge branch 'master' into php5
...
* master:
Only install composer dependencies in PHP 5.5 environment.
Run code sniffer on PHP 5.5 environment on Travis CI.
Add ruleset for phpseclib coding standard.
Install composer dependencies on Travis CI.
Add composer.lock file.
Add CodeSniffer as composer development dependency.
2013-11-26 20:09:35 +01:00
Andreas Fischer
399407fdef
Merge pull request #186 from bantu/code-sniffer
...
Introducing Code Sniffer / Ensuring coding standard
* bantu/code-sniffer:
Only install composer dependencies in PHP 5.5 environment.
Run code sniffer on PHP 5.5 environment on Travis CI.
Add ruleset for phpseclib coding standard.
Install composer dependencies on Travis CI.
Add composer.lock file.
Add CodeSniffer as composer development dependency.
2013-11-26 20:09:30 +01:00
Andreas Fischer
6e10eb195d
Merge branch 'master' into php5
...
* master:
Add Blowfish and Twofish as composer keywords.
2013-11-26 19:35:49 +01:00
Andreas Fischer
28b2ae7849
Add Blowfish and Twofish as composer keywords.
2013-11-23 21:25:26 +01:00
Andreas Fischer
d09c6c3e6f
Merge pull request #185 from mpscholten/patch-1
...
Removed Php_Compat note in composer.json because we dropped php4 support
* mpscholten/patch-1:
Removed Php_Compat note in composer.json because we dropped php4 support
2013-11-23 21:06:53 +01:00
mpscholten
c2d183d223
Removed Php_Compat note in composer.json because we dropped php4 support
2013-11-23 20:37:06 +01:00
Andreas Fischer
e74744c620
Add CodeSniffer as composer development dependency.
2013-11-23 20:30:25 +01:00
Andreas Fischer
cc08a59b4b
Add people from AUTHORS to composer.json.
2013-11-23 19:46:04 +01:00
Andreas Fischer
e0cbaedccf
Require PHP 5.3 in composer.json
2013-11-20 21:18:51 +01:00
Beau Simensen
33e82feca1
Added a branch alias for master
2013-05-03 08:35:01 -05:00
David Stensland
28f18f83ec
SSH2: Be less overly clever loading Crypt/Random
2013-04-01 12:29:28 -04:00
terrafrost
98fb493611
- resolve conflict in composer.json, up required php version to 5.0.0 and suggest pear-pear/PHP_Compat
2012-06-09 19:04:07 -05:00
Rob Loach
6117e9d9a6
Fix for composer.json to just link to the homepage by @bantu #r954989
2012-06-08 21:32:57 -04:00
Andreas Fischer
6e29e5be6f
[feature/composer] Use proper case for RSA, AES and folks.
2012-06-09 00:14:06 +02:00
Rob Loach
73a45af6f9
Fix the suggest, require and author properties from #6
2012-06-08 16:57:26 -04:00
Andreas Fischer
32a3eab2ab
[feature/composer] Add description for suggested extensions, it's not a version
2012-06-08 22:14:00 +02:00
