Skip to content

Commit

Permalink
Add support for Laravel 6 (#39)
Browse files Browse the repository at this point in the history
* Add support for Laravel 6

* drop support for PHP < 7.2

* styleci linting has been deprecated

* updated phpunit and testbench

* Switch to new symantic versioning for Laravel
  • Loading branch information
stefro authored Feb 8, 2020
1 parent 3672bad commit 79afb25
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
1 change: 1 addition & 0 deletions .phpunit.result.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
C:37:"PHPUnit\Runner\DefaultTestResultCache":1464:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:22:{s:53:"Tests\BotManTesterTest::it_can_fake_incoming_messages";d:0.011;s:52:"Tests\BotManTesterTest::it_can_fake_user_information";d:0;s:45:"Tests\BotManTesterTest::it_can_assert_replies";d:0;s:53:"Tests\BotManTesterTest::it_can_assert_replies_are_not";d:0;s:61:"Tests\BotManTesterTest::it_can_assert_replies_are_in_an_array";d:0;s:65:"Tests\BotManTesterTest::it_can_assert_replies_are_not_in_an_array";d:0;s:53:"Tests\BotManTesterTest::it_can_assert_generic_replies";d:0;s:61:"Tests\BotManTesterTest::it_can_assert_replies_are_not_present";d:0;s:49:"Tests\BotManTesterTest::it_can_assert_raw_replies";d:0;s:54:"Tests\BotManTesterTest::it_can_assert_multiple_replies";d:0;s:54:"Tests\BotManTesterTest::it_can_assert_a_template_class";d:0;s:55:"Tests\BotManTesterTest::it_can_assert_a_template_object";d:0.001;s:63:"Tests\BotManTesterTest::it_can_assert_a_template_is_in_an_array";d:0;s:67:"Tests\BotManTesterTest::it_can_assert_a_template_is_not_in_an_array";d:0;s:56:"Tests\BotManTesterTest::it_can_fake_interactive_messages";d:0.008;s:45:"Tests\BotManTesterTest::it_can_fake_locations";d:0;s:42:"Tests\BotManTesterTest::it_can_fake_images";d:0;s:42:"Tests\BotManTesterTest::it_can_fake_videos";d:0;s:41:"Tests\BotManTesterTest::it_can_fake_audio";d:0;s:41:"Tests\BotManTesterTest::it_can_fake_files";d:0;s:42:"Tests\BotManTesterTest::it_can_fake_events";d:0;s:45:"Tests\BotManTesterTest::it_can_test_questions";d:0.009;}}}
2 changes: 0 additions & 2 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ preset: laravel

enabled:
- unalign_double_arrow

linting: true
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3

before_script:
- travis_retry composer self-update --preview
Expand All @@ -16,4 +16,4 @@ before_install:
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

after_success:
- codecov
- codecov
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
}
],
"require": {
"php": ">=7.0",
"php": "^7.2",
"botman/botman": "~2.0|~3.0",
"guzzlehttp/guzzle": "~6.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
"illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
"illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
"thecodingmachine/discovery": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "~6.0",
"orchestra/testbench": "~3.5.0",
"orchestra/testbench": "^3.6|^3.7|^3.8|^4.0",
"phpunit/phpunit": "^7.0|^8.0",
"mockery/mockery": "dev-master"
},
"autoload": {
Expand Down
3 changes: 1 addition & 2 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
>
<testsuites>
<testsuite name="Package Test Suite">
Expand All @@ -20,4 +19,4 @@
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
</phpunit>
</phpunit>
4 changes: 2 additions & 2 deletions tests/BotManTesterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ class BotManTesterTest extends TestCase
/** @var BotMan */
protected $botman;

public function tearDown()
public function tearDown() : void
{
m::close();
}

protected function setUp()
protected function setUp() :void
{
parent::setUp();

Expand Down

0 comments on commit 79afb25

Please sign in to comment.