Update PHPUnit, Travis and Scrutinizer configuration

Author: Romain Monteil

.gitattributes

@@ -8,4 +8,3 @@
 /phpunit.xml.dist   export-ignore
 /.scrutinizer.yml   export-ignore
 /tests              export-ignore
-/docs               export-ignore

.php_cs.dist

@@ -2,6 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests')
 ;
 
 return PhpCsFixer\Config::create()

.scrutinizer.yml

@@ -1,43 +1,11 @@
-imports:
-- php
+filter:
+  excluded_paths: [vendor/*, tests/*]
 
 checks:
   php:
     code_rating: true
     duplication: true
 
-filter:
-  excluded_paths:
-  - "tests/"
-  dependency_paths:
-  - "vendor/"
-
 tools:
-  php_mess_detector: true
-  php_cpd:
-    excluded_dirs:
-    - tests/
-  php_loc:
-    excluded_dirs:
-    - tests/
-  php_pdepend:
-    excluded_dirs:
-      2: tests/
-
-build:
-  nodes:
-    analysis:
-      project_setup:
-        override: true
-      tests:
-        override: [php-scrutinizer-run]
-    coverage:
-      tests:
-        override:
-        - command: 'vendor/bin/phpunit --coverage-clover=clover.xml'
-          coverage:
-            file: 'clover.xml'
-            format: 'clover'
-  environment:
-    php:
-      version: 7.1
+  external_code_coverage:
+    timeout: 1800    # Timeout in seconds.

.travis.yml

@@ -1,38 +1,36 @@
 language: php
 
-sudo: false
-
 cache:
   directories:
-    - $HOME/.composer/cache/files
+    - $HOME/.composer/cache
 
 php:
   - 7.1
   - 7.2
   - 7.3
   - 7.4
 
-env:
-  global:
-  - secure: j+1g/twymlVnvpQlsdS+82IY3xR8GIBB7m8bEmpYP6J1ketRToJWANDre6Xb/33JHEzekcr5Kt0F2UDkNzR5rNbviHqYH4EyHA7VZTikqSSelY+lZF7qo1xTyGRnCJZV6c2bri/rPVSjw1FYngNFh5FGCh7PmpzzeQZkhyCG3Cs=
-
 matrix:
   fast_finish: true
+  include:
+    # Run test with code coverage
+    - php: 7.1
+      env: COVERAGE=true
 
 before_install:
   - composer self-update
-  - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi
 
 install:
-  - composer install --prefer-dist --no-interaction
-
-before_script:
-  - mkdir -p build/logs
+  - composer update --prefer-dist --prefer-stable --no-interaction
 
 script:
-  - vendor/bin/php-cs-fixer fix --diff --dry-run
   - vendor/bin/phpstan --level=max --memory-limit="-1" --no-progress analyze
-  - vendor/bin/phpunit --stderr --coverage-clover build/coverage/xml
+  - vendor/bin/php-cs-fixer fix --diff --dry-run
+  - vendor/bin/phpunit --stderr --coverage-clover=build/coverage.xml
+
+after_success:
+  - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
 
 notifications:
   email: false

composer.json

@@ -34,17 +34,17 @@
   },
   "autoload": {
     "psr-4": {
-      "Kerox\\Fcm\\": "src"
+      "Kerox\\Fcm\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Kerox\\Fcm\\Test\\": "tests"
+      "Tests\\Kerox\\Fcm\\": "tests/"
     }
   },
   "scripts": {
     "php-cs-fixer": "vendor/bin/php-cs-fixer fix --diff --verbose --config=.php_cs",
-    "php-stan": "vendor/bin/phpstan --level=max --memory-limit=\"-1\" --no-progress analyze",
-    "test": "vendor/bin/phpunit"
+    "phpstan": "vendor/bin/phpstan --level=max --memory-limit=\"-1\" --no-progress analyze",
+    "phpunit": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
   }
 }

phpunit.xml.dist

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit processIsolation="false"
          stopOnFailure="false"
-         bootstrap="./tests/bootstrap.php">
+         bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Fcm Test Suite">
-            <directory>./tests/TestCase</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 

tests/TestCase/Api/SendTest.php tests/Api/SendTest.phptests/TestCase/Api/SendTest.php renamed to tests/Api/SendTest.php

@@ -1,20 +1,22 @@
 <?php
 
-namespace Kerox\Fcm\Test\TestCase\Api;
+declare(strict_types=1);
+
+namespace Tests\Kerox\Fcm\Api;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Kerox\Fcm\Api\Send;
 use Kerox\Fcm\Model\Message;
-use Kerox\Fcm\Test\TestCase\AbstractTestCase;
+use PHPUnit\Framework\TestCase;
 
-class SendTest extends AbstractTestCase
+class SendTest extends TestCase
 {
-    public function testSendMessage()
+    public function testSendMessage(): void
     {
-        $bodyResponse = file_get_contents(__DIR__ . '/../../Mocks/Response/Send/basic.json');
+        $bodyResponse = file_get_contents(__DIR__ . '/../Mocks/Response/Send/basic.json');
         $mockedResponse = new MockHandler([
             new Response(200, [], $bodyResponse),
         ]);
@@ -31,13 +33,13 @@ public function testSendMessage()
 
         $response = $sendApi->message($message, true);
 
-        $this->assertEquals('projects/myproject-b5ae1/messages/0:1500415314455276%31bd1c9631bd1c96', $response->getName());
-        $this->assertEquals('0:1500415314455276%31bd1c9631bd1c96', $response->getMessageId());
+        $this->assertSame('projects/myproject-b5ae1/messages/0:1500415314455276%31bd1c9631bd1c96', $response->getName());
+        $this->assertSame('0:1500415314455276%31bd1c9631bd1c96', $response->getMessageId());
     }
 
-    public function testSendMessageWithResponseError()
+    public function testSendMessageWithResponseError(): void
     {
-        $bodyResponse = file_get_contents(__DIR__ . '/../../Mocks/Response/Send/error.json');
+        $bodyResponse = file_get_contents(__DIR__ . '/../Mocks/Response/Send/error.json');
         $mockedResponse = new MockHandler([
             new Response(200, [], $bodyResponse),
         ]);
@@ -57,7 +59,7 @@ public function testSendMessageWithResponseError()
         $this->assertNull($response->getName());
         $this->assertNull($response->getMessageId());
         $this->assertTrue($response->hasError());
-        $this->assertEquals('UNSPECIFIED_ERROR', $response->getErrorCode());
-        $this->assertEquals('No more information is available about this error.', $response->getErrorMessage());
+        $this->assertSame('UNSPECIFIED_ERROR', $response->getErrorCode());
+        $this->assertSame('No more information is available about this error.', $response->getErrorMessage());
     }
 }

tests/TestCase/FcmTest.php tests/FcmTest.phptests/TestCase/FcmTest.php renamed to tests/FcmTest.php

@@ -1,18 +1,21 @@
 <?php
 
-namespace Kerox\Fcm\Test\TestCase;
+declare(strict_types=1);
+
+namespace Tests\Kerox\Fcm;
 
 use Kerox\Fcm\Api\Send;
 use Kerox\Fcm\Fcm;
+use PHPUnit\Framework\TestCase;
 
-class FcmTest extends AbstractTestCase
+class FcmTest extends TestCase
 {
     /**
      * @var \Kerox\Fcm\Fcm
      */
     protected $fcm;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fcm = new Fcm('4321dcba', 'abcd1234');
     }
