Merge pull request #1561 from CachetHQ/deps

Updated dependencies
2016-02-25 17:45:03 +00:00
parent 49c6a7806b 54a8fbd185
commit e8cbd81ad0
2 changed files with 25 additions and 25 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "~5.2.20",
+        "laravel/framework": "~5.2.21",
        "alt-three/badger": "^3.0",
        "alt-three/bus": "^1.0",
        "alt-three/emoji": "^3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "615527bfdcb047bd29b69ba193df6082",
-    "content-hash": "26390cf00f34ea90e3e9c75e8b5fd785",
+    "hash": "74c779dc332906a864a316cc48fdb8c6",
+    "content-hash": "d0ab20df55c42e4852db58b8a0804159",
    "packages": [
        {
            "name": "alt-three/badger",
@@ -1803,16 +1803,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v5.2.20",
+            "version": "v5.2.21",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f"
+                "reference": "4df24638165650a833e072851cad39606da89faf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d4ff9a1e3e9b2f99f8f3e957876e343d804d944f",
-                "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4df24638165650a833e072851cad39606da89faf",
+                "reference": "4df24638165650a833e072851cad39606da89faf",
                "shasum": ""
            },
            "require": {
@@ -1827,7 +1827,7 @@
                "nesbot/carbon": "~1.20",
                "paragonie/random_compat": "~1.1",
                "php": ">=5.5.9",
-                "psy/psysh": "0.6.*",
+                "psy/psysh": "0.7.*",
                "swiftmailer/swiftmailer": "~5.1",
                "symfony/console": "2.8.*|3.0.*",
                "symfony/debug": "2.8.*|3.0.*",
@@ -1927,7 +1927,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2016-02-19 17:58:28"
+            "time": "2016-02-24 15:13:36"
        },
        {
            "name": "league/commonmark",
@@ -2552,16 +2552,16 @@
        },
        {
            "name": "psy/psysh",
-            "version": "v0.6.1",
+            "version": "v0.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "0f04df0b23663799a8941fae13cd8e6299bde3ed"
+                "reference": "1573b36948a32bdaf43db525edf5e95d5a08ed06"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0f04df0b23663799a8941fae13cd8e6299bde3ed",
-                "reference": "0f04df0b23663799a8941fae13cd8e6299bde3ed",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1573b36948a32bdaf43db525edf5e95d5a08ed06",
+                "reference": "1573b36948a32bdaf43db525edf5e95d5a08ed06",
                "shasum": ""
            },
            "require": {
@@ -2620,20 +2620,20 @@
                "interactive",
                "shell"
            ],
-            "time": "2015-11-12 16:18:56"
+            "time": "2016-02-20 16:27:05"
        },
        {
            "name": "rcrowe/twigbridge",
-            "version": "v0.9.1",
+            "version": "v0.9.2",
            "source": {
                "type": "git",
                "url": "https://github.com/rcrowe/TwigBridge.git",
-                "reference": "634c4d12fc3dc633d202341b7a29a107f77a67da"
+                "reference": "78a4b7da75042660258a3269751c259eee81c34a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/634c4d12fc3dc633d202341b7a29a107f77a67da",
-                "reference": "634c4d12fc3dc633d202341b7a29a107f77a67da",
+                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/78a4b7da75042660258a3269751c259eee81c34a",
+                "reference": "78a4b7da75042660258a3269751c259eee81c34a",
                "shasum": ""
            },
            "require": {
@@ -2684,7 +2684,7 @@
                "laravel",
                "twig"
            ],
-            "time": "2015-12-21 22:03:34"
+            "time": "2016-02-22 07:48:48"
        },
        {
            "name": "roumen/feed",
@@ -3734,16 +3734,16 @@
    "packages-dev": [
        {
            "name": "alt-three/testbench",
-            "version": "v1.2.1",
+            "version": "v1.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/AltThree/TestBench.git",
-                "reference": "36da8c1357570ee323cd07e9e25df2372863623d"
+                "reference": "51155d628f670d6b1670dbd408c055274d26dc03"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/TestBench/zipball/36da8c1357570ee323cd07e9e25df2372863623d",
-                "reference": "36da8c1357570ee323cd07e9e25df2372863623d",
+                "url": "https://api.github.com/repos/AltThree/TestBench/zipball/51155d628f670d6b1670dbd408c055274d26dc03",
+                "reference": "51155d628f670d6b1670dbd408c055274d26dc03",
                "shasum": ""
            },
            "require": {
@@ -3759,7 +3759,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                }
            },
            "autoload": {
@@ -3791,7 +3791,7 @@
                "TestBench",
                "app"
            ],
-            "time": "2016-01-03 10:46:11"
+            "time": "2016-02-21 16:34:19"
        },
        {
            "name": "doctrine/instantiator",