Compare commits

..

No commits in common. "b12738073b7654589527b948b90d5dee7049c3a9" and "296fbd61e8aec27d4946b2b88fef5f07f3854bc4" have entirely different histories.

27 changed files with 61 additions and 60 deletions

1
.gitignore vendored
View File

@ -4,7 +4,6 @@
.credentials .credentials
.credentials* .credentials*
vendor/ vendor/
scripts/
composer.lock composer.lock
env.* env.*
phinx.* phinx.*

View File

@ -1 +1 @@
v3.0.8 v3.0.7

View File

@ -40,7 +40,7 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool; public static function meta_hidden(): bool;

View File

@ -59,7 +59,7 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -54,13 +54,14 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {
return false; return false;
} }
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -80,7 +80,7 @@ class OctopushShortcodeAdapter implements AdapterInterface
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -86,7 +86,7 @@ class OctopushVirtualNumberAdapter implements AdapterInterface
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -65,7 +65,7 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -77,7 +77,7 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -64,7 +64,7 @@ namespace adapters;
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -76,7 +76,7 @@ class TwilioVirtualNumberAdapter implements AdapterInterface
/** /**
* Should this adapter be hidden in user interface for phone creation and * Should this adapter be hidden in user interface for phone creation and
* available to creation through API only. * available to creation through API only
*/ */
public static function meta_hidden(): bool public static function meta_hidden(): bool
{ {

View File

@ -99,7 +99,7 @@ namespace controllers\internals;
//Check for user //Check for user
$internal_user = new \controllers\internals\User($this->bdd); $internal_user = new \controllers\internals\User($this->bdd);
$user = $internal_user->check_credentials($decode_message['login'], $decode_message['password']); $user = $internal_user->check_credentials($decode_message['login'], $decode_message['password']);
if (!$user || (int) $user['id'] !== $id_user) if (!$user || $user['id'] !== $id_user)
{ {
return false; return false;
} }

View File

@ -71,6 +71,8 @@ namespace controllers\internals;
* Check if a user exists based on email. * Check if a user exists based on email.
* *
* @param string $email : User email * @param string $email : User email
*
* @return void : exit code 1 on false, 0 else
*/ */
public function user_exists(string $email) public function user_exists(string $email)
{ {

View File

@ -135,7 +135,7 @@ namespace controllers\internals;
//Padding line with '' entries to make sure its same length as head //Padding line with '' entries to make sure its same length as head
//this allow to mix users with data with users without data //this allow to mix users with data with users without data
$line = array_pad($line, \count($head), ''); $line = array_pad($line, count($head), '');
$line = array_combine($head, $line); $line = array_combine($head, $line);
if (false === $line) if (false === $line)
@ -282,13 +282,12 @@ namespace controllers\internals;
$data = json_decode($contact['data'], true); $data = json_decode($contact['data'], true);
$line = [$contact['name'], $contact['number']]; $line = [$contact['name'], $contact['number']];
foreach (\array_slice($columns, 2) as $column) foreach (array_slice($columns, 2) as $column) //ignore first two columns as it's alway name & number
{ //ignore first two columns as it's alway name & number {
//If their is no data for this column key, we set '' to ignore //If their is no data for this column key, we set '' to ignore
if (!isset($data[$column])) if (!isset($data[$column]))
{ {
$line[] = ''; $line[] = '';
continue; continue;
} }

View File

@ -112,9 +112,9 @@ namespace controllers\publics;
$contacts = $this->internal_contact->gets_for_user($id_user); $contacts = $this->internal_contact->gets_for_user($id_user);
$phones = $this->internal_phone->gets_for_user($id_user); $phones = $this->internal_phone->gets_for_user($id_user);
$contact_ids = (isset($_GET['contact_ids']) && \is_array($_GET['contact_ids'])) ? $_GET['contact_ids'] : []; $contact_ids = (isset($_GET['contact_ids']) && is_array($_GET['contact_ids'])) ? $_GET['contact_ids'] : [];
$group_ids = (isset($_GET['group_ids']) && \is_array($_GET['group_ids'])) ? $_GET['group_ids'] : []; $group_ids = (isset($_GET['group_ids']) && is_array($_GET['group_ids'])) ? $_GET['group_ids'] : [];
$conditional_group_ids = (isset($_GET['conditional_group_ids']) && \is_array($_GET['conditional_group_ids'])) ? $_GET['conditional_group_ids'] : []; $conditional_group_ids = (isset($_GET['conditional_group_ids']) && is_array($_GET['conditional_group_ids'])) ? $_GET['conditional_group_ids'] : [];
$prefilled_contacts = []; $prefilled_contacts = [];
$prefilled_groups = []; $prefilled_groups = [];

View File

@ -25,7 +25,7 @@ $config = PhpCsFixer\Config::create()
'@PHP56Migration' => true, '@PHP56Migration' => true,
'@PHPUnit60Migration:risky' => true, '@PHPUnit60Migration:risky' => true,
'@PhpCsFixer' => true, '@PhpCsFixer' => true,
'@PhpCsFixer:risky' => false, '@PhpCsFixer:risky' => true,
'header_comment' => ['header' => $header], 'header_comment' => ['header' => $header],
'list_syntax' => ['syntax' => 'long'], 'list_syntax' => ['syntax' => 'long'],
'array_syntax' => ['syntax' => 'short'], 'array_syntax' => ['syntax' => 'short'],