Merge remote-tracking branch 'Crinsane/master'

Author: MichaelBelgium

composer.json

@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
-        "illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
-        "illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
+        "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*",
+        "illuminate/session": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*",
+        "illuminate/events": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*|| 5.6.* || 5.7.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0|~6.0|~7.0",
+        "phpunit/phpunit": "~5.0 || ~6.0 || ~7.0",
         "mockery/mockery": "~0.9.0",
         "orchestra/testbench": "~3.1"
     },