Added assertion library and downgraded phpunit

PHPUnit 4.4 was the last version without phpspec. phpspec conflicts
with this package because it requires v2 of this component and
this causes a cyclic issue with composer
This commit is contained in:
Mike van Riel
2015-06-13 18:30:22 +02:00
committed by Mike van Riel
parent c150553124
commit 090cf6b3ad
2 changed files with 76 additions and 94 deletions
+4 -3
View File
@@ -11,7 +11,8 @@
"require": { "require": {
"php": ">=5.5", "php": ">=5.5",
"phpdocumentor/reflection-common": "^0.1", "phpdocumentor/reflection-common": "^0.1",
"phpdocumentor/type-resolver": "^1.0@dev" "phpdocumentor/type-resolver": "^0.1.1",
"webmozart/assert": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": {"phpDocumentor\\Reflection\\": ["src/"]} "psr-4": {"phpDocumentor\\Reflection\\": ["src/"]}
@@ -20,8 +21,8 @@
"psr-4": {"phpDocumentor\\Reflection\\": ["tests/unit"]} "psr-4": {"phpDocumentor\\Reflection\\": ["tests/unit"]}
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.6", "mockery/mockery": "^0.9.4",
"mockery/mockery": "^0.9.4" "phpunit/phpunit": "4.4"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
Generated
+72 -91
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"
], ],
"hash": "3dfae8837b6c37701c1285da903c3426", "hash": "ba3538f875cdcc53e70e55ff36b78c31",
"packages": [ "packages": [
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@@ -59,7 +59,7 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "dev-master", "version": "0.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
@@ -103,6 +103,52 @@
} }
], ],
"time": "2015-06-12 22:00:00" "time": "2015-06-12 22:00:00"
},
{
"name": "webmozart/assert",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "b8ef76d0f0c3b9a0a1bc987085fe0a0ddba984ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/b8ef76d0f0c3b9a0a1bc987085fe0a0ddba984ab",
"reference": "b8ef76d0f0c3b9a0a1bc987085fe0a0ddba984ab",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "[email protected]"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"time": "2015-05-12 15:19:25"
} }
], ],
"packages-dev": [ "packages-dev": [
@@ -270,66 +316,6 @@
], ],
"time": "2015-04-02 19:54:00" "time": "2015-04-02 19:54:00"
}, },
{
"name": "phpspec/prophecy",
"version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"phpdocumentor/reflection-docblock": "~2.0",
"sebastian/comparator": "~1.1"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Prophecy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Konstantin Kudryashov",
"email": "[email protected]",
"homepage": "http://everzet.com"
},
{
"name": "Marcello Duarte",
"email": "[email protected]"
}
],
"description": "Highly opinionated mocking framework for PHP 5.3+",
"homepage": "https://github.com/phpspec/prophecy",
"keywords": [
"Double",
"Dummy",
"fake",
"mock",
"spy",
"stub"
],
"time": "2015-04-27 22:15:08"
},
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "2.1.5", "version": "2.1.5",
@@ -394,33 +380,31 @@
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
"version": "1.4.0", "version": "1.3.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "a923bb15680d0089e2316f7a4af8f437046e96bb" "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb", "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
"reference": "a923bb15680d0089e2316f7a4af8f437046e96bb", "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"src/" "File/"
] ]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"include-path": [
""
],
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
], ],
@@ -437,7 +421,7 @@
"filesystem", "filesystem",
"iterator" "iterator"
], ],
"time": "2015-04-02 05:19:05" "time": "2013-10-10 15:34:57"
}, },
{ {
"name": "phpunit/php-text-template", "name": "phpunit/php-text-template",
@@ -575,16 +559,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.7.3", "version": "4.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "41fea1e84ed84d373f5ac099a1276c4358c90708" "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41fea1e84ed84d373f5ac099a1276c4358c90708", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"reference": "41fea1e84ed84d373f5ac099a1276c4358c90708", "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -594,19 +578,18 @@
"ext-reflection": "*", "ext-reflection": "*",
"ext-spl": "*", "ext-spl": "*",
"php": ">=5.3.3", "php": ">=5.3.3",
"phpspec/prophecy": "~1.3,>=1.3.1", "phpunit/php-code-coverage": "~2.0",
"phpunit/php-code-coverage": "~2.1", "phpunit/php-file-iterator": "~1.3.2",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "~1.0", "phpunit/php-timer": "~1.0.2",
"phpunit/phpunit-mock-objects": "~2.3", "phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1", "sebastian/comparator": "~1.0",
"sebastian/diff": "~1.2", "sebastian/diff": "~1.1",
"sebastian/environment": "~1.2", "sebastian/environment": "~1.1",
"sebastian/exporter": "~1.2", "sebastian/exporter": "~1.0",
"sebastian/global-state": "~1.0", "sebastian/global-state": "~1.0",
"sebastian/version": "~1.0", "sebastian/version": "~1.0",
"symfony/yaml": "~2.1|~3.0" "symfony/yaml": "~2.0"
}, },
"suggest": { "suggest": {
"phpunit/php-invoker": "~1.1" "phpunit/php-invoker": "~1.1"
@@ -617,7 +600,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.7.x-dev" "dev-master": "4.4.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -643,7 +626,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2015-06-11 16:20:25" "time": "2014-12-05 06:49:03"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@@ -1123,9 +1106,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"phpdocumentor/type-resolver": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {