Skip to content

Commit

Permalink
Merge pull request #13 from ASKozienko/use-formapro-values
Browse files Browse the repository at this point in the history
Use formapro/values
  • Loading branch information
makasim authored Mar 5, 2019
2 parents 03ab028 + b23c938 commit 6778d20
Show file tree
Hide file tree
Showing 24 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"makasim/values": "^0.5",
"formapro/values": "^0.5",

This comment has been minimized.

Copy link
@espritf

espritf Mar 5, 2019

this version still has old namespace

"guzzlehttp/guzzle": "^6.3"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions src/AnswerCallbackQuery.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class AnswerCallbackQuery
{
Expand Down
4 changes: 2 additions & 2 deletions src/AnswerPreCheckoutQuery.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class AnswerPreCheckoutQuery
{
Expand Down
4 changes: 2 additions & 2 deletions src/Bot.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Formapro\TelegramBot;

use Psr\Http\Message\ResponseInterface;
use function Makasim\Values\set_value;
use function Makasim\Values\get_values;
use function Formapro\Values\set_value;
use function Formapro\Values\get_values;

class Bot
{
Expand Down
4 changes: 2 additions & 2 deletions src/CallbackQuery.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;

class CallbackQuery
{
Expand Down
2 changes: 1 addition & 1 deletion src/Chat.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Formapro\Values\get_value;

class Chat
{
Expand Down
2 changes: 1 addition & 1 deletion src/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Formapro\Values\get_value;

class Contact
{
Expand Down
4 changes: 2 additions & 2 deletions src/InlineKeyboardButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class InlineKeyboardButton
{
Expand Down
2 changes: 1 addition & 1 deletion src/InlineKeyboardMarkup.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\add_object;
use function Formapro\Values\add_object;

class InlineKeyboardMarkup implements ReplyMarkup
{
Expand Down
4 changes: 2 additions & 2 deletions src/KeyboardButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class KeyboardButton
{
Expand Down
8 changes: 4 additions & 4 deletions src/LabeledPrice.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\get_values;
use function Makasim\Values\set_object;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\get_values;
use function Formapro\Values\set_object;
use function Formapro\Values\set_value;

class LabeledPrice
{
Expand Down
4 changes: 2 additions & 2 deletions src/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;

class Message
{
Expand Down
4 changes: 2 additions & 2 deletions src/OrderInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;

class OrderInfo
{
Expand Down
6 changes: 3 additions & 3 deletions src/PreCheckoutQuery.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class PreCheckoutQuery
{
Expand Down
6 changes: 3 additions & 3 deletions src/ReplyKeyboardMarkup.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\add_object;
use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\add_object;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class ReplyKeyboardMarkup implements ReplyMarkup
{
Expand Down
8 changes: 4 additions & 4 deletions src/SendDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\get_values;
use function Makasim\Values\set_object;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\get_values;
use function Formapro\Values\set_object;
use function Formapro\Values\set_value;

class SendDocument
{
Expand Down
12 changes: 6 additions & 6 deletions src/SendInvoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\add_object;
use function Makasim\Values\get_value;
use function Makasim\Values\get_values;
use function Makasim\Values\set_object;
use function Makasim\Values\set_objects;
use function Makasim\Values\set_value;
use function Formapro\Values\add_object;
use function Formapro\Values\get_value;
use function Formapro\Values\get_values;
use function Formapro\Values\set_object;
use function Formapro\Values\set_objects;
use function Formapro\Values\set_value;

class SendInvoice
{
Expand Down
6 changes: 3 additions & 3 deletions src/SendMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\get_values;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\get_values;
use function Formapro\Values\set_value;

class SendMessage
{
Expand Down
8 changes: 4 additions & 4 deletions src/SendPhoto.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\get_values;
use function Makasim\Values\set_object;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\get_values;
use function Formapro\Values\set_object;
use function Formapro\Values\set_value;

class SendPhoto
{
Expand Down
4 changes: 2 additions & 2 deletions src/SetWebhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Makasim\Values\set_value;
use function Formapro\Values\get_value;
use function Formapro\Values\set_value;

class SetWebhook
{
Expand Down
4 changes: 2 additions & 2 deletions src/ShippingAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;

class ShippingAddress
{
Expand Down
2 changes: 1 addition & 1 deletion src/SuccessfulPayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Formapro\Values\get_value;

class SuccessfulPayment
{
Expand Down
6 changes: 3 additions & 3 deletions src/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_object;
use function Makasim\Values\get_value;
use function Makasim\Values\set_values;
use function Formapro\Values\get_object;
use function Formapro\Values\get_value;
use function Formapro\Values\set_values;

class Update
{
Expand Down
2 changes: 1 addition & 1 deletion src/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Formapro\TelegramBot;

use function Makasim\Values\get_value;
use function Formapro\Values\get_value;

class User
{
Expand Down

0 comments on commit 6778d20

Please sign in to comment.