@@ -22,7 +25,7 @@ public function testGetInstanceOfApi(): void
         $this->assertInstanceOf(Send::class, $this->fcm->send());
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->fcm);
     }

tests/Model/Message/ConditionTest.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Kerox\Fcm\Model\Message;
+
+use Kerox\Fcm\Model\Message\Condition;
+use PHPUnit\Framework\TestCase;
+
+class ConditionTest extends TestCase
+{
+    public function testConditionAndWithOnlyTopics(): void
+    {
+        $condition = (new Condition())->and('TopicA', 'TopicB', 'TopicC');
+
+        $this->assertSame("'TopicA' in topics && 'TopicB' in topics && 'TopicC' in topics", $condition);
+    }
+
+    public function testConditionOrWithOnlyTopics(): void
+    {
+        $condition = (new Condition())->or('TopicA', 'TopicB', 'TopicC');
+
+        $this->assertSame("'TopicA' in topics || 'TopicB' in topics || 'TopicC' in topics", $condition);
+    }
+
+    public function testConditionNotWithTopic(): void
+    {
+        $condition = (new Condition())->not('TopicA');
+
+        $this->assertSame("!('TopicA' in topics)", $condition);
+    }
+
+    public function testConditionAndWithClosure(): void
+    {
+        $condition = (new Condition())->and('TopicA', static function () {
+            return (new Condition())->or('TopicB', 'TopicC');
+        });
+
+        $this->assertSame("'TopicA' in topics && ('TopicB' in topics || 'TopicC' in topics)", $condition);
+    }
+
+    public function testConditionOrWithClosure(): void
+    {
+        $condition = (new Condition())->or('TopicA', static function () {
+            return (new Condition())->and('TopicB', 'TopicC');
+        });
+
+        $this->assertSame("'TopicA' in topics || ('TopicB' in topics && 'TopicC' in topics)", $condition);
+    }
+
+    public function testConditionNotWithClosure(): void
+    {
+        $condition = (new Condition())->not(static function () {
+            return (new Condition())->and('TopicA', 'TopicB');
+        });
+
+        $this->assertSame("!('TopicA' in topics && 'TopicB' in topics)", $condition);
+    }
+
+    public function testConditionWithMultipleClosure(): void
+    {
+        $condition = (new Condition())->and('TopicA', static function () {
+            return (new Condition())->or('TopicB', static function () {
+                return (new Condition())->and('TopicC', 'TopicD', static function () {
+                    return (new Condition())->not('TopicE');
+                });
+            });
+        });
+
+        $this->assertSame("'TopicA' in topics && ('TopicB' in topics || ('TopicC' in topics && 'TopicD' in topics && (!('TopicE' in topics))))", $condition);
+    }
+
+    public function testConditionAndWithInvalidTopics(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('"Topic A" is an invalid topic name.');
+
+        (new Condition())->and('Topic A', 'TopicB', 'TopicC');
+    }
+}

…Notification/AndroidNotificationTest.php …Notification/AndroidNotificationTest.phptests/TestCase/Model/Message/Notification/AndroidNotificationTest.php renamed to tests/Model/Message/Notification/AndroidNotificationTest.php tests/TestCase/Model/Message/Notification/AndroidNotificationTest.php renamed to tests/Model/Message/Notification/AndroidNotificationTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Kerox\Fcm\Test\TestCase\Model\Message\Notification;
+namespace Tests\Kerox\Fcm\Model\Message\Notification;
 
 use Kerox\Fcm\Model\Message\Notification\AndroidNotification\Color;
 use Kerox\Fcm\Model\Message\Notification\AndroidNotification\LightSettings;
-use Kerox\Fcm\Test\TestCase\AbstractTestCase;
+use PHPUnit\Framework\TestCase;
 
-class AndroidNotificationTest extends AbstractTestCase
+class AndroidNotificationTest extends TestCase
 {
     public function testLightSettingsWithInvalidColor(): void
     {