Merge branch 'feature-update-dependencies'

This commit is contained in:
Dmitry Khomutov 2017-01-09 23:35:50 +07:00
commit caab13c393
10 changed files with 357 additions and 184 deletions

View file

@ -45,9 +45,9 @@
"symfony/yaml": "2.8.*", "symfony/yaml": "2.8.*",
"symfony/console": "2.8.*", "symfony/console": "2.8.*",
"psr/log": "1.0.*", "psr/log": "1.0.*",
"monolog/monolog": "1.17.*", "monolog/monolog": "1.22.*",
"pimple/pimple": "3.0.*", "pimple/pimple": "3.0.*",
"robmorgan/phinx": "0.5.*", "robmorgan/phinx": "0.6.*",
"sensiolabs/ansi-to-html": "1.1.*", "sensiolabs/ansi-to-html": "1.1.*",
"pda/pheanstalk": "3.1.*", "pda/pheanstalk": "3.1.*",
@ -55,42 +55,27 @@
"bower-asset/admin-lte": "2.3.*", "bower-asset/admin-lte": "2.3.*",
"npm-asset/sprintf-js": "1.0.*", "npm-asset/sprintf-js": "1.0.*",
"bower-asset/font-awesome": "4.6.*", "bower-asset/font-awesome": "4.7.*",
"bower-asset/ionicons": "2.0.*", "bower-asset/ionicons": "2.0.*",
"bower-asset/raphael": "2.2.*" "bower-asset/raphael": "2.2.*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.8.*", "phpunit/phpunit": "5.7.*",
"phpmd/phpmd": "2.4.*", "phpmd/phpmd": "2.5.*",
"sebastian/phpcpd": "2.0.*", "sebastian/phpcpd": "2.0.*",
"squizlabs/php_codesniffer": "2.6.*", "squizlabs/php_codesniffer": "2.7.*",
"block8/php-docblock-checker": "1.0.*", "block8/php-docblock-checker": "1.0.*",
"phploc/phploc": "3.0.*", "phploc/phploc": "3.0.*",
"jakub-onderka/php-parallel-lint": "0.9.*" "jakub-onderka/php-parallel-lint": "0.9.*"
}, },
"suggest": {
"block8/php-docblock-checker": "PHP Docblock Checker",
"phpmd/phpmd": "PHP Mess Detector",
"sebastian/phpcpd": "PHP Copy/Paste Detector",
"squizlabs/php_codesniffer": "PHP Code Sniffer",
"phpspec/phpspec": "PHP Spec",
"fabpot/php-cs-fixer": "PHP Coding Standards Fixer",
"phploc/phploc": "PHP Lines of Code",
"atoum/atoum": "Atoum",
"jakub-onderka/php-parallel-lint": "Parallel Linting Tool",
"behat/behat": "Behat BDD Testing",
"phptal/phptal": "PHPTAL templating engine",
"maknz/slack": "Slack",
"hipchat/hipchat-php": "Hipchat",
"mremi/flowdock": "Flowdock"
},
"extra": { "extra": {
"installer-paths": { "installer-paths": {
"public/assets/vendor/admin-lte": ["bower-asset/admin-lte"], "public/assets/vendor/admin-lte": ["bower-asset/admin-lte"],
"public/assets/vendor/sprintf-js": ["npm-asset/sprintf-js"], "public/assets/vendor/sprintf-js": ["npm-asset/sprintf-js"],
"public/assets/vendor/font-awesome": ["bower-asset/font-awesome"], "public/assets/vendor/font-awesome": ["bower-asset/font-awesome"],
"public/assets/vendor/ion-icons": ["bower-asset/ionicons"], "public/assets/vendor/ion-icons": ["bower-asset/ionicons"],
"public/assets/vendor/raphael": ["bower-asset/raphael"] "public/assets/vendor/raphael": ["bower-asset/raphael"],
"public/assets/vendor/eve-raphael": ["bower-asset/eve-raphael"]
} }
}, },
"repositories": [ "repositories": [

403
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "044515382f24198141701f357d52365e", "content-hash": "971c01918d0471d275ebce511923b1fc",
"packages": [ "packages": [
{ {
"name": "bower-asset/admin-lte", "name": "bower-asset/admin-lte",
@ -40,16 +40,16 @@
}, },
{ {
"name": "bower-asset/font-awesome", "name": "bower-asset/font-awesome",
"version": "4.6.3.0", "version": "4.7.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FortAwesome/Font-Awesome.git", "url": "https://github.com/FortAwesome/Font-Awesome.git",
"reference": "8e241f209faa1dd2182c9fdc9c352d8806504a4e" "reference": "a8386aae19e200ddb0f6845b5feeee5eb7013687"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/8e241f209faa1dd2182c9fdc9c352d8806504a4e", "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/a8386aae19e200ddb0f6845b5feeee5eb7013687",
"reference": "8e241f209faa1dd2182c9fdc9c352d8806504a4e", "reference": "a8386aae19e200ddb0f6845b5feeee5eb7013687",
"shasum": null "shasum": null
}, },
"type": "library" "type": "library"
@ -143,16 +143,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.17.2", "version": "1.22.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
"reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -163,17 +163,17 @@
"psr/log-implementation": "1.0.0" "psr/log-implementation": "1.0.0"
}, },
"require-dev": { "require-dev": {
"aws/aws-sdk-php": "^2.4.9", "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0", "graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9", "jakub-onderka/php-parallel-lint": "0.9",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5", "phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0", "phpunit/phpunit-mock-objects": "2.3.0",
"raven/raven": "^0.13",
"ruflin/elastica": ">=0.90 <3.0", "ruflin/elastica": ">=0.90 <3.0",
"swiftmailer/swiftmailer": "~5.3", "sentry/sentry": "^0.13",
"videlalvaro/php-amqplib": "~2.4" "swiftmailer/swiftmailer": "~5.3"
}, },
"suggest": { "suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@ -181,16 +181,17 @@
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server", "ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome", "php-console/php-console": "Allow sending log messages to Google Chrome",
"raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar", "rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
"videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib" "sentry/sentry": "Allow sending log messages to a Sentry server"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.16.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -216,7 +217,7 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2015-10-14T12:51:02+00:00" "time": "2016-11-26T00:15:39+00:00"
}, },
{ {
"name": "npm-asset/sprintf-js", "name": "npm-asset/sprintf-js",
@ -374,16 +375,16 @@
}, },
{ {
"name": "robmorgan/phinx", "name": "robmorgan/phinx",
"version": "v0.5.5", "version": "v0.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/robmorgan/phinx.git", "url": "https://github.com/robmorgan/phinx.git",
"reference": "da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc" "reference": "6943cb4bb78bf9d3964967a032220b7c793b97b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/robmorgan/phinx/zipball/da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc", "url": "https://api.github.com/repos/robmorgan/phinx/zipball/6943cb4bb78bf9d3964967a032220b7c793b97b7",
"reference": "da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc", "reference": "6943cb4bb78bf9d3964967a032220b7c793b97b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -393,7 +394,7 @@
"symfony/yaml": "~2.8|~3.0" "symfony/yaml": "~2.8|~3.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^3.7|^4.0|^5.0" "phpunit/phpunit": "^4.8.26|^5.0"
}, },
"bin": [ "bin": [
"bin/phinx" "bin/phinx"
@ -420,6 +421,11 @@
"email": "robbym@gmail.com", "email": "robbym@gmail.com",
"homepage": "https://robmorgan.id.au", "homepage": "https://robmorgan.id.au",
"role": "Lead Developer" "role": "Lead Developer"
},
{
"name": "Richard Quadling",
"email": "rquadling@gmail.com",
"role": "Developer"
} }
], ],
"description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.",
@ -431,7 +437,7 @@
"migrations", "migrations",
"phinx" "phinx"
], ],
"time": "2016-06-17T15:29:02+00:00" "time": "2016-10-27T10:16:12+00:00"
}, },
{ {
"name": "sensiolabs/ansi-to-html", "name": "sensiolabs/ansi-to-html",
@ -1018,6 +1024,48 @@
"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint", "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
"time": "2015-12-15T10:42:16+00:00" "time": "2015-12-15T10:42:16+00:00"
}, },
{
"name": "myclabs/deep-copy",
"version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/399c1f9781e222f6eb6cc238796f5200d1b7f108",
"reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"doctrine/collections": "1.*",
"phpunit/phpunit": "~4.1"
},
"type": "library",
"autoload": {
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Create deep copies (clones) of your objects",
"homepage": "https://github.com/myclabs/DeepCopy",
"keywords": [
"clone",
"copy",
"duplicate",
"object",
"object graph"
],
"time": "2016-10-31T17:19:45+00:00"
},
{ {
"name": "pdepend/pdepend", "name": "pdepend/pdepend",
"version": "2.3.2", "version": "2.3.2",
@ -1259,16 +1307,16 @@
}, },
{ {
"name": "phpmd/phpmd", "name": "phpmd/phpmd",
"version": "2.4.4", "version": "2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpmd/phpmd.git", "url": "https://github.com/phpmd/phpmd.git",
"reference": "148b605040ae6f7cc839e14a9e206beec9868d97" "reference": "9298602a922cd8c46666df8d540a60bc5925ce55"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpmd/phpmd/zipball/148b605040ae6f7cc839e14a9e206beec9868d97", "url": "https://api.github.com/repos/phpmd/phpmd/zipball/9298602a922cd8c46666df8d540a60bc5925ce55",
"reference": "148b605040ae6f7cc839e14a9e206beec9868d97", "reference": "9298602a922cd8c46666df8d540a60bc5925ce55",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1320,7 +1368,7 @@
"phpmd", "phpmd",
"pmd" "pmd"
], ],
"time": "2016-11-22T14:35:17+00:00" "time": "2016-11-23T20:33:32+00:00"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
@ -1387,39 +1435,40 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "2.2.4", "version": "4.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" "reference": "c14196e64a78570034afd0b7a9f3757ba71c2a0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c14196e64a78570034afd0b7a9f3757ba71c2a0a",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "reference": "c14196e64a78570034afd0b7a9f3757ba71c2a0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": "^5.6 || ^7.0",
"phpunit/php-file-iterator": "~1.3", "phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3", "phpunit/php-token-stream": "^1.4.2",
"sebastian/environment": "^1.3.2", "sebastian/code-unit-reverse-lookup": "~1.0",
"sebastian/version": "~1.0" "sebastian/environment": "^1.3.2 || ^2.0",
"sebastian/version": "~1.0|~2.0"
}, },
"require-dev": { "require-dev": {
"ext-xdebug": ">=2.1.4", "ext-xdebug": ">=2.1.4",
"phpunit/phpunit": "~4" "phpunit/phpunit": "^5.4"
}, },
"suggest": { "suggest": {
"ext-dom": "*", "ext-dom": "*",
"ext-xdebug": ">=2.2.1", "ext-xdebug": ">=2.4.0",
"ext-xmlwriter": "*" "ext-xmlwriter": "*"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2.x-dev" "dev-master": "4.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1445,7 +1494,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2015-10-06T15:47:00+00:00" "time": "2016-12-20T15:22:42+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@ -1630,40 +1679,50 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.8.31", "version": "5.7.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3" "reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/98b2b39a520766bec663ff5b7ff1b729db9dbfe3", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50fd2be8f3e23e91da825f36f08e5f9633076ffe",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3", "reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-json": "*", "ext-json": "*",
"ext-pcre": "*", "ext-libxml": "*",
"ext-reflection": "*", "ext-mbstring": "*",
"ext-spl": "*", "ext-xml": "*",
"php": ">=5.3.3", "myclabs/deep-copy": "~1.3",
"phpspec/prophecy": "^1.3.1", "php": "^5.6 || ^7.0",
"phpunit/php-code-coverage": "~2.1", "phpspec/prophecy": "^1.6.2",
"phpunit/php-code-coverage": "^4.0.3",
"phpunit/php-file-iterator": "~1.4", "phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6", "phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3", "phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.2.2", "sebastian/comparator": "~1.2.2",
"sebastian/diff": "~1.2", "sebastian/diff": "~1.2",
"sebastian/environment": "~1.3", "sebastian/environment": "^1.3.4 || ^2.0",
"sebastian/exporter": "~1.2", "sebastian/exporter": "~2.0",
"sebastian/global-state": "~1.0", "sebastian/global-state": "^1.0 || ^2.0",
"sebastian/version": "~1.0", "sebastian/object-enumerator": "~2.0",
"sebastian/resource-operations": "~1.0",
"sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0" "symfony/yaml": "~2.1|~3.0"
}, },
"conflict": {
"phpdocumentor/reflection-docblock": "3.0.2"
},
"require-dev": {
"ext-pdo": "*"
},
"suggest": { "suggest": {
"ext-xdebug": "*",
"phpunit/php-invoker": "~1.1" "phpunit/php-invoker": "~1.1"
}, },
"bin": [ "bin": [
@ -1672,7 +1731,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.8.x-dev" "dev-master": "5.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1698,30 +1757,33 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-12-09T02:45:31+00:00" "time": "2016-12-28T07:18:51+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "2.3.8", "version": "3.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": ">=5.3.3", "php": "^5.6 || ^7.0",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "^1.2",
"sebastian/exporter": "~1.2" "sebastian/exporter": "^1.2 || ^2.0"
},
"conflict": {
"phpunit/phpunit": "<5.4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.4" "phpunit/phpunit": "^5.4"
}, },
"suggest": { "suggest": {
"ext-soap": "*" "ext-soap": "*"
@ -1729,7 +1791,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.3.x-dev" "dev-master": "3.2.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1754,7 +1816,52 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2015-10-02T06:51:40+00:00" "time": "2016-12-08T20:27:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "~5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2016-02-13T06:45:14+00:00"
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",
@ -1874,28 +1981,28 @@
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
"version": "1.3.8", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/environment.git", "url": "https://github.com/sebastianbergmann/environment.git",
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0" "php": "^5.6 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0" "phpunit/phpunit": "^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1920,25 +2027,25 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
"time": "2016-08-18T05:49:44+00:00" "time": "2016-11-26T07:53:53+00:00"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
"version": "1.2.2", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git", "url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"sebastian/recursion-context": "~1.0" "sebastian/recursion-context": "~2.0"
}, },
"require-dev": { "require-dev": {
"ext-mbstring": "*", "ext-mbstring": "*",
@ -1947,7 +2054,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -1987,7 +2094,7 @@
"export", "export",
"exporter" "exporter"
], ],
"time": "2016-06-17T09:04:28+00:00" "time": "2016-11-19T08:54:04+00:00"
}, },
{ {
"name": "sebastian/finder-facade", "name": "sebastian/finder-facade",
@ -2124,6 +2231,52 @@
], ],
"time": "2015-10-12T03:26:01+00:00" "time": "2015-10-12T03:26:01+00:00"
}, },
{
"name": "sebastian/object-enumerator",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
"reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
"reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
"shasum": ""
},
"require": {
"php": ">=5.6",
"sebastian/recursion-context": "~2.0"
},
"require-dev": {
"phpunit/phpunit": "~5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2016-11-19T07:35:10+00:00"
},
{ {
"name": "sebastian/phpcpd", "name": "sebastian/phpcpd",
"version": "2.0.4", "version": "2.0.4",
@ -2177,16 +2330,16 @@
}, },
{ {
"name": "sebastian/recursion-context", "name": "sebastian/recursion-context",
"version": "1.0.2", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git", "url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791" "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791", "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2198,7 +2351,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -2226,23 +2379,73 @@
], ],
"description": "Provides functionality to recursively process PHP variables", "description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context", "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2015-11-11T19:50:13+00:00" "time": "2016-11-19T07:33:16+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/resource-operations",
"version": "1.0.6", "version": "1.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/version.git", "url": "https://github.com/sebastianbergmann/resource-operations.git",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"shasum": "" "shasum": ""
}, },
"require": {
"php": ">=5.6.0"
},
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28T20:34:47+00:00"
},
{
"name": "sebastian/version",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"src/" "src/"
@ -2261,20 +2464,20 @@
], ],
"description": "Library that helps with managing the version number of Git-hosted PHP projects", "description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version", "homepage": "https://github.com/sebastianbergmann/version",
"time": "2015-06-21T13:59:46+00:00" "time": "2016-10-03T07:35:21+00:00"
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "2.6.2", "version": "2.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "4edb770cb853def6e60c93abb088ad5ac2010c83" "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f",
"reference": "4edb770cb853def6e60c93abb088ad5ac2010c83", "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2339,7 +2542,7 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2016-07-13T23:29:13+00:00" "time": "2016-11-30T04:02:31+00:00"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",

