diff --git a/controllers/internals/Command.php b/controllers/internals/Command.php index b4eec01..eb1e01b 100644 --- a/controllers/internals/Command.php +++ b/controllers/internals/Command.php @@ -149,8 +149,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/ConditionalGroup.php b/controllers/internals/ConditionalGroup.php index 330f56a..22312e7 100644 --- a/controllers/internals/ConditionalGroup.php +++ b/controllers/internals/ConditionalGroup.php @@ -102,8 +102,6 @@ namespace controllers\internals; * * @param int $id_user : User id * @param string $condition : Condition string to verify - * - * @return array */ public function get_contacts_for_condition_and_user(int $id_user, string $condition): array { @@ -130,8 +128,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Contact.php b/controllers/internals/Contact.php index 7a04196..876db70 100644 --- a/controllers/internals/Contact.php +++ b/controllers/internals/Contact.php @@ -343,8 +343,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Event.php b/controllers/internals/Event.php index 01ac517..c4fc6c6 100644 --- a/controllers/internals/Event.php +++ b/controllers/internals/Event.php @@ -58,8 +58,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Group.php b/controllers/internals/Group.php index ef1fbfb..c000d59 100644 --- a/controllers/internals/Group.php +++ b/controllers/internals/Group.php @@ -129,8 +129,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Media.php b/controllers/internals/Media.php index 820f23e..64c25a7 100644 --- a/controllers/internals/Media.php +++ b/controllers/internals/Media.php @@ -129,8 +129,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index 40d270e..68b9429 100644 --- a/controllers/internals/Phone.php +++ b/controllers/internals/Phone.php @@ -99,8 +99,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Received.php b/controllers/internals/Received.php index 91eba7d..2293693 100644 --- a/controllers/internals/Received.php +++ b/controllers/internals/Received.php @@ -264,8 +264,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Ruler.php b/controllers/internals/Ruler.php index b645793..5753740 100644 --- a/controllers/internals/Ruler.php +++ b/controllers/internals/Ruler.php @@ -13,9 +13,9 @@ namespace controllers\internals; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; -/** - * Class to analyse rules used by conditional groups. - */ + /** + * Class to analyse rules used by conditional groups. + */ class Ruler extends \descartes\InternalController { private $expression_language; diff --git a/controllers/internals/Scheduled.php b/controllers/internals/Scheduled.php index 417263e..31aa3f7 100644 --- a/controllers/internals/Scheduled.php +++ b/controllers/internals/Scheduled.php @@ -418,8 +418,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Sended.php b/controllers/internals/Sended.php index 3654652..82bd14e 100644 --- a/controllers/internals/Sended.php +++ b/controllers/internals/Sended.php @@ -210,8 +210,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/Setting.php b/controllers/internals/Setting.php index 9060060..d2620e5 100644 --- a/controllers/internals/Setting.php +++ b/controllers/internals/Setting.php @@ -55,8 +55,6 @@ namespace controllers\internals; * @param int $id_user : user id * @param string $name : setting name * @param mixed $value : value of the setting - * - * @return bool */ public function create(int $id_user, string $name, $value): bool { @@ -90,8 +88,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/SmsStop.php b/controllers/internals/SmsStop.php index bbbe784..5859907 100644 --- a/controllers/internals/SmsStop.php +++ b/controllers/internals/SmsStop.php @@ -66,8 +66,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/internals/StandardController.php b/controllers/internals/StandardController.php index 8b19d68..6c9b52b 100644 --- a/controllers/internals/StandardController.php +++ b/controllers/internals/StandardController.php @@ -137,8 +137,6 @@ namespace controllers\internals; /** * Get the model for the Controller. - * - * @return \descartes\Model */ abstract protected function get_model(): \descartes\Model; } diff --git a/controllers/internals/Webhook.php b/controllers/internals/Webhook.php index 87ea440..0e54cb9 100644 --- a/controllers/internals/Webhook.php +++ b/controllers/internals/Webhook.php @@ -137,8 +137,6 @@ class Webhook extends StandardController /** * Get the model for the Controller. - * - * @return \descartes\Model */ protected function get_model(): \descartes\Model { diff --git a/controllers/publics/Callback.php b/controllers/publics/Callback.php index 00136a1..9f5b6ae 100644 --- a/controllers/publics/Callback.php +++ b/controllers/publics/Callback.php @@ -14,9 +14,9 @@ namespace controllers\publics; use Monolog\Handler\StreamHandler; use Monolog\Logger; -/** - * Controller of callback pages, like sms status update notification. - */ + /** + * Controller of callback pages, like sms status update notification. + */ class Callback extends \descartes\Controller { private $logger; diff --git a/daemons/AbstractDaemon.php b/daemons/AbstractDaemon.php index 3f5fbc7..93e3530 100644 --- a/daemons/AbstractDaemon.php +++ b/daemons/AbstractDaemon.php @@ -66,7 +66,6 @@ abstract class AbstractDaemon /** * Used to handle properly SIGINT, SIGTERM, SIGCHLD and SIGHUP. * - * @param int $signal * @param mixed $signinfo */ protected function handle_signal(int $signal, $signinfo) diff --git a/daemons/Phone.php b/daemons/Phone.php index 6fe7ea7..cee8be2 100644 --- a/daemons/Phone.php +++ b/daemons/Phone.php @@ -68,6 +68,7 @@ class Phone extends AbstractDaemon if ((microtime(true) - $this->last_message_at) > $this->max_inactivity) { posix_kill(getmypid(), SIGTERM); //Send exit signal to the current process + return false; } } diff --git a/models/Command.php b/models/Command.php index 0391631..6525c33 100644 --- a/models/Command.php +++ b/models/Command.php @@ -15,8 +15,6 @@ namespace models; { /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/ConditionalGroup.php b/models/ConditionalGroup.php index f2f2665..5c1483a 100644 --- a/models/ConditionalGroup.php +++ b/models/ConditionalGroup.php @@ -28,8 +28,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Contact.php b/models/Contact.php index 02a71b3..5646424 100644 --- a/models/Contact.php +++ b/models/Contact.php @@ -41,8 +41,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Event.php b/models/Event.php index c92a52c..ef73445 100644 --- a/models/Event.php +++ b/models/Event.php @@ -28,8 +28,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Group.php b/models/Group.php index 0a8bfff..fd12a16 100644 --- a/models/Group.php +++ b/models/Group.php @@ -75,8 +75,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Media.php b/models/Media.php index 54cd229..68ca4df 100644 --- a/models/Media.php +++ b/models/Media.php @@ -241,8 +241,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Phone.php b/models/Phone.php index 6b14cdd..a75a03c 100644 --- a/models/Phone.php +++ b/models/Phone.php @@ -40,8 +40,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Received.php b/models/Received.php index 5891b99..d085a64 100644 --- a/models/Received.php +++ b/models/Received.php @@ -257,8 +257,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Scheduled.php b/models/Scheduled.php index 1166a57..7d7bc90 100644 --- a/models/Scheduled.php +++ b/models/Scheduled.php @@ -248,8 +248,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Sended.php b/models/Sended.php index 5fb19f0..3837659 100644 --- a/models/Sended.php +++ b/models/Sended.php @@ -167,8 +167,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/Setting.php b/models/Setting.php index ae52503..f2e6d43 100644 --- a/models/Setting.php +++ b/models/Setting.php @@ -29,8 +29,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/SmsStop.php b/models/SmsStop.php index 15bf60a..65cc522 100644 --- a/models/SmsStop.php +++ b/models/SmsStop.php @@ -28,8 +28,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string { diff --git a/models/StandardModel.php b/models/StandardModel.php index 64cadff..8ae077f 100644 --- a/models/StandardModel.php +++ b/models/StandardModel.php @@ -190,8 +190,6 @@ namespace models; /** * Return table name. - * - * @return string */ abstract protected function get_table_name(): string; } diff --git a/models/Webhook.php b/models/Webhook.php index f8fabb3..945cd82 100644 --- a/models/Webhook.php +++ b/models/Webhook.php @@ -31,8 +31,6 @@ namespace models; /** * Return table name. - * - * @return string */ protected function get_table_name(): string {