Browse Source

Workaround for https://github.com/facebook/hhvm/issues/5170

Jordi Boggiano 10 years ago
parent
commit
e2b183136c
2 changed files with 11 additions and 9 deletions
  1. 3 1
      composer.json
  2. 8 8
      composer.lock

+ 3 - 1
composer.json

@@ -30,8 +30,10 @@
         "symfony/process": "~2.1"
         "symfony/process": "~2.1"
     },
     },
     "require-dev": {
     "require-dev": {
-        "phpunit/phpunit": "~4.5"
+        "phpunit/phpunit": "~4.5",
+        "phpunit/phpunit-mock-objects": "2.3.0"
     },
     },
+    "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223",
     "config": {
     "config": {
         "platform": {
         "platform": {
             "php": "5.3.3"
             "php": "5.3.3"

+ 8 - 8
composer.lock

@@ -4,7 +4,7 @@
         "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": "f81f79c547e147bfef2b15c1aed19f08",
+    "hash": "9a6a4c54f625e54ffe83b995dd796620",
     "packages": [
     "packages": [
         {
         {
             "name": "justinrainbow/json-schema",
             "name": "justinrainbow/json-schema",
@@ -761,25 +761,25 @@
         },
         },
         {
         {
             "name": "phpunit/phpunit-mock-objects",
             "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.1",
+            "version": "2.3.0",
             "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": "74ffb87f527f24616f72460e54b595f508dccb5c"
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
-                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "doctrine/instantiator": "~1.0,>=1.0.1",
                 "php": ">=5.3.3",
                 "php": ">=5.3.3",
                 "phpunit/php-text-template": "~1.2"
                 "phpunit/php-text-template": "~1.2"
             },
             },
             "require-dev": {
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "~4.3"
             },
             },
             "suggest": {
             "suggest": {
                 "ext-soap": "*"
                 "ext-soap": "*"
@@ -812,7 +812,7 @@
                 "mock",
                 "mock",
                 "xunit"
                 "xunit"
             ],
             ],
-            "time": "2015-04-02 05:36:41"
+            "time": "2014-10-03 05:12:11"
         },
         },
         {
         {
             "name": "sebastian/comparator",
             "name": "sebastian/comparator",