View file

@ -36,7 +36,7 @@ class CreateAdminCommandTest extends \PHPUnit_Framework_TestCase
{ {
parent::setUp(); parent::setUp();
$userStoreMock = $this->getMock('PHPCensor\\Store\\UserStore'); $userStoreMock = $this->getMockBuilder('PHPCensor\\Store\\UserStore')->getMock();
$this->command = new CreateAdminCommand($userStoreMock); $this->command = new CreateAdminCommand($userStoreMock);

View file

@ -29,7 +29,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase
{ {
parent::setUp(); parent::setUp();
$projectMock = $this->getMock('PHPCensor\\Model\\Project'); $projectMock = $this->getMockBuilder('PHPCensor\\Model\\Project')->getMock();
$projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore') $projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore')
->getMock(); ->getMock();

View file

@ -27,9 +27,9 @@ class EmailTest extends \PHPUnit_Framework_TestCase
protected $testedEmailPlugin; protected $testedEmailPlugin;
/** /**
* @var \PHPUnit_Framework_MockObject_MockObject $mockCiBuilder * @var \PHPUnit_Framework_MockObject_MockObject $mockBuilder
*/ */
protected $mockCiBuilder; protected $mockBuilder;
/** /**
* @var \PHPUnit_Framework_MockObject_MockObject $mockBuild * @var \PHPUnit_Framework_MockObject_MockObject $mockBuild
@ -70,25 +70,23 @@ class EmailTest extends \PHPUnit_Framework_TestCase
] ]
]); ]);
$this->mockProject = $this->getMock( $this->mockProject = $this
'\PHPCensor\Model\Project', ->getMockBuilder('\PHPCensor\Model\Project')
['getTitle'], ->setMethods(['getTitle'])
[], ->setMockClassName('mockProject')
"mockProject", ->disableOriginalConstructor()
false ->getMock();
);
$this->mockProject->expects($this->any()) $this->mockProject->expects($this->any())
->method('getTitle') ->method('getTitle')
->will($this->returnValue("Test-Project")); ->will($this->returnValue("Test-Project"));
$this->mockBuild = $this->getMock( $this->mockBuild = $this
'\PHPCensor\Model\Build', ->getMockBuilder('\PHPCensor\Model\Build')
['getLog', 'getStatus', 'getProject', 'getCommitterEmail'], ->setMethods(['getLog', 'getStatus', 'getProject', 'getCommitterEmail'])
[], ->setMockClassName('mockBuild')
"mockBuild", ->disableOriginalConstructor()
false ->getMock();
);
$this->mockBuild->expects($this->any()) $this->mockBuild->expects($this->any())
->method('getLog') ->method('getLog')
@ -108,22 +106,16 @@ class EmailTest extends \PHPUnit_Framework_TestCase
->method('getCommitterEmail') ->method('getCommitterEmail')
->will($this->returnValue('committer-email@example.com')); ->will($this->returnValue('committer-email@example.com'));
$this->mockCiBuilder = $this->getMock( $this->mockBuilder = $this
'\PHPCensor\Builder', ->getMockBuilder('\PHPCensor\Builder')
[ ->setMethods(['getSystemConfig', 'getBuild', 'log', 'logDebug'])
'getSystemConfig', ->setMockClassName('mockBuilder_email')
'getBuild', ->disableOriginalConstructor()
'log', ->getMock();
'logDebug'
],
[],
"mockBuilder_email",
false
);
$this->mockCiBuilder->buildPath = "/"; $this->mockBuilder->buildPath = "/";
$this->mockCiBuilder->expects($this->any()) $this->mockBuilder->expects($this->any())
->method('getSystemConfig') ->method('getSystemConfig')
->with('php-censor') ->with('php-censor')
->will($this->returnValue(['email_settings' => ['from_address' => "test-from-address@example.com"]])); ->will($this->returnValue(['email_settings' => ['from_address' => "test-from-address@example.com"]]));
@ -144,15 +136,11 @@ class EmailTest extends \PHPUnit_Framework_TestCase
$self = $this; $self = $this;
$this->testedEmailPlugin = $this->getMock( $this->testedEmailPlugin = $this
'\PHPCensor\Plugin\Email', ->getMockBuilder('\PHPCensor\Plugin\Email')
['sendEmail'], ->setMethods(['sendEmail'])
[ ->setConstructorArgs([$this->mockBuilder, $this->mockBuild, $arrOptions])
$this->mockCiBuilder, ->getMock();
$this->mockBuild,
$arrOptions
]
);
$this->testedEmailPlugin->expects($this->any()) $this->testedEmailPlugin->expects($this->any())
->method('sendEmail') ->method('sendEmail')

View file

@ -168,13 +168,10 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
$this->testedFactory->registerResource( $this->testedFactory->registerResource(
function () use ($self) { function () use ($self) {
return $self->getMock( return $self
'PHPCensor\Builder', ->getMockBuilder('PHPCensor\Builder')
[], ->disableOriginalConstructor()
[], ->getMock();
'',
false
);
}, },
null, null,
'PHPCensor\\Builder' 'PHPCensor\\Builder'
@ -182,13 +179,10 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
$this->testedFactory->registerResource( $this->testedFactory->registerResource(
function () use ($self) { function () use ($self) {
return $self->getMock( return $self
'PHPCensor\Model\Build', ->getMockBuilder('PHPCensor\Model\Build')
[], ->disableOriginalConstructor()
[], ->getMock();
'',
false
);
}, },
null, null,
'PHPCensor\\Model\\Build' 'PHPCensor\\Model\\Build'

View file

@ -33,7 +33,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
$this->mockBuildStore = $this->getMock('PHPCensor\Store\BuildStore'); $this->mockBuildStore = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock();
$this->mockBuildStore->expects($this->any()) $this->mockBuildStore->expects($this->any())
->method('save') ->method('save')
->will($this->returnArgument(0)); ->will($this->returnArgument(0));
@ -121,7 +121,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
public function testExecute_DeleteBuild() public function testExecute_DeleteBuild()
{ {
$store = $this->getMock('PHPCensor\Store\BuildStore'); $store = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock();
$store->expects($this->once()) $store->expects($this->once())
->method('delete') ->method('delete')
->will($this->returnValue(true)); ->will($this->returnValue(true));

View file

@ -112,7 +112,10 @@ class BuildStatusServiceTest extends \PHPUnit_Framework_TestCase
*/ */
protected function getProjectMock($prevBuildId = null, $setProject = true) { protected function getProjectMock($prevBuildId = null, $setProject = true) {
$project = $this->getMock('PHPCensor\Model\Project', ['getLatestBuild']); $project = $this
->getMockBuilder('PHPCensor\Model\Project')
->setMethods(['getLatestBuild'])
->getMock();
$prevBuild = ($prevBuildId) ? $this->getBuild($prevBuildId, false) : null; $prevBuild = ($prevBuildId) ? $this->getBuild($prevBuildId, false) : null;

View file

@ -33,7 +33,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
$this->mockProjectStore = $this->getMock('PHPCensor\Store\ProjectStore'); $this->mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock();
$this->mockProjectStore->expects($this->any()) $this->mockProjectStore->expects($this->any())
->method('save') ->method('save')
->will($this->returnArgument(0)); ->will($this->returnArgument(0));
@ -115,7 +115,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase
public function testExecute_DeleteProject() public function testExecute_DeleteProject()
{ {
$store = $this->getMock('PHPCensor\Store\ProjectStore'); $store = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock();
$store->expects($this->once()) $store->expects($this->once())
->method('delete') ->method('delete')
->will($this->returnValue(true)); ->will($this->returnValue(true));

View file

@ -32,7 +32,7 @@ class UserServiceTest extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
$this->mockUserStore = $this->getMock('PHPCensor\Store\UserStore'); $this->mockUserStore = $this->getMockBuilder('PHPCensor\Store\UserStore')->getMock();
$this->mockUserStore->expects($this->any()) $this->mockUserStore->expects($this->any())
->method('save') ->method('save')
->will($this->returnArgument(0)); ->will($this->returnArgument(0));