danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-26 20:35:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into php5

Browse Source 
* master:
  Updated dependencies

Conflicts:
	composer.lock
This commit is contained in:
Andreas Fischer 2014-12-03 12:30:55 +01:00
commit 74d0b8ccce
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -49,10 +49,10 @@
"php": ">=5.3.2"
},
"require-dev": {
"phing/phing": "2.7.*",
"phpunit/phpunit": "4.3.*",
"sami/sami": "2.*",
"squizlabs/php_codesniffer": "1.*"
"phing/phing": "~2.7",
"phpunit/phpunit": "~4.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~1.5"
},
"suggest": {
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",

60
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "4f12b7267ae2893c231aa139d04f1dfd",
"hash": "ac4c1e95b626e10464bc35aec0f78db8",
"packages": [],
"packages-dev": [
{
@ -159,25 +159,61 @@
},
{
"name": "phing/phing",
"version": "2.7.0",
"version": "2.9.0",
"source": {
"type": "git",
"url": "https://github.com/phingofficial/phing.git",
"reference": "bd2689790c620ac745b3ad29765c641a0dd5d007"
"reference": "12af1264dd4c5b88e28ee787e829de13c5ec172e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phingofficial/phing/zipball/bd2689790c620ac745b3ad29765c641a0dd5d007",
"reference": "bd2689790c620ac745b3ad29765c641a0dd5d007",
"url": "https://api.github.com/repos/phingofficial/phing/zipball/12af1264dd4c5b88e28ee787e829de13c5ec172e",
"reference": "12af1264dd4c5b88e28ee787e829de13c5ec172e",
"shasum": ""
},
"require": {
"php": ">=5.2.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
"lastcraft/simpletest": "@dev",
"pdepend/pdepend": "1.x",
"pear-pear.php.net/http_request2": "2.2.x",
"pear-pear.php.net/net_growl": "2.7.x",
"pear-pear.php.net/pear_packagefilemanager": "1.7.x",
"pear-pear.php.net/pear_packagefilemanager2": "1.0.x",
"pear-pear.php.net/xml_serializer": "0.20.x",
"pear/pear_exception": "@dev",
"pear/versioncontrol_git": "@dev",
"pear/versioncontrol_svn": "@dev",
"phpdocumentor/phpdocumentor": "2.x",
"phploc/phploc": "2.x",
"phpunit/phpunit": ">=3.7",
"sebastian/phpcpd": "2.x",
"squizlabs/php_codesniffer": "1.5.x"
},
"suggest": {
"pdepend/pdepend": "PHP version of JDepend",
"pear/archive_tar": "Tar file management class",
"pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
"pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
"phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
"phploc/phploc": "A tool for quickly measuring the size of a PHP project",
"phpmd/phpmd": "PHP version of PMD tool",
"phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
"phpunit/phpunit": "The PHP Unit Testing Framework",
"sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
"tedivm/jshrink": "Javascript Minifier built in PHP"
},
"bin": [
"bin/phing"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.9.x-dev"
}
},
"autoload": {
"classmap": [
"classes/phing/"
@ -188,27 +224,27 @@
"classes"
],
"license": [
"LGPL3"
"LGPL-3.0"
],
"authors": [
{
"name": "Michiel Rook",
"email": "mrook@php.net",
"role": "Lead"
},
{
"name": "Phing Community",
"homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
},
{
"name": "Michiel Rook",
"email": "mrook@php.net"
}
],
"description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
"homepage": "http://www.phing.info/",
"keywords": [
"build",
"phing",
"task",
"tool"
],
"time": "2014-02-13 13:17:59"
"time": "2014-11-25 14:58:59"
},
{
"name": "phpunit/php-code-coverage",