@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** \brief Check that the given offset exists or not */ |
42 | 42 | public function offsetExists($offset) |
43 | 43 | { |
44 | -<<<<<<< HEAD |
|
44 | +<< << <<< HEAD |
|
45 | 45 | return isset($this->container[$offset]); |
46 | 46 | } |
47 | 47 | |
@@ -63,6 +63,4 @@ discard block |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -63,6 +63,4 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | // If not return the data from the array after checking it is set |
66 | - return isset($this->container[$offset]) ? $this->container[$offset] : null; |
|
67 | - } |
|
68 | -} |
|
66 | + return isset($this->container[$offset]) ? $this->container[$offset |
|
69 | 67 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | namespace PhpBotFramework\Utilities; |
20 | 20 | |
21 | -<<<<<<< HEAD |
|
21 | +<< << <<< HEAD |
|
22 | 22 | /** |
23 | 23 | * \addtogroup Modules |
24 | 24 | * @{ |
@@ -102,10 +102,4 @@ discard block |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -102,10 +102,4 @@ |
||
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | - return $message; |
|
106 | - } |
|
107 | -} |
|
108 | - |
|
109 | -/* |
|
110 | - * @} |
|
111 | - */ |
|
105 | + return $message |
|
112 | 106 | \ No newline at end of file |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param CoreBot $bot References to the bot that's using the inline keyboard. |
39 | 39 | * @param array $buttons Buttons passed as inizialization. |
40 | 40 | */ |
41 | - public function __construct(CoreBot &$bot, array $buttons = array()) |
|
41 | + public function __construct(CoreBot & $bot, array $buttons = array()) |
|
42 | 42 | { |
43 | 43 | $this->bot = $bot; |
44 | 44 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function getBackButton(bool $json_serialized = true) |
56 | 56 | { |
57 | 57 | // Create the button |
58 | - $inline_keyboard = [ 'inline_keyboard' => |
|
58 | + $inline_keyboard = ['inline_keyboard' => |
|
59 | 59 | [ |
60 | 60 | [ |
61 | 61 | [ |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | public function getBackSkipKeyboard(bool $json_serialized = true) |
91 | 91 | { |
92 | 92 | // Create the keyboard |
93 | - $inline_keyboard = [ 'inline_keyboard' => |
|
93 | + $inline_keyboard = ['inline_keyboard' => |
|
94 | 94 | [ |
95 | 95 | [ |
96 | 96 | [ |