Added Tests

Author: TiiFuchs

.gitignore

@@ -1,2 +1,4 @@
 vendor/
 composer.lock
+.phpunit.result.cache
+.phpunit.cache

composer.json

@@ -22,5 +22,13 @@
     "require": {
         "php": "^7.3|^8.0",
         "ext-json": "*"
+    },
+    "require-dev": {
+        "pestphp/pest": "^1.21"
+    },
+    "config": {
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
+</phpunit>

src/FluentEntity.php

@@ -11,6 +11,11 @@ abstract class FluentEntity implements \JsonSerializable
 
     protected $defaults = [];
 
+    public function __construct(array $data = [])
+    {
+        $this->data = $data + $this->data;
+    }
+
     public static function make()
     {
         return new static;
@@ -25,6 +30,7 @@ public function __call($name, $arguments)
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->data;

src/InlineKeyboard/InlineKeyboardButton.php

@@ -21,4 +21,15 @@ class InlineKeyboardButton extends FluentEntity
         'pay' => true,
     ];
 
+    public static function make(string $text = null)
+    {
+        $data = [];
+
+        if ($text) {
+            $data['text'] = $text;
+        }
+
+        return new static($data);
+    }
+
 }

src/InlineKeyboard/InlineKeyboardMarkup.php

@@ -19,6 +19,20 @@ class InlineKeyboardMarkup extends FluentEntity
     public function row(array $row = [])
     {
         $this->data['inline_keyboard'][] = $row;
+
+        return $this;
+    }
+
+    public function button(InlineKeyboardButton $button)
+    {
+        $count = count($this->data['inline_keyboard']);
+        if (count($this->data['inline_keyboard']) === 0) {
+            $this->data['inline_keyboard'][] = [];
+            $count++;
+        }
+
+        $this->data['inline_keyboard'][$count - 1][] = $button;
+
         return $this;
     }
 

src/ReplyKeyboard/KeyboardButton.php

@@ -6,11 +6,26 @@
 
 /**
  * @method self text(string $text)
- * @method self requestContact(bool $request_contact)
- * @method self requestLocation(bool $request_location)
- * @method self requestPoll(KeyboardButtonPollType $request_poll)
+ * @method self requestContact(bool $request_contact = true)
+ * @method self requestLocation(bool $request_location = true)
+ * @method self requestPoll(KeyboardButtonPollType|array $request_poll = [])
  */
 class KeyboardButton extends FluentEntity
 {
+    protected $defaults = [
+        'request_contact'  => true,
+        'request_location' => true,
+        'request_poll'     => [],
+    ];
 
+    public static function make(string $text = null)
+    {
+        $data = [];
+
+        if ($text) {
+            $data['text'] = $text;
+        }
+
+        return new static($data);
+    }
 }

src/ReplyKeyboard/KeyboardButtonPollType.php

@@ -31,6 +31,7 @@ public static function regular()
         ]);
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->data;

src/ReplyKeyboard/ReplyKeyboardMarkup.php

@@ -31,6 +31,20 @@ class ReplyKeyboardMarkup extends FluentEntity
     public function row(array $row = [])
     {
         $this->data['keyboard'][] = $row;
+
+        return $this;
+    }
+
+    public function button(KeyboardButton $button)
+    {
+        $count = count($this->data['keyboard']);
+        if ($count === 0) {
+            $this->data['keyboard'][] = [];
+            $count++;
+        }
+
+        $this->data['keyboard'][$count - 1][] = $button;
+
         return $this;
     }
 

tests/Pest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Test Case
+|--------------------------------------------------------------------------
+|
+| The closure you provide to your test functions is always bound to a specific PHPUnit test
+| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
+| need to change it using the "uses()" function to bind a different classes or traits.
+|
+*/
+
+// uses(Tests\TestCase::class)->in('Feature');
+
+/*
+|--------------------------------------------------------------------------
+| Expectations
+|--------------------------------------------------------------------------
+|
+| When you're writing tests, you often need to check that values meet certain conditions. The
+| "expect()" function gives you access to a set of "expectations" methods that you can use
+| to assert different things. Of course, you may extend the Expectation API at any time.
+|
+*/
+
+expect()->extend('toBeJsonSerializable', function () {
+    return $this->jsonSerialize()->toBeArray();
+});
+
+/*
+|--------------------------------------------------------------------------
+| Functions
+|--------------------------------------------------------------------------
+|
+| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
+| project that you don't want to repeat in every file. Here you can also expose helpers as
+| global functions to help you to reduce the number of lines of code in your test files.
+|
+*/
+
+function something()
+{
+    // ..
+}