From 8628c7f9c486e247f56dbee853f970d673a6d514 Mon Sep 17 00:00:00 2001 From: Roni Estein Date: Tue, 17 Dec 2019 20:50:31 -0600 Subject: [PATCH 1/5] Added updated packages and ran tests illuminate/support to 6.* orchestra/testbench to include 4.* phpunit/phpunit to ^8.0 --- .idea/modules.xml | 8 ++++++++ composer.json | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 .idea/modules.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a456695 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index c85c9d3..22afabc 100755 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ "require": { "php": "^7.1", "clue/stdio-react": "^2.2", - "illuminate/support": "5.6.*|5.7.*|5.8.*", + "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0", "laravel/tinker": "^1.0", "psy/psysh": "^0.9.9", "react/socket": "^1.2" }, "require-dev": { - "orchestra/testbench": "3.7.*", - "phpunit/phpunit": "^7.0" + "orchestra/testbench": "3.7.*|^4.0", + "phpunit/phpunit": "^8.0" }, "autoload": { "files": [ From d3e8c0d40e9f79a8dfe2612f4b4c0c2934036621 Mon Sep 17 00:00:00 2001 From: roni-estein Date: Tue, 17 Dec 2019 20:54:55 -0600 Subject: [PATCH 2/5] Delete modules.xml This slipped past me --- .idea/modules.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/modules.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index a456695..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From b97f0aad4254794cac9fefe7658d7e20f23db0de Mon Sep 17 00:00:00 2001 From: Roni Estein Date: Tue, 17 Dec 2019 20:50:31 -0600 Subject: [PATCH 3/5] Added updated packages and ran tests illuminate/support to 6.* orchestra/testbench to include 4.* phpunit/phpunit to ^8.0 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c85c9d3..22afabc 100755 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ "require": { "php": "^7.1", "clue/stdio-react": "^2.2", - "illuminate/support": "5.6.*|5.7.*|5.8.*", + "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0", "laravel/tinker": "^1.0", "psy/psysh": "^0.9.9", "react/socket": "^1.2" }, "require-dev": { - "orchestra/testbench": "3.7.*", - "phpunit/phpunit": "^7.0" + "orchestra/testbench": "3.7.*|^4.0", + "phpunit/phpunit": "^8.0" }, "autoload": { "files": [ From 7f9b7a25711afb5f19909383086432da047e5c81 Mon Sep 17 00:00:00 2001 From: Roni Estein Date: Tue, 17 Dec 2019 21:11:40 -0600 Subject: [PATCH 4/5] Added phpunit 7.x back to satisfy older versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 22afabc..0f12fc0 100755 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "require-dev": { "orchestra/testbench": "3.7.*|^4.0", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^7.0|^8.0" }, "autoload": { "files": [ From 680489f32f61f071ab9ed6672cb06438db915039 Mon Sep 17 00:00:00 2001 From: Roni Estein Date: Wed, 18 Dec 2019 10:07:19 -0600 Subject: [PATCH 5/5] removed old str_helpers --- src/helpers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers.php b/src/helpers.php index 176d12e..b42a6e6 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -16,14 +16,14 @@ function tinker(...$args) return file($filePath)[$lineNumber - 1]; // " tinker($post, new User);" })->map(function ($carry) { - return str_before(str_after($carry, 'tinker('), ');'); + return Str::before(Str::after($carry, 'tinker('), ');'); // "$post, new User" })->flatMap(function ($carry) { return array_map('trim', explode(',', $carry)); // ["post", "new User"] })->map(function ($carry, $index) { return strpos($carry, '$') === 0 - ? str_after($carry, '$') + ? Str::after($carry, '$') : 'temp'.$index; // ["post", "temp1"] })