Merge pull request #44 from christophrumpel/feature/updateDependencies

Update dependencies and only support Laravel 5.7

.styleci.yml

@@ -1,3 +1,4 @@
 preset: laravel
 
-linting: true
+disabled:
+- single_class_element_per_statement

composer.json

@@ -13,15 +13,16 @@
     ],
     "require": {
         "php": ">=5.6.4",
-        "abraham/twitteroauth": "^0.7.2",
-        "illuminate/notifications": "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.*",
+        "abraham/twitteroauth": "^0.9.2",
+        "illuminate/notifications": "5.7.*",
+        "illuminate/support": "5.7.*",
         "kylewm/brevity": "^0.2.9"
     },
+
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "5.*",
-        "orchestra/testbench": "~3.3|~3.4"
+        "phpunit/phpunit": "^7.3",
+        "orchestra/testbench": "~3.7"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -22,7 +22,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage" />
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

src/TwitterStatusUpdate.php

@@ -34,6 +34,7 @@ public function __construct($content)
         if ($exceededLength = $this->messageIsTooLong($content, new Brevity())) {
             throw CouldNotSendNotification::statusUpdateTooLong($exceededLength);
         }
+
         $this->content = $content;
     }
 

tests/TestCase.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace NotificationChannels\Twitter\Test;
+
+use Mockery;
+
+abstract class TestCase extends \Orchestra\Testbench\TestCase
+{
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        if ($container = \Mockery::getContainer()) {
+            $this->addToAssertionCount($container->mockery_getExpectationCount());
+        }
+
+        Mockery::close();
+    }
+}

tests/TwitterChannelTest.php

@@ -4,7 +4,6 @@
 
 use Mockery;
 use stdClass;
-use Orchestra\Testbench\TestCase;
 use Abraham\TwitterOAuth\TwitterOAuth;
 use Illuminate\Notifications\Notification;
 use NotificationChannels\Twitter\TwitterChannel;
@@ -26,12 +25,6 @@ public function setUp()
         $this->channel = new TwitterChannel($this->twitter);
     }
 
-    public function tearDown()
-    {
-        Mockery::close();
-        parent::tearDown();
-    }
-
     /** @test */
     public function it_can_send_a_status_update_notification()
     {
@@ -77,7 +70,7 @@ public function it_throws_an_exception_when_it_could_not_send_the_notification()
 
         $this->twitter->shouldReceive('getLastBody')->once()->andReturn($twitterResponse);
 
-        $this->setExpectedException(CouldNotSendNotification::class);
+        $this->expectException(CouldNotSendNotification::class);
 
         $this->channel->send(new TestNotifiable(), new TestNotification());
     }

tests/TwitterDirectMessageTest.php

@@ -4,7 +4,7 @@
 
 use NotificationChannels\Twitter\TwitterDirectMessage;
 
-class TwitterDirectMessageTest extends \PHPUnit_Framework_TestCase
+class TwitterDirectMessageTest extends TestCase
 {
     /** @var TwitterDirectMessage */
     protected $message;

tests/TwitterImageTest.php

@@ -2,7 +2,6 @@
 
 namespace NotificationChannels\Twitter\Test;
 
-use Orchestra\Testbench\TestCase;
 use NotificationChannels\Twitter\TwitterImage;
 
 class TwitterImageTest extends TestCase

tests/TwitterStatusUpdateTest.php

@@ -6,7 +6,7 @@
 use NotificationChannels\Twitter\TwitterStatusUpdate;
 use NotificationChannels\Twitter\Exceptions\CouldNotSendNotification;
 
-class TwitterStatusUpdateTest extends \PHPUnit_Framework_TestCase
+class TwitterStatusUpdateTest extends TestCase
 {
     /** @var TwitterStatusUpdate */
     protected $message;
@@ -64,8 +64,7 @@ public function it_constructs_a_request_body()
     /** @test */
     public function it_throws_an_exception_when_the_status_update_is_too_long()
     {
-        $tooLongMessage = 'Laravel Notification Channels are awesome and this message is far too long for a Twitter 
-            status update and this is why an exception is thrown!';
+        $tooLongMessage = 'This is a super intensive long new Twitter status message which includes some super useful and concrete information about an upcoming package test that will check if a certain Twitter message may be too long in the case that the character count is higher than specific prior defined count.';
 
         try {
             $statusUpdate = new TwitterStatusUpdate($tooLongMessage);
@@ -77,21 +76,21 @@ public function it_throws_an_exception_when_the_status_update_is_too_long()
     /** @test */
     public function it_provides_exceeded_message_count_when_the_status_update_is_too_long()
     {
-        $tooLongMessage = 'Laravel Notification Channels are awesome and this message is far too long for a Twitter status update because of this URL https://github.com/laravel-notification-channels';
+        $tooLongMessage = 'This is a super intensive long new Twitter status message which includes some super useful and concrete information about an upcoming package test that will check if a certain Twitter message may be too long in the case that the character count is higher than specific prior define count.';
 
         try {
             $statusUpdate = new TwitterStatusUpdate($tooLongMessage);
         } catch (CouldNotSendNotification $e) {
-            $this->assertEquals("Couldn't post Notification, because the status message was too long by 6 character(s).",
+            $this->assertEquals("Couldn't post Notification, because the status message was too long by 8 character(s).",
                 $e->getMessage());
         }
 
-        $anotherTooLongMessage = 'Laravel Notification Channels are awesome and this message is just in length so that Twitter does not complain!!!!!!! https://github.com/laravel-notification-channels';
+        $anotherTooLongMessage = 'This is a super intensive long new Twitter status message which includes some super useful and concrete information about an upcoming package test that will check if a certain Twitter message may be too long in the case that the character count is higher than specific prior define count!!';
 
         try {
             $statusUpdate = new TwitterStatusUpdate($anotherTooLongMessage);
         } catch (CouldNotSendNotification $e) {
-            $this->assertEquals("Couldn't post Notification, because the status message was too long by 1 character(s).",
+            $this->assertEquals("Couldn't post Notification, because the status message was too long by 9 character(s).",
                 $e->getMessage());
         }
     }