Merge pull request #12 from polidog/feat/test-add-php8

Supported php8

Author: polidog

.github/workflows/test.yaml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        php-versions: [ '7.0', '7.1', '7.2', '7.3', '7.4' ]
+        php-versions: [ '7.4', '8.0', '8.1', '8.2' ]
 
     steps:
       - uses: actions/checkout@v1
@@ -17,4 +17,4 @@ jobs:
           composer install
       - name: phpunit
         run: |
-          composer test
+          composer test

.gitignore

@@ -4,3 +4,6 @@ vendor/
 composer.lock
 .php_cs.cache
 /demo.php
+.phpunit.result.cache
+.php-cs-fixer.cache
+.php-cs-fixer.php

.php-cs-fixer.dist.php

@@ -0,0 +1,16 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+    ->exclude('vendor');
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR12' => true,
+        'strict_param' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        '@PHP74Migration:risky' => true,
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ;

.php_cs

@@ -12,13 +12,16 @@
     }
   ],
   "require": {
-    "php": ">=7.0",
-    "guzzlehttp/guzzle": "^6.0",
-    "cakephp/utility": "^3.0",
-    "friendsofphp/php-cs-fixer": "^2.16"
+    "ext-json": "*",
+    "php": ">=7.4",
+    "guzzlehttp/guzzle": "^7.0",
+    "cakephp/utility": "^4.3",
+    "friendsofphp/php-cs-fixer": "^3.23"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.5"
+    "phpunit/phpunit": "^9.6",
+    "phpspec/prophecy": "^1.17",
+    "phpspec/prophecy-phpunit": "^2.0"
   },
   "autoload": {
     "psr-4": {"Polidog\\Chatwork\\": "src/"}

composer.json

@@ -45,7 +45,7 @@ public function accept($requestId)
         );
     }
 
-    public function reject($requestId)
+    public function reject($requestId): void
     {
         $this->client->delete("incoming_requests/{$requestId}");
     }

src/Api/IncomingRequests.php

@@ -17,8 +17,8 @@
 
 class Rooms
 {
-    const ACTION_TYPE_LEAVE = 'leave';
-    const ACTION_TYPE_DELETE = 'delete';
+    public const ACTION_TYPE_LEAVE = 'leave';
+    public const ACTION_TYPE_DELETE = 'delete';
 
     /**
      * @var ClientInterface
@@ -93,7 +93,7 @@ public function create(Room $room, MemberCollection $members)
      *
      * @param Room $room
      */
-    public function update(Room $room)
+    public function update(Room $room): void
     {
         $this->client->put(
             "rooms/{$room->roomId}",
@@ -109,7 +109,7 @@ public function update(Room $room)
      *
      * @throws InvalidArgumentException
      */
-    public function remove(Room $room, $actionType)
+    public function remove(Room $room, $actionType): void
     {
         if ('leave' !== $actionType && 'delete' !== $actionType) {
             throw new InvalidArgumentException('ActionType is only leave or delete');

src/Api/Rooms.php

@@ -74,12 +74,12 @@ public function show($accountId = null)
     public function detail($id, $downloadLink = false)
     {
         return $this->factory->entity(
-          $this->client->get(
-              "rooms/{$this->roomId}/files/{$id}",
-              [
-                  'create_download_url' => (int) $downloadLink,
-              ]
-          )
+            $this->client->get(
+                "rooms/{$this->roomId}/files/{$id}",
+                [
+                    'create_download_url' => (int) $downloadLink,
+                ]
+            )
         );
     }
 }

src/Api/Rooms/Files.php

@@ -55,7 +55,7 @@ public function show()
     /**
      * @param MemberCollection $members
      */
-    public function update(MemberCollection $members)
+    public function update(MemberCollection $members): void
     {
         $options = [
             'members_admin_ids' => implode(',', $members->getAdminIds()),

src/Api/Rooms/Members.php

@@ -82,7 +82,7 @@ public function detail($id, $force = false)
     /**
      * @param Message $message
      */
-    public function create(Message $message)
+    public function create(Message $message): void
     {
         $result = $this->client->post(
             "rooms/{$this->roomId}/messages",
@@ -98,7 +98,7 @@ public function create(Message $message)
      * @param Message $message
      * @param $id
      */
-    public function update(Message $message, $id)
+    public function update(Message $message, $id): void
     {
         $result = $this->client->put(
             "rooms/{$this->roomId}/messages/{$id}",
@@ -113,7 +113,7 @@ public function update(Message $message, $id)
     /**
      * @param $id
      */
-    public function delete($id)
+    public function delete($id): void
     {
         $result = $this->client->delete(
             "rooms/{$this->roomId}/messages/{$id}"