diff --git a/composer.json b/composer.json
index 009bcba..65d6790 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "smarty-gettext/smarty-gettext": "~1.6.0",
     "zonuexe/http-accept-language": "~0.4.1",
     "rinvex/countries": "~3.1.0",
-    "php-mock/php-mock-mockery": "~1.2.0"
+    "php-mock/php-mock-mockery": "~1.3.0"
   },
   "require-dev": {
     "symfony/var-dumper": "~3.4.1",
diff --git a/composer.lock b/composer.lock
index 61c76aa..76f486f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f0a821f3b9f10013e1cc5fb9f4715ac9",
+    "content-hash": "ee0f459b32da827b9437bdfc81671210",
     "packages": [
         {
             "name": "aura/session",
@@ -533,30 +533,29 @@
         },
         {
             "name": "php-mock/php-mock",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-mock/php-mock.git",
-                "reference": "bfa2d17d64dbf129073a7ba2051a96ce52749570"
+                "reference": "22d297231118e6fd5b9db087fbe1ef866c2b95d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-mock/php-mock/zipball/bfa2d17d64dbf129073a7ba2051a96ce52749570",
-                "reference": "bfa2d17d64dbf129073a7ba2051a96ce52749570",
+                "url": "https://api.github.com/repos/php-mock/php-mock/zipball/22d297231118e6fd5b9db087fbe1ef866c2b95d2",
+                "reference": "22d297231118e6fd5b9db087fbe1ef866c2b95d2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
+                "php": ">=5.6",
                 "phpunit/php-text-template": "^1"
             },
             "replace": {
                 "malkusch/php-mock": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4|^5"
+                "phpunit/phpunit": "^5.7"
             },
             "suggest": {
-                "php-mock/php-mock-mockery": "Allows using PHPMockery for Mockery integration",
                 "php-mock/php-mock-phpunit": "Allows integration into PHPUnit testcase with the trait PHPMock."
             },
             "type": "library",
@@ -564,7 +563,7 @@
                 "psr-4": {
                     "phpmock\\": [
                         "classes/",
-                        "tests/unit/"
+                        "tests/"
                     ]
                 }
             },
@@ -591,25 +590,25 @@
                 "test",
                 "test double"
             ],
-            "time": "2015-11-11T22:37:09+00:00"
+            "time": "2017-02-17T20:52:52+00:00"
         },
         {
             "name": "php-mock/php-mock-integration",
-            "version": "1.0.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-mock/php-mock-integration.git",
-                "reference": "e83fb65dd20cd3cf250d554cbd4682b96b684f4b"
+                "reference": "5a0d7d7755f823bc2a230cfa45058b40f9013bc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-mock/php-mock-integration/zipball/e83fb65dd20cd3cf250d554cbd4682b96b684f4b",
-                "reference": "e83fb65dd20cd3cf250d554cbd4682b96b684f4b",
+                "url": "https://api.github.com/repos/php-mock/php-mock-integration/zipball/5a0d7d7755f823bc2a230cfa45058b40f9013bc4",
+                "reference": "5a0d7d7755f823bc2a230cfa45058b40f9013bc4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
-                "php-mock/php-mock": "^1",
+                "php": ">=5.6",
+                "php-mock/php-mock": "^2",
                 "phpunit/php-text-template": "^1"
             },
             "require-dev": {
@@ -644,26 +643,26 @@
                 "test",
                 "test double"
             ],
-            "time": "2015-10-26T21:21:42+00:00"
+            "time": "2017-02-17T21:31:34+00:00"
         },
         {
             "name": "php-mock/php-mock-mockery",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-mock/php-mock-mockery.git",
-                "reference": "f3d67a36558c6d1fb912ed8ba786fffaf94e0755"
+                "reference": "d6d3df9d9232f1623f1ca3cfdaacd53415593825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-mock/php-mock-mockery/zipball/f3d67a36558c6d1fb912ed8ba786fffaf94e0755",
-                "reference": "f3d67a36558c6d1fb912ed8ba786fffaf94e0755",
+                "url": "https://api.github.com/repos/php-mock/php-mock-mockery/zipball/d6d3df9d9232f1623f1ca3cfdaacd53415593825",
+                "reference": "d6d3df9d9232f1623f1ca3cfdaacd53415593825",
                 "shasum": ""
             },
             "require": {
                 "mockery/mockery": "^1",
                 "php": ">=5.6",
-                "php-mock/php-mock-integration": "^1"
+                "php-mock/php-mock-integration": "^2"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4|^5"
@@ -698,7 +697,7 @@
                 "test",
                 "test double"
             ],
-            "time": "2017-10-13T09:34:01+00:00"
+            "time": "2018-03-27T07:00:25+00:00"
         },
         {
             "name": "phpunit/php-text-template",