octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-02-03 12:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update sami/sami to 2.*

Browse Source
This commit is contained in:
Andreas Fischer 2014-12-02 21:20:52 +01:00
parent c0511f2df4
commit a71ace33ad
2 changed files with 92 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -51,7 +51,7 @@
"require-dev": { "require-dev": {
"phing/phing": "2.7.*", "phing/phing": "2.7.*",
"phpunit/phpunit": "4.0.*", "phpunit/phpunit": "4.0.*",
"sami/sami": "1.*", "sami/sami": "2.*",
"squizlabs/php_codesniffer": "1.*" "squizlabs/php_codesniffer": "1.*"
}, },
"suggest": { "suggest": {

200
composer.lock generated
View File

@ -4,10 +4,8 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "9cd5afc2a6149e787c5b50511476b94b", "hash": "467bc4f93b7fb39d99c2ce3d5fd1f234",
"packages": [ "packages": [],
],
"packages-dev": [ "packages-dev": [
{ {
"name": "michelf/php-markdown", "name": "michelf/php-markdown",
@ -62,19 +60,20 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v0.9.4", "version": "v0.9.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f" "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
"reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f", "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-tokenizer": "*",
"php": ">=5.2" "php": ">=5.2"
}, },
"type": "library", "type": "library",
@ -102,7 +101,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2013-08-25 17:11:40" "time": "2014-07-23 18:24:17"
}, },
{ {
"name": "phing/phing", "name": "phing/phing",
@ -538,16 +537,16 @@
}, },
{ {
"name": "pimple/pimple", "name": "pimple/pimple",
"version": "v1.0.2", "version": "v2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Pimple.git", "url": "https://github.com/silexphp/Pimple.git",
"reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94" "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Pimple/zipball/ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
"reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -556,12 +555,12 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "2.1.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Pimple": "lib/" "Pimple": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -571,9 +570,7 @@
"authors": [ "authors": [
{ {
"name": "Fabien Potencier", "name": "Fabien Potencier",
"email": "fabien@symfony.com", "email": "fabien@symfony.com"
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
} }
], ],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@ -582,27 +579,27 @@
"container", "container",
"dependency injection" "dependency injection"
], ],
"time": "2013-03-08 08:21:40" "time": "2014-07-24 07:10:08"
}, },
{ {
"name": "sami/sami", "name": "sami/sami",
"version": "v1.4", "version": "v2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Sami.git", "url": "https://github.com/FriendsOfPHP/Sami.git",
"reference": "70f29c781f7bef30181c814b9471b2ceac694454" "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Sami/zipball/70f29c781f7bef30181c814b9471b2ceac694454", "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/fa58b324f41aa2aefe21dac4f22d8c98965fc012",
"reference": "70f29c781f7bef30181c814b9471b2ceac694454", "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"michelf/php-markdown": "~1.3", "michelf/php-markdown": "~1.3",
"nikic/php-parser": "0.9.*", "nikic/php-parser": "0.9.*",
"php": ">=5.3.0", "php": ">=5.3.0",
"pimple/pimple": "1.0.*", "pimple/pimple": "2.*",
"symfony/console": "~2.1", "symfony/console": "~2.1",
"symfony/filesystem": "~2.1", "symfony/filesystem": "~2.1",
"symfony/finder": "~2.1", "symfony/finder": "~2.1",
@ -616,7 +613,7 @@
"type": "application", "type": "application",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4-dev" "dev-master": "2.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -631,9 +628,7 @@
"authors": [ "authors": [
{ {
"name": "Fabien Potencier", "name": "Fabien Potencier",
"email": "fabien@symfony.com", "email": "fabien@symfony.com"
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
} }
], ],
"description": "Sami, an API documentation generator", "description": "Sami, an API documentation generator",
@ -641,7 +636,7 @@
"keywords": [ "keywords": [
"phpdoc" "phpdoc"
], ],
"time": "2014-06-25 11:24:03" "time": "2014-06-25 12:05:18"
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
@ -918,17 +913,17 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.5.2", "version": "v2.6.0",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/Console.git",
"reference": "386fa63407805959bd2c5fe540294721ad4224c8" "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/386fa63407805959bd2c5fe540294721ad4224c8", "url": "https://api.github.com/repos/symfony/Console/zipball/d3bac228fd7a2aac9193e241b239880b3ba39a10",
"reference": "386fa63407805959bd2c5fe540294721ad4224c8", "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -936,16 +931,18 @@
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1" "symfony/event-dispatcher": "~2.1",
"symfony/process": "~2.1"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log": "For using the console logger",
"symfony/event-dispatcher": "" "symfony/event-dispatcher": "",
"symfony/process": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -958,34 +955,32 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
} }
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-07-15 14:15:12" "time": "2014-11-20 13:24:23"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v2.5.2", "version": "v2.6.0",
"target-dir": "Symfony/Component/Filesystem", "target-dir": "Symfony/Component/Filesystem",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Filesystem.git", "url": "https://github.com/symfony/Filesystem.git",
"reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c" "reference": "6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/c1309b0ee195ad264a4314435bdaecdfacb8ae9c", "url": "https://api.github.com/repos/symfony/Filesystem/zipball/6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0",
"reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c", "reference": "6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -994,7 +989,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -1007,34 +1002,32 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
} }
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-07-09 09:05:48" "time": "2014-11-16 17:28:09"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v2.5.2", "version": "v2.6.0",
"target-dir": "Symfony/Component/Finder", "target-dir": "Symfony/Component/Finder",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Finder.git", "url": "https://github.com/symfony/Finder.git",
"reference": "576d8f69feec477067e91b6bd0367c113e76a1a0" "reference": "d574347c652a14cfee0349f744c7880e1d9029fd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/576d8f69feec477067e91b6bd0367c113e76a1a0", "url": "https://api.github.com/repos/symfony/Finder/zipball/d574347c652a14cfee0349f744c7880e1d9029fd",
"reference": "576d8f69feec477067e91b6bd0367c113e76a1a0", "reference": "d574347c652a14cfee0349f744c7880e1d9029fd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1043,7 +1036,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -1056,34 +1049,32 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
} }
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-07-15 14:15:12" "time": "2014-11-28 10:00:40"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.5.2", "version": "v2.6.0",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process.git", "url": "https://github.com/symfony/Process.git",
"reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa" "reference": "dc88f75d1c07791e5733f90be747961dce26cf05"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", "url": "https://api.github.com/repos/symfony/Process/zipball/dc88f75d1c07791e5733f90be747961dce26cf05",
"reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", "reference": "dc88f75d1c07791e5733f90be747961dce26cf05",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1092,7 +1083,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.5-dev" "dev-master": "2.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -1105,34 +1096,32 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
} }
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-07-09 09:05:48" "time": "2014-11-04 14:29:39"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.4.3", "version": "v2.6.0",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd" "reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", "url": "https://api.github.com/repos/symfony/Yaml/zipball/51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
"reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", "reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1141,7 +1130,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.6-dev"
} }
}, },
"autoload": { "autoload": {
@ -1154,33 +1143,31 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
} }
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-12 18:29:58" "time": "2014-11-20 13:24:23"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.16.0", "version": "v1.16.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "8ce37115802e257a984a82d38254884085060024" "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024", "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
"reference": "8ce37115802e257a984a82d38254884085060024", "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1209,7 +1196,7 @@
"role": "Lead Developer" "role": "Lead Developer"
}, },
{ {
"name": "Armin Ronacher2", "name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com", "email": "armin.ronacher@active-4.com",
"role": "Project Founder" "role": "Project Founder"
}, },
@ -1224,20 +1211,15 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2014-07-05 12:19:05" "time": "2014-10-17 12:53:44"
} }
], ],
"aliases": [ "aliases": [],
],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [ "stability-flags": [],
"prefer-stable": false,
],
"platform": { "platform": {
"php": ">=5.0.0" "php": ">=5.0.0"
}, },
"platform-dev": [ "platform-dev": []
]
} }