diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d9fa01e169c90bf6c2b345ee90f2248d5c37af77..f21e0df3209c5ac2737ee5d2629bf066bdc58705 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -33,6 +33,7 @@ class AppServiceProvider extends ServiceProvider
{
if ($this->app->environment('local', 'dev', 'testing')) {
$this->app->register(\Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class);
+ $this->app->register(\Laravel\Dusk\DuskServiceProvider::class);
}
}
}
diff --git a/composer.json b/composer.json
index 7735863f907b6d4b0e737b7be3b46d84790bf04c..6fcc75a69685c7ab912e0daaef38558af39dc24f 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,8 @@
},
"require-dev": {
"fzaninotto/faker": "~1.4",
- "laravel/tinker": "~1.0",
+ "laravel/dusk": "^1.0",
+ "laravel/tinker": "^1.0",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"rap2hpoutre/laravel-log-viewer": "^0.8.0",
diff --git a/composer.lock b/composer.lock
index 5845beaa0f264d76931599e0f656402b5d858895..bee359e53b662cfec9890c3ba2c69110ccfb53bc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,21 +4,21 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "eed2ac9bb0eed1c9c6041a5d396444b4",
- "content-hash": "4572898495ffc1ac9224676fe24a2e7c",
+ "hash": "2651777ef7f53367bad692799b879466",
+ "content-hash": "a6ec042d1f6d132dc718236e232f3459",
"packages": [
{
"name": "callr/sdk-php",
- "version": "v0.11.0",
+ "version": "v0.11.1",
"source": {
"type": "git",
"url": "https://github.com/THECALLR/sdk-php.git",
- "reference": "f6ebf768d69d90237dace07e818999ce42e80cc6"
+ "reference": "307ef11902b3dea11507c089ca48fae8dd56019b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/THECALLR/sdk-php/zipball/f6ebf768d69d90237dace07e818999ce42e80cc6",
- "reference": "f6ebf768d69d90237dace07e818999ce42e80cc6",
+ "url": "https://api.github.com/repos/THECALLR/sdk-php/zipball/307ef11902b3dea11507c089ca48fae8dd56019b",
+ "reference": "307ef11902b3dea11507c089ca48fae8dd56019b",
"shasum": ""
},
"require": {
@@ -55,7 +55,7 @@
"sdk",
"thecallr"
],
- "time": "2017-05-10 12:29:24"
+ "time": "2017-07-12 08:31:53"
},
{
"name": "doctrine/inflector",
@@ -126,16 +126,16 @@
},
{
"name": "erusev/parsedown",
- "version": "1.6.2",
+ "version": "1.6.3",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
- "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01"
+ "reference": "728952b90a333b5c6f77f06ea9422b94b585878d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown/zipball/1bf24f7334fe16c88bf9d467863309ceaf285b01",
- "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/728952b90a333b5c6f77f06ea9422b94b585878d",
+ "reference": "728952b90a333b5c6f77f06ea9422b94b585878d",
"shasum": ""
},
"require": {
@@ -164,20 +164,20 @@
"markdown",
"parser"
],
- "time": "2017-03-29 16:04:15"
+ "time": "2017-05-14 14:47:48"
},
{
"name": "korko/callr",
- "version": "1.0.0",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/Korko/callr.git",
- "reference": "f9d5f3fa0a00990ab754690da92cfa0a1b97207e"
+ "reference": "75c3b568babd5176390dae77a05387ba30d7f71b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Korko/callr/zipball/f9d5f3fa0a00990ab754690da92cfa0a1b97207e",
- "reference": "f9d5f3fa0a00990ab754690da92cfa0a1b97207e",
+ "url": "https://api.github.com/repos/Korko/callr/zipball/75c3b568babd5176390dae77a05387ba30d7f71b",
+ "reference": "75c3b568babd5176390dae77a05387ba30d7f71b",
"shasum": ""
},
"require": {
@@ -186,7 +186,7 @@
"type": "library",
"autoload": {
"psr-4": {
- "Korko\\CallR\\": "src/"
+ "Korko\\Callr\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -201,13 +201,13 @@
"role": "Developer"
}
],
- "description": "A simple library for working with CallR in Laravel.",
+ "description": "A simple library for working with Callr in Laravel.",
"homepage": "https://github.com/korko/callr",
"keywords": [
"CALLR",
"laravel"
],
- "time": "2017-07-03 09:08:20"
+ "time": "2017-07-12 10:13:06"
},
{
"name": "korko/laravel5-recaptcha2",
@@ -497,16 +497,16 @@
},
{
"name": "mariuzzo/laravel-js-localization",
- "version": "v1.4.1",
+ "version": "v1.4.2",
"source": {
"type": "git",
"url": "https://github.com/rmariuzzo/Laravel-JS-Localization.git",
- "reference": "7c98fbcf08d746ffc48b6851634ae75c8ceef983"
+ "reference": "5817f9c6e619b6952858933ba591112e6fdf49ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/rmariuzzo/Laravel-JS-Localization/zipball/7c98fbcf08d746ffc48b6851634ae75c8ceef983",
- "reference": "7c98fbcf08d746ffc48b6851634ae75c8ceef983",
+ "url": "https://api.github.com/repos/rmariuzzo/Laravel-JS-Localization/zipball/5817f9c6e619b6952858933ba591112e6fdf49ec",
+ "reference": "5817f9c6e619b6952858933ba591112e6fdf49ec",
"shasum": ""
},
"require": {
@@ -569,7 +569,7 @@
"laravel 5",
"localization"
],
- "time": "2017-05-01 03:35:24"
+ "time": "2017-07-04 18:29:24"
},
{
"name": "monolog/monolog",
@@ -1038,16 +1038,16 @@
},
{
"name": "symfony/console",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e"
+ "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/70d2a29b2911cbdc91a7e268046c395278238b2e",
- "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a97e45d98c59510f085fa05225a1acb74dfe0546",
+ "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546",
"shasum": ""
},
"require": {
@@ -1103,11 +1103,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-06-02 19:24:58"
+ "time": "2017-07-03 13:19:36"
},
{
"name": "symfony/css-selector",
- "version": "v3.2.9",
+ "version": "v3.2.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -1160,16 +1160,16 @@
},
{
"name": "symfony/debug",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d"
+ "reference": "63b85a968486d95ff9542228dc2e4247f16f9743"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/e9c50482841ef696e8fa1470d950a79c8921f45d",
- "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/63b85a968486d95ff9542228dc2e4247f16f9743",
+ "reference": "63b85a968486d95ff9542228dc2e4247f16f9743",
"shasum": ""
},
"require": {
@@ -1212,20 +1212,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2017-06-01 21:01:25"
+ "time": "2017-07-05 13:02:37"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "4054a102470665451108f9b59305c79176ef98f0"
+ "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4054a102470665451108f9b59305c79176ef98f0",
- "reference": "4054a102470665451108f9b59305c79176ef98f0",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e",
+ "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e",
"shasum": ""
},
"require": {
@@ -1275,11 +1275,11 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-06-04 18:15:29"
+ "time": "2017-06-09 14:53:08"
},
{
"name": "symfony/finder",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1328,16 +1328,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "80eb5a1f968448b77da9e8b2c0827f6e8d767846"
+ "reference": "f347a5f561b03db95ed666959db42bbbf429b7e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/80eb5a1f968448b77da9e8b2c0827f6e8d767846",
- "reference": "80eb5a1f968448b77da9e8b2c0827f6e8d767846",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f347a5f561b03db95ed666959db42bbbf429b7e5",
+ "reference": "f347a5f561b03db95ed666959db42bbbf429b7e5",
"shasum": ""
},
"require": {
@@ -1377,20 +1377,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2017-06-05 13:06:51"
+ "time": "2017-06-24 09:29:48"
},
{
"name": "symfony/http-kernel",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "be8280f7fa8e95b86514f1e1be997668a53b2888"
+ "reference": "33f87c957122cfbd9d90de48698ee074b71106ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/be8280f7fa8e95b86514f1e1be997668a53b2888",
- "reference": "be8280f7fa8e95b86514f1e1be997668a53b2888",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33f87c957122cfbd9d90de48698ee074b71106ea",
+ "reference": "33f87c957122cfbd9d90de48698ee074b71106ea",
"shasum": ""
},
"require": {
@@ -1463,7 +1463,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2017-06-06 03:59:58"
+ "time": "2017-07-05 13:28:15"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1526,16 +1526,16 @@
},
{
"name": "symfony/process",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf"
+ "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/8e30690c67aafb6c7992d6d8eb0d707807dd3eaf",
- "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf",
+ "url": "https://api.github.com/repos/symfony/process/zipball/5ab8949b682b1bf9d4511a228b5e045c96758c30",
+ "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30",
"shasum": ""
},
"require": {
@@ -1571,20 +1571,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-05-22 12:32:03"
+ "time": "2017-07-03 08:12:02"
},
{
"name": "symfony/routing",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "39804eeafea5cca851946e1eed122eb94459fdb4"
+ "reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/39804eeafea5cca851946e1eed122eb94459fdb4",
- "reference": "39804eeafea5cca851946e1eed122eb94459fdb4",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/dc70bbd0ca7b19259f63cdacc8af370bc32a4728",
+ "reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728",
"shasum": ""
},
"require": {
@@ -1649,20 +1649,20 @@
"uri",
"url"
],
- "time": "2017-06-02 09:51:43"
+ "time": "2017-06-24 09:29:48"
},
{
"name": "symfony/translation",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "dc3b2a0c6cfff60327ba1c043a82092735397543"
+ "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/dc3b2a0c6cfff60327ba1c043a82092735397543",
- "reference": "dc3b2a0c6cfff60327ba1c043a82092735397543",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
+ "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
"shasum": ""
},
"require": {
@@ -1714,20 +1714,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2017-05-22 07:42:36"
+ "time": "2017-06-24 16:45:30"
},
{
"name": "symfony/var-dumper",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "347c4247a3e40018810b476fcd5dec36d46d08dc"
+ "reference": "9ee920bba1d2ce877496dcafca7cbffff4dbe08a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/347c4247a3e40018810b476fcd5dec36d46d08dc",
- "reference": "347c4247a3e40018810b476fcd5dec36d46d08dc",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9ee920bba1d2ce877496dcafca7cbffff4dbe08a",
+ "reference": "9ee920bba1d2ce877496dcafca7cbffff4dbe08a",
"shasum": ""
},
"require": {
@@ -1782,7 +1782,7 @@
"debug",
"dump"
],
- "time": "2017-06-02 09:10:29"
+ "time": "2017-07-05 13:02:37"
},
{
"name": "tedivm/jshrink",
@@ -2959,16 +2959,16 @@
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "3.4.3",
+ "version": "3.4.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
- "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
"shasum": ""
},
"require": {
@@ -3014,20 +3014,20 @@
"mock",
"xunit"
],
- "time": "2016-12-08 20:27:08"
+ "time": "2017-06-30 09:13:00"
},
{
"name": "psy/psysh",
- "version": "v0.8.8",
+ "version": "v0.8.9",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e"
+ "reference": "58a31cc4404c8f632d8c557bc72056af2d3a83db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/fe65c30cbc55c71e61ba3a38b5a581149be31b8e",
- "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/58a31cc4404c8f632d8c557bc72056af2d3a83db",
+ "reference": "58a31cc4404c8f632d8c557bc72056af2d3a83db",
"shasum": ""
},
"require": {
@@ -3087,7 +3087,7 @@
"interactive",
"shell"
],
- "time": "2017-06-24 06:16:19"
+ "time": "2017-07-06 14:53:52"
},
{
"name": "rap2hpoutre/laravel-log-viewer",
@@ -3652,7 +3652,7 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v3.2.9",
+ "version": "v3.2.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
@@ -3708,16 +3708,16 @@
},
{
"name": "symfony/yaml",
- "version": "v3.3.2",
+ "version": "v3.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063"
+ "reference": "1f93a8d19b8241617f5074a123e282575b821df8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063",
- "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8",
+ "reference": "1f93a8d19b8241617f5074a123e282575b821df8",
"shasum": ""
},
"require": {
@@ -3759,7 +3759,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2017-06-02 22:05:06"
+ "time": "2017-06-15 12:58:50"
},
{
"name": "webmozart/assert",
diff --git a/config/app.php b/config/app.php
index 316e8caffb64e2ce62ce8f50b43c64d22a84cf32..316dd1309ec5aa2d1a7adea5c968384384379ba3 100644
--- a/config/app.php
+++ b/config/app.php
@@ -181,8 +181,9 @@ return [
* Vendors Service Providers...
*/
CrazyInventor\Lacaptcha\LacaptchaServiceProvider::class,
- Korko\CallR\CallRServiceProvider::class,
+ Korko\Callr\CallrServiceProvider::class,
Korko\Validator\ValidatorServiceProvider::class,
+ Laravel\Tinker\TinkerServiceProvider::class,
League\StatsD\Laravel5\Provider\StatsdServiceProvider::class,
Mariuzzo\LaravelJsLocalization\LaravelJsLocalizationServiceProvider::class,
Spatie\BladeJavaScript\BladeJavaScriptServiceProvider::class,
@@ -231,7 +232,7 @@ return [
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
- 'Sms' => Facades\Korko\CallR\CallRClient::class,
+ 'Sms' => Facades\Korko\Callr\CallrClient::class,
'Statsd' => League\StatsD\Laravel5\Facade\StatsdFacade::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => Illuminate\Support\Facades\URL::class,
diff --git a/config/callr.php b/config/callr.php
deleted file mode 100644
index 21c4b67132dc22165713620307998d2ceff31cc4..0000000000000000000000000000000000000000
--- a/config/callr.php
+++ /dev/null
@@ -1,8 +0,0 @@
- env('CALLR_USERNAME', 'username'),
- 'password' => env('CALLR_PASSWORD', 'password'),
- 'alias' => env('CALLR_ALIAS', ''),
- 'sender' => env('CALLR_SENDER', ''),
-];
diff --git a/phpunit.dusk.xml b/phpunit.dusk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34d0dbb84515291b799bea0c8376e770502b6241
--- /dev/null
+++ b/phpunit.dusk.xml
@@ -0,0 +1,21 @@
+
+