';
- $feed .= $commentaire['nom'].' '.$commentaire['prenom'];
+ $feed .= $commentaire['nom'] . ' ' . $commentaire['prenom'];
$feed .= '
');
- $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('static' , 'note' , '' , '
');
+ $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', ['size' => 60, 'maxlength' => 255]);
$formulaire->addElement('hidden' , 'image');
$formulaire->addElement('date' , 'date' , 'Date' , ['language' => 'fr', 'minYear' => 2001, 'maxYear' => date('Y')]);
- $formulaire->addElement('select' , 'position' , 'Position' , $feuille->positionable());
- $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
+ $formulaire->addElement('select' , 'position' , 'Position' , $feuille->positionable());
+ $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
$formulaire->addElement('textarea' , 'patterns' , 'Patterns URL');
- $formulaire->addElement('header' , 'boutons' , '');
- $formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
+ $formulaire->addElement('header' , 'boutons' , '');
+ $formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
- $formulaire->addRule('nom' , 'Nom manquant' , 'required');
- $formulaire->addRule('contenu' , 'Contenu manquant' , 'required');
- $formulaire->addRule('lien' , 'Lien manquant' , 'required');
+ $formulaire->addRule('nom' , 'Nom manquant' , 'required');
+ $formulaire->addRule('contenu' , 'Contenu manquant' , 'required');
+ $formulaire->addRule('lien' , 'Lien manquant' , 'required');
$formulaire->addRule('image' , 'Mimetype' , 'mimetype', ['jpg','jpeg','gif','png']);
- if ($file->isUploadedFile()) {
- $values = $file->getValue();
- if ($values['error'] == 0) {
- $file->moveUploadedFile('../../templates/site/images/', $values['name']);
- $feuille->image = $values['name'];
- } else {
- $feuille->image = $formulaire->exportValue('image');
- }
- }
+ if ($file->isUploadedFile()) {
+ $values = $file->getValue();
+ if ($values['error'] == 0) {
+ $file->moveUploadedFile('../../templates/site/images/', $values['name']);
+ $feuille->image = $values['name'];
+ } else {
+ $feuille->image = $formulaire->exportValue('image');
+ }
+ }
if ($formulaire->validate()) {
- $feuille->id_parent = $formulaire->exportValue('id_parent');
- $feuille->nom = $formulaire->exportValue('nom');
- $feuille->lien = $formulaire->exportValue('lien');
- $feuille->alt = $formulaire->exportValue('alt');
+ $feuille->id_parent = $formulaire->exportValue('id_parent');
+ $feuille->nom = $formulaire->exportValue('nom');
+ $feuille->lien = $formulaire->exportValue('lien');
+ $feuille->alt = $formulaire->exportValue('alt');
$feuille->image_alt = $formulaire->exportValue('image_alt');
- $feuille->position = $formulaire->exportValue('position');
- $date = $formulaire->exportValue('date');
- $feuille->date = mktime(0, 0, 0, $date['M'], $date['d'], $date['Y']);
- $feuille->etat = $formulaire->exportValue('etat');
- $feuille->patterns = $formulaire->exportValue('patterns');
-
- if ($action == 'ajouter') {
- if ($feuille->inserer()) {
- Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
- afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
- } else {
+ $feuille->position = $formulaire->exportValue('position');
+ $date = $formulaire->exportValue('date');
+ $feuille->date = mktime(0, 0, 0, (int) $date['M'], (int) $date['d'], (int) $date['Y']);
+ $feuille->etat = $formulaire->exportValue('etat');
+ $feuille->patterns = $formulaire->exportValue('patterns');
+
+ if ($action == 'ajouter') {
+ if ($feuille->inserer()) {
+ Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
+ afficherMessage('La feuille a été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
+ } else {
$smarty->assign('erreur', 'Une erreur est survenue lors de l\'ajout de la feuille');
- }
- } else {
- if ($feuille->modifier()) {
- Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
- afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
- } else {
- $smarty->assign('erreur', 'Une erreur est survenue lors de la modification de la feuille');
- }
- }
- }
-
- $smarty->assign('formulaire', genererFormulaire($formulaire));
+ }
+ } elseif ($feuille->modifier()) {
+ Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
+ afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
+ } else {
+ $smarty->assign('erreur', 'Une erreur est survenue lors de la modification de la feuille');
+ }
+ }
+
+ $smarty->assign('formulaire', genererFormulaire($formulaire));
}
-function process($values) {
+function process($values): void
+{
global $file;
if ($file->isUploadedFile()) {
$file->moveUploadedFile($path);
diff --git a/htdocs/pages/event-payment/index.php b/htdocs/pages/event-payment/index.php
index 508c4c204..69a2a4586 100644
--- a/htdocs/pages/event-payment/index.php
+++ b/htdocs/pages/event-payment/index.php
@@ -1,19 +1,20 @@
setUrlRetourErreur('https://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/paybox_erreur.php')
;
-$invoiceRepository = $symfonyKernel->getKernel()->getContainer()->get(\AppBundle\Event\Model\Repository\InvoiceRepository::class);
-/** @var \AppBundle\Event\Model\Invoice $invoice */
+$invoiceRepository = $symfonyKernel->getKernel()->getContainer()->get(InvoiceRepository::class);
+/** @var Invoice $invoice */
$invoice = $invoiceRepository->getByReference($inscription['reference']);
if (null === $invoice) {
throw new \RuntimeException(sprintf("Invoice %s not found", $inscription['reference']));
}
-$payboxBilling = \AppBundle\Payment\PayboxBilling::createFromInvoice($invoice);
+$payboxBilling = PayboxBilling::createFromInvoice($invoice);
$smarty->assign('paybox', $paybox->generate(new \DateTime(), $payboxBilling));
$smarty->assign('inscription', $inscription);
diff --git a/htdocs/pages/event-payment/paybox_annule.php b/htdocs/pages/event-payment/paybox_annule.php
index d13db448b..b1285a8bc 100644
--- a/htdocs/pages/event-payment/paybox_annule.php
+++ b/htdocs/pages/event-payment/paybox_annule.php
@@ -1,3 +1,5 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/event-payment/paybox_effectue.php b/htdocs/pages/event-payment/paybox_effectue.php
index 696fa68eb..e5b187613 100644
--- a/htdocs/pages/event-payment/paybox_effectue.php
+++ b/htdocs/pages/event-payment/paybox_effectue.php
@@ -1,3 +1,5 @@
display('paybox_effectue.html');
\ No newline at end of file
+
+declare(strict_types=1);
+require_once __DIR__ . '/../../../sources/Afup/Bootstrap/Http.php';
+$smarty->display('paybox_effectue.html');
diff --git a/htdocs/pages/event-payment/paybox_erreur.php b/htdocs/pages/event-payment/paybox_erreur.php
index 9fe3384db..7fab36377 100644
--- a/htdocs/pages/event-payment/paybox_erreur.php
+++ b/htdocs/pages/event-payment/paybox_erreur.php
@@ -1,3 +1,5 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/event-payment/paybox_refuse.php b/htdocs/pages/event-payment/paybox_refuse.php
index 8ec06be1c..4cef45449 100644
--- a/htdocs/pages/event-payment/paybox_refuse.php
+++ b/htdocs/pages/event-payment/paybox_refuse.php
@@ -1,3 +1,5 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/index.php b/htdocs/pages/paiement/index.php
index 40c98da05..190705880 100644
--- a/htdocs/pages/paiement/index.php
+++ b/htdocs/pages/paiement/index.php
@@ -1,13 +1,17 @@
obtenir($ref);
if ($facture) {
@@ -37,7 +41,7 @@
->setUrlRetourErreur('https://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/paybox_erreur.php')
;
- $payboxBilling = new \AppBundle\Payment\PayboxBilling($facture['prenom'], $facture['nom'], $facture['adresse'], $facture['code_postal'], $facture['ville'], $facture['id_pays']);
+ $payboxBilling = new PayboxBilling($facture['prenom'], $facture['nom'], $facture['adresse'], $facture['code_postal'], $facture['ville'], $facture['id_pays']);
$now = new \DateTime();
$smarty->assign('paybox', $paybox->generate($now, $payboxBilling));
diff --git a/htdocs/pages/paiement/paybox_annule.php b/htdocs/pages/paiement/paybox_annule.php
index d13db448b..b1285a8bc 100644
--- a/htdocs/pages/paiement/paybox_annule.php
+++ b/htdocs/pages/paiement/paybox_annule.php
@@ -1,3 +1,5 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/paiement/paybox_effectue.php b/htdocs/pages/paiement/paybox_effectue.php
index 696fa68eb..e5b187613 100644
--- a/htdocs/pages/paiement/paybox_effectue.php
+++ b/htdocs/pages/paiement/paybox_effectue.php
@@ -1,3 +1,5 @@
display('paybox_effectue.html');
\ No newline at end of file
+
+declare(strict_types=1);
+require_once __DIR__ . '/../../../sources/Afup/Bootstrap/Http.php';
+$smarty->display('paybox_effectue.html');
diff --git a/htdocs/pages/paiement/paybox_erreur.php b/htdocs/pages/paiement/paybox_erreur.php
index 9fe3384db..7fab36377 100644
--- a/htdocs/pages/paiement/paybox_erreur.php
+++ b/htdocs/pages/paiement/paybox_erreur.php
@@ -1,3 +1,5 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/paiement/paybox_refuse.php b/htdocs/pages/paiement/paybox_refuse.php
index 8ec06be1c..4cef45449 100644
--- a/htdocs/pages/paiement/paybox_refuse.php
+++ b/htdocs/pages/paiement/paybox_refuse.php
@@ -1,3 +1,5 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/payment_tracking.php b/htdocs/pages/paiement/payment_tracking.php
index 76705f45c..2e7303e12 100644
--- a/htdocs/pages/paiement/payment_tracking.php
+++ b/htdocs/pages/paiement/payment_tracking.php
@@ -1,13 +1,18 @@
boot();
-$container = $kernel->getContainer();
-/** @var FeedCrawler $crawler */
-$crawler = $container->get(FeedCrawler::class);
-$crawler->crawl();
+boot();
+$container = $kernel->getContainer();
+/** @var FeedCrawler $crawler */
+$crawler = $container->get(FeedCrawler::class);
+$crawler->crawl();
diff --git a/htdocs/templates/administration/compta_balance.html b/htdocs/templates/administration/compta_balance.html
index 9014edc3f..1112bc547 100644
--- a/htdocs/templates/administration/compta_balance.html
+++ b/htdocs/templates/administration/compta_balance.html
@@ -32,8 +32,8 @@
{$ecriture.evenement}
- {$ecriture.debit|number_format:2:',':' '}
- {$ecriture.credit|number_format:2:',':' '}
+ {$ecriture.debit|floatval|number_format:2:',':' '}
+ {$ecriture.credit|floatval|number_format:2:',':' '}
Balance comptable
{$detail.date_ecriture|date_format:"%d/%m/%Y"}
{$detail.categorie}
{$detail.description}
- {if $detail.debit}{$detail.debit|number_format:2:',':' '}{else}0,00{/if}
- {if $detail.credit}{$detail.credit|number_format:2:',':' '}{else}0,00{/if}
+ {if $detail.debit}{$detail.debit|floatval|number_format:2:',':' '}{else}0,00{/if}
+ {if $detail.credit}{$detail.credit|floatval|number_format:2:',':' '}{else}0,00{/if}
Balance comptable
Sous Total
- {if $txt.debit}{$txt.debit|number_format:2:',':' '}{else}0,00{/if}
+ {if $txt.debit}{$txt.debit|floatval|number_format:2:',':' '}{else}0,00{/if}
- {if $txt.credit}{$txt.credit|number_format:2:',':' '}{else}0,00{/if}
+ {if $txt.credit}{$txt.credit|floatval|number_format:2:',':' '}{else}0,00{/if}
@@ -126,14 +126,14 @@
@@ -185,7 +185,7 @@ {$detail.description}
{if $detail.debit}
- {$detail.debit|number_format:2:',':' '}
+ {$detail.debit|floatval|number_format:2:',':' '}
{/if}
@@ -210,12 +210,12 @@
{if $txt.debit}
- {$txt.debit|number_format:2:',':' '}
+ {$txt.debit|floatval|number_format:2:',':' '}
{/if}
{if $txt.credit}
- {$txt.credit|number_format:2:',':' '}
+ {$txt.credit|floatval|number_format:2:',':' '}
{/if}
{$ecriture.reglement}
{$ecriture.description}
{if $ecriture.idoperation == 1}
- {$ecriture.montant|number_format:2:',':' '}
+ {$ecriture.montant|floatval|number_format:2:',':' '}
{else}
- {$ecriture.montant|number_format:2:',':' '}
+ {$ecriture.montant|floatval|number_format:2:',':' '}
{/if}
Journal de banque
Sous Total
- {if $txt.debit}{$txt.debit|number_format:2:',':' '}{else}0,00{/if}
+ {if $txt.debit}{$txt.debit|floatval|number_format:2:',':' '}{else}0,00{/if}
- {if $txt.credit}{$txt.credit|number_format:2:',':' '}{else}0,00{/if}
+ {if $txt.credit}{$txt.credit|floatval|number_format:2:',':' '}{else}0,00{/if}
- {$txt.dif|number_format:2:',':' '}
+ {$txt.dif|floatval|number_format:2:',':' '}
{assign var=compteurLigne value=0}
@@ -107,7 +107,7 @@
Total débit
@@ -117,7 +117,7 @@
Total crédit
@@ -131,7 +131,7 @@
Solde
diff --git a/htdocs/templates/administration/compta_bilan.html b/htdocs/templates/administration/compta_bilan.html
index edc854d70..b8b00f091 100644
--- a/htdocs/templates/administration/compta_bilan.html
+++ b/htdocs/templates/administration/compta_bilan.html
@@ -41,7 +41,7 @@
{$debits.evenement}
- {$debits.montant|number_format:2:',':' '}
+ {$debits.montant|floatval|number_format:2:',':' '}
Bilan
{$detail.date_ecriture|date_format:"%d/%m/%Y"}
{$detail.description}
- {$detail.montant|number_format:2:',':' '}
+ {$detail.montant|floatval|number_format:2:',':' '}
Bilan
{foreach from=$credit item=credits}
{$credits.evenement}
- {$credits.montant|number_format:2:',':' '}
+ {$credits.montant|floatval|number_format:2:',':' '}
Bilan
{$detail.date_ecriture|date_format:"%d/%m/%Y"}
{$detail.description}
- {$detail.montant|number_format:2:',':' '}
+ {$detail.montant|floatval|number_format:2:',':' '}
Bilan
@@ -201,7 +201,7 @@
@@ -244,7 +244,7 @@
{$detail.date_ecriture|date_format:"%d/%m/%Y"}
{$detail.description}
- {$detail.montant|number_format:2:',':' '}
+ {$detail.montant|floatval|number_format:2:',':' '}
{/foreach}
@@ -272,7 +272,7 @@
{$detail.date_ecriture|date_format:"%d/%m/%Y"}
{$detail.description}
- {$detail.montant|number_format:2:',':' '}
+ {$detail.montant|floatval|number_format:2:',':' '}
{/foreach}
@@ -290,14 +290,14 @@
@@ -306,7 +306,7 @@
diff --git a/htdocs/templates/administration/compta_devis.html b/htdocs/templates/administration/compta_devis.html
index 964832be1..8fea42d5a 100644
--- a/htdocs/templates/administration/compta_devis.html
+++ b/htdocs/templates/administration/compta_devis.html
@@ -53,7 +53,7 @@ {$ecriture.ville}
{$ecriture.ref_clt1}
{$ecriture.numero_devis}
- {$ecriture.prix|number_format:2:',':' '}
+ {$ecriture.prix|floatval|number_format:2:',':' '}
{if $ecriture.numero_facture == ''}
non
diff --git a/htdocs/templates/administration/compta_facture.html b/htdocs/templates/administration/compta_facture.html
index 97d07cfad..a8bbc11ec 100644
--- a/htdocs/templates/administration/compta_facture.html
+++ b/htdocs/templates/administration/compta_facture.html
@@ -40,7 +40,7 @@
- {$ecriture.prix|number_format:2:',':' '}
+ {$ecriture.prix|floatval|number_format:2:',':' '}
Journal
{$ecriture.description}
{if $ecriture.idoperation == 1}
- -{$ecriture.montant|number_format:2:',':' '}
+ -{$ecriture.montant|floatval|number_format:2:',':' '}
+{$ecriture.montant|number_format:2:',':' '}
+ +{$ecriture.montant|floatval|number_format:2:',':' '}
{/if}
diff --git a/htdocs/templates/administration/compta_synthese.html b/htdocs/templates/administration/compta_synthese.html
index 381ac05ec..497c72218 100644
--- a/htdocs/templates/administration/compta_synthese.html
+++ b/htdocs/templates/administration/compta_synthese.html
@@ -44,7 +44,7 @@
{$debits.categorie}
{$debits.description}
- {$debits.montant|number_format:2:',':' '}
+ {$debits.montant|floatval|number_format:2:',':' '}
{foreachelse}
@@ -68,7 +68,7 @@
{$credits.categorie}
{$credits.description}
- {$credits.montant|number_format:2:',':' '}
+ {$credits.montant|floatval|number_format:2:',':' '}
{foreachelse}
@@ -85,7 +85,7 @@
';
$feed .= date('d/m/Y h:i', $commentaire['date']);
$feed .= '
';
@@ -224,39 +225,39 @@
$formulaire->addElement('static', 'note', '', $feed);
}
- $formulaire->addElement('header', 'boutons' , '');
- $formulaire->addElement('submit', 'soumettre', 'Soumettre');
+ $formulaire->addElement('header', 'boutons' , '');
+ $formulaire->addElement('submit', 'soumettre', 'Soumettre');
- // On ajoute les règles
- $formulaire->addRule('titre' , 'Titre manquant' , 'required');
- $formulaire->addRule('conferencier_id_1', 'Conférencier n°1 manquant' , 'required');
+ // On ajoute les règles
+ $formulaire->addRule('titre' , 'Titre manquant' , 'required');
+ $formulaire->addRule('conferencier_id_1', 'Conférencier n°1 manquant' , 'required');
if ($formulaire->validate()) {
- $valeurs = $formulaire->exportValues();
- $valeurs += ['needs_mentoring' => 0];
+ $valeurs = $formulaire->exportValues();
+ $valeurs += ['needs_mentoring' => 0];
- if ($action == 'ajouter') {
- $session_id = $forum_appel->ajouterSession(
- $valeurs['id_forum'],
- $valeurs['date_soumission']['Y'].'-'.$valeurs['date_soumission']['M'].'-'.$valeurs['date_soumission']['d'],
+ if ($action == 'ajouter') {
+ $session_id = $forum_appel->ajouterSession(
+ $valeurs['id_forum'],
+ $valeurs['date_soumission']['Y'] . '-' . $valeurs['date_soumission']['M'] . '-' . $valeurs['date_soumission']['d'],
$valeurs['titre'],
$valeurs['abstract'],
- (int)$valeurs['genre'],
- (int)$valeurs['plannifie'],
- isset($valeurs['needs_mentoring']) ? (int)$valeurs['needs_mentoring'] : 0,
- (int)$valeurs['skill'],
+ (int) $valeurs['genre'],
+ (int) $valeurs['plannifie'],
+ isset($valeurs['needs_mentoring']) ? (int) $valeurs['needs_mentoring'] : 0,
+ (int) $valeurs['skill'],
$valeurs['use_markdown']
);
- $ok = (bool)$session_id;
+ $ok = (bool) $session_id;
} else {
- $session_id = (int)$_GET['id'];
+ $session_id = (int) $_GET['id'];
$ok = $forum_appel->modifierSession($session_id,
- $valeurs['id_forum'],
- $valeurs['date_soumission']['Y'].'-'.$valeurs['date_soumission']['M'].'-'.$valeurs['date_soumission']['d'],
- $valeurs['titre'],
- $valeurs['abstract'],
- (int)$valeurs['genre'],
- (int)$valeurs['plannifie'],
+ $valeurs['id_forum'],
+ $valeurs['date_soumission']['Y'] . '-' . $valeurs['date_soumission']['M'] . '-' . $valeurs['date_soumission']['d'],
+ $valeurs['titre'],
+ $valeurs['abstract'],
+ (int) $valeurs['genre'],
+ (int) $valeurs['plannifie'],
$valeurs['joindin'],
$valeurs['youtube_id'],
$valeurs['slides_url'],
@@ -264,12 +265,12 @@
$valeurs['blog_post_url'],
$valeurs['interview_url'],
$valeurs['language_code'],
- (int)$valeurs['skill'],
- (int)$valeurs['needs_mentoring'],
+ (int) $valeurs['skill'],
+ (int) $valeurs['needs_mentoring'],
$valeurs['use_markdown'],
$valeurs['video_has_fr_subtitles'],
$valeurs['video_has_en_subtitles'],
- $valeurs['date_publication']['Y'].'-'.$valeurs['date_publication']['M'].'-'.$valeurs['date_publication']['d'] . ' ' . $valeurs['date_publication']['H'] . ':' . $valeurs['date_publication']['i'] . ':' . $valeurs['date_publication']['s'],
+ $valeurs['date_publication']['Y'] . '-' . $valeurs['date_publication']['M'] . '-' . $valeurs['date_publication']['d'] . ' ' . $valeurs['date_publication']['H'] . ':' . $valeurs['date_publication']['i'] . ':' . $valeurs['date_publication']['s'],
$valeurs['tweets'],
$valeurs['transcript'],
$valeurs['verbatim']
diff --git a/htdocs/pages/administration/index.php b/htdocs/pages/administration/index.php
index f0481ad9e..a687583ba 100644
--- a/htdocs/pages/administration/index.php
+++ b/htdocs/pages/administration/index.php
@@ -1,6 +1,11 @@
getResponse();
$response->send();
diff --git a/htdocs/pages/administration/logs.php b/htdocs/pages/administration/logs.php
index 5ce2f5dfd..3a4cc666b 100644
--- a/htdocs/pages/administration/logs.php
+++ b/htdocs/pages/administration/logs.php
@@ -1,20 +1,19 @@
assign('logs' , Logs::obtenirTous($_GET['numero_page']));
$smarty->assign('nombre_pages', Logs::obtenirNombrePages());
$smarty->assign('numero_page' , $_GET['numero_page']);
$smarty->assign('url' , 'index.php?page=logs');
-
-?>
diff --git a/htdocs/pages/administration/membre_administrateur.php b/htdocs/pages/administration/membre_administrateur.php
index f3eca4ba4..029d68578 100644
--- a/htdocs/pages/administration/membre_administrateur.php
+++ b/htdocs/pages/administration/membre_administrateur.php
@@ -1,9 +1,12 @@
exportValue('raison_sociale') . ' (' . $_GET['id'] . ')');
- afficherMessage('La personne morale a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=membre_personne_morale');
+ afficherMessage('La personne morale a été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=membre_personne_morale');
} else {
- $smarty->assign('erreur', 'Une erreur est survenue lors de ' . (($action == 'ajouter') ? "l'ajout" : 'la modification') . ' de la personne morale');
+ $smarty->assign('erreur', 'Une erreur est survenue lors de ' . (($action === 'ajouter') ? "l'ajout" : 'la modification') . ' de la personne morale');
}
}
diff --git a/htdocs/pages/administration/message.php b/htdocs/pages/administration/message.php
index 10b8bae81..0c2ae9320 100644
--- a/htdocs/pages/administration/message.php
+++ b/htdocs/pages/administration/message.php
@@ -1,7 +1,11 @@
assign('message', stripslashes($_GET['message']));
$smarty->assign('url' , $_GET['url']);
$smarty->assign('erreur' , $_GET['erreur']);
$smarty->display('message.html');
-
+
// On s'arrête là pour ne pas afficher le pied de page
exit;
-?>
diff --git a/htdocs/pages/administration/paybox_annule.php b/htdocs/pages/administration/paybox_annule.php
index 804de78c3..a67bf429b 100644
--- a/htdocs/pages/administration/paybox_annule.php
+++ b/htdocs/pages/administration/paybox_annule.php
@@ -1,5 +1,7 @@
Votre paiement a été annulé. Désolé.";
$paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
"; @@ -7,4 +9,3 @@ $smarty->assign('paybox', $paybox); $smarty->display('paybox.html'); -?> \ No newline at end of file diff --git a/htdocs/pages/administration/paybox_effectue.php b/htdocs/pages/administration/paybox_effectue.php index 2a8a34375..65a807084 100644 --- a/htdocs/pages/administration/paybox_effectue.php +++ b/htdocs/pages/administration/paybox_effectue.php @@ -1,6 +1,8 @@ Votre paiement a été enregistré. Merci et à bientôt."; $message .= "Une questions ? N'hésitez pas à contacter le trésorier.
"; diff --git a/htdocs/pages/administration/paybox_erreur.php b/htdocs/pages/administration/paybox_erreur.php index 9320424e6..38b0a625c 100644 --- a/htdocs/pages/administration/paybox_erreur.php +++ b/htdocs/pages/administration/paybox_erreur.php @@ -1,5 +1,7 @@ Il y a eu une erreur lors de votre paiement. Désolé."; $paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
"; diff --git a/htdocs/pages/administration/paybox_refuse.php b/htdocs/pages/administration/paybox_refuse.php index 8c58c2d3b..c712adcec 100644 --- a/htdocs/pages/administration/paybox_refuse.php +++ b/htdocs/pages/administration/paybox_refuse.php @@ -1,13 +1,17 @@ Votre paiement a été refusé. Désolé."; $paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
"; @@ -15,4 +19,3 @@ $smarty->assign('paybox', $paybox); $smarty->display('paybox.html'); -?> diff --git a/htdocs/pages/administration/personnes_morales.php b/htdocs/pages/administration/personnes_morales.php index ae33fdfce..72f3c6c63 100644 --- a/htdocs/pages/administration/personnes_morales.php +++ b/htdocs/pages/administration/personnes_morales.php @@ -1,12 +1,15 @@ addElement('text' , 'email' , 'Email' , ['size' => 30, 'maxlength' => 100]); $formulaire->addElement('text' , 'telephone_fixe' , 'Tél. fixe' , ['size' => 20, 'maxlength' => 20]); $formulaire->addElement('text' , 'telephone_portable' , 'Tél. portable' , ['size' => 20, 'maxlength' => 20]); - if($action != 'ajouter') { + if ($action != 'ajouter') { $smarty->assign('personnes_physiques_associees', $users); } $formulaire->addElement('header' , '' , 'Paramètres'); diff --git a/htdocs/pages/administration/site_articles.php b/htdocs/pages/administration/site_articles.php index 3592294b1..137babe06 100755 --- a/htdocs/pages/administration/site_articles.php +++ b/htdocs/pages/administration/site_articles.php @@ -1,13 +1,17 @@ obtenirListe(null, '*', 'date_debut DESC') as $forum) { $forumLabelsById[$forum['id']] = $forum['titre']; @@ -59,7 +63,7 @@ function checkNoSpace($value): bool } $articlesList = []; - foreach ($articles->obtenirListe($list_champs, $list_ordre.' '.$list_sens, $list_filtre) as $article) { + foreach ($articles->obtenirListe($list_champs, $list_ordre . ' ' . $list_sens, $list_filtre) as $article) { $article['theme_label'] = Article::getThemeLabel($article['theme']); $article['forum_label'] = $forumLabelsById[$article['id_forum']] ?? ''; $articlesList[] = $article; @@ -67,7 +71,6 @@ function checkNoSpace($value): bool // Mise en place de la liste dans le scope de smarty $smarty->assign('articles', $articlesList); - } elseif ($action == 'supprimer') { $article = new Article($_GET['id']); if ($article->supprimer()) { @@ -76,14 +79,13 @@ function checkNoSpace($value): bool } else { afficherMessage('Une erreur est survenue lors de la suppression de l\'article', 'index.php?page=site_articles&action=lister', true); } - } else { - $id = isset($_GET['id']) ? (int)$_GET['id'] : 0; + $id = isset($_GET['id']) ? (int) $_GET['id'] : 0; $article = new Article($id); $rubriques = new Rubriques(); $users = [null => '']; foreach ($userRepository->search() as $user) { - $users[$user->getId()] = $user->getFirstName().' '.$user->getLastName(); + $users[$user->getId()] = $user->getFirstName() . ' ' . $user->getLastName(); } $formulaire = instancierFormulaire(); @@ -143,16 +145,12 @@ function checkNoSpace($value): bool $article->position = $formulaire->exportValue('position'); $date = $formulaire->exportValue('date'); - $article->date = mktime($date['H'], $date['i'], $date['s'], $date['M'], $date['d'], $date['Y']); + $article->date = mktime((int) $date['H'],(int) $date['i'], (int) $date['s'], (int) $date['M'], (int) $date['d'], (int) $date['Y']); $article->etat = $formulaire->exportValue('etat'); $article->theme = $formulaire->exportValue('theme'); $article->id_forum = $formulaire->exportValue('id_forum'); - if ($action == 'ajouter') { - $ok = $article->inserer(); - } else { - $ok = $article->modifier(); - } + $ok = $action == 'ajouter' ? $article->inserer() : $article->modifier(); if ($ok) { if ($action == 'ajouter') { diff --git a/htdocs/pages/administration/site_feuilles.php b/htdocs/pages/administration/site_feuilles.php index 45b68c3ae..404fda01b 100644 --- a/htdocs/pages/administration/site_feuilles.php +++ b/htdocs/pages/administration/site_feuilles.php @@ -1,14 +1,15 @@ assign('feuilles', $feuilles->obtenirListe($list_champs, $list_ordre.' '.$list_sens, $list_filtre)); + $f = []; + $list_champs = '*'; + $list_ordre = 'date'; + $list_sens = 'desc'; + $list_filtre = false; + + if (isset($_GET['sens']) && in_array($_GET['sens'], array_keys($sens_valides))) { + $list_sens = $_GET['sens']; + } else { + $_GET['sens'] = $list_sens; + } + if (isset($_GET['tri']) && in_array($_GET['tri'], array_keys($tris_valides))) { + $list_ordre = $_GET['tri']; + } else { + $_GET['tri'] = $list_ordre; + } + + // Mise en place de la liste dans le scope de smarty + $smarty->assign('feuilles', $feuilles->obtenirListe($list_champs, $list_ordre . ' ' . $list_sens, $list_filtre)); } elseif ($action == 'supprimer') { - $feuille = new Feuille($_GET['id']); - if ($feuille->supprimer()) { - Logs::log('Suppression de la feuille ' . $_GET['id']); - afficherMessage('La feuille a été supprimée', 'index.php?page=site_feuilles&action=lister'); - } else { - afficherMessage('Une erreur est survenue lors de la suppression de la feuille', 'index.php?page=site_feuilles&action=lister', true); - } + $feuille = new Feuille($_GET['id']); + if ($feuille->supprimer()) { + Logs::log('Suppression de la feuille ' . $_GET['id']); + afficherMessage('La feuille a été supprimée', 'index.php?page=site_feuilles&action=lister'); + } else { + afficherMessage('Une erreur est survenue lors de la suppression de la feuille', 'index.php?page=site_feuilles&action=lister', true); + } } else { // ajouter | modifier - $id = isset($_GET['id']) ? (int)$_GET['id'] : 0; - $feuille = new Feuille($id); - - $formulaire = instancierFormulaire(); - if ($action == 'ajouter') { - $formulaire->setDefaults(['date' => time(), - 'position' => 0, - 'id_personne_physique' => $droits->obtenirIdentifiant(), - 'etat' => 0]); - } else { - $feuille->charger(); - $formulaire->setDefaults($feuille->exportable()); - } - - $formulaire->addElement('header' , '' , 'feuille'); - $formulaire->addElement('select' , 'id_parent' , 'Parent' , [null => '' ] + $feuilles->obtenirListe('id, nom', 'nom', true)); - $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 60, 'maxlength' => 255]); - $formulaire->addElement('text' , 'lien' , 'Lien' , ['size' => 60, 'maxlength' => 255]); - $formulaire->addElement('text' , 'alt' , 'Description', ['size' => 60, 'maxlength' => 255]); + $id = isset($_GET['id']) ? (int) $_GET['id'] : 0; + $feuille = new Feuille($id); + + $formulaire = instancierFormulaire(); + if ($action == 'ajouter') { + $formulaire->setDefaults(['date' => time(), + 'position' => 0, + 'id_personne_physique' => $droits->obtenirIdentifiant(), + 'etat' => 0]); + } else { + $feuille->charger(); + $formulaire->setDefaults($feuille->exportable()); + } + + $formulaire->addElement('header' , '' , 'feuille'); + $formulaire->addElement('select' , 'id_parent' , 'Parent' , [null => '' ] + $feuilles->obtenirListe('id, nom', 'nom', true)); + $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 60, 'maxlength' => 255]); + $formulaire->addElement('text' , 'lien' , 'Lien' , ['size' => 60, 'maxlength' => 255]); + $formulaire->addElement('text' , 'alt' , 'Description', ['size' => 60, 'maxlength' => 255]); $file =& $formulaire->addElement('file', 'nouvelle-image' , 'Image'); - $formulaire->addElement('static' , 'note' , '' , '');
- $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('static' , 'note' , '' , '');
+ $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', ['size' => 60, 'maxlength' => 255]);
$formulaire->addElement('hidden' , 'image');
$formulaire->addElement('date' , 'date' , 'Date' , ['language' => 'fr', 'minYear' => 2001, 'maxYear' => date('Y')]);
- $formulaire->addElement('select' , 'position' , 'Position' , $feuille->positionable());
- $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
+ $formulaire->addElement('select' , 'position' , 'Position' , $feuille->positionable());
+ $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
$formulaire->addElement('textarea' , 'patterns' , 'Patterns URL');
- $formulaire->addElement('header' , 'boutons' , '');
- $formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
+ $formulaire->addElement('header' , 'boutons' , '');
+ $formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
- $formulaire->addRule('nom' , 'Nom manquant' , 'required');
- $formulaire->addRule('contenu' , 'Contenu manquant' , 'required');
- $formulaire->addRule('lien' , 'Lien manquant' , 'required');
+ $formulaire->addRule('nom' , 'Nom manquant' , 'required');
+ $formulaire->addRule('contenu' , 'Contenu manquant' , 'required');
+ $formulaire->addRule('lien' , 'Lien manquant' , 'required');
$formulaire->addRule('image' , 'Mimetype' , 'mimetype', ['jpg','jpeg','gif','png']);
- if ($file->isUploadedFile()) {
- $values = $file->getValue();
- if ($values['error'] == 0) {
- $file->moveUploadedFile('../../templates/site/images/', $values['name']);
- $feuille->image = $values['name'];
- } else {
- $feuille->image = $formulaire->exportValue('image');
- }
- }
+ if ($file->isUploadedFile()) {
+ $values = $file->getValue();
+ if ($values['error'] == 0) {
+ $file->moveUploadedFile('../../templates/site/images/', $values['name']);
+ $feuille->image = $values['name'];
+ } else {
+ $feuille->image = $formulaire->exportValue('image');
+ }
+ }
if ($formulaire->validate()) {
- $feuille->id_parent = $formulaire->exportValue('id_parent');
- $feuille->nom = $formulaire->exportValue('nom');
- $feuille->lien = $formulaire->exportValue('lien');
- $feuille->alt = $formulaire->exportValue('alt');
+ $feuille->id_parent = $formulaire->exportValue('id_parent');
+ $feuille->nom = $formulaire->exportValue('nom');
+ $feuille->lien = $formulaire->exportValue('lien');
+ $feuille->alt = $formulaire->exportValue('alt');
$feuille->image_alt = $formulaire->exportValue('image_alt');
- $feuille->position = $formulaire->exportValue('position');
- $date = $formulaire->exportValue('date');
- $feuille->date = mktime(0, 0, 0, $date['M'], $date['d'], $date['Y']);
- $feuille->etat = $formulaire->exportValue('etat');
- $feuille->patterns = $formulaire->exportValue('patterns');
-
- if ($action == 'ajouter') {
- if ($feuille->inserer()) {
- Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
- afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
- } else {
+ $feuille->position = $formulaire->exportValue('position');
+ $date = $formulaire->exportValue('date');
+ $feuille->date = mktime(0, 0, 0, (int) $date['M'], (int) $date['d'], (int) $date['Y']);
+ $feuille->etat = $formulaire->exportValue('etat');
+ $feuille->patterns = $formulaire->exportValue('patterns');
+
+ if ($action == 'ajouter') {
+ if ($feuille->inserer()) {
+ Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
+ afficherMessage('La feuille a été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
+ } else {
$smarty->assign('erreur', 'Une erreur est survenue lors de l\'ajout de la feuille');
- }
- } else {
- if ($feuille->modifier()) {
- Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
- afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
- } else {
- $smarty->assign('erreur', 'Une erreur est survenue lors de la modification de la feuille');
- }
- }
- }
-
- $smarty->assign('formulaire', genererFormulaire($formulaire));
+ }
+ } elseif ($feuille->modifier()) {
+ Logs::log('Ajout de la feuille ' . $formulaire->exportValue('nom'));
+ afficherMessage('La feuille a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=site_feuilles&action=lister');
+ } else {
+ $smarty->assign('erreur', 'Une erreur est survenue lors de la modification de la feuille');
+ }
+ }
+
+ $smarty->assign('formulaire', genererFormulaire($formulaire));
}
-function process($values) {
+function process($values): void
+{
global $file;
if ($file->isUploadedFile()) {
$file->moveUploadedFile($path);
diff --git a/htdocs/pages/event-payment/index.php b/htdocs/pages/event-payment/index.php
index 508c4c204..69a2a4586 100644
--- a/htdocs/pages/event-payment/index.php
+++ b/htdocs/pages/event-payment/index.php
@@ -1,19 +1,20 @@
setUrlRetourErreur('https://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/paybox_erreur.php')
;
-$invoiceRepository = $symfonyKernel->getKernel()->getContainer()->get(\AppBundle\Event\Model\Repository\InvoiceRepository::class);
-/** @var \AppBundle\Event\Model\Invoice $invoice */
+$invoiceRepository = $symfonyKernel->getKernel()->getContainer()->get(InvoiceRepository::class);
+/** @var Invoice $invoice */
$invoice = $invoiceRepository->getByReference($inscription['reference']);
if (null === $invoice) {
throw new \RuntimeException(sprintf("Invoice %s not found", $inscription['reference']));
}
-$payboxBilling = \AppBundle\Payment\PayboxBilling::createFromInvoice($invoice);
+$payboxBilling = PayboxBilling::createFromInvoice($invoice);
$smarty->assign('paybox', $paybox->generate(new \DateTime(), $payboxBilling));
$smarty->assign('inscription', $inscription);
diff --git a/htdocs/pages/event-payment/paybox_annule.php b/htdocs/pages/event-payment/paybox_annule.php
index d13db448b..b1285a8bc 100644
--- a/htdocs/pages/event-payment/paybox_annule.php
+++ b/htdocs/pages/event-payment/paybox_annule.php
@@ -1,3 +1,5 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/event-payment/paybox_effectue.php b/htdocs/pages/event-payment/paybox_effectue.php
index 696fa68eb..e5b187613 100644
--- a/htdocs/pages/event-payment/paybox_effectue.php
+++ b/htdocs/pages/event-payment/paybox_effectue.php
@@ -1,3 +1,5 @@
display('paybox_effectue.html');
\ No newline at end of file
+
+declare(strict_types=1);
+require_once __DIR__ . '/../../../sources/Afup/Bootstrap/Http.php';
+$smarty->display('paybox_effectue.html');
diff --git a/htdocs/pages/event-payment/paybox_erreur.php b/htdocs/pages/event-payment/paybox_erreur.php
index 9fe3384db..7fab36377 100644
--- a/htdocs/pages/event-payment/paybox_erreur.php
+++ b/htdocs/pages/event-payment/paybox_erreur.php
@@ -1,3 +1,5 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/event-payment/paybox_refuse.php b/htdocs/pages/event-payment/paybox_refuse.php
index 8ec06be1c..4cef45449 100644
--- a/htdocs/pages/event-payment/paybox_refuse.php
+++ b/htdocs/pages/event-payment/paybox_refuse.php
@@ -1,3 +1,5 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/index.php b/htdocs/pages/paiement/index.php
index 40c98da05..190705880 100644
--- a/htdocs/pages/paiement/index.php
+++ b/htdocs/pages/paiement/index.php
@@ -1,13 +1,17 @@
obtenir($ref);
if ($facture) {
@@ -37,7 +41,7 @@
->setUrlRetourErreur('https://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/paybox_erreur.php')
;
- $payboxBilling = new \AppBundle\Payment\PayboxBilling($facture['prenom'], $facture['nom'], $facture['adresse'], $facture['code_postal'], $facture['ville'], $facture['id_pays']);
+ $payboxBilling = new PayboxBilling($facture['prenom'], $facture['nom'], $facture['adresse'], $facture['code_postal'], $facture['ville'], $facture['id_pays']);
$now = new \DateTime();
$smarty->assign('paybox', $paybox->generate($now, $payboxBilling));
diff --git a/htdocs/pages/paiement/paybox_annule.php b/htdocs/pages/paiement/paybox_annule.php
index d13db448b..b1285a8bc 100644
--- a/htdocs/pages/paiement/paybox_annule.php
+++ b/htdocs/pages/paiement/paybox_annule.php
@@ -1,3 +1,5 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/paiement/paybox_effectue.php b/htdocs/pages/paiement/paybox_effectue.php
index 696fa68eb..e5b187613 100644
--- a/htdocs/pages/paiement/paybox_effectue.php
+++ b/htdocs/pages/paiement/paybox_effectue.php
@@ -1,3 +1,5 @@
display('paybox_effectue.html');
\ No newline at end of file
+
+declare(strict_types=1);
+require_once __DIR__ . '/../../../sources/Afup/Bootstrap/Http.php';
+$smarty->display('paybox_effectue.html');
diff --git a/htdocs/pages/paiement/paybox_erreur.php b/htdocs/pages/paiement/paybox_erreur.php
index 9fe3384db..7fab36377 100644
--- a/htdocs/pages/paiement/paybox_erreur.php
+++ b/htdocs/pages/paiement/paybox_erreur.php
@@ -1,3 +1,5 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/paiement/paybox_refuse.php b/htdocs/pages/paiement/paybox_refuse.php
index 8ec06be1c..4cef45449 100644
--- a/htdocs/pages/paiement/paybox_refuse.php
+++ b/htdocs/pages/paiement/paybox_refuse.php
@@ -1,3 +1,5 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/payment_tracking.php b/htdocs/pages/paiement/payment_tracking.php
index 76705f45c..2e7303e12 100644
--- a/htdocs/pages/paiement/payment_tracking.php
+++ b/htdocs/pages/paiement/payment_tracking.php
@@ -1,13 +1,18 @@
boot();
-$container = $kernel->getContainer();
-/** @var FeedCrawler $crawler */
-$crawler = $container->get(FeedCrawler::class);
-$crawler->crawl();
+boot();
+$container = $kernel->getContainer();
+/** @var FeedCrawler $crawler */
+$crawler = $container->get(FeedCrawler::class);
+$crawler->crawl();
diff --git a/htdocs/templates/administration/compta_balance.html b/htdocs/templates/administration/compta_balance.html
index 9014edc3f..1112bc547 100644
--- a/htdocs/templates/administration/compta_balance.html
+++ b/htdocs/templates/administration/compta_balance.html
@@ -32,8 +32,8 @@ Balance comptable
{foreach from=$balance item=ecriture}Balance comptable
- {$totalDepense|number_format:2:',':' '}
+ {$totalDepense|floatval|number_format:2:',':' '}
- {$totalRecette|number_format:2:',':' '}
+ {$totalRecette|floatval|number_format:2:',':' '}
Balance comptable
Balance comptable
Journal de banque
Journal de banque
- {$total.debit|number_format:2:',':' '}
+ {$total.debit|floatval|number_format:2:',':' '}
Journal de banque
- {$total.credit|number_format:2:',':' '}
+ {$total.credit|floatval|number_format:2:',':' '}
Journal de banque
- {$total.dif|number_format:2:',':' '}
+ {$total.dif|floatval|number_format:2:',':' '}
Bilan
{foreach from=$debit item=debits}
- {$totalDepense|number_format:2:',':' '}
+ {$totalDepense|floatval|number_format:2:',':' '}
- {$totalRecette|number_format:2:',':' '}
+ {$totalRecette|floatval|number_format:2:',':' '}
Bilan
- {$difMontant|number_format:2:',':' '}
+ {$difMontant|floatval|number_format:2:',':' '}
Bilan
Bilan
Bilan
- {$sousTotalDebit|number_format:2:',':' '}
+ {$sousTotalDebit|floatval|number_format:2:',':' '}
- {$sousTotalCredit|number_format:2:',':' '}
+ {$sousTotalCredit|floatval|number_format:2:',':' '}
Bilan
- {$difMontant|number_format:2:',':' '}
+ {$difMontant|floatval|number_format:2:',':' '}
Liste devis
Factures
En attente {/if}Synthese des évènements
Synthese des évènements
Synthese des évènements
- {$totalDepense|number_format:2:',':' '}
+ {$totalDepense|floatval|number_format:2:',':' '}
Total dépenses
@@ -95,7 +95,7 @@
Synthese des évènements
- {$totalRecette|number_format:2:',':' '}
+ {$totalRecette|floatval|number_format:2:',':' '}
Total recettes
@@ -108,7 +108,7 @@
Synthese des évènements
- {$difMontant|number_format:2:',':' '}
+ {$difMontant|floatval|number_format:2:',':' '}
Différence
diff --git a/htdocs/templates/administration/forum_facturation.html b/htdocs/templates/administration/forum_facturation.html
index 3b544b250..a19b60cfb 100644
--- a/htdocs/templates/administration/forum_facturation.html
+++ b/htdocs/templates/administration/forum_facturation.html
@@ -29,7 +29,7 @@
Factures d'évènement
-
+
diff --git a/htdocs/templates/administration/forum_inscriptions.html b/htdocs/templates/administration/forum_inscriptions.html
index 7298d668e..ee00d6214 100644
--- a/htdocs/templates/administration/forum_inscriptions.html
+++ b/htdocs/templates/administration/forum_inscriptions.html
@@ -131,7 +131,7 @@
Inscriptions
-
+
diff --git a/htdocs/templates/administration/forum_sessions.html b/htdocs/templates/administration/forum_sessions.html
index 9d4c923b3..9b11c2295 100644
--- a/htdocs/templates/administration/forum_sessions.html
+++ b/htdocs/templates/administration/forum_sessions.html
@@ -58,7 +58,7 @@
Conférences
-
+
diff --git a/htdocs/templates/administration/personnes_morales.html b/htdocs/templates/administration/personnes_morales.html
index 7e2fb3766..2ecbbcf87 100644
--- a/htdocs/templates/administration/personnes_morales.html
+++ b/htdocs/templates/administration/personnes_morales.html
@@ -19,7 +19,7 @@
Liste des personnes morales
-
+
diff --git a/htdocs/templates/administration/site_articles.html b/htdocs/templates/administration/site_articles.html
index fbad0e96f..c34849346 100755
--- a/htdocs/templates/administration/site_articles.html
+++ b/htdocs/templates/administration/site_articles.html
@@ -20,7 +20,7 @@
Liste des articles
-
+
diff --git a/htdocs/templates/planete/images/cron.php b/htdocs/templates/planete/images/cron.php
index 060af04c8..b47defc17 100644
--- a/htdocs/templates/planete/images/cron.php
+++ b/htdocs/templates/planete/images/cron.php
@@ -1,20 +1,20 @@
\ No newline at end of file
diff --git a/rector.php b/rector.php
index 9a0ab030a..f6381f1eb 100644
--- a/rector.php
+++ b/rector.php
@@ -17,13 +17,14 @@
__DIR__ . '/htdocs/cache',
])
->withPhp74Sets()
- //->withTypeCoverageLevel(0)
- //->withDeadCodeLevel(0)
- //->withCodeQualityLevel(0)
- //->withSymfonyContainerXml(__DIR__ . '/var/cache/dev/appAppKernelDevDebugContainer.xml')
- //->withSets([
- // SymfonySetList::SYMFONY_44,
- // SymfonySetList::SYMFONY_CODE_QUALITY,
- // SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
- //])
+ ->withTypeCoverageLevel(PHP_INT_MAX)
+ ->withDeadCodeLevel(PHP_INT_MAX)
+ ->withCodeQualityLevel(PHP_INT_MAX)
+ ->withImportNames(true, true, false)
+ ->withSymfonyContainerXml(__DIR__ . '/var/cache/dev/appDevDebugProjectContainer.xml')
+ ->withSets([
+ SymfonySetList::SYMFONY_44,
+ SymfonySetList::SYMFONY_CODE_QUALITY,
+ SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
+ ])
;
diff --git a/sources/Afup/Association/Cotisations.php b/sources/Afup/Association/Cotisations.php
index 04d2f7ad9..921b963ee 100644
--- a/sources/Afup/Association/Cotisations.php
+++ b/sources/Afup/Association/Cotisations.php
@@ -1,13 +1,16 @@
_bdd = $bdd;
$this->_droits = $droits;
@@ -69,10 +69,9 @@ function __construct(&$bdd, $droits = null)
* @param string $champs Champs à renvoyer
* @param string $ordre Tri des enregistrements
* @param bool $associatif Renvoyer un tableau associatif ?
- * @access public
* @return array
*/
- function obtenirListe($type_personne, $id_personne, $champs = '*', $ordre = 'date_fin DESC', $associatif = false)
+ public function obtenirListe($type_personne, $id_personne, string $champs = '*', string $ordre = 'date_fin DESC', bool $associatif = false)
{
$requete = 'SELECT';
$requete .= ' ' . $champs . ' ';
@@ -94,10 +93,9 @@ function obtenirListe($type_personne, $id_personne, $champs = '*', $ordre = 'dat
*
* @param int $id Identifiant de la cotisation
* @param string $champs Champs à renvoyer
- * @access public
* @return array
*/
- function obtenir($id, $champs = '*')
+ public function obtenir($id, string $champs = '*')
{
$requete = 'SELECT';
$requete .= ' ' . $champs . ' ';
@@ -111,10 +109,8 @@ function obtenir($id, $champs = '*')
/**
* Renvoit le numéro de la prochaine facture au format : {année}-{index depuis le début de l'année}
*
- * @access private
- * @return string
*/
- function _genererNumeroFacture()
+ public function _genererNumeroFacture(): string
{
$requete = 'SELECT';
$requete .= " MAX(CAST(SUBSTRING_INDEX(numero_facture, '-', -1) AS UNSIGNED)) + 1 ";
@@ -140,11 +136,10 @@ function _genererNumeroFacture()
* @param int $date_fin Date de fin de la cotisation
* @param string $commentaires Commentaires concernnant la cotisation
* @param string $referenceClient Reference client à mentionner sur la facture
- * @access public
* @return bool Succès de l'ajout
*/
- function ajouter($type_personne, $id_personne, $montant, $type_reglement,
- $informations_reglement, $date_debut, $date_fin, $commentaires, $referenceClient = null)
+ public function ajouter($type_personne, $id_personne, $montant, $type_reglement,
+ $informations_reglement, $date_debut, $date_fin, $commentaires, $referenceClient = null): bool
{
$requete = 'INSERT INTO ';
$requete .= ' afup_cotisations (type_personne, id_personne, montant, type_reglement , informations_reglement,';
@@ -161,11 +156,7 @@ function ajouter($type_personne, $id_personne, $montant, $type_reglement,
$requete .= $this->_bdd->echapper(base64_encode(random_bytes(30))) . ',';
$requete .= $this->_bdd->echapper($commentaires) . ',';
$requete .= $this->_bdd->echapper($referenceClient) . ')';
-
- if ($this->_bdd->executer($requete) === false) {
- return false;
- }
- return true;
+ return $this->_bdd->executer($requete) !== false;
}
/**
@@ -182,11 +173,10 @@ function ajouter($type_personne, $id_personne, $montant, $type_reglement,
* @param int $date_fin Date de fin de la cotisation
* @param string $commentaires Commentaires concernnant la cotisation
* @param string $referenceClient Reference client à mentionner sur la facture
- * @access public
* @return bool Succès de la modification
*/
- function modifier($id, $type_personne, $id_personne, $montant, $type_reglement,
- $informations_reglement, $date_debut, $date_fin, $commentaires, $referenceClient)
+ public function modifier($id, $type_personne, $id_personne, $montant, $type_reglement,
+ $informations_reglement, $date_debut, $date_fin, $commentaires, $referenceClient): bool
{
$requete = 'UPDATE';
$requete .= ' afup_cotisations ';
@@ -202,13 +192,10 @@ function modifier($id, $type_personne, $id_personne, $montant, $type_reglement,
$requete .= ' reference_client=' . $this->_bdd->echapper($referenceClient) . ' ';
$requete .= 'WHERE';
$requete .= ' id=' . $id;
- if ($this->_bdd->executer($requete) === false) {
- return false;
- }
- return true;
+ return $this->_bdd->executer($requete) !== false;
}
- function estDejaReglee($cmd)
+ public function estDejaReglee($cmd)
{
$requete = 'SELECT';
$requete .= ' 1 ';
@@ -219,7 +206,7 @@ function estDejaReglee($cmd)
return $this->_bdd->obtenirUn($requete);
}
- function notifierRegelementEnLigneAuTresorier($cmd, $total, $autorisation, $transaction, UserRepository $userRepository)
+ public function notifierRegelementEnLigneAuTresorier(string $cmd, string $total, string $autorisation, string $transaction, UserRepository $userRepository): ?bool
{
$account = $this->getAccountFromCmd($cmd);
@@ -254,9 +241,10 @@ function notifierRegelementEnLigneAuTresorier($cmd, $total, $autorisation, $tran
if (false === $ok) {
return false;
}
+ return null;
}
- function validerReglementEnLigne($cmd, $total, $autorisation, $transaction)
+ public function validerReglementEnLigne($cmd, $total, string $autorisation, string $transaction)
{
$reference = substr($cmd, 0, strlen($cmd) - 4);
$verif = substr($cmd, strlen($cmd) - 3, strlen($cmd));
@@ -272,10 +260,9 @@ function validerReglementEnLigne($cmd, $total, $autorisation, $transaction)
$cotisation['id'],
AFUP_COTISATIONS_REGLEMENT_ENLIGNE, "autorisation : " . $autorisation . " / transaction : " . $transaction
);
-
- } elseif (substr(md5($reference), -3) == strtolower($verif) and !$this->estDejaReglee($cmd)) {
+ } elseif (substr(md5($reference), -3) === strtolower($verif) && !$this->estDejaReglee($cmd)) {
[$ref, $date, $type_personne, $id_personne, $reste] = explode('-', $cmd, 5);
- $date_debut = mktime(0, 0, 0, substr($date, 2, 2), substr($date, 0, 2), substr($date, 4, 4));
+ $date_debut = mktime(0, 0, 0, (int) substr($date, 2, 2), (int) substr($date, 0, 2), (int) substr($date, 4, 4));
$cotisation = $this->obtenirDerniere($type_personne, $id_personne);
$date_fin_precedente = $cotisation === false ? 0 : $cotisation['date_fin'];
@@ -298,7 +285,10 @@ function validerReglementEnLigne($cmd, $total, $autorisation, $transaction)
return $result;
}
- public function getAccountFromCmd($cmd)
+ /**
+ * @return int[]|string[]
+ */
+ public function getAccountFromCmd($cmd): array
{
$arr = explode('-', $cmd, 5);
// Personne morale : $cmd=FCOTIS-2023-202
@@ -316,10 +306,9 @@ public function getAccountFromCmd($cmd)
* Supprime une cotisation
*
* @param int $id Identifiant de la cotisation à supprimer
- * @access public
* @return bool Succès de la suppression
*/
- function supprimer($id)
+ public function supprimer($id)
{
$requete = 'DELETE FROM afup_cotisations WHERE id=' . $id;
return $this->_bdd->executer($requete);
@@ -330,10 +319,9 @@ function supprimer($id)
*
* @param int $id_cotisation Identifiant de la cotisation
* @param string $chemin Chemin du fichier PDF à générer. Si ce chemin est omi, le PDF est renvoyé au navigateur.
- * @access public
* @return int Le numero de la facture
*/
- function genererFacture($id_cotisation, $chemin = null)
+ public function genererFacture($id_cotisation, $chemin = null)
{
$requete = 'SELECT * FROM afup_cotisations WHERE id=' . $id_cotisation;
$cotisation = $this->_bdd->obtenirEnregistrement($requete);
@@ -397,7 +385,7 @@ function genererFacture($id_cotisation, $chemin = null)
$pdf->Ln();
$pdf->SetFillColor(255, 255, 255);
$pdf->Cell(50, 5, 'ADH', 1);
- $pdf->Cell(100, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', $cotisation['date_fin'])), 1);
+ $pdf->Cell(100, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', (int) $cotisation['date_fin'])), 1);
$pdf->Cell(40, 5, utf8_decode($cotisation['montant'] . ' '), 1);
$pdf->Ln(15);
@@ -445,7 +433,7 @@ function genererFacture($id_cotisation, $chemin = null)
$pdf->Cell(10, 5, utf8_decode('Lors de votre règlement, merci de préciser la mention : "Facture n°' . $cotisation['numero_facture']) . '"');
if (is_null($chemin)) {
- $pattern = str_replace(' ', '', $patternPrefix) . '_' . $cotisation['numero_facture'] . '_' . date('dmY', $cotisation['date_debut']) . '.pdf';
+ $pattern = str_replace(' ', '', $patternPrefix) . '_' . $cotisation['numero_facture'] . '_' . date('dmY', (int) $cotisation['date_debut']) . '.pdf';
$pdf->Output($pattern, 'D');
} else {
@@ -455,13 +443,13 @@ function genererFacture($id_cotisation, $chemin = null)
return $cotisation['numero_facture'];
}
- private function buildDetailsPersonneMorale(PDF_Facture $pdf, $montant, $dateFin)
+ private function buildDetailsPersonneMorale(PDF_Facture $pdf, $montant, $dateFin): array
{
$montantTtc = $montant * (1 + Utils::MEMBERSHIP_FEE_VAT_RATE);
$pdf->Ln();
$pdf->SetFillColor(255, 255, 255);
$pdf->Cell(20, 5, 'ADH', 1);
- $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', $dateFin)), 1);
+ $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', (int) $dateFin)), 1);
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montant) . ' '), 1, 0, 'R');
$pdf->Cell(25, 5, utf8_decode((Utils::MEMBERSHIP_FEE_VAT_RATE * 100) . ' %'), 1, 0, 'R');
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montantTtc) . ' '), 1, 0, 'R');
@@ -471,7 +459,7 @@ private function buildDetailsPersonneMorale(PDF_Facture $pdf, $montant, $dateFin
return [$totalHt, $total];
}
- private function buildDetailsPersonnePhysique(PDF_Facture $pdf, $montant, $dateFin)
+ private function buildDetailsPersonnePhysique(PDF_Facture $pdf, $montant, $dateFin): array
{
$montantFixeHt = 5 / 100 * $montant;
$montantFixeTTc = $montantFixeHt * (1 + Utils::MEMBERSHIP_FEE_VAT_RATE);
@@ -480,7 +468,7 @@ private function buildDetailsPersonnePhysique(PDF_Facture $pdf, $montant, $dateF
$pdf->Ln();
$pdf->SetFillColor(255, 255, 255);
$pdf->Cell(20, 5, 'ADH-var', 1);
- $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', $dateFin) . ' - part variable'), 1);
+ $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', (int) $dateFin) . ' - part variable'), 1);
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montantFixeHt) . ' '), 1, 0, 'R');
$pdf->Cell(25, 5, utf8_decode((Utils::MEMBERSHIP_FEE_VAT_RATE * 100) . ' %'), 1, 0, 'R');
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montantFixeTTc) . ' '), 1, 0, 'R');
@@ -488,9 +476,9 @@ private function buildDetailsPersonnePhysique(PDF_Facture $pdf, $montant, $dateF
$pdf->Ln();
$pdf->SetFillColor(255, 255, 255);
$pdf->Cell(20, 5, 'ADH-fixe', 1);
- $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', $dateFin) . ' - part fixe'), 1);
+ $pdf->Cell(95, 5, utf8_decode("Adhésion AFUP jusqu'au " . date('d/m/Y', (int) $dateFin) . ' - part fixe'), 1);
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montantVariable) . ' '), 1, 0, 'R');
- $pdf->Cell(25, 5, utf8_decode('0' . ' %'), 1, 0, 'R');
+ $pdf->Cell(25, 5, utf8_decode('0 %'), 1, 0, 'R');
$pdf->Cell(25, 5, utf8_decode($this->formatFactureValue($montantVariable) . ' '), 1, 0, 'R');
$totalHt = $montantFixeHt + $montantVariable;
@@ -499,7 +487,7 @@ private function buildDetailsPersonnePhysique(PDF_Facture $pdf, $montant, $dateF
return [$totalHt, $total];
}
- private function formatFactureValue($value)
+ private function formatFactureValue($value): string
{
return number_format($value, 2, ',', ' ');
}
@@ -508,13 +496,10 @@ private function formatFactureValue($value)
* Envoi par mail d'une facture au format PDF
*
* @param int $id_cotisation Identifiant de la cotisation
- * @access public
* @return bool Succès de l'envoi
*/
public function envoyerFacture($id_cotisation, Mailer $mailer, UserRepository $userRepository)
{
- $configuration = $GLOBALS['AFUP_CONF'];
-
$personne = $this->obtenir($id_cotisation, 'type_personne, id_personne');
if ($personne['type_personne'] == AFUP_PERSONNES_MORALES) {
@@ -563,12 +548,11 @@ public function envoyerFacture($id_cotisation, Mailer $mailer, UserRepository $u
/**
* Retourne la dernière cotisation d'une personne morale
- *
- * @param int $id_personne Identifiant de la personne
- * @access public
- * @return array|false
+ * @param int|string $type_personne
+ * @param int $id_personne Identifiant de la personne
+ * @return array|false
*/
- function obtenirDerniere($type_personne, $id_personne)
+ public function obtenirDerniere($type_personne, $id_personne)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -591,10 +575,9 @@ function obtenirDerniere($type_personne, $id_personne)
*
* @param int $type_personne Identifiant du type de personne
* @param int $id_personne Identifiant de la personne
- * @access public
* @return int Timestamp de la date de la cotisation
*/
- function obtenirDateDebut($type_personne, $id_personne)
+ public function obtenirDateDebut($type_personne, $id_personne)
{
$requete = 'SELECT';
$requete .= ' date_fin ';
@@ -616,16 +599,12 @@ function obtenirDateDebut($type_personne, $id_personne)
}
/**
- * @param array $cotisation from Afup_Personnes_Physiques::obtenirDerniereCotisation
+ * @param array|false $cotisation from Afup_Personnes_Physiques::obtenirDerniereCotisation
* @return DateTime Date of end of next subscription
*/
- public function finProchaineCotisation($cotisation)
+ public function finProchaineCotisation($cotisation = false): DateTime
{
- if ($cotisation === false) {
- $endSubscription = new DateTime();
- } else {
- $endSubscription = DateTime::createFromFormat('U', $cotisation['date_fin']);
- }
+ $endSubscription = $cotisation === false ? new DateTime() : DateTime::createFromFormat('U', $cotisation['date_fin']);
$base = $now = new DateTime();
$year = new DateInterval('P1Y');
@@ -645,7 +624,7 @@ public function finProchaineCotisation($cotisation)
* @param string|null $token Token de la facture. Si null, pas de vérification
* @return array
*/
- public function getByInvoice($invoiceId, $token = null)
+ public function getByInvoice(string $invoiceId, string $token = null)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -668,7 +647,7 @@ public function getByInvoice($invoiceId, $token = null)
* @param string $informations_reglement Informations concernant le règlement (numéro de chèque, de virement etc.)
* @return bool Succès de la modification
*/
- function updatePayment($id, $type_reglement, $informations_reglement)
+ public function updatePayment($id, $type_reglement, string $informations_reglement): bool
{
$requete = 'UPDATE';
$requete .= ' afup_cotisations ';
@@ -677,13 +656,10 @@ function updatePayment($id, $type_reglement, $informations_reglement)
$requete .= ' informations_reglement=' . $this->_bdd->echapper($informations_reglement);
$requete .= ' WHERE';
$requete .= ' id=' . $id;
- if ($this->_bdd->executer($requete) === false) {
- return false;
- }
- return true;
+ return $this->_bdd->executer($requete) !== false;
}
- public function isCurrentUserAllowedToReadInvoice ($invoiceId)
+ public function isCurrentUserAllowedToReadInvoice(string $invoiceId)
{
if (!$this->_droits) {
throw new \RuntimeException('La variable $_droits ne doit pas être null.');
diff --git a/sources/Afup/Association/Personnes_Morales.php b/sources/Afup/Association/Personnes_Morales.php
index 2798a07f8..24b33c656 100644
--- a/sources/Afup/Association/Personnes_Morales.php
+++ b/sources/Afup/Association/Personnes_Morales.php
@@ -1,5 +1,7 @@
_bdd = $bdd;
}
@@ -35,16 +35,14 @@ function __construct(&$bdd)
* @param string $champs Champs à renvoyer
* @param string $ordre Tri des enregistrements
* @param bool $associatif Renvoyer un tableau associatif ?
- * @access public
* @return array
*/
- function obtenirListe($champs = '*',
- $ordre = 'raison_sociale',
+ public function obtenirListe(string $champs = '*',
+ string $ordre = 'raison_sociale',
$associatif = false,
$filtre = false,
$isActive = null
- )
- {
+ ) {
$requete = 'SELECT';
$requete .= ' ' . $champs . ' ';
$requete .= 'FROM';
@@ -77,22 +75,21 @@ function obtenirListe($champs = '*',
* Obtenir le nombre d'actifs d'une personne morale
*
* @param integer $id ID de la personne morale
- * @access public
* @return int le nombre d'actifs
*/
- function obtenirActifs($id)
+ public function obtenirActifs($id): int
{
$requete = "SELECT count(*) FROM afup_personnes_morales m, afup_personnes_physiques p ";
$requete .= "where m.id = $id and m.id = p.id_personne_morale and p.etat = 1";
$actifs = $this->_bdd->obtenirTous($requete);
- return (int)current($actifs[0]);
+ return (int) current($actifs[0]);
}
public function obtenirMembresMaximum($id, $default = 3)
{
$requete = "SELECT max_members FROM afup_personnes_morales";
- $requete .= " where afup_personnes_morales.id = " . (int)$id;
+ $requete .= " where afup_personnes_morales.id = " . (int) $id;
$row = $this->_bdd->obtenirTous($requete);
if (!isset($row[0])) {
@@ -111,10 +108,9 @@ public function obtenirMembresMaximum($id, $default = 3)
*
* @param int $id Identifiant de la personne
* @param string $champs Champs à renvoyer
- * @access public
* @return array|false
*/
- function obtenir($id, $champs = '*')
+ public function obtenir($id, string $champs = '*')
{
$requete = 'SELECT';
$requete .= ' ' . $champs . ' ';
@@ -133,10 +129,9 @@ function obtenir($id, $champs = '*')
* @param string $ville Ville de la personne morale
* @param int $id_pays Identifiant du pays de la personne morale
* @param int $etat Etat de la personne morale
- * @access public
* @return bool Succès de l'ajout
*/
- function ajouter($civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adresse, $code_postal, $ville, $id_pays, $telephone_fixe, $telephone_portable, $etat, $max_members)
+ public function ajouter(string $civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adresse, $code_postal, $ville, $id_pays, $telephone_fixe, $telephone_portable, $etat, $max_members)
{
$requete = 'INSERT INTO
afup_personnes_morales (civilite, nom, prenom, email, raison_sociale, siret, adresse, code_postal, ville, id_pays, telephone_fixe, telephone_portable, etat, max_members)
@@ -155,7 +150,6 @@ function ajouter($civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adr
$this->_bdd->echapper($etat) . ', ' .
$this->_bdd->echapper($max_members) . ')';
return $this->_bdd->executer($requete);
-
}
@@ -169,10 +163,9 @@ function ajouter($civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adr
* @param string $ville Ville de la personne morale
* @param int $id_pays Identifiant du pays de la personne morale
* @param int $etat Etat de la personne morale
- * @access public
* @return bool Succès de l'ajout
*/
- function modifier($id, $civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adresse, $code_postal, $ville, $id_pays, $telephone_fixe, $telephone_portable, $etat, $max_members = null)
+ public function modifier($id, string $civilite, $nom, $prenom, $email, $raison_sociale, $siret, $adresse, $code_postal, $ville, $id_pays, $telephone_fixe, $telephone_portable, $etat, $max_members = null)
{
$requete = 'UPDATE
afup_personnes_morales
@@ -193,7 +186,7 @@ function modifier($id, $civilite, $nom, $prenom, $email, $raison_sociale, $siret
if ($max_members !== null) {
$requete .= ', max_members = ' . $this->_bdd->echapper($max_members);
}
- $requete .= 'WHERE id=' . (int)$id;
+ $requete .= 'WHERE id=' . (int) $id;
return $this->_bdd->executer($requete);
}
@@ -201,10 +194,9 @@ function modifier($id, $civilite, $nom, $prenom, $email, $raison_sociale, $siret
* Supprime une personne morale
*
* @param int $id Identifiant de la personne morale à supprimer
- * @access public
* @return bool Succès de la suppression
*/
- function supprimer($id, UserRepository $userRepository)
+ public function supprimer($id, UserRepository $userRepository)
{
$cotisation = new Cotisations($this->_bdd);
$cotisation_personne_morale = $cotisation->obtenirListe(AFUP_PERSONNES_MORALES, $id, 'id');
@@ -221,10 +213,9 @@ function supprimer($id, UserRepository $userRepository)
* Retourne le nombre de personnes morales.
*
* @param int $etat Etat des personnes à retourner
- * @access public
* @return int
*/
- function obtenirNombrePersonnesMorales($etat = NULL)
+ public function obtenirNombrePersonnesMorales($etat = null)
{
$requete = 'SELECT';
$requete .= ' COUNT(*) ';
@@ -246,5 +237,3 @@ public function getMembershipFee($id)
return ceil($membersCount / AFUP_PERSONNE_MORALE_SEUIL) * AFUP_COTISATION_PERSONNE_MORALE;
}
}
-
-?>
diff --git a/sources/Afup/AuthentificationInterface.php b/sources/Afup/AuthentificationInterface.php
index 24aa000bd..42be949b4 100644
--- a/sources/Afup/AuthentificationInterface.php
+++ b/sources/Afup/AuthentificationInterface.php
@@ -1,24 +1,21 @@
\ No newline at end of file
diff --git a/sources/Afup/AuthentificationWiki.php b/sources/Afup/AuthentificationWiki.php
index 0c587c4ac..1293f8940 100644
--- a/sources/Afup/AuthentificationWiki.php
+++ b/sources/Afup/AuthentificationWiki.php
@@ -1,4 +1,6 @@
\ No newline at end of file
diff --git a/sources/Afup/Bootstrap/Cli.php b/sources/Afup/Bootstrap/Cli.php
index c22a12b34..fbeaf2b98 100644
--- a/sources/Afup/Bootstrap/Cli.php
+++ b/sources/Afup/Bootstrap/Cli.php
@@ -1,18 +1,20 @@
* @author Olivier Hoareau
* @copyright 2010 Association Française des Utilisateurs de PHP
- *
+ *
* @category AFUP
* @package AFUP
* @group Bootstraps
@@ -25,4 +27,4 @@
require_once __DIR__ . '/_Common.php';
require_once __DIR__ . '/../../../vendor/autoload.php';
-Logs::initialiser($bdd, 0);
\ No newline at end of file
+Logs::initialiser($bdd, 0);
diff --git a/sources/Afup/Bootstrap/Http.php b/sources/Afup/Bootstrap/Http.php
index 69e071a0e..dc3fdceec 100644
--- a/sources/Afup/Bootstrap/Http.php
+++ b/sources/Afup/Bootstrap/Http.php
@@ -1,18 +1,20 @@
* @author Olivier Hoareau
* @copyright 2010 Association Française des Utilisateurs de PHP
- *
+ *
* @category AFUP
* @package AFUP
* @group Bootstraps
@@ -32,13 +34,13 @@
// mise à jour des paramétrages PHP en fonction de la configuration
if (getenv('SYMFONY_ENV') === 'prod') {
- ini_set('error_reporting', E_ALL ^ E_WARNING ^ E_NOTICE);
- ini_set('display_errors', 0);
+ ini_set('error_reporting', (string) (E_ALL ^ E_WARNING ^ E_NOTICE));
+ ini_set('display_errors', '0');
} else {
- ini_set('error_reporting', E_ALL);
- ini_set('display_errors', 1);
+ ini_set('error_reporting', (string) E_ALL);
+ ini_set('display_errors', '1');
}
-ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . __DIR__.'/../../../dependencies/PEAR/');
+ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . __DIR__ . '/../../../dependencies/PEAR/');
header('Content-type: text/html; charset=UTF-8');
@@ -47,8 +49,8 @@
$serveur = '';
$url = $_SERVER['REQUEST_URI'];
if (strrpos($url, '?') !== false) {
- $position = strrpos($url, '?');
- $url = substr($url, 0, $position);
+ $position = strrpos($url, '?');
+ $url = substr($url, 0, $position);
}
$position = strrpos($url, '/');
$url = substr($_SERVER['REQUEST_URI'], 0, $position);
@@ -69,8 +71,8 @@
$smarty->php_handling = SMARTY_PHP_ALLOW;
$smarty->assign('url_base', 'http://' . $_SERVER['HTTP_HOST'] . '/');
-$smarty->assign('chemin_template', $serveur.Site::WEB_PATH.'templates/' . $sous_site . '/');
-$smarty->assign('chemin_javascript', $serveur.Site::WEB_PATH.'javascript/');
+$smarty->assign('chemin_template', $serveur . Site::WEB_PATH . 'templates/' . $sous_site . '/');
+$smarty->assign('chemin_javascript', $serveur . Site::WEB_PATH . 'javascript/');
$GLOBALS['AFUP_DB']->executer("SET NAMES 'utf8'");
require_once(__DIR__ . '/commonStart.php');
diff --git a/sources/Afup/Bootstrap/OtherToolPlugin.php b/sources/Afup/Bootstrap/OtherToolPlugin.php
index f54a580dd..d685e47a7 100644
--- a/sources/Afup/Bootstrap/OtherToolPlugin.php
+++ b/sources/Afup/Bootstrap/OtherToolPlugin.php
@@ -1,18 +1,20 @@
* @author Olivier Hoareau
* @copyright 2010 Association Française des Utilisateurs de PHP
- *
+ *
* @category AFUP
* @package AFUP
* @group Bootstraps
@@ -20,4 +22,4 @@
// chargement des paramétrages génériques / multi-contextuels de l'application
-require_once __DIR__ . '/_Common.php';
\ No newline at end of file
+require_once __DIR__ . '/_Common.php';
diff --git a/sources/Afup/Bootstrap/_Common.php b/sources/Afup/Bootstrap/_Common.php
index 4dfcb5364..8340ec851 100644
--- a/sources/Afup/Bootstrap/_Common.php
+++ b/sources/Afup/Bootstrap/_Common.php
@@ -1,4 +1,7 @@
*/
-set_include_path(
- $root . '/dependencies'
- . PATH_SEPARATOR . $root . '/sources'
-);
+set_include_path($root . '/dependencies' . PATH_SEPARATOR . $root . '/sources');
// préparation de la requête / session
-
-require_once 'Afup/fonctions.php';
-
-
+require_once __DIR__ . '/../fonctions.php';
// chargement de la configuration
$conf = new Configuration();
// mets la configuration dans une 'clé de registre' accessible à tout moment
-
$GLOBALS['AFUP_CONF'] = $conf;
// initialisation de la couche d'abstraction de la base de données
-
$bdd = new _Site_Base_De_Donnees();
// mets la connexion db dans une 'clé de registre' accessible à tout moment
-
$GLOBALS['AFUP_DB'] = $bdd;
diff --git a/sources/Afup/Bootstrap/commonStart.php b/sources/Afup/Bootstrap/commonStart.php
index cd250c0e6..87ae2f53b 100644
--- a/sources/Afup/Bootstrap/commonStart.php
+++ b/sources/Afup/Bootstrap/commonStart.php
@@ -1,5 +1,12 @@
addLoader('xliff', new \Symfony\Component\Translation\Loader\XliffFileLoader());
+$translator = new Translator($lang);
+$translator->addLoader('xliff', new XliffFileLoader());
$translator->addResource('xliff', __DIR__ . '/../../../translations/inscription.en.xlf', 'en');
$translator->addResource('xliff', __DIR__ . '/../../../translations/cfp.en.xlf', 'en');
$translator->setFallbackLocales(['fr']);
@@ -174,7 +181,7 @@
// Initialisation de ting
-$services = new \CCMBenchmark\Ting\Services();
+$services = new Services();
$services->get('ConnectionPool')->setConfig([
'main' => [
'namespace' => '\CCMBenchmark\Ting\Driver\Mysqli',
@@ -195,4 +202,4 @@
['default' => ['database' => $GLOBALS['AFUP_CONF']->obtenir('database_name')]]
)
;
-$services->set('security.csrf.token_manager', fn() => new Symfony\Component\Security\Csrf\CsrfTokenManager());
+$services->set('security.csrf.token_manager', fn (): CsrfTokenManager => new CsrfTokenManager());
diff --git a/sources/Afup/Comptabilite/Comptabilite.php b/sources/Afup/Comptabilite/Comptabilite.php
index 5068037ef..fcf50d6e5 100755
--- a/sources/Afup/Comptabilite/Comptabilite.php
+++ b/sources/Afup/Comptabilite/Comptabilite.php
@@ -1,4 +1,6 @@
_bdd = $bdd;
}
@@ -43,12 +41,10 @@ function __construct(&$bdd)
* Paypal
*
*/
- function obtenirJournalBanque($compte = 1,
+ public function obtenirJournalBanque($compte = 1,
$periode_debut = '',
$periode_fin = ''
- )
- {
-
+ ) {
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
$requete = 'SELECT ';
@@ -74,27 +70,32 @@ function obtenirJournalBanque($compte = 1,
$requete .= 'AND compta.date_regl <= \'' . $periode_fin . '\' ';
$requete .= 'AND compta.montant != \'0.00\' ';
$requete .= 'AND compta.idmode_regl = compta_reglement.id ';
- $requete .= 'AND idcompte = ' . (int)$compte . ' ';
+ $requete .= 'AND idcompte = ' . (int) $compte . ' ';
$requete .= 'ORDER BY ';
$requete .= 'compta.date_regl ';
return $this->_bdd->obtenirTous($requete);
}
- function obtenirSousTotalJournalBanque($compte = 1, $periode_debut, $periode_fin)
+ public function obtenirSousTotalJournalBanque($periode_debut, $periode_fin, $compte = 1)
{
-
$data = $this->obtenirJournalBanque($compte, $periode_debut, $periode_fin);
for ($i = 1; $i <= 12; $i++) {
- $credit[$i] = '';
- $debit[$i] = '';
- $nligne[$i] = '';
+ $credit[$i] = 0;
+ $debit[$i] = 0;
+ $nligne[$i] = 0;
}
- foreach ($data as $id => $row) {
- if ($row['idoperation'] == "1") $debit[$row['mois']] += $row['montant'];
- if ($row['idoperation'] == "2") $credit[$row['mois']] += $row['montant'];
- if ($row['idoperation'] == "1" || $row['idoperation'] == "2") $nligne[$row['mois']]++;
+ foreach ($data as $row) {
+ if ($row['idoperation'] == "1") {
+ $debit[$row['mois']] += $row['montant'];
+ }
+ if ($row['idoperation'] == "2") {
+ $credit[$row['mois']] += $row['montant'];
+ }
+ if ($row['idoperation'] == "1" || $row['idoperation'] == "2") {
+ $nligne[$row['mois']]++;
+ }
}
$dif_old = 0;
@@ -112,9 +113,8 @@ function obtenirSousTotalJournalBanque($compte = 1, $periode_debut, $periode_fin
return $tableau;
}
- function obtenirTotalJournalBanque($compte = 1, $periode_debut, $periode_fin)
+ public function obtenirTotalJournalBanque($periode_debut, $periode_fin, $compte = 1): array
{
-
$data = $this->obtenirJournalBanque($compte, $periode_debut, $periode_fin);
/* echo "';
+ $extraction .= '';
if ($this->navigation == 'image' && $feuille['image'] !== null) {
- $extraction .= '!['.$feuille['alt'].']('.Site::WEB_PATH.'templates/site/images/'.$feuille['image'].')
'; + $extraction .= '![' . $feuille['alt'] . '](' . Site::WEB_PATH . 'templates/site/images/' . $feuille['image'] . ')
'; $extraction .= $feuille['nom'] . '
'; $extraction .= $feuille['alt']; } else { - $extraction .= '' . $feuille['nom'] . ''; + $extraction .= '' . $feuille['nom'] . ''; } $extraction .= ''; if ($profondeur > 0) { $extraction .= $this->naviguer($feuille['id'], $profondeur - 1); } - } } diff --git a/sources/Afup/Corporate/Feuille.php b/sources/Afup/Corporate/Feuille.php index 0810beb01..b28c407b6 100644 --- a/sources/Afup/Corporate/Feuille.php +++ b/sources/Afup/Corporate/Feuille.php @@ -1,7 +1,11 @@ id = $id; - if ($bdd) { - $this->bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - function inserer() + public function inserer() { if ($this->id > 0) { $this->supprimer(); } $requete = 'INSERT INTO afup_site_feuille SET - id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ', + id_parent = ' . $this->bdd->echapper($this->id_parent ?: null) . ', nom = ' . $this->bdd->echapper($this->nom) . ', lien = ' . $this->bdd->echapper($this->lien) . ', alt = ' . $this->bdd->echapper($this->alt) . ', @@ -62,11 +62,11 @@ function inserer() return $this->bdd->executer($requete); } - function modifier() + public function modifier() { $requete = 'UPDATE afup_site_feuille SET - id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ', + id_parent = ' . $this->bdd->echapper($this->id_parent ?: null) . ', nom = ' . $this->bdd->echapper($this->nom) . ', lien = ' . $this->bdd->echapper($this->lien) . ', alt = ' . $this->bdd->echapper($this->alt) . ', @@ -76,12 +76,12 @@ function modifier() date = ' . $this->bdd->echapper($this->date) . ', patterns = ' . $this->bdd->echapper($this->patterns) . ', etat = ' . $this->bdd->echapper($this->etat) . ' - WHERE id = ' . (int)$this->id; + WHERE id = ' . (int) $this->id; return $this->bdd->executer($requete); } - function remplir($f) + public function remplir(array $f): void { $this->id = $f['id']; $this->id_parent = $f['id_parent']; @@ -96,7 +96,7 @@ function remplir($f) $this->patterns = $f['patterns']; } - function exportable() + public function exportable(): array { return [ 'id' => $this->id, @@ -107,13 +107,13 @@ function exportable() 'image' => $this->image, 'image_alt' => $this->image_alt, 'position' => $this->position, - 'date' => date('Y-m-d', $this->date), + 'date' => date('Y-m-d', (int) $this->date), 'etat' => $this->etat, 'patterns' => $this->patterns, ]; } - function charger() + public function charger(): void { $requete = 'SELECT * FROM afup_site_feuille @@ -122,13 +122,16 @@ function charger() $this->remplir($f); } - function supprimer() + public function supprimer() { $requete = 'DELETE FROM afup_site_feuille WHERE id = ' . $this->bdd->echapper($this->id); return $this->bdd->executer($requete); } - function positionable() + /** + * @return int[] + */ + public function positionable(): array { $positions = []; for ($i = 9; $i >= -9; $i--) { @@ -136,5 +139,4 @@ function positionable() } return $positions; } - } diff --git a/sources/Afup/Corporate/Feuilles.php b/sources/Afup/Corporate/Feuilles.php index 8188ec86a..12d2ff780 100644 --- a/sources/Afup/Corporate/Feuilles.php +++ b/sources/Afup/Corporate/Feuilles.php @@ -1,25 +1,23 @@ bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - function obtenirListe($champs = '*', $ordre = 'titre', $associatif = false) + public function obtenirListe(string $champs = '*', string $ordre = 'titre', $associatif = false) { $requete = 'SELECT ' . $champs . ' '; $requete .= 'FROM'; @@ -30,4 +28,4 @@ function obtenirListe($champs = '*', $ordre = 'titre', $associatif = false) } return $this->bdd->obtenirTous($requete); } -} \ No newline at end of file +} diff --git a/sources/Afup/Corporate/Footer.php b/sources/Afup/Corporate/Footer.php index 51c4abda0..ca12f2a0e 100644 --- a/sources/Afup/Corporate/Footer.php +++ b/sources/Afup/Corporate/Footer.php @@ -1,23 +1,18 @@ conf = $GLOBALS['AFUP_CONF']; - } - - function logos() + public function logos(): string { $branche = new Branche(); $branche->navigation_avec_image(true); return '' . $question->titre() . ' ';
}
- $contenu .= '';
- return $contenu;
+ return $contenu . '';
}
- function articles()
+ public function articles(): string
{
$articles = new Articles();
$ajouts = $articles->chargerDerniersAjouts();
@@ -39,13 +33,12 @@ function articles()
foreach ($ajouts as $ajout) {
$contenu .= '' . $ajout->titre() . ' ';
}
- $contenu .= '';
- return $contenu;
+ return $contenu . '';
}
- function render()
+ public function render(): string
{
return "";
}
-}
\ No newline at end of file
+}
diff --git a/sources/Afup/Corporate/Page.php b/sources/Afup/Corporate/Page.php
index ee712235f..669d3ba9e 100644
--- a/sources/Afup/Corporate/Page.php
+++ b/sources/Afup/Corporate/Page.php
@@ -1,4 +1,6 @@
bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
$this->conf = $GLOBALS['AFUP_CONF'];
}
- function definirRoute($route)
+ public function definirRoute($route): void
{
$this->route = $route;
switch (true) {
@@ -59,13 +57,13 @@ function definirRoute($route)
}
}
- function community()
+ public function community(): string
{
$branche = new Branche($this->bdd);
return $branche->naviguer(5, 2);
}
- function header($url = null, UserInterface $user = null)
+ public function header($url = null, UserInterface $user = null): string
{
$branche = new Branche($this->bdd);
$url = urldecode($url);
@@ -73,7 +71,7 @@ function header($url = null, UserInterface $user = null)
$feuillesEnfants = $branche->feuillesEnfants(Feuille::ID_FEUILLE_HEADER);
- if (null !== $user) {
+ if ($user instanceof UserInterface) {
$feuillesEnfants[] = [
'id' => PHP_INT_MAX,
'id_parent' => Feuille::ID_FEUILLE_HEADER,
@@ -86,8 +84,6 @@ function header($url = null, UserInterface $user = null)
'image' => null,
'patterns' => "#/admin/company#",
];
-
-
} else {
$feuillesEnfants[] = [
'id' => PHP_INT_MAX - 1,
@@ -106,14 +102,16 @@ function header($url = null, UserInterface $user = null)
foreach ($feuillesEnfants as $feuille) {
$isCurrent = false;
- foreach (explode(PHP_EOL, $feuille['patterns']) as $pattern) {
- $pattern = trim($pattern);
- if (strlen($pattern) === 0) {
- continue;
- }
+ if ($feuille['patterns']) {
+ foreach (explode(PHP_EOL, $feuille['patterns']) as $pattern) {
+ $pattern = trim($pattern);
+ if ($pattern === '') {
+ continue;
+ }
- if (preg_match($pattern, $url)) {
- $isCurrent = true;
+ if (preg_match($pattern, $url)) {
+ $isCurrent = true;
+ }
}
}
@@ -129,7 +127,6 @@ function header($url = null, UserInterface $user = null)
$isCurrent = true;
}
}
-
}
}
@@ -142,21 +139,20 @@ function header($url = null, UserInterface $user = null)
$str .= sprintf("%s ", $class, $feuille['lien'], $feuille['nom']);
}
- $str .= '
";
print_r($data);
@@ -122,22 +122,26 @@ function obtenirTotalJournalBanque($compte = 1, $periode_debut, $periode_fin)
$credit = 0;
$debit = 0;
- foreach ($data as $id => $row) {
- if ($row['idoperation'] == "1") $debit += $row['montant'];
- if ($row['idoperation'] == "2") $credit += $row['montant'];
+ foreach ($data as $row) {
+ if ($row['idoperation'] == "1") {
+ $debit += $row['montant'];
+ }
+ if ($row['idoperation'] == "2") {
+ $credit += $row['montant'];
+ }
}
-//print_r($credit);
-//$dif_old=0;
-//for ($i=1;$i<=12;$i++)
-//{
-// $dif=$dif_old+$credit[$i]-$debit[$i];
+ //print_r($credit);
+ //$dif_old=0;
+ //for ($i=1;$i<=12;$i++)
+ //{
+ // $dif=$dif_old+$credit[$i]-$debit[$i];
$tableau = [
"debit" => $debit,
"credit" => $credit,
"dif" => $credit - $debit
];
-// $dif_old=$dif;
-//}
+ // $dif_old=$dif;
+ //}
return $tableau;
/* $total=0;
@@ -150,27 +154,21 @@ function obtenirTotalJournalBanque($compte = 1, $periode_debut, $periode_fin)
return $total;
*/
-
}
/* Journal des opération
*
*/
- function obtenirJournal($debitCredit = '',
+ public function obtenirJournal(string $debitCredit = '',
$periode_debut = '',
$periode_fin = '',
$onlyUnclasifedEntries = true
- )
- {
-
+ ) {
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
- if ($debitCredit == 1 || $debitCredit == 2)
- $filtre = 'AND compta.idoperation =\'' . $debitCredit . '\' ';
- else
- $filtre = "";
+ $filtre = $debitCredit == 1 || $debitCredit == 2 ? 'AND compta.idoperation =\'' . $debitCredit . '\' ' : "";
$requete = 'SELECT ';
$requete .= 'compta.date_ecriture, compta.description, compta.montant, compta.idoperation,compta.id as idtmp, ';
@@ -221,15 +219,12 @@ function obtenirJournal($debitCredit = '',
}
// mise en forme du montant
- function formatMontantCompta($valeur)
+ public function formatMontantCompta($valeur): string
{
- $prix_ok = number_format($valeur, 2, ',', ' ');
-
- return $prix_ok;
-
+ return number_format($valeur, 2, ',', ' ');
}
- function periodeDebutFin($debutFin = 'debut', $date = '')
+ public function periodeDebutFin($debutFin = 'debut', $date = '')
{
// echo "=>$debutFin*$date*
";
if ($date != '') {
@@ -242,8 +237,8 @@ function periodeDebutFin($debutFin = 'debut', $date = '')
{
$r=obtenirPeriodeEnCours($id_periode);
} else {*/
- return DATE("Y") . "-01-01";
- // }
+ return date("Y") . "-01-01";
+ // }
} else {
/* if ($id_periode !='')
{
@@ -251,12 +246,12 @@ function periodeDebutFin($debutFin = 'debut', $date = '')
print_r($r);
return $r;
} else {*/
- return DATE("Y") . "-12-31";
+ return date("Y") . "-12-31";
//}
}
}
- function obtenirPeriodeEnCours($id_periode)
+ public function obtenirPeriodeEnCours($id_periode)
{
// Si la periode existe
if ($id_periode != "") {
@@ -270,18 +265,16 @@ function obtenirPeriodeEnCours($id_periode)
if ($result) {
return $result[0]['id'];
- } else // ajout d'une nouvelle periode
- {
+ } else { // ajout d'une nouvelle periode
$result = $this->ajouterListPeriode();
return $result[0]['id'];
}
}
- function ajouterListPeriode()
+ public function ajouterListPeriode()
{
-
- $date_debut = DATE("Y") . '-01-01';
- $date_fin = DATE("Y") . '-12-31';
+ $date_debut = date("Y") . '-01-01';
+ $date_fin = date("Y") . '-12-31';
$requete = 'INSERT INTO ';
$requete .= 'compta_periode (';
@@ -294,17 +287,16 @@ function ajouterListPeriode()
$this->_bdd->executer($requete);
return $this->obtenirListPeriode($date_debut, $date_fin);
-
}
- function obtenirListPeriode($date_debut = '', $date_fin = '')
+ public function obtenirListPeriode(?string $date_debut = '', ?string $date_fin = '')
{
$requete = 'SELECT ';
$requete .= 'id, date_debut,date_fin, verouiller ';
$requete .= 'FROM ';
$requete .= 'compta_periode ';
- if ($date_debut != '' AND $date_fin != '') {
+ if ($date_debut != '' && $date_fin != '') {
$requete .= 'WHERE ';
$requete .= 'compta_periode.date_debut= \'' . $date_debut . '\' ';
$requete .= 'AND compta_periode.date_fin= \'' . $date_fin . '\' ';
@@ -313,13 +305,15 @@ function obtenirListPeriode($date_debut = '', $date_fin = '')
return $this->_bdd->obtenirTous($requete);
}
- function obtenirListOperations($filtre = '', $where = '')
+ public function obtenirListOperations($filtre = '', ?string $where = '')
{
$requete = 'SELECT ';
$requete .= 'id, operation ';
$requete .= 'FROM ';
$requete .= 'compta_operation ';
- if ($where) $requete .= 'WHERE id=' . $where . ' ';
+ if ($where) {
+ $requete .= 'WHERE id=' . $where . ' ';
+ }
$requete .= 'ORDER BY ';
$requete .= 'operation ';
@@ -339,13 +333,15 @@ function obtenirListOperations($filtre = '', $where = '')
}
}
- function obtenirListComptes($filtre = '', $where = '')
+ public function obtenirListComptes($filtre = '', ?string $where = '')
{
$requete = 'SELECT ';
$requete .= 'id, nom_compte ';
$requete .= 'FROM ';
$requete .= 'compta_compte ';
- if ($where) $requete .= 'WHERE id=' . $where . ' ';
+ if ($where) {
+ $requete .= 'WHERE id=' . $where . ' ';
+ }
$requete .= 'ORDER BY ';
$requete .= 'nom_compte ';
@@ -365,7 +361,7 @@ function obtenirListComptes($filtre = '', $where = '')
}
}
- function obtenirListCategories($filtre = '', $where = '', $usedInAccountingJournal = false)
+ public function obtenirListCategories($filtre = '', ?string $where = '', $usedInAccountingJournal = false)
{
$requete = 'SELECT ';
$requete .= 'id, idevenement, categorie ';
@@ -379,7 +375,7 @@ function obtenirListCategories($filtre = '', $where = '', $usedInAccountingJourn
$wheres[] = 'hide_in_accounting_journal_at IS NULL';
}
- if (count($wheres)) {
+ if ($wheres !== []) {
$requete .= sprintf('WHERE %s ',implode(' AND ', $wheres));
}
@@ -399,7 +395,6 @@ function obtenirListCategories($filtre = '', $where = '', $usedInAccountingJourn
return $result;
}
-
}
public function obtenirListCategoriesJournal()
@@ -410,7 +405,7 @@ public function obtenirListCategoriesJournal()
return $categories;
}
- function obtenirListEvenements($filtre = '', $where = '', $usedInAccountingJournal = false)
+ public function obtenirListEvenements($filtre = '', ?string $where = '', $usedInAccountingJournal = false)
{
$requete = 'SELECT ';
$requete .= 'id, evenement ';
@@ -424,7 +419,7 @@ function obtenirListEvenements($filtre = '', $where = '', $usedInAccountingJourn
$wheres[] = 'hide_in_accounting_journal_at IS NULL';
}
- if (count($wheres)) {
+ if ($wheres !== []) {
$requete .= sprintf('WHERE %s ',implode(' AND ', $wheres));
}
@@ -454,7 +449,7 @@ public function obtenirListEvenementsJournal()
return $events;
}
- function obtenirListReglements($filtre = '', $where = '', $usedInAccountingJournal = false)
+ public function obtenirListReglements($filtre = '', ?string $where = '', $usedInAccountingJournal = false)
{
$requete = 'SELECT ';
$requete .= 'id, reglement ';
@@ -468,7 +463,7 @@ function obtenirListReglements($filtre = '', $where = '', $usedInAccountingJourn
$wheres[] = 'hide_in_accounting_journal_at IS NULL';
}
- if (count($wheres)) {
+ if ($wheres !== []) {
$requete .= sprintf('WHERE %s ',implode(' AND ', $wheres));
}
@@ -498,11 +493,10 @@ public function obtenirListReglementsJournal()
return $reglements;
}
- function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
+ public function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
$numero, $idmode_regl, $date_regl, $obs_regl, $idevenement, $numero_operation = null,
$attachmentRequired = 0, $montantHtSoumisTva0 = null, $montantHtSoumisTva55 = null, $montantHtSoumisTva10 = null, $montantHtSoumisTva20 = null, $tvaZone = null)
{
-
$requete = 'INSERT INTO ';
$requete .= 'compta (';
$requete .= 'idoperation,idcategorie,date_ecriture,nom_frs,tva_intra,montant,description,';
@@ -525,11 +519,11 @@ function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs
$requete .= $this->_bdd->echapper($numero_operation) . ',';
$requete .= $this->_bdd->echapper($idcompte) . ',';
$requete .= $this->_bdd->echapper($attachmentRequired) . ',';
- $requete .= (!$montantHtSoumisTva0 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva0)) . ',';
- $requete .= (!$montantHtSoumisTva55 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva55)) . ',';
- $requete .= (!$montantHtSoumisTva10 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva10)) . ',';
- $requete .= (!$montantHtSoumisTva20 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva20)) . ',';
- $requete .= (!$tvaZone ? 'NULL' : $this->_bdd->echapper($tvaZone)) . '';
+ $requete .= ($montantHtSoumisTva0 ? $this->_bdd->echapper($montantHtSoumisTva0) : 'NULL') . ',';
+ $requete .= ($montantHtSoumisTva55 ? $this->_bdd->echapper($montantHtSoumisTva55) : 'NULL') . ',';
+ $requete .= ($montantHtSoumisTva10 ? $this->_bdd->echapper($montantHtSoumisTva10) : 'NULL') . ',';
+ $requete .= ($montantHtSoumisTva20 ? $this->_bdd->echapper($montantHtSoumisTva20) : 'NULL') . ',';
+ $requete .= ($tvaZone ? $this->_bdd->echapper($tvaZone) : 'NULL') . '';
$requete .= ');';
$resultat = $this->_bdd->executer($requete);
@@ -539,13 +533,11 @@ function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs
return $resultat;
}
- function modifier($id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
+ public function modifier(string $id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
$numero, $idmode_regl, $date_regl, $obs_regl, $idevenement, $comment, $numero_operation = null, $attachmentRequired = 0,
$montantHtSoumisTva0 = null, $montantHtSoumisTva55 = null, $montantHtSoumisTva10 = null, $montantHtSoumisTva20 = null,
$tvaZone = null
- )
- {
-
+ ) {
$requete = 'UPDATE ';
$requete .= 'compta ';
$requete .= 'SET ';
@@ -561,12 +553,12 @@ function modifier($id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $n
$requete .= 'date_regl=' . $this->_bdd->echapper($date_regl) . ',';
$requete .= 'obs_regl=' . $this->_bdd->echapper($obs_regl) . ',';
$requete .= 'idcompte=' . $this->_bdd->echapper($idcompte) . ',';
- $requete .= 'montant_ht_soumis_tva_0=' . (!$montantHtSoumisTva0 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva0)) . ',';
- $requete .= 'montant_ht_soumis_tva_5_5=' . (!$montantHtSoumisTva55 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva55)) . ',';
- $requete .= 'montant_ht_soumis_tva_10=' . (!$montantHtSoumisTva10 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva10)) . ',';
- $requete .= 'montant_ht_soumis_tva_20=' . (!$montantHtSoumisTva20 ? 'NULL' : $this->_bdd->echapper($montantHtSoumisTva20)) . ',';
- $requete .= 'tva_zone=' . (!$tvaZone ? 'NULL' : $this->_bdd->echapper($tvaZone)) . ',';
- $requete .= 'comment=' . (!$comment ? 'NULL' : $this->_bdd->echapper($comment)) . ',';
+ $requete .= 'montant_ht_soumis_tva_0=' . ($montantHtSoumisTva0 ? $this->_bdd->echapper($montantHtSoumisTva0) : 'NULL') . ',';
+ $requete .= 'montant_ht_soumis_tva_5_5=' . ($montantHtSoumisTva55 ? $this->_bdd->echapper($montantHtSoumisTva55) : 'NULL') . ',';
+ $requete .= 'montant_ht_soumis_tva_10=' . ($montantHtSoumisTva10 ? $this->_bdd->echapper($montantHtSoumisTva10) : 'NULL') . ',';
+ $requete .= 'montant_ht_soumis_tva_20=' . ($montantHtSoumisTva20 ? $this->_bdd->echapper($montantHtSoumisTva20) : 'NULL') . ',';
+ $requete .= 'tva_zone=' . ($tvaZone ? $this->_bdd->echapper($tvaZone) : 'NULL') . ',';
+ $requete .= 'comment=' . ($comment ? $this->_bdd->echapper($comment) : 'NULL') . ',';
if ($numero_operation) {
$requete .= 'numero_operation=' . $this->_bdd->echapper($numero_operation) . ',';
}
@@ -612,7 +604,7 @@ public function modifierColonne($id, $columnName, $columnValue)
return $this->_bdd->executer($requete);
}
- function ajouterConfig($table, $champ, $valeur)
+ public function ajouterConfig(string $table, string $champ, $valeur)
{
$requete = 'INSERT INTO ';
$requete .= '' . $table . ' (';
@@ -624,9 +616,8 @@ function ajouterConfig($table, $champ, $valeur)
return $this->_bdd->executer($requete);
}
- function modifierConfig($table, $id, $champ, $valeur)
+ public function modifierConfig(string $table, string $id, string $champ, $valeur)
{
-
$requete = 'UPDATE ';
$requete .= '' . $table . ' ';
$requete .= 'SET ';
@@ -637,7 +628,7 @@ function modifierConfig($table, $id, $champ, $valeur)
return $this->_bdd->executer($requete);
}
- function obtenir($id)
+ public function obtenir(string $id)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -648,8 +639,12 @@ function obtenir($id)
return $this->_bdd->obtenirEnregistrement($requete);
}
-
- function obtenirSyntheseEvenement($idoperation = '1', $idevenement)
+ /**
+ * @param string|int $idevenement
+ * @param string|int $idoperation
+ * @return array|false|mixed
+ */
+ public function obtenirSyntheseEvenement($idevenement, $idoperation = 1)
{
$requete = 'SELECT ';
$requete .= 'compta.*, ';
@@ -666,11 +661,15 @@ function obtenirSyntheseEvenement($idoperation = '1', $idevenement)
$requete .= 'compta.date_ecriture ';
return $this->_bdd->obtenirTous($requete);
-
}
- function obtenirTotalSyntheseEvenement($idoperation = '1', $idevenement)
+ /**
+ * @param string|int $idevenement
+ * @param string|int $idoperation
+ * @return int|mixed
+ */
+ public function obtenirTotalSyntheseEvenement($idevenement, $idoperation = 1)
{
$requete = 'SELECT ';
$requete .= 'compta.montant ';
@@ -683,13 +682,13 @@ function obtenirTotalSyntheseEvenement($idoperation = '1', $idevenement)
$data = $this->_bdd->obtenirTous($requete);
$total = 0;
- foreach ($data as $id => $row) {
+ foreach ($data as $row) {
$total += $row['montant'];
}
return $total;
}
- function obtenirBilan($idoperation = '1', $periode_debut = '', $periode_fin = '')
+ public function obtenirBilan($idoperation = 1, $periode_debut = '', $periode_fin = '')
{
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
@@ -713,21 +712,26 @@ function obtenirBilan($idoperation = '1', $periode_debut = '', $periode_fin = ''
return $this->_bdd->obtenirTous($requete);
}
- function obtenirTotalBilan($idoperation = '1', $periode_debut, $periode_fin)
+ public function obtenirTotalBilan($periode_debut, $periode_fin, $idoperation = '1')
{
-
$data = $this->obtenirBilan($idoperation, $periode_debut, $periode_fin);
$total = 0;
- foreach ($data as $id => $row) {
-
+ foreach ($data as $row) {
$total += $row['montant'];
}
return $total;
}
- function obtenirBilanDetails($idoperation, $periode_debut = '', $periode_fin = '', $idevenement)
+ /**
+ * @param string|int $idoperation
+ * @param string|int $idevenement
+ * @param string $periode_debut
+ * @param string $periode_fin
+ * @return array|false|mixed
+ */
+ public function obtenirBilanDetails($idoperation, $idevenement, $periode_debut = '', $periode_fin = '')
{
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
@@ -752,19 +756,16 @@ function obtenirBilanDetails($idoperation, $periode_debut = '', $periode_fin = '
//$requete .= ' compta_evenement.evenement ';
$requete .= 'ORDER BY ';
$requete .= ' compta.date_ecriture ';
-//echo $requete."
";
+ //echo $requete."
";
return $this->_bdd->obtenirTous($requete);
-
}
- function obtenirSousTotalBilan($idoperation = '1', $periode_debut, $periode_fin, $idevenement)
+ public function obtenirSousTotalBilan($periode_debut, $periode_fin, string $idevenement, string $idoperation = '1')
{
-
- $data = $this->obtenirBilanDetails($idoperation, $periode_debut, $periode_fin, $idevenement);
+ $data = $this->obtenirBilanDetails($idoperation, $idevenement, $periode_debut, $periode_fin);
$total = 0;
- foreach ($data as $id => $row) {
-
+ foreach ($data as $row) {
$total += $row['montant'];
}
@@ -772,7 +773,7 @@ function obtenirSousTotalBilan($idoperation = '1', $periode_debut, $periode_fin,
}
- function obtenirBalance($idoperation = '', $periode_debut = '', $periode_fin = '')
+ public function obtenirBalance($idoperation = null, $periode_debut = '', $periode_fin = '')
{
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
@@ -789,8 +790,9 @@ function obtenirBalance($idoperation = '', $periode_debut = '', $periode_fin = '
$requete .= ' compta.idevenement = compta_evenement.id ';
$requete .= ' AND compta.date_ecriture >= \'' . $periode_debut . '\' ';
$requete .= ' AND compta.date_ecriture <= \'' . $periode_fin . '\' ';
- if ($idoperation != '')
+ if ($idoperation != '') {
$requete .= ' AND compta.idoperation = \'' . $idoperation . '\' ';
+ }
$requete .= 'GROUP BY ';
$requete .= ' compta_evenement.evenement ';
@@ -800,21 +802,23 @@ function obtenirBalance($idoperation = '', $periode_debut = '', $periode_fin = '
return $this->_bdd->obtenirTous($requete);
}
- function obtenirTotalBalance($idoperation = '1', $periode_debut, $periode_fin)
+ public function obtenirTotalBalance($periode_debut, $periode_fin, $idoperation = '1')
{
-
$data = $this->obtenirBalance($idoperation, $periode_debut, $periode_fin);
$total = 0;
- foreach ($data as $id => $row) {
- if ($idoperation == 1) $total += $row['debit'];
- if ($idoperation == 2) $total += $row['credit'];
-
+ foreach ($data as $row) {
+ if ($idoperation == 1) {
+ $total += $row['debit'];
+ }
+ if ($idoperation == 2) {
+ $total += $row['credit'];
+ }
}
return $total;
}
- function obtenirBalanceDetails($evenement, $periode_debut = '', $periode_fin = '')
+ public function obtenirBalanceDetails(string $evenement, $periode_debut = '', $periode_fin = '')
{
$periode_debut = $this->periodeDebutFin($debutFin = 'debut', $periode_debut);
$periode_fin = $this->periodeDebutFin($debutFin = 'fin', $periode_fin);
@@ -840,23 +844,30 @@ function obtenirBalanceDetails($evenement, $periode_debut = '', $periode_fin = '
return $this->_bdd->obtenirTous($requete);
}
- function obtenirSousTotalBalance($evenement, $periode_debut, $periode_fin)
+ /**
+ * @return array{idevenement: int<1, 30>, debit: mixed, credit: mixed, nligne: int<0, max>}[]
+ */
+ public function obtenirSousTotalBalance(string $evenement, $periode_debut, $periode_fin): array
{
$tableau = [];
-// echo $evenement."*".$periode_debut."*".$periode_fin;
+ // echo $evenement."*".$periode_debut."*".$periode_fin;
$data = $this->obtenirBalanceDetails($evenement, $periode_debut, $periode_fin);
for ($i = 1; $i <= 30; $i++) {
$credit[$i] = '';
$debit[$i] = '';
$nligne[$i] = 0;
-
}
- foreach ($data as $id => $row) {
- if ($row['idoperation'] == "1") $debit[$row['id']] += $row['montant'];
- if ($row['idoperation'] == "2") $credit[$row['id']] += $row['montant'];
- if ($row['idoperation'] == "1" || $row['idoperation'] == "2") $nligne[$row['id']]++;
-
+ foreach ($data as $row) {
+ if ($row['idoperation'] == "1") {
+ $debit[$row['id']] += $row['montant'];
+ }
+ if ($row['idoperation'] == "2") {
+ $credit[$row['id']] += $row['montant'];
+ }
+ if ($row['idoperation'] == "1" || $row['idoperation'] == "2") {
+ $nligne[$row['id']]++;
+ }
}
@@ -873,13 +884,13 @@ function obtenirSousTotalBalance($evenement, $periode_debut, $periode_fin)
return $tableau;
}
- function supprimerEcriture($id)
+ public function supprimerEcriture(string $id)
{
$requete = 'DELETE FROM compta WHERE id=' . $id;
return $this->_bdd->executer($requete);
}
- function obtenirParNumeroOperation($numero_operation)
+ public function obtenirParNumeroOperation($numero_operation)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -890,7 +901,7 @@ function obtenirParNumeroOperation($numero_operation)
return $this->_bdd->obtenirEnregistrement($requete);
}
- function obtenirSuivantADeterminer($numero_operation)
+ public function obtenirSuivantADeterminer($numero_operation)
{
$requete = 'SELECT';
$requete .= ' id ';
@@ -907,7 +918,7 @@ function obtenirSuivantADeterminer($numero_operation)
return $this->_bdd->obtenirEnregistrement($requete);
}
- function obtenirTous()
+ public function obtenirTous()
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -917,7 +928,7 @@ function obtenirTous()
return $this->_bdd->obtenirTous($requete);
}
- function obtenirEvenementParIdForum($id)
+ public function obtenirEvenementParIdForum($id)
{
$requete = 'SELECT ';
$requete .= ' compta_evenement.id ';
@@ -926,16 +937,11 @@ function obtenirEvenementParIdForum($id)
$requete .= 'INNER JOIN ';
$requete .= ' afup_forum on afup_forum.titre = compta_evenement.evenement ';
$requete .= 'WHERE ';
- $requete .= ' afup_forum.id = ' . (int)$id;
+ $requete .= ' afup_forum.id = ' . (int) $id;
return $this->_bdd->obtenirUn($requete);
}
- /**
- *
- * @param Importer $importer
- * @return bool
- */
- function extraireComptaDepuisCSVBanque(Importer $importer)
+ public function extraireComptaDepuisCSVBanque(Importer $importer): bool
{
if (!$importer->validate()) {
return false;
@@ -1012,7 +1018,7 @@ function extraireComptaDepuisCSVBanque(Importer $importer)
* @param $query string String to search
* @return array Results sorted by type
*/
- public function rechercher($query)
+ public function rechercher($query): array
{
$like = $this->_bdd->echapper("%$query%");
$results = [];
@@ -1130,7 +1136,7 @@ public function rechercher($query)
return $results;
}
- function obtenirListRegles($filtre = '', $where = '')
+ public function obtenirListRegles($filtre = '', $where = '')
{
$requete = 'SELECT ';
$requete .= '`id`, `label`, `condition`, `is_credit`, `vat`, `category_id`, `event_id`, `mode_regl_id`, `attachment_required` ';
@@ -1141,7 +1147,7 @@ function obtenirListRegles($filtre = '', $where = '')
$wheres[] = 'id=' . intval($where) . ' ';
}
- if (count($wheres)) {
+ if ($wheres !== []) {
$requete .= sprintf('WHERE %s ',implode(' AND ', $wheres));
}
@@ -1153,9 +1159,10 @@ function obtenirListRegles($filtre = '', $where = '')
} elseif ($filtre) {
return $this->_bdd->obtenirTous($requete);
}
+ return null;
}
- function ajouterRegle($label, $condition, $is_credit, $tva, $category_id, $event_id, $mode_regl_id, $attachment_required)
+ public function ajouterRegle($label, $condition, $is_credit, $tva, $category_id, $event_id, $mode_regl_id, $attachment_required)
{
$requete = 'INSERT INTO ';
$requete .= 'compta_regle (';
@@ -1174,9 +1181,8 @@ function ajouterRegle($label, $condition, $is_credit, $tva, $category_id, $event
return $this->_bdd->executer($requete);
}
- function modifierRegle($id, $label, $condition, $is_credit, $tva, $category_id, $event_id, $mode_regl_id, $attachment_required)
+ public function modifierRegle($id, $label, $condition, $is_credit, $tva, $category_id, $event_id, $mode_regl_id, $attachment_required)
{
-
$requete = 'UPDATE ';
$requete .= 'compta_regle ';
$requete .= 'SET ';
@@ -1203,4 +1209,3 @@ public static function getTvaZoneLabel($tvaZoneCode, $defaultValue = null)
return self::TVA_ZONES[$tvaZoneCode];
}
}
-
diff --git a/sources/Afup/Comptabilite/Facture.php b/sources/Afup/Comptabilite/Facture.php
index f3497b8a1..e6a1e47f7 100644
--- a/sources/Afup/Comptabilite/Facture.php
+++ b/sources/Afup/Comptabilite/Facture.php
@@ -1,7 +1,10 @@
_bdd = $bdd;
}
@@ -27,9 +30,8 @@ function __construct(&$bdd)
/* Journal des opération
*
*/
- function obtenirDevis($idPeriode = null)
+ public function obtenirDevis($idPeriode = null)
{
-
$requete = 'SELECT ';
$requete .= ' acf.*, sum(quantite * pu) prix ';
$requete .= 'FROM ';
@@ -54,9 +56,8 @@ function obtenirDevis($idPeriode = null)
return $this->_bdd->obtenirTous($requete);
}
- function obtenirDevisDetails($id)
+ public function obtenirDevisDetails($id)
{
-
$requete = 'SELECT ';
$requete .= 'afup_compta_facture.*, ';
$requete .= 'afup_compta_facture_details.ref,afup_compta_facture_details.designation,afup_compta_facture_details.quantite,afup_compta_facture_details.pu ';
@@ -72,9 +73,8 @@ function obtenirDevisDetails($id)
return $this->_bdd->obtenirTous($requete);
}
- function obtenirFacture()
+ public function obtenirFacture()
{
-
$requete = 'SELECT ';
$requete .= ' acf.*, sum(quantite * pu) prix ';
$requete .= 'FROM ';
@@ -93,9 +93,8 @@ function obtenirFacture()
return $this->_bdd->obtenirTous($requete);
}
- function obtenirFactureDetails($id)
+ public function obtenirFactureDetails($id)
{
-
$requete = 'SELECT ';
$requete .= 'afup_compta_facture.*, ';
$requete .= 'afup_compta_facture_details.ref,afup_compta_facture_details.designation,afup_compta_facture_details.quantite,afup_compta_facture_details.pu ';
@@ -111,7 +110,7 @@ function obtenirFactureDetails($id)
return $this->_bdd->obtenirTous($requete);
}
- function obtenir($id)
+ public function obtenir(string $id)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -133,7 +132,7 @@ public function obtenirParNumeroFacture($numerofacture)
return $this->_bdd->obtenirEnregistrement($requete);
}
- function obtenir_details($id)
+ public function obtenir_details(string $id)
{
$requete = 'SELECT';
$requete .= ' * ';
@@ -144,11 +143,10 @@ function obtenir_details($id)
return $this->_bdd->obtenirTous($requete);
}
- function ajouter($date_devis, $societe, $service, $adresse, $code_postal, $ville, $id_pays,
+ public function ajouter($date_devis, $societe, $service, $adresse, $code_postal, $ville, $id_pays,
$nom, $prenom, $tel, $email, $tva_intra, $observation, $ref_clt1, $ref_clt2, $ref_clt3,
$etat_paiement = 0, $date_paiement = null, $devise = 'EUR')
{
-
$requete = 'INSERT INTO ';
$requete .= 'afup_compta_facture (';
$requete .= 'date_devis,societe,service,adresse,code_postal,ville,id_pays,';
@@ -180,7 +178,7 @@ function ajouter($date_devis, $societe, $service, $adresse, $code_postal, $ville
return $this->_bdd->executer($requete);
}
- function ajouter_details($ref, $designation, int $quantite, float $pu, int $tva = 0)
+ public function ajouter_details($ref, $designation, int $quantite, float $pu, int $tva = 0)
{
$requete = 'INSERT INTO ';
$requete .= 'afup_compta_facture_details (';
@@ -198,11 +196,10 @@ function ajouter_details($ref, $designation, int $quantite, float $pu, int $tva
return $this->_bdd->executer($requete);
}
- function modifier($id, $date_devis, $societe, $service, $adresse, $code_postal, $ville, $id_pays,
+ public function modifier($id, $date_devis, $societe, $service, $adresse, $code_postal, $ville, $id_pays,
$nom, $prenom, $tel, $email, $tva_intra, $observation, $ref_clt1, $ref_clt2, $ref_clt3,
$numero_devis, $numero_facture, $etat_paiement, $date_paiement, $devise)
{
-
$requete = 'UPDATE ';
$requete .= 'afup_compta_facture ';
$requete .= 'SET ';
@@ -237,7 +234,7 @@ function modifier($id, $date_devis, $societe, $service, $adresse, $code_postal,
return $this->_bdd->executer($requete);
}
- function modifier_details($id, $ref, $designation, int $quantite, float $pu, int $tva = 0)
+ public function modifier_details(string $id, $ref, $designation, int $quantite, float $pu, int $tva = 0)
{
$requete = 'UPDATE ';
$requete .= 'afup_compta_facture_details ';
@@ -253,7 +250,7 @@ function modifier_details($id, $ref, $designation, int $quantite, float $pu, int
return $this->_bdd->executer($requete);
}
- function obtenirDernier()
+ public function obtenirDernier()
{
/**
* @TODO ne supporte pas les enregistrements concurrents !
@@ -266,7 +263,7 @@ function obtenirDernier()
}
- function transfertDevis($numero_devis)
+ public function transfertDevis($numero_devis)
{
$numero_facture = $this->genererNumeroFacture();
@@ -281,26 +278,26 @@ function transfertDevis($numero_devis)
return $this->_bdd->executer($requete);
}
- function genererNumeroFacture()
+ public function genererNumeroFacture(): string
{
$year = (int) date('Y');
$sql = "SELECT MAX(CAST(SUBSTRING_INDEX(numero_facture, '-', -1) AS UNSIGNED)) + 1
FROM afup_compta_facture
WHERE LEFT(numero_facture, 4)=";
- $index = $this->_bdd->obtenirUn($sql.$year);
+ $index = $this->_bdd->obtenirUn($sql . $year);
// index null = changement d'année
// on va chercher l'index de l'année dernière
if (null === $index) {
- $index = $this->_bdd->obtenirUn($sql.($year-1));
+ $index = $this->_bdd->obtenirUn($sql . ($year-1));
$index = (int) (is_null($index) ? 1 : $index);
}
return "$year-$index";
}
- function genererNumeroDevis()
+ public function genererNumeroDevis(): string
{
$requete = 'SELECT';
$requete .= " MAX(CAST(SUBSTRING_INDEX(numero_devis, '-', -1) AS UNSIGNED)) + 1 ";
@@ -314,7 +311,7 @@ function genererNumeroDevis()
}
- function genererDevis($reference, $chemin = null)
+ public function genererDevis(string $reference, $chemin = null): void
{
$requete = 'SELECT * FROM afup_compta_facture WHERE numero_devis=' . $this->_bdd->echapper($reference);
$coordonnees = $this->_bdd->obtenirEnregistrement($requete);
@@ -443,22 +440,22 @@ function genererDevis($reference, $chemin = null)
$vatAmounts[$detail['tva']] = 0;
}
$vatAmounts[$detail['tva']] += ($detail['tva'] / 100) * $montantTtc;
- $montantTtc = $montantTtc * (1 + ($detail['tva'] / 100));
+ $montantTtc *= 1 + ($detail['tva'] / 100);
$x += 20;
$pdf->SetXY($x, $y);
- $pdf->MultiCell(30, 5, utf8_decode($this->formatFactureValue($detail['pu'], $isSubjectedToVat)) . $devise, 'T', 0, "R");
+ $pdf->MultiCell(30, 5, $this->formatFactureValue($detail['pu'], $isSubjectedToVat) . $devise, 'T', 0, "R");
$x += 30;
$pdf->SetXY($x, $y);
- $pdf->MultiCell(30, 5, utf8_decode($this->formatFactureValue($montantTtc, $isSubjectedToVat)) . $devise, 'T', 0, "R");
+ $pdf->MultiCell(30, 5, $this->formatFactureValue($montantTtc, $isSubjectedToVat) . $devise, 'T', 0, "R");
} else {
$pdf->Cell(30, 5, $detail['ref'], 1);
$pdf->Cell(80, 5, utf8_decode($detail['designation']), 1);
$pdf->Cell(20, 5, utf8_decode($detail['quantite']), 1, 0, "C");
$pdf->Cell(30, 5, utf8_decode($detail['pu']) . $devise, 1, 0, "R");
- $pdf->Cell(30, 5, utf8_decode($montantHt) . $devise, 1, 0, "R");
+ $pdf->Cell(30, 5, $montantHt . $devise, 1, 0, "R");
}
$totalHt += $montantHt;
@@ -511,7 +508,7 @@ function genererDevis($reference, $chemin = null)
}
- function genererFacture($reference, $chemin = null)
+ public function genererFacture(string $reference, $chemin = null): void
{
$requete = 'SELECT * FROM afup_compta_facture WHERE numero_facture=' . $this->_bdd->echapper($reference);
$coordonnees = $this->_bdd->obtenirEnregistrement($requete);
@@ -554,7 +551,7 @@ function genererFacture($reference, $chemin = null)
utf8_decode($coordonnees['code_postal']) . "\n" .
utf8_decode($coordonnees['ville']) . "\n" .
utf8_decode($pays->obtenirNom($coordonnees['id_pays'])) .
- ($coordonnees['tva_intra'] ? ("\n" . utf8_decode('N° TVA Intracommunautaire : ' . $coordonnees['tva_intra'])) : null) );
+ ($coordonnees['tva_intra'] ? ("\n" . utf8_decode('N° TVA Intracommunautaire : ' . $coordonnees['tva_intra'])) : null));
$pdf->Ln(10);
$pdf->SetFont('Arial', 'BU', 10);
@@ -607,11 +604,7 @@ function genererFacture($reference, $chemin = null)
break;
}
$yInitial = $pdf->getY();
- if ($isSubjectedToVat) {
- $columns = [0, 30, 90, 110, 130, 160, 190];
- } else {
- $columns = [0, 30, 110, 130, 160, 190];
- }
+ $columns = $isSubjectedToVat ? [0, 30, 90, 110, 130, 160, 190] : [0, 30, 110, 130, 160, 190];
$vatAmounts = [];
@@ -644,17 +637,17 @@ function genererFacture($reference, $chemin = null)
$vatAmounts[$detail['tva']] = 0;
}
$vatAmounts[$detail['tva']] += ($detail['tva'] / 100) * $montantTtc;
- $montantTtc = $montantTtc * (1 + ($detail['tva'] / 100));
+ $montantTtc *= 1 + ($detail['tva'] / 100);
}
$x += 20;
$pdf->SetXY($x, $y);
- $pdf->MultiCell(30, 5, utf8_decode($this->formatFactureValue($detail['pu'], $isSubjectedToVat)) . $devise, 'T', 0, "R");
+ $pdf->MultiCell(30, 5, $this->formatFactureValue($detail['pu'], $isSubjectedToVat) . $devise, 'T', 0, "R");
$x += 30;
$pdf->SetXY($x, $y);
- $pdf->MultiCell(30, 5, utf8_decode($this->formatFactureValue($montantTtc, $isSubjectedToVat)) . $devise, 'T', 0, "R");
+ $pdf->MultiCell(30, 5, $this->formatFactureValue($montantTtc, $isSubjectedToVat) . $devise, 'T', 0, "R");
$totalHt += $montantHt;
$totalTtc += $montantTtc;
@@ -708,25 +701,23 @@ function genererFacture($reference, $chemin = null)
}
}
- private function formatFactureValue($value, $isSubjectedToVat)
+ private function formatFactureValue($value, bool $isSubjectedToVat)
{
if (!$isSubjectedToVat) {
return $value;
}
- return number_format($value, 2, ',', ' ');
+ return number_format((float) $value, 2, ',', ' ');
}
/**
* Envoi par mail d'une facture au format PDF
*
* @param string $reference Reference de la facturation
- * @access public
* @return bool Succès de l'envoi
*/
- function envoyerFacture($reference)
+ public function envoyerFacture(string $reference)
{
- $configuration = $GLOBALS['AFUP_CONF'];
$personne = $this->obtenirParNumeroFacture($reference);
$sujet = "Facture AFUP\n";
@@ -745,7 +736,7 @@ function envoyerFacture($reference)
$message = new Message($sujet, new MailUser(MailUser::DEFAULT_SENDER_EMAIL, MailUser::DEFAULT_SENDER_NAME), new MailUser($personne['email'], $personne['nom']));
$message->addAttachment(new Attachment(
$chemin_facture,
- 'facture-'.$reference.'.pdf',
+ 'facture-' . $reference . '.pdf',
'base64',
'application/pdf'
));
diff --git a/sources/Afup/Comptabilite/PDF.php b/sources/Afup/Comptabilite/PDF.php
index 9e7def660..cf399245a 100644
--- a/sources/Afup/Comptabilite/PDF.php
+++ b/sources/Afup/Comptabilite/PDF.php
@@ -1,29 +1,30 @@
Ln(1); //Saut de ligne
}
-//Pied de page
- function Footer()
+ //Pied de page
+ public function Footer(): void
{
// $this->SetY(-15); //Positionnement à 1,5 cm du bas
// $this->SetFont('Arial','I',8); //Police Arial italique 8
// $this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C'); //Numéro de page
-
}
- function tableau($position, $header, $data)
+ public function tableau($position, $header, $data): void
{
- if ($position == 1) $position = 0; else $position = 150;
+ $position = $position == 1 ? 0 : 150;
$y = 30;
//Couleurs, épaisseur du trait et police grasse
@@ -66,6 +67,4 @@ function tableau($position, $header, $data)
}
$this->Cell(array_sum($w), 0, '', 'T');
}
-
-
}
diff --git a/sources/Afup/Corporate/Accueil.php b/sources/Afup/Corporate/Accueil.php
index 0f9b7c476..c01f9cc36 100644
--- a/sources/Afup/Corporate/Accueil.php
+++ b/sources/Afup/Corporate/Accueil.php
@@ -1,6 +1,7 @@
bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
}
- function charger()
+ public function charger(): void
{
-
}
- function afficher() {
+ public function afficher(): string
+ {
return $this->colonne_de_gauche();
}
- function colonne_de_gauche() {
+ public function colonne_de_gauche(): string
+ {
$articles = new Articles($this->bdd);
$derniers_articles = $articles->chargerDerniersAjouts(10);
@@ -36,10 +34,10 @@ function colonne_de_gauche() {
foreach ($derniers_articles as $article) {
$chapeau = $article->chapeau;
- $colonne .= '';
- $colonne .= '';
- $colonne .= ''.$article->titre.'
';
- $colonne .= ''.strip_tags($chapeau, '
').'
';
+ $colonne .= '';
+ $colonne .= '';
+ $colonne .= '' . $article->titre . '
';
+ $colonne .= '' . strip_tags($chapeau, '
') . '
';
$colonne .= '';
}
diff --git a/sources/Afup/Corporate/Article.php b/sources/Afup/Corporate/Article.php
index 8b007dc26..f5184b112 100644
--- a/sources/Afup/Corporate/Article.php
+++ b/sources/Afup/Corporate/Article.php
@@ -1,11 +1,14 @@
'Cycles de conférences',
@@ -52,7 +55,7 @@ public static function getThemeLabel($code)
/**
* @param mixed $position
*/
- public function setPosition($position)
+ public function setPosition($position): void
{
$this->position = $position;
}
@@ -64,28 +67,21 @@ public function setPosition($position)
*/
protected $conf;
/**
- * @var \Afup\Site\Utils\Base_De_Donnees
+ * @var Base_De_Donnees
*/
protected $bdd;
- function __construct($id = 0, $bdd = false, $conf = false)
+ public function __construct($id = 0, $bdd = false, $conf = false)
{
$this->id = $id;
- if ($bdd) {
- $this->bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
- if ($conf) {
- $this->conf = $conf;
- } else {
- $this->conf = $GLOBALS['AFUP_CONF'];
- }
+ $this->conf = $conf ?: $GLOBALS['AFUP_CONF'];
}
- function afficher() {
+ public function afficher(): string
+ {
return '
' .
'' .
@@ -95,17 +91,17 @@ function afficher() {
' ';
}
- function titre()
+ public function titre()
{
return $this->titre;
}
- public function getCode()
+ public function getCode(): string
{
return $this->id . '-' . $this->raccourci;
}
- function teaser()
+ public function teaser()
{
switch (true) {
case !empty($this->chapeau):
@@ -117,7 +113,7 @@ function teaser()
return $teaser;
}
- function corps()
+ public function corps()
{
if ($this->etat <= 0) {
return false;
@@ -138,12 +134,15 @@ function corps()
return $corps;
}
- function date()
+ public function date(): string
{
return date("d/m/y", $this->date);
}
- function positionable()
+ /**
+ * @return int[]
+ */
+ public function positionable(): array
{
$positions = [];
for ($i = 9; $i >= -9; $i--) {
@@ -153,7 +152,7 @@ function positionable()
return $positions;
}
- function exportable()
+ public function exportable(): array
{
return [
'id' => $this->id,
@@ -165,20 +164,20 @@ function exportable()
'contenu' => $this->contenu,
'type_contenu' => $this->type_contenu,
'position' => $this->position,
- 'date' => date('Y-m-d H:i:s', $this->date),
+ 'date' => date('Y-m-d H:i:s', (int) $this->date),
'theme' => $this->theme,
'id_forum' => $this->id_forum,
'etat' => $this->etat,
];
}
- function supprimer()
+ public function supprimer()
{
$requete = 'DELETE FROM afup_site_article WHERE id = ' . $this->bdd->echapper($this->id);
return $this->bdd->executer($requete);
}
- function charger()
+ public function charger(): void
{
$requete = 'SELECT *
FROM afup_site_article
@@ -186,7 +185,7 @@ function charger()
$this->remplir($this->bdd->obtenirEnregistrement($requete));
}
- function chargerDepuisRaccourci($raccourci)
+ public function chargerDepuisRaccourci($raccourci): void
{
$requete = 'SELECT *
FROM afup_site_article
@@ -194,7 +193,7 @@ function chargerDepuisRaccourci($raccourci)
$this->remplir($this->bdd->obtenirEnregistrement($requete));
}
- function charger_dernier_depuis_rubrique()
+ public function charger_dernier_depuis_rubrique(): void
{
$requete = 'SELECT *
FROM afup_site_article
@@ -203,7 +202,7 @@ function charger_dernier_depuis_rubrique()
$this->remplir($this->bdd->obtenirEnregistrement($requete));
}
- function remplir($article)
+ public function remplir(array $article): void
{
$this->id = $article['id'];
$this->id_site_rubrique = $article['id_site_rubrique'];
@@ -221,7 +220,7 @@ function remplir($article)
$this->route = $this->route();
}
- function modifier()
+ public function modifier()
{
$requete = 'UPDATE afup_site_article
SET
@@ -243,7 +242,7 @@ function modifier()
return $this->bdd->executer($requete);
}
- function inserer()
+ public function inserer()
{
$requete = 'INSERT INTO afup_site_article
SET
@@ -272,7 +271,7 @@ function inserer()
return $resultat;
}
- function route()
+ public function route(): string
{
$rubrique = new Rubrique($this->id_site_rubrique, $this->bdd, $this->conf);
$rubrique->charger();
@@ -280,10 +279,10 @@ function route()
$rubrique->raccourci = 'rubrique';
}
- return Site::WEB_PATH.Site::WEB_PREFIX.Site::WEB_QUERY_PREFIX . $rubrique->raccourci . '/' . $this->id . '/' . $this->raccourci;
+ return Site::WEB_PATH . Site::WEB_PREFIX . Site::WEB_QUERY_PREFIX . $rubrique->raccourci . '/' . $this->id . '/' . $this->raccourci;
}
- function fil_d_ariane()
+ public function fil_d_ariane(): string
{
$fil = '';
@@ -296,14 +295,14 @@ function fil_d_ariane()
return $fil;
}
- function autres_articles()
+ public function autres_articles(): array
{
$articles = new Articles($this->bdd);
return $articles->chargerArticlesDeRubrique($this->id_site_rubrique);
}
- public function isTypeContenuMarkdown()
+ public function isTypeContenuMarkdown(): bool
{
return self::TYPE_CONTENU_MARKDOWN == $this->type_contenu;
}
diff --git a/sources/Afup/Corporate/Articles.php b/sources/Afup/Corporate/Articles.php
index 04981851e..007eab56c 100644
--- a/sources/Afup/Corporate/Articles.php
+++ b/sources/Afup/Corporate/Articles.php
@@ -1,6 +1,7 @@
bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
}
- function obtenirListe($champs = '*',
- $ordre = 'titre',
+ public function obtenirListe(string $champs = '*',
+ string $ordre = 'titre',
$filtre = false,
$associatif = false)
{
@@ -31,7 +28,7 @@ function obtenirListe($champs = '*',
$requete .= ' afup_site_rubrique on afup_site_article.id_site_rubrique = afup_site_rubrique.id ';
$requete .= 'WHERE 1 = 1 ';
if ($filtre) {
- $escapedFiltre = $this->bdd->echapper('%' . $filtre . '%');
+ $escapedFiltre = $this->bdd->echapper('%' . $filtre . '%');
$requete .= sprintf(' AND (afup_site_article.titre LIKE %s OR afup_site_article.contenu LIKE %s) ', $escapedFiltre, $escapedFiltre);
}
$requete .= ' ORDER BY ' . $ordre;
@@ -43,18 +40,21 @@ function obtenirListe($champs = '*',
}
}
- function chargerArticlesDeRubrique($id_site_rubrique, $rowcount = null)
+ /**
+ * @return Article[]
+ */
+ public function chargerArticlesDeRubrique($id_site_rubrique, $rowcount = null): array
{
$requete = ' SELECT';
$requete .= ' * ';
$requete .= ' FROM';
$requete .= ' afup_site_article ';
$requete .= ' WHERE ';
- $requete .= ' id_site_rubrique = ' . (int)$id_site_rubrique;
+ $requete .= ' id_site_rubrique = ' . (int) $id_site_rubrique;
$requete .= ' AND etat = 1';
$requete .= ' ORDER BY date DESC';
if (is_int($rowcount)) {
- $requete .= ' LIMIT 0, ' . (int)$rowcount;
+ $requete .= ' LIMIT 0, ' . $rowcount;
}
$elements = $this->bdd->obtenirTous($requete);
@@ -68,10 +68,12 @@ function chargerArticlesDeRubrique($id_site_rubrique, $rowcount = null)
}
return $articles;
-
}
- function chargerDerniersAjouts($rowcount = 10)
+ /**
+ * @return Article[]
+ */
+ public function chargerDerniersAjouts($rowcount = 10): array
{
$requete = ' SELECT';
$requete .= ' afup_site_article.* ';
@@ -86,7 +88,7 @@ function chargerDerniersAjouts($rowcount = 10)
$requete .= ' AND afup_site_rubrique.id <> ' . Rubrique::ID_RUBRIQUE_ANTENNES . ' '; // On affiche pas les articles de la page antennes
$requete .= ' AND afup_site_rubrique.id <> ' . Rubrique::ID_RUBRIQUE_NOS_ACTIONS . ' '; // On affiche pas les articles de la page actions
$requete .= ' ORDER BY date DESC';
- $requete .= ' LIMIT 0, ' . (int)$rowcount;
+ $requete .= ' LIMIT 0, ' . (int) $rowcount;
$ajouts = [];
$elements = $this->bdd->obtenirTous($requete);
@@ -104,7 +106,10 @@ function chargerDerniersAjouts($rowcount = 10)
return $ajouts;
}
- function chargerDernieresQuestions()
+ /**
+ * @return Article[]
+ */
+ public function chargerDernieresQuestions(): array
{
$requete = ' SELECT';
$requete .= ' * ';
diff --git a/sources/Afup/Corporate/Branche.php b/sources/Afup/Corporate/Branche.php
index 771a5ff4a..93cf0aaed 100644
--- a/sources/Afup/Corporate/Branche.php
+++ b/sources/Afup/Corporate/Branche.php
@@ -1,35 +1,25 @@
bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
- if ($conf) {
- $this->conf = $conf;
- } else {
- $this->conf = $GLOBALS['AFUP_CONF'];
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
}
- function navigation_avec_image($bool = false)
+ public function navigation_avec_image($bool = false): void
{
if ($bool) {
$this->navigation = 'image';
@@ -40,7 +30,7 @@ public function feuillesEnfants($id)
{
$requete = 'SELECT *
FROM afup_site_feuille
- WHERE id_parent = '.$this->bdd->echapper($id).'
+ WHERE id_parent = ' . $this->bdd->echapper($id) . '
AND etat = 1
ORDER BY position';
return $this->bdd->obtenirTous($requete);
@@ -61,7 +51,7 @@ public function getNom($id)
return $enregistrement['nom'];
}
- function naviguer($id, $profondeur = 1, $identification = "")
+ public function naviguer($id, $profondeur = 1, string $identification = ""): string
{
$requete = 'SELECT *
FROM afup_site_feuille
@@ -70,7 +60,7 @@ function naviguer($id, $profondeur = 1, $identification = "")
$racine = $this->bdd->obtenirEnregistrement($requete);
$feuilles = $this->extraireFeuilles($id, $profondeur);
- if ($feuilles) {
+ if ($feuilles !== '' && $feuilles !== '0') {
$navigation = '- ' . $feuilles . '
'; + $extraction .= '
'; $extraction .= $feuille['nom'] . '
'; $extraction .= $feuille['alt']; } else { - $extraction .= '' . $feuille['nom'] . ''; + $extraction .= '' . $feuille['nom'] . ''; } $extraction .= ''; if ($profondeur > 0) { $extraction .= $this->naviguer($feuille['id'], $profondeur - 1); } - } } diff --git a/sources/Afup/Corporate/Feuille.php b/sources/Afup/Corporate/Feuille.php index 0810beb01..b28c407b6 100644 --- a/sources/Afup/Corporate/Feuille.php +++ b/sources/Afup/Corporate/Feuille.php @@ -1,7 +1,11 @@ id = $id; - if ($bdd) { - $this->bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - function inserer() + public function inserer() { if ($this->id > 0) { $this->supprimer(); } $requete = 'INSERT INTO afup_site_feuille SET - id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ', + id_parent = ' . $this->bdd->echapper($this->id_parent ?: null) . ', nom = ' . $this->bdd->echapper($this->nom) . ', lien = ' . $this->bdd->echapper($this->lien) . ', alt = ' . $this->bdd->echapper($this->alt) . ', @@ -62,11 +62,11 @@ function inserer() return $this->bdd->executer($requete); } - function modifier() + public function modifier() { $requete = 'UPDATE afup_site_feuille SET - id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ', + id_parent = ' . $this->bdd->echapper($this->id_parent ?: null) . ', nom = ' . $this->bdd->echapper($this->nom) . ', lien = ' . $this->bdd->echapper($this->lien) . ', alt = ' . $this->bdd->echapper($this->alt) . ', @@ -76,12 +76,12 @@ function modifier() date = ' . $this->bdd->echapper($this->date) . ', patterns = ' . $this->bdd->echapper($this->patterns) . ', etat = ' . $this->bdd->echapper($this->etat) . ' - WHERE id = ' . (int)$this->id; + WHERE id = ' . (int) $this->id; return $this->bdd->executer($requete); } - function remplir($f) + public function remplir(array $f): void { $this->id = $f['id']; $this->id_parent = $f['id_parent']; @@ -96,7 +96,7 @@ function remplir($f) $this->patterns = $f['patterns']; } - function exportable() + public function exportable(): array { return [ 'id' => $this->id, @@ -107,13 +107,13 @@ function exportable() 'image' => $this->image, 'image_alt' => $this->image_alt, 'position' => $this->position, - 'date' => date('Y-m-d', $this->date), + 'date' => date('Y-m-d', (int) $this->date), 'etat' => $this->etat, 'patterns' => $this->patterns, ]; } - function charger() + public function charger(): void { $requete = 'SELECT * FROM afup_site_feuille @@ -122,13 +122,16 @@ function charger() $this->remplir($f); } - function supprimer() + public function supprimer() { $requete = 'DELETE FROM afup_site_feuille WHERE id = ' . $this->bdd->echapper($this->id); return $this->bdd->executer($requete); } - function positionable() + /** + * @return int[] + */ + public function positionable(): array { $positions = []; for ($i = 9; $i >= -9; $i--) { @@ -136,5 +139,4 @@ function positionable() } return $positions; } - } diff --git a/sources/Afup/Corporate/Feuilles.php b/sources/Afup/Corporate/Feuilles.php index 8188ec86a..12d2ff780 100644 --- a/sources/Afup/Corporate/Feuilles.php +++ b/sources/Afup/Corporate/Feuilles.php @@ -1,25 +1,23 @@ bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - function obtenirListe($champs = '*', $ordre = 'titre', $associatif = false) + public function obtenirListe(string $champs = '*', string $ordre = 'titre', $associatif = false) { $requete = 'SELECT ' . $champs . ' '; $requete .= 'FROM'; @@ -30,4 +28,4 @@ function obtenirListe($champs = '*', $ordre = 'titre', $associatif = false) } return $this->bdd->obtenirTous($requete); } -} \ No newline at end of file +} diff --git a/sources/Afup/Corporate/Footer.php b/sources/Afup/Corporate/Footer.php index 51c4abda0..ca12f2a0e 100644 --- a/sources/Afup/Corporate/Footer.php +++ b/sources/Afup/Corporate/Footer.php @@ -1,23 +1,18 @@ conf = $GLOBALS['AFUP_CONF']; - } - - function logos() + public function logos(): string { $branche = new Branche(); $branche->navigation_avec_image(true); return '
- ' . $branche->naviguer(9, 0, "LogoElement") . '
- ';
-
- return $str;
+ return $str . '
- - Nous contacter + Nous contacter
-
L\'AFUP sur Facebook
@@ -168,7 +164,10 @@ function social() {
';
}
- function footer()
+ /**
+ * @return array{nom: mixed, items: mixed}[]
+ */
+ public function footer(): array
{
$branche = new Branche($this->bdd);
@@ -183,17 +182,10 @@ function footer()
return $footerColumns;
}
- function getRightColumn() {
+ public function getRightColumn(): Branche
+ {
$branche = new Branche($this->bdd);
$branche->navigation_avec_image(true);
return $branche;
-
- $content = '';
- return $content;
}
}
diff --git a/sources/Afup/Corporate/Rubrique.php b/sources/Afup/Corporate/Rubrique.php
index 2b0aaabe4..6ddcc86c7 100644
--- a/sources/Afup/Corporate/Rubrique.php
+++ b/sources/Afup/Corporate/Rubrique.php
@@ -1,7 +1,10 @@
id = $id;
- if ($bdd) {
- $this->bdd = $bdd;
- } else {
- $this->bdd = new _Site_Base_De_Donnees();
- }
+ $this->bdd = $bdd ?: new _Site_Base_De_Donnees();
- if ($conf) {
- $this->conf = $conf;
- } else {
- $this->conf = $GLOBALS['AFUP_CONF'];
- }
+ $this->conf = $conf ?: $GLOBALS['AFUP_CONF'];
if (isset($_GET['page_courante'])) {
- $this->page_courante = (int)$_GET['page_courante'];
+ $this->page_courante = (int) $_GET['page_courante'];
}
if ($this->page_courante <= 0) {
$this->page_courante = 1;
}
}
- function afficher()
+ public function afficher(): string
{
$article = new Article(null, $this->bdd);
$article->id_site_rubrique = $this->id;
@@ -79,7 +74,7 @@ function afficher()
'';
}
- function rubrique()
+ public function rubrique(): string
{
return '
- ' .
'
- ' . @@ -91,22 +86,22 @@ function rubrique() '
'; } - function titre() + public function titre() { return $this->nom; } - function liste_sous_navigation() + public function liste_sous_navigation(): string { $liste = ""; $sous_rubriques = $this->sous_rubriques(); - if (count($sous_rubriques) > 0) { + if ($sous_rubriques !== []) { $liste .= '
- ';
foreach ($sous_rubriques as $rubrique) {
$liste .= '
- ' . $rubrique->nom . ' '; @@ -115,7 +110,7 @@ function liste_sous_navigation() } $autres_articles = $this->autres_articles(); - if (count($autres_articles) > 0) { + if ($autres_articles !== []) { $liste .= '
- ' . $article->titre . ' '; @@ -126,7 +121,7 @@ function liste_sous_navigation() return $liste; } - function remplir($rubrique) + public function remplir($rubrique): void { $this->id = $rubrique['id']; $this->id_parent = $rubrique['id_parent']; @@ -142,7 +137,7 @@ function remplir($rubrique) $this->feuille_associee = $rubrique['feuille_associee']; } - function charger() + public function charger(): void { $requete = 'SELECT * FROM afup_site_rubrique @@ -151,23 +146,21 @@ function charger() $this->remplir($rubrique); } - function date() + public function date(): string { return date("d/m/Y", $this->date); } - function annexe() + public function annexe() { if ($this->etat <= 0) { return false; } - $annexe = ''; - - return $annexe; + return ''; } - function corps() + public function corps() { if ($this->etat <= 0) { return false; @@ -181,7 +174,7 @@ function corps() return $corps; } - function exportable() + public function exportable(): array { return [ 'id' => $this->id, @@ -197,7 +190,10 @@ function exportable() ]; } - function positionable() + /** + * @return int[] + */ + public function positionable(): array { $positions = []; for ($i = 9; $i >= -9; $i--) { @@ -207,13 +203,13 @@ function positionable() return $positions; } - function supprimer() + public function supprimer() { $requete = 'DELETE FROM afup_site_rubrique WHERE id = ' . $this->bdd->echapper($this->id); return $this->bdd->executer($requete); } - function modifier() + public function modifier() { $requete = 'UPDATE afup_site_rubrique SET @@ -233,7 +229,7 @@ function modifier() return $this->bdd->executer($requete); } - function inserer() + public function inserer() { $requete = 'INSERT INTO afup_site_rubrique SET @@ -260,24 +256,24 @@ function inserer() return $resultat; } - function route() + public function route(): string { - return Site::WEB_PATH.Site::WEB_PREFIX.Site::WEB_QUERY_PREFIX . $this->raccourci . '/' . $this->id; + return Site::WEB_PATH . Site::WEB_PREFIX . Site::WEB_QUERY_PREFIX . $this->raccourci . '/' . $this->id; } - function nom() + public function nom() { return $this->nom; } - function fil_d_ariane() + public function fil_d_ariane(): string { $fil = '/ ' . $this->nom . ''; if ($this->id_parent > 0) { $id_parent = $this->id_parent; while ($id_parent > 0) { - $parent = new Rubrique($id_parent, $this->bdd, $this->conf); + $parent = new self($id_parent, $this->bdd, $this->conf); $parent->charger(); $fil = '/ ' . $parent->nom . ' ' . $fil; $id_parent = $parent->id_parent; @@ -287,17 +283,17 @@ function fil_d_ariane() return $fil; } - function sous_rubriques() + public function sous_rubriques(): array { $rubriques = new Rubriques(); return $rubriques->chargerSousRubriques($this->id); } - function rubriques_dans_la_rubrique() + public function rubriques_dans_la_rubrique(): string { $sous_rubriques = $this->sous_rubriques(); $liste = ""; - if (count($sous_rubriques) > 0) { + if ($sous_rubriques !== []) { $liste = '
- ' . $rubrique->nom . ' '; @@ -308,25 +304,26 @@ function rubriques_dans_la_rubrique() return $liste; } - function articles_dans_la_rubrique() + public function articles_dans_la_rubrique(): string { $autres_articles = $this->autres_articles(); $articles = ""; - if (count($autres_articles) > 0) { - foreach ($autres_articles as $article) { - $articles .= '' . - '' . - '
- \$1 \n
- ';
foreach ($autres_articles as $article) {
$liste .= '
- ';
foreach ($sous_rubriques as $rubrique) {
$liste .= '
' . $article->titre . '
' . - '' . $article->teaser() . '
' . - ''; - } + foreach ($autres_articles as $article) { + $articles .= '' . + '' . + '' . $article->titre . '
' . + '' . $article->teaser() . '
' . + ''; } return $articles; } - function autres_articles() + /** + * @return Article[] + */ + public function autres_articles(): array { $autres = []; @@ -336,13 +333,13 @@ function autres_articles() $requete .= ' afup_site_article '; $requete .= ' WHERE '; $requete .= ' etat = 1 '; - $requete .= ' AND id_site_rubrique = ' . (int)$this->id; + $requete .= ' AND id_site_rubrique = ' . (int) $this->id; $requete .= ' ORDER BY date DESC'; if ($this->pagination > 0) { $offset = ($this->page_courante - 1) * $this->pagination; $limit = $this->pagination; - $requete .= ' LIMIT ' . (int)$offset . ', ' . $limit; + $requete .= ' LIMIT ' . (int) $offset . ', ' . $limit; } $articles = $this->bdd->obtenirTous($requete); @@ -358,7 +355,7 @@ function autres_articles() return $autres; } - function compte_autres_articles() + public function compte_autres_articles() { $requete = ' SELECT'; $requete .= ' COUNT(*) '; @@ -366,13 +363,13 @@ function compte_autres_articles() $requete .= ' afup_site_article '; $requete .= ' WHERE '; $requete .= ' etat = 1 '; - $requete .= ' AND id_site_rubrique = ' . (int)$this->id; + $requete .= ' AND id_site_rubrique = ' . (int) $this->id; $requete .= ' ORDER BY date DESC'; return $this->bdd->obtenirUn($requete); } - function pagination_html() + public function pagination_html() { if ($this->pagination) { return new Pagination( @@ -386,7 +383,7 @@ function pagination_html() } } - function genere_route($params) + public function genere_route($params): string { $page = $params['page'] ?? 1; $url = $this->route(); diff --git a/sources/Afup/Corporate/Rubriques.php b/sources/Afup/Corporate/Rubriques.php index 65c0fe18b..c8bfda025 100644 --- a/sources/Afup/Corporate/Rubriques.php +++ b/sources/Afup/Corporate/Rubriques.php @@ -1,30 +1,33 @@ bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - function chargerSousRubriques($id_site_rubrique) + /** + * @return Rubrique[] + */ + public function chargerSousRubriques($id_site_rubrique): array { $requete = ' SELECT'; $requete .= ' * '; $requete .= ' FROM'; $requete .= ' afup_site_rubrique '; $requete .= ' WHERE '; - $requete .= ' id_parent = ' . (int)$id_site_rubrique; + $requete .= ' id_parent = ' . (int) $id_site_rubrique; $requete .= ' ORDER BY date ASC'; $elements = $this->bdd->obtenirTous($requete); @@ -38,11 +41,10 @@ function chargerSousRubriques($id_site_rubrique) } return $rubriques; - } - function obtenirListe($champs = '*', - $ordre = 'titre', + public function obtenirListe(string $champs = '*', + string $ordre = 'titre', $filtre = null, $associatif = false ) { @@ -51,7 +53,7 @@ function obtenirListe($champs = '*', $requete .= 'FROM'; $requete .= ' afup_site_rubrique '; - if (strlen(trim($filtre)) > 0) { + if ($filtre && trim($filtre) !== '') { $requete .= sprintf(' WHERE afup_site_rubrique.nom LIKE %s ', $this->bdd->echapper('%' . $filtre . '%')); } diff --git a/sources/Afup/Corporate/Site.php b/sources/Afup/Corporate/Site.php index 67ecdeda2..690a03fd9 100755 --- a/sources/Afup/Corporate/Site.php +++ b/sources/Afup/Corporate/Site.php @@ -1,6 +1,9 @@ bdd = $bdd; - } else { - $this->bdd = new _Site_Base_De_Donnees(); - } + $this->bdd = $bdd ?: new _Site_Base_De_Donnees(); } - static function raccourcir($texte, $separator = '-') + public static function raccourcir($texte, string $separator = '-'): ?string { $texte = str_replace('�', 'e', $texte); $texte = iconv('ISO-8859-15', 'ASCII//TRANSLIT', trim($texte)); @@ -34,37 +33,34 @@ static function raccourcir($texte, $separator = '-') return preg_replace($pattern, $replacement, strtolower($texte)); } - static function transformer_lien_spip($texte) + public static function transformer_lien_spip($texte) { - $texte = preg_replace('`\[(.*?)[[:space:]]*->http://(.*?)\]`', "" . '$1' . "", $texte); - $texte = preg_replace('`\[(.*?)->(.*?)\]`', "" . '$1' . "", $texte); - return $texte; + $texte = preg_replace('`\[(.*?)[[:space:]]*->http://(.*?)\]`', '$1', $texte); + return preg_replace('`\[(.*?)->(.*?)\]`', '$1', $texte); } - static function transformer_liste_spip($texte) + public static function transformer_liste_spip($texte): string { $lignes = explode("\n", $texte); foreach ($lignes as &$ligne) { $ligne = preg_replace("`^- (.*)`", "- \n
- \n", '', $texte);
- return $texte;
+ return str_replace("
- \n", '', $texte);
}
- static function transformer_spip_en_html($texte)
+ public static function transformer_spip_en_html($texte): string
{
- $texte = Site::transformer_lien_spip($texte);
+ $texte = self::transformer_lien_spip($texte);
for ($i = 0; $i < 2; $i++) {
- $texte = preg_replace('`\{\{\{[[:space:]]*(.*?)[[:space:]]*\}\}\}`', "
" . '$1' . "
", $texte); - $texte = preg_replace('`\{\{[[:space:]]*(.*?)[[:space:]]*\}\}`', "" . '$1' . "", $texte); - $texte = preg_replace('`\{[[:space:]]*(.*?)[[:space:]]*\}`', "" . '$1' . "", $texte); + $texte = preg_replace('`\{\{\{[[:space:]]*(.*?)[[:space:]]*\}\}\}`', '$1
', $texte); + $texte = preg_replace('`\{\{[[:space:]]*(.*?)[[:space:]]*\}\}`', '$1', $texte); + $texte = preg_replace('`\{[[:space:]]*(.*?)[[:space:]]*\}`', '$1', $texte); } - $texte = Site::transformer_liste_spip($texte); - return $texte; + return self::transformer_liste_spip($texte); } - function importer_spip() + public function importer_spip(): void { $this->bdd->executer('TRUNCATE TABLE afup_site_article'); $this->bdd->executer('TRUNCATE TABLE afup_site_rubrique'); @@ -80,9 +76,9 @@ function importer_spip() $rubrique->position = 0; $rubrique->date = time(); $rubrique->nom = ($rubrique_spip['titre']); - $rubrique->raccourci = Site::raccourcir($rubrique_spip['titre']); - $rubrique->descriptif = Site::transformer_spip_en_html(($rubrique_spip['descriptif'])); - $rubrique->contenu = Site::transformer_spip_en_html(($rubrique_spip['texte'])); + $rubrique->raccourci = self::raccourcir($rubrique_spip['titre']); + $rubrique->descriptif = self::transformer_spip_en_html(($rubrique_spip['descriptif'])); + $rubrique->contenu = self::transformer_spip_en_html(($rubrique_spip['texte'])); $rubrique->etat = 1; $rubrique->inserer(); $nombre_rubriques++; @@ -97,9 +93,9 @@ function importer_spip() $article = new Article($article_spip['id_article'], $this->bdd); $article->id_site_rubrique = $article_spip['id_rubrique']; $article->titre = ($article_spip['titre']); - $article->raccourci = Site::raccourcir($article_spip['titre']); - $article->chapeau = Site::transformer_spip_en_html(($article_spip['chapo'])); - $article->contenu = Site::transformer_spip_en_html(($article_spip['texte'])); + $article->raccourci = self::raccourcir($article_spip['titre']); + $article->chapeau = self::transformer_spip_en_html(($article_spip['chapo'])); + $article->contenu = self::transformer_spip_en_html(($article_spip['texte'])); $article->position = 0; $article->date = strtotime($article_spip['date']); $article->etat = 1; diff --git a/sources/Afup/Corporate/_Site_Base_De_Donnees.php b/sources/Afup/Corporate/_Site_Base_De_Donnees.php index 5eeb5f822..ea4f985f4 100644 --- a/sources/Afup/Corporate/_Site_Base_De_Donnees.php +++ b/sources/Afup/Corporate/_Site_Base_De_Donnees.php @@ -1,4 +1,6 @@ _pages = $pages; @@ -82,17 +73,13 @@ public function verifierDroitSurLaPage($page): bool return true; } foreach ($this->_pages as $_page => $_page_details) { - if ($page == $_page) { - if (isset($_page_details['niveau']) && $this->authorizationChecker->isGranted($_page_details['niveau'])) { - return true; - } + if ($page == $_page && (isset($_page_details['niveau']) && $this->authorizationChecker->isGranted($_page_details['niveau']))) { + return true; } - if (isset($_page_details['elements']) and is_array($_page_details['elements'])) { + if (isset($_page_details['elements']) && is_array($_page_details['elements'])) { foreach ($_page_details['elements'] as $_element => $_element_details) { - if ($page == $_element) { - if (isset($_element_details['niveau']) && $this->authorizationChecker->isGranted($_element_details['niveau'])) { - return true; - } + if ($page == $_element && (isset($_element_details['niveau']) && $this->authorizationChecker->isGranted($_element_details['niveau']))) { + return true; } } } diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php index ba6712ec5..d11511551 100644 --- a/sources/Afup/Forum/AppelConferencier.php +++ b/sources/Afup/Forum/AppelConferencier.php @@ -1,15 +1,17 @@ _bdd = $bdd; } - function supprimerSession($id) + public function supprimerSession($id) { $this->delierSession($id); @@ -37,7 +38,7 @@ function supprimerSession($id) return $this->_bdd->executer($requete); } - function obtenirCommentairesPourSession($id = 0) + public function obtenirCommentairesPourSession($id = 0) { $requete = ' SELECT '; $requete .= ' co.*, '; @@ -53,10 +54,9 @@ function obtenirCommentairesPourSession($id = 0) $requete .= ' ORDER BY date ASC'; return $this->_bdd->obtenirTous($requete); - } - function obtenirConferenciersPourSession($id = 0) + public function obtenirConferenciersPourSession($id = 0) { $requete = ' SELECT '; $requete .= ' LOWER(CONCAT(SUBSTRING(c.prenom, 1, 1), c.nom)) as code, '; @@ -72,7 +72,7 @@ function obtenirConferenciersPourSession($id = 0) return $this->_bdd->obtenirTous($requete); } - function obtenirPlanningDeSession($id_session = 0) + public function obtenirPlanningDeSession($id_session = 0) { $requete = ' SELECT '; $requete .= ' se.*, '; @@ -95,7 +95,7 @@ function obtenirPlanningDeSession($id_session = 0) return $this->_bdd->obtenirEnregistrement($requete); } - function obtenirSession($id = 0, $champs = '*', $complement = true) + public function obtenirSession($id = 0, string $champs = '*', $complement = true) { $this->_bdd->executer("SET NAMES utf8mb4"); @@ -131,7 +131,7 @@ function obtenirSession($id = 0, $champs = '*', $complement = true) return $session; } - function obtenirListeSalles($id_forum = null, + public function obtenirListeSalles($id_forum = null, $associatif = false) { $requete = ' SELECT '; @@ -144,10 +144,9 @@ function obtenirListeSalles($id_forum = null, } else { return $this->_bdd->obtenirTous($requete); } - } - function supprimerSessionDuPlanning($id) + public function supprimerSessionDuPlanning($id) { $requete = ' DELETE FROM afup_forum_planning '; $requete .= ' WHERE id = ' . $this->_bdd->echapper($id); @@ -155,7 +154,7 @@ function supprimerSessionDuPlanning($id) return $this->_bdd->executer($requete); } - function modifierSessionDuPlanning($id, + public function modifierSessionDuPlanning($id, $id_forum, $id_session, $debut, @@ -169,11 +168,11 @@ function modifierSessionDuPlanning($id, $requete .= ' fin = ' . $this->_bdd->echapper($fin) . ', '; $requete .= ' keynote = ' . $this->_bdd->echapper($keynote) . ', '; $requete .= ' id_salle = ' . $this->_bdd->echapper($id_salle) . ' '; - $requete .= ' WHERE id = ' . (int)$id; + $requete .= ' WHERE id = ' . (int) $id; return $this->_bdd->executer($requete); } - function ajouterSessionDansPlanning($id_forum, + public function ajouterSessionDansPlanning($id_forum, $id_session, $debut, $fin, @@ -198,7 +197,10 @@ function ajouterSessionDansPlanning($id_forum, return $this->_bdd->obtenirUn('SELECT LAST_INSERT_ID()'); } - function obtenirListeSessionsAvecResumes($id_forum) + /** + * @return mixed[] + */ + public function obtenirListeSessionsAvecResumes($id_forum): array { $requete = ' SELECT '; $requete .= ' se.session_id, '; @@ -229,7 +231,7 @@ function obtenirListeSessionsAvecResumes($id_forum) if (!$forum_details) { return []; } - $directoryPath = __DIR__. "/../../../htdocs/templates/" . $forum_details['path'] . "/resumes/"; + $directoryPath = __DIR__ . "/../../../htdocs/templates/" . $forum_details['path'] . "/resumes/"; if (!is_dir($directoryPath)) { return []; } @@ -237,7 +239,7 @@ function obtenirListeSessionsAvecResumes($id_forum) $repertoire = new \DirectoryIterator($directoryPath); foreach ($repertoire as $file) { if (preg_match("/^[1-9]/", $file->getFilename())) { - $id = (int)$file->getFilename(); + $id = (int) $file->getFilename(); if (isset($sessionsAvecId[$id])) { $sessionsAvecResumes[$id] = $sessionsAvecId[$id]; $sessionsAvecResumes[$id]['file'] = $file->getFilename(); @@ -248,7 +250,7 @@ function obtenirListeSessionsAvecResumes($id_forum) return $sessionsAvecResumes; } - function obtenirListeSessionsPlannifies($id_forum) + public function obtenirListeSessionsPlannifies($id_forum) { $requete = ' SELECT '; $requete .= " ( SELECT CONCAT(c.prenom, ' ', c.nom,' - ', c.societe ) FROM afup_conferenciers_sessions cs INNER JOIN afup_conferenciers c ON c.conferencier_id = cs.conferencier_id WHERE cs.session_id = se.session_id order by c.conferencier_id asc limit 1) as conf1 , @@ -284,9 +286,9 @@ function obtenirListeSessionsPlannifies($id_forum) return $this->_bdd->obtenirTous($requete); } - function obtenirListeProjets($id_forum = null, - $champs = 's.*', - $ordre = 's.date_soumission', + public function obtenirListeProjets($id_forum = null, + string $champs = 's.*', + string $ordre = 's.date_soumission', $associatif = false, $filtre = false, $only_ids = []) @@ -307,7 +309,7 @@ function obtenirListeProjets($id_forum = null, $requete .= ' AND s.titre LIKE \'%' . $filtre . '%\' '; } if ($only_ids) { - $requete .= ' AND s.session_id IN (' . implode($only_ids, ', ') . ') '; + $requete .= ' AND s.session_id IN (' . implode(', ', $only_ids) . ') '; } $requete .= ' AND s.genre = 9 '; $requete .= ' GROUP BY s.session_id '; @@ -320,16 +322,15 @@ function obtenirListeProjets($id_forum = null, } } - function obtenirListeSessions($id_forum = null, - $champs = 's.*', - $ordre = 's.date_soumission', + public function obtenirListeSessions($id_forum = null, + string $champs = 's.*', + string $ordre = 's.date_soumission', $associatif = false, $filtre = false, $type = 'session', $needsMentoring = null, $planned = null - ) - { + ) { $requete = ' SELECT '; $requete .= ' COUNT(co.id) as commentaires_nombre, '; $requete .= ' (SELECT AVG(vote) FROM afup_sessions_vote_github asvg WHERE asvg.session_id = s.session_id) AS note, '; @@ -362,7 +363,7 @@ function obtenirListeSessions($id_forum = null, } if (null !== $needsMentoring) { - $requete .= ' AND s.needs_mentoring = ' . ((int)$needsMentoring); + $requete .= ' AND s.needs_mentoring = ' . ((int) $needsMentoring); } $requete .= ' GROUP BY s.session_id '; @@ -374,7 +375,7 @@ function obtenirListeSessions($id_forum = null, } } - function ajouterConferencier($id_forum, $civilite, $nom, $prenom, $email, $societe, $biographie, $twitter) + public function ajouterConferencier($id_forum, $civilite, $nom, $prenom, $email, $societe, $biographie, $twitter) { $donnees = [ $this->_bdd->echapper($id_forum), @@ -482,7 +483,7 @@ public function modifierSession( $requete .= 'verbatim = ' . $this->_bdd->echapper($verbatim) . ', '; } $requete .= ' plannifie = ' . $this->_bdd->echapper($plannifie) . ' '; - $requete .= ' WHERE session_id = ' . (int)$id; + $requete .= ' WHERE session_id = ' . (int) $id; return $this->_bdd->executer($requete); } @@ -491,7 +492,7 @@ public function modifierJoindinSession($id, $joindin) { $requete = 'UPDATE afup_sessions SET '; $requete .= ' joindin = ' . $this->_bdd->echapper($joindin); - $requete .= ' WHERE session_id = ' . (int)$id; + $requete .= ' WHERE session_id = ' . (int) $id; return $this->_bdd->executer($requete); } @@ -507,7 +508,6 @@ public function ajouterSession( int $level = Talk::SKILL_NA, $useMarkdown = false ) { - $donnees = [ $this->_bdd->echapper($id_forum), $this->_bdd->echapper($date_soumission), @@ -518,7 +518,7 @@ public function ajouterSession( $this->_bdd->echapper($plannifie), $this->_bdd->echapper($needs_mentoring), $this->_bdd->echapper($level), - (int)$useMarkdown + (int) $useMarkdown ]; $requete = ' INSERT INTO afup_sessions @@ -533,10 +533,10 @@ public function ajouterSession( return $this->_bdd->obtenirUn('select LAST_INSERT_ID()'); } - function delierSession($session_id) + public function delierSession($session_id) { $requete = ' DELETE FROM afup_conferenciers_sessions '; - $requete .= ' WHERE session_id = ' . (int)$session_id; + $requete .= ' WHERE session_id = ' . (int) $session_id; return $this->_bdd->executer($requete); } @@ -559,20 +559,20 @@ public function lierConferencierSession($conferencier_id, $session_id) return $this->_bdd->executer($requete); } - function dejaVote($id_user, $id_session) + public function dejaVote($id_user, $id_session): bool { $requete = 'SELECT count(*) FROM afup_sessions_vote WHERE id_personne_physique=' . $this->_bdd->echapper($id_user) . ' AND id_session=' . $this->_bdd->echapper($id_session); - return (bool)$this->_bdd->obtenirUn($requete); + return (bool) $this->_bdd->obtenirUn($requete); } - function nbVoteSession($id_session) + public function nbVoteSession($id_session): int { $requete = 'SELECT count(*) FROM afup_sessions_vote WHERE id_session=' . $this->_bdd->echapper($id_session); - return (int)$this->_bdd->obtenirUn($requete); + return (int) $this->_bdd->obtenirUn($requete); } } diff --git a/sources/Afup/Forum/Coupon.php b/sources/Afup/Forum/Coupon.php index d586c33ec..807de6a00 100644 --- a/sources/Afup/Forum/Coupon.php +++ b/sources/Afup/Forum/Coupon.php @@ -1,5 +1,7 @@ _bdd = $bdd; } @@ -28,10 +28,9 @@ function __construct(&$bdd) * * @param int $id Identifiant du forum * @param string $champs Champs à renvoyer - * @access public * @return array */ - function obtenir($id, $champs = '*') + public function obtenir($id, string $champs = '*') { $requete = 'SELECT'; $requete .= ' ' . $champs . ' '; @@ -41,7 +40,7 @@ function obtenir($id, $champs = '*') return $this->_bdd->obtenirEnregistrement($requete); } - function obtenirCouponsForum($id_forum) + public function obtenirCouponsForum(string $id_forum) { $requete = 'SELECT'; $requete .= ' id, texte '; @@ -51,23 +50,23 @@ function obtenirCouponsForum($id_forum) return $this->_bdd->obtenirAssociatif($requete); } - function ajouter($id_forum, $texte) + public function ajouter($id_forum, $texte) { $requete = 'INSERT INTO '; $requete .= ' afup_forum_coupon (id, id_forum, texte) '; $requete .= 'VALUES (null,'; - $requete .= (int)$id_forum . ','; + $requete .= (int) $id_forum . ','; $requete .= $this->_bdd->echapper(strtoupper($texte)) . ')'; return $this->_bdd->executer($requete); } - function supprimer($id) + public function supprimer(string $id) { $requete = 'DELETE FROM afup_forum_coupon WHERE id=' . $id; return $this->_bdd->executer($requete); } - function supprimerParForum($id_forum) + public function supprimerParForum(string $id_forum) { $requete = 'DELETE FROM afup_forum_coupon WHERE id_forum =' . $id_forum; return $this->_bdd->executer($requete); diff --git a/sources/Afup/Forum/Facturation.php b/sources/Afup/Forum/Facturation.php index cf5812136..72994d963 100644 --- a/sources/Afup/Forum/Facturation.php +++ b/sources/Afup/Forum/Facturation.php @@ -1,5 +1,7 @@ _bdd = $bdd; } @@ -40,10 +40,9 @@ function __construct(&$bdd) * * @param string $reference Reference de la facturation * @param string $champs Champs à renvoyer - * @access public * @return array */ - function obtenir($reference, $champs = '*') + public function obtenir($reference, string $champs = '*') { $requete = 'SELECT'; $requete .= ' ' . $champs . ' '; @@ -60,12 +59,11 @@ function obtenir($reference, $champs = '*') * @param string $champs Champs à renvoyer * @param string $ordre Tri des enregistrements * @param bool $associatif Renvoyer un tableau associatif ? - * @access public * @return array */ - function obtenirListe($id_forum = null, - $champs = '*', - $ordre = 'date_reglement', + public function obtenirListe($id_forum = null, + string $champs = '*', + string $ordre = 'date_reglement', $associatif = false, $filtre = false) { @@ -87,14 +85,14 @@ function obtenirListe($id_forum = null, } } - function creerReference($id_forum, $label) + public function creerReference($id_forum, $label): string { $label = preg_replace('/[^A-Z0-9_\-\:\.;]/', '', strtoupper(supprimerAccents($label))); return 'F' . date('Y') . sprintf('%02d', $id_forum) . '-' . date('dm') . '-' . substr($label, 0, 5) . '-' . substr(md5(date('r') . $label), -5); } - function estFacture($reference) + public function estFacture($reference) { $facture = $this->obtenir($reference, 'etat, facturation'); if ($facture['facturation'] == AFUP_FORUM_FACTURE_A_ENVOYER) { @@ -111,7 +109,7 @@ function estFacture($reference) return true; } - function genererDevis($reference, $chemin = null) + public function genererDevis(string $reference, $chemin = null): void { $requete = 'SELECT aff.*, af.titre AS event_name FROM afup_facturation_forum aff @@ -187,7 +185,7 @@ function genererDevis($reference, $chemin = null) $pdf->Cell(10, 5, 'TVA non applicable - art. 293B du CGI'); if (is_null($chemin)) { - $pdf->Output('Devis - ' . ($facture['societe'] ?: $facture['nom'] . '_' . $facture['prenom']) . ' - ' . date('Y-m-d_H-i', $facture['date_facture']) . '.pdf', 'D'); + $pdf->Output('Devis - ' . ($facture['societe'] ?: $facture['nom'] . '_' . $facture['prenom']) . ' - ' . date('Y-m-d_H-i', (int) $facture['date_facture']) . '.pdf', 'D'); } else { $pdf->Output($chemin, 'F'); } @@ -207,10 +205,8 @@ protected function truncate($value, $length) * * @param string $reference Reference de la facture * @param string $chemin Chemin du fichier PDF à générer. Si ce chemin est omi, le PDF est renvoyé au navigateur. - * @access public - * @return bool */ - function genererFacture($reference, $chemin = null) + public function genererFacture(string $reference, $chemin = null): string { $type = ''; $requete = 'SELECT aff.*, af.titre AS event_name, af.has_prices_defined_with_vat as event_has_prices_defined_with_vat @@ -383,7 +379,7 @@ function genererFacture($reference, $chemin = null) $pdf->SetTextColor(255, 0, 0); $pdf->Cell(130, 5); if ($facture['type_reglement'] != Ticket::PAYMENT_NONE) { - $pdf->Cell(60, 5, utf8_decode('Payé ' . $type . ' le ' . date('d/m/Y', $facture['date_reglement']))); + $pdf->Cell(60, 5, utf8_decode('Payé ' . $type . ' le ' . date('d/m/Y', (int) $facture['date_reglement']))); } $pdf->SetTextColor(0, 0, 0); } @@ -393,7 +389,7 @@ function genererFacture($reference, $chemin = null) } if (is_null($chemin)) { - $pdf->Output('Facture - ' . ($facture['societe'] ?: $facture['nom'] . '_' . $facture['prenom']) . ' - ' . date('Y-m-d_H-i', $facture['date_facture']) . '.pdf', 'D'); + $pdf->Output('Facture - ' . ($facture['societe'] ?: $facture['nom'] . '_' . $facture['prenom']) . ' - ' . date('Y-m-d_H-i', (int) $facture['date_facture']) . '.pdf', 'D'); } else { $pdf->Output($chemin, 'F'); } @@ -401,26 +397,23 @@ function genererFacture($reference, $chemin = null) return $reference; } - private function formatFactureValue($value, $isSubjectedToVat) + private function formatFactureValue($value, bool $isSubjectedToVat) { if (false === $isSubjectedToVat) { return $value; } - return number_format($value, 2, ',', ' '); + return number_format((float) $value, 2, ',', ' '); } /** * Envoi par mail d'une facture au format PDF * * @param string|array $reference Invoicing reference as string, or the invoice itself - * @access public * @return bool Succès de l'envoi */ - function envoyerFacture($reference, $copyTresorier = true, $facturer = true) + public function envoyerFacture($reference, $copyTresorier = true, $facturer = true) { - $configuration = $GLOBALS['AFUP_CONF']; - if (is_array($reference)) { $personne = $reference; $reference = $personne['reference']; @@ -440,11 +433,11 @@ function envoyerFacture($reference, $copyTresorier = true, $facturer = true) $mailer->renderTemplate($message,'mail_templates/facture-forum.html.twig', [ 'raison_sociale' => AFUP_RAISON_SOCIALE, 'adresse' => AFUP_ADRESSE, - 'ville' => AFUP_CODE_POSTAL.' '.AFUP_VILLE, + 'ville' => AFUP_CODE_POSTAL . ' ' . AFUP_VILLE, ]); $message->addAttachment(new Attachment( $cheminFacture, - 'facture-'.$numeroFacture.'.pdf', + 'facture-' . $numeroFacture . '.pdf', 'base64', 'application/pdf' )); diff --git a/sources/Afup/Forum/Forum.php b/sources/Afup/Forum/Forum.php index ed38f1dbe..7e47f228f 100644 --- a/sources/Afup/Forum/Forum.php +++ b/sources/Afup/Forum/Forum.php @@ -1,5 +1,7 @@ _bdd = $bdd; } @@ -28,10 +28,9 @@ function __construct(&$bdd) * * @param int $id Identifiant du forum * @param string $champs Champs à renvoyer - * @access public * @return array */ - function obtenir($id, $champs = '*') + public function obtenir($id, string $champs = '*') { $requete = 'SELECT'; $requete .= ' ' . $champs . ', annee as forum_annee '; @@ -41,7 +40,7 @@ function obtenir($id, $champs = '*') return $this->_bdd->obtenirEnregistrement($requete); } - function supprimable($id) + public function supprimable(string $id): bool { $requete = 'SELECT'; $requete .= ' f.id, count(session_id) as sessions,count(i.id) as inscriptions '; @@ -56,7 +55,7 @@ function supprimable($id) return $forum['sessions'] == 0 && $forum['inscriptions'] == 0; } - function obtenirNombrePlaces($id = NULL) + public function obtenirNombrePlaces($id = null) { if (empty($id)) { $id = $this->obtenirDernier(); @@ -66,27 +65,27 @@ function obtenirNombrePlaces($id = NULL) return $enregistrement['nb_places']; } - function obtenirDebut($id_forum) + public function obtenirDebut($id_forum) { $requete = 'SELECT UNIX_TIMESTAMP(date_debut)'; $requete .= 'FROM'; $requete .= ' afup_forum '; $requete .= 'WHERE'; - $requete .= ' id = ' . (int)$id_forum; + $requete .= ' id = ' . (int) $id_forum; return $this->_bdd->obtenirUn($requete); } - function obtenirForumPrecedent($id_forum) + public function obtenirForumPrecedent($id_forum) { $requete = 'SELECT MAX(id)'; $requete .= 'FROM'; $requete .= ' afup_forum '; $requete .= 'WHERE'; - $requete .= ' id < ' . (int)$id_forum . ' AND titre like "%Forum%"'; + $requete .= ' id < ' . (int) $id_forum . ' AND titre like "%Forum%"'; return $this->_bdd->obtenirUn($requete); } - function obtenirDernier() + public function obtenirDernier() { $requete = 'SELECT id '; $requete .= 'FROM afup_forum '; @@ -100,12 +99,11 @@ function obtenirDernier() * @param string $champs Champs à renvoyer * @param string $ordre Tri des enregistrements * @param bool $associatif Renvoyer un tableau associatif ? - * @access public * @return array */ - function obtenirListe($id_forum = null, - $champs = '*', - $ordre = 'titre', + public function obtenirListe($id_forum = null, + string $champs = '*', + string $ordre = 'titre', $associatif = false, $filtre = false) { @@ -121,14 +119,14 @@ function obtenirListe($id_forum = null, } } - function afficherDeroulementMobile($sessions) + public function afficherDeroulementMobile($sessions): string { $deroulement = ""; $jour = 0; $heure = 0; foreach ($sessions as $session) { - if ($jour != mktime(0, 0, 0, date("m", $session['debut']), date("d", $session['debut']), date("Y", $session['debut']))) { - $jour = mktime(0, 0, 0, date("m", $session['debut']), date("d", $session['debut']), date("Y", $session['debut'])); + if ($jour != mktime(0, 0, 0, (int) date("m", $session['debut']), (int) date("d", $session['debut']), (int) date("Y", $session['debut']))) { + $jour = mktime(0, 0, 0, (int) date("m", $session['debut']), (int) date("d", $session['debut']), (int) date("Y", $session['debut'])); $deroulement .= ""; } - function afficherDeroulement($sessions) + public function afficherDeroulement($sessions): string { $deroulement = "" . ($jour > 10000 ? date("d/m/Y", $jour) : 'Jour à définir') . "
"; } if ($heure != $session['debut']) { @@ -147,25 +145,24 @@ function afficherDeroulementMobile($sessions) $conferenciers .= "
" . $session['conf2']; } - $deroulement .= ""; + $deroulement .= ""; - return $deroulement; + return $deroulement . ""; $deroulement .= " "; $deroulement .= ""; } - $deroulement .= "" . $conferenciers . ""; $deroulement .= "" . $session['nom_salle'] . ""; $deroulement .= ""; $jour = 0; $heure = 0; foreach ($sessions as $session) { - if ($jour != mktime(0, 0, 0, date("m", $session['debut']), date("d", $session['debut']), date("Y", $session['debut']))) { - $jour = mktime(0, 0, 0, date("m", $session['debut']), date("d", $session['debut']), date("Y", $session['debut'])); + if ($jour != mktime(0, 0, 0, (int) date("m", $session['debut']), (int) date("d", $session['debut']), (int) date("Y", $session['debut']))) { + $jour = mktime(0, 0, 0, (int) date("m", $session['debut']), (int) date("d", $session['debut']), (int) date("Y", $session['debut'])); $deroulement .= ""; } - function afficherAgenda($sessions) + public function afficherAgenda($sessions): string { $slots = []; $salles = []; $debuts = []; foreach ($sessions as $session) { - $jour = mktime(0, 0, 0, date("m", $session['debut']), date("d", $session['debut']), date("Y", $session['debut'])); + $jour = mktime(0, 0, 0, (int) date("m", $session['debut']), (int) date("d", $session['debut']), (int) date("Y", $session['debut'])); $slots[$jour][$session['nom_salle']][$session['debut']] = $session; - if (!isset($debuts[$jour])) { - $debuts[$jour] = $session['debut']; - } else { - $debuts[$jour] = min($session['debut'], $debuts[$jour]); - } + $debuts[$jour] = isset($debuts[$jour]) ? min($session['debut'], $debuts[$jour]) : $session['debut']; $salles[] = $session['id_salle']; } $salles = array_unique($salles); @@ -219,8 +211,8 @@ function afficherAgenda($sessions) $nb_salles = count($slots_avec_salle); $agenda .= "" . ($jour > 10000 ? date("d/m/Y", $jour) : 'Jour à définir') . "
"; } if ($heure != $session['debut']) { @@ -184,29 +181,24 @@ function afficherDeroulement($sessions) $conferenciers .= "
" . $session['conf2']; } - $deroulement .= ""; + $deroulement .= ""; - return $deroulement; + return $deroulement . ""; $deroulement .= " "; $deroulement .= ""; } - $deroulement .= "" . $conferenciers . ""; $deroulement .= ""; $agenda .= "" . date("d/m/Y", $jour) . "
"; - foreach ($slots_avec_salle as $salle => $slots_avec_horaire) { - foreach ($slots_avec_horaire as $debut => $session) { + foreach ($slots_avec_salle as $slots_avec_horaire) { + foreach ($slots_avec_horaire as $session) { $classes = ["slot"]; $classes[] = $session['journee']; @@ -241,7 +233,7 @@ function afficherAgenda($sessions) $styles[] = "height: " . round(($session['fin'] - $session['debut']) / 19) . "px;"; $styles[] = "top: " . round(40 + $passage_jour * 1600 + ($session['debut'] - $debuts[$jour]) / 19) . "px;"; - $agenda .= ""; + $agenda .= ""; $agenda .= " "; $agenda .= "" . $conferenciers . ""; $agenda .= "" . date("H\hi", $session['debut']) . " - " . date("H\hi", $session['fin']) . ""; @@ -264,12 +256,12 @@ function afficherAgenda($sessions) * * @param Int $annee (Optionnel, retournera tout si aucunne année indiquée) */ - function obtenirAgenda($annee = null, $forum_id = null) + public function obtenirAgenda($annee = null, $forum_id = null) { $aWhere = []; if (isset($annee)) { - $tdebut = mktime(0, 0, 0, 1, 1, $annee); - $tfin = mktime(0, 0, 0, 1, 1, ($annee + 1)); + $tdebut = mktime(0, 0, 0, 1, 1, (int) $annee); + $tfin = mktime(0, 0, 0, 1, 1, (int) ($annee + 1)); $aWhere[] = "p.debut >= " . $tdebut; $aWhere[] = "p.fin < " . $tfin; $aWhere[] = "s.plannifie = 1"; @@ -296,8 +288,7 @@ function obtenirAgenda($annee = null, $forum_id = null) " JOIN afup_forum_salle l ON p.id_salle = l.id " . $sWhere . " " . "ORDER BY p.debut ASC, p.id_salle ASC"; - $planning = $this->_bdd->obtenirTous($requete); - return $planning; + return $this->_bdd->obtenirTous($requete); } /** @@ -311,15 +302,14 @@ function obtenirAgenda($annee = null, $forum_id = null) * @param String $heures * @return Int */ - function dureeSeance($heures) + public function dureeSeance($heures) { $aHeures = explode("-", $heures); $aDebut = explode(":", $aHeures[0]); $aFin = explode(":", $aHeures[1]); - $iDebut = ((int)$aDebut[0] * 60) + (int)$aDebut[1]; - $iFin = ((int)$aFin[0] * 60) + (int)$aFin[1]; - $duree = ($iFin - $iDebut) / 5; - return $duree; + $iDebut = ((int) $aDebut[0] * 60) + (int) $aDebut[1]; + $iFin = ((int) $aFin[0] * 60) + (int) $aFin[1]; + return ($iFin - $iDebut) / 5; } /** @@ -331,26 +321,20 @@ function dureeSeance($heures) * i.e : "/sessions.php#%1" . %1 is the session id * @return String */ - function lienSeance($infoSeance, $for_bo, $linkFormat) + public function lienSeance($infoSeance, $for_bo, $linkFormat): ?string { - $masque = "#^([0-9]+) ?: ?(.*)#"; + $masque = "#^(\\d+) ?: ?(.*)#"; //$masque = "#^([0-9]+) ?| ?(.*) ?| ?(.*)#"; $lien = '#$1'; if ($for_bo === false) { - if ($linkFormat !== null) { - $lien = sprintf($linkFormat, '$1'); - } else { - $lien = './sessions.php#$1'; - } + $lien = $linkFormat !== null ? sprintf($linkFormat, '$1') : './sessions.php#$1'; } - - $lien = preg_replace($masque, '', $infoSeance); - return $lien; + return preg_replace($masque, '', $infoSeance); } - function genAgenda($annee, $for_bo = false, $only_data = false, $forum_id = null, $linkFormat = null) + public function genAgenda($annee, $for_bo = false, $only_data = false, $forum_id = null, $linkFormat = null) { $aProgrammeData = []; $aAgenda = $this->obtenirAgenda($annee, $forum_id); @@ -360,7 +344,7 @@ function genAgenda($annee, $for_bo = false, $only_data = false, $forum_id = null $j = 0; $d = null; $aProgramme = []; - foreach ($aAgenda as $index => $session) { + foreach ($aAgenda as $session) { if (!isset($nomSalles[$session['id_salle']])) { $nomSalles[$session['id_salle']] = $session['nom']; } @@ -443,9 +427,9 @@ function genAgenda($annee, $for_bo = false, $only_data = false, $forum_id = null /* On vérifie qu'on est pas déjà sur une scéance commencée à un tour précédent. */ if ($aRowSpan[$idSalle] <= 1): $bSeance = false; - $rs = null; - /* Calcul du nombre de lignes occupées par la scéance s'il y en a une. */ - for ($c = 0; $c < $nbConf; $c++): + $rs = null; + /* Calcul du nombre de lignes occupées par la scéance s'il y en a une. */ + for ($c = 0; $c < $nbConf; $c++): //var_dump($aAgenda[$c]); if ( $aAgenda[$c]['debut'] == $sHeure . ":" . $m && @@ -455,41 +439,40 @@ function genAgenda($annee, $for_bo = false, $only_data = false, $forum_id = null /* Si on toruve une scéance, on ne mettra pas de cellule vide. */ $bSeance = true; - $bKeynote = $aAgenda[$c]['keynote']; - $colspan = $bKeynote ? ' colspan="' . $nbSalles . '" class="keynote" ' : ''; - $heures = $aAgenda[$c]['debut'] . "-" . $aAgenda[$c]['fin']; - $nl = $this->dureeSeance($heures); - $aRowSpan[$idSalle] = $nl; + $bKeynote = $aAgenda[$c]['keynote']; + $colspan = $bKeynote ? ' colspan="' . $nbSalles . '" class="keynote" ' : ''; + $heures = $aAgenda[$c]['debut'] . "-" . $aAgenda[$c]['fin']; + $nl = $this->dureeSeance($heures); + $aRowSpan[$idSalle] = $nl; - $class = 'conf conf_' . ($confNumber % 2 === 0 ? 'odd' : 'even'); + $class = 'conf conf_' . ($confNumber % 2 === 0 ? 'odd' : 'even'); - $rs = ($nl > 1) ? ' rowspan="' . $nl . '"' : null; - $nbSeances = (isset($aInfos[$heures][$nomSalle])) ? count($aInfos[$heures][$nomSalle]) : 0; - if ($nbSeances > 0): + $rs = ($nl > 1) ? ' rowspan="' . $nl . '"' : null; + $nbSeances = (isset($aInfos[$heures][$nomSalle])) ? count($aInfos[$heures][$nomSalle]) : 0; + if ($nbSeances > 0): $conflit = $nbSeances > 1 ? ' style="color: inherit; background-color: #f99"' : null; - $sTable .= <<CODE_HTML; - for ($sc = 0; $sc < $nbSeances; $sc++): + for ($sc = 0; $sc < $nbSeances; $sc++): $lien = $this->lienSeance($aInfos[$heures][$nomSalle][$sc], $for_bo, $linkFormat); - //$lien = ''; - $sTable .= $lien; - endfor; - $sTable .= ""; - $confNumber++; - endif; - break; - endif; - endfor; - if (in_array($sHeure . '_' . $m . '_' . $journee, ['17_00_12-11-2009', '10_30_12-11-2009'])) { - $bKeynote = true; - } - if (false === $bSeance && !$bKeynote): + //$lien = ''; + $sTable .= $lien; + endfor; + $sTable .= ""; + $confNumber++; + endif; + break; + endif; + endfor; + if (in_array($sHeure . '_' . $m . '_' . $journee, ['17_00_12-11-2009', '10_30_12-11-2009'])) { + $bKeynote = true; + } + if (false === $bSeance && !$bKeynote): $sTable .= " Votre adhésion d’un an à l’AFUP approche de son terme ! Déjà presque une année que vous bénéficiez de nos tarifs @@ -29,12 +31,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Votre adhésion à l’AFUP arrive à son terme : J-15'; } - protected function getKey() + protected function getKey(): string { return '15DaysBefore'; } diff --git a/sources/AppBundle/Association/CompanyMembership/Reminder7DaysBeforeEnd.php b/sources/AppBundle/Association/CompanyMembership/Reminder7DaysBeforeEnd.php index 7a767102c..fdf880b74 100644 --- a/sources/AppBundle/Association/CompanyMembership/Reminder7DaysBeforeEnd.php +++ b/sources/AppBundle/Association/CompanyMembership/Reminder7DaysBeforeEnd.php @@ -1,11 +1,13 @@ Chère société membre de l’AFUP,
@@ -32,12 +34,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Votre adhésion à l’AFUP arrive à son terme : J-7 !'; } - protected function getKey() + protected function getKey(): string { return '7DaysBefore'; } diff --git a/sources/AppBundle/Association/CompanyMembership/ReminderDDay.php b/sources/AppBundle/Association/CompanyMembership/ReminderDDay.php index 209fbfc26..6bae894d2 100644 --- a/sources/AppBundle/Association/CompanyMembership/ReminderDDay.php +++ b/sources/AppBundle/Association/CompanyMembership/ReminderDDay.php @@ -1,11 +1,13 @@ Cher société membre de l\'AFUP, @@ -28,12 +30,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Fin de validité de votre adhésion à l’AFUP'; } - protected function getKey() + protected function getKey(): string { return 'DDay'; } diff --git a/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php b/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php index 3936af1ab..db6dbb5d3 100644 --- a/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php +++ b/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php @@ -1,5 +1,7 @@ legacyModelFactory = $legacyModelFactory; } - public function createInvoiceForInscription(CompanyMember $company, $numberOfMembers) + public function createInvoiceForInscription(CompanyMember $company, $numberOfMembers): array { $subscription = $this->legacyModelFactory->createObject(Cotisations::class); diff --git a/sources/AppBundle/Association/CompanyMembership/UserCompany.php b/sources/AppBundle/Association/CompanyMembership/UserCompany.php index 3abd22070..68ed014f6 100644 --- a/sources/AppBundle/Association/CompanyMembership/UserCompany.php +++ b/sources/AppBundle/Association/CompanyMembership/UserCompany.php @@ -1,5 +1,7 @@ eventDispatcher = $eventDispatcher; } - public function setManager(User $user) + public function setManager(User $user): void { $user->addRole('ROLE_COMPANY_MANAGER'); $this->userRepository->save($user); } - public function unsetManager(User $user) + public function unsetManager(User $user): void { $user->removeRole('ROLE_COMPANY_MANAGER'); $this->userRepository->save($user); } - public function disableUser(User $user) + public function disableUser(User $user): void { $user ->removeRole('ROLE_COMPANY_MANAGER') @@ -46,7 +42,7 @@ public function disableUser(User $user) ; $this->userRepository->save($user); - $userDisabledEvent = new UserDisabledEvent($user); - $this->eventDispatcher->dispatch(UserDisabledEvent::NAME, $userDisabledEvent); + $event = new UserDisabledEvent($user); + $this->eventDispatcher->dispatch($event::NAME, $event); } } diff --git a/sources/AppBundle/Association/Event/NewMemberEvent.php b/sources/AppBundle/Association/Event/NewMemberEvent.php index 5a1b22579..fc5ff470b 100644 --- a/sources/AppBundle/Association/Event/NewMemberEvent.php +++ b/sources/AppBundle/Association/Event/NewMemberEvent.php @@ -1,5 +1,7 @@ user = $user; } - public function getUser() + public function getUser(): User { return $this->user; } diff --git a/sources/AppBundle/Association/Event/UserDisabledEvent.php b/sources/AppBundle/Association/Event/UserDisabledEvent.php index 63d86dbc4..e6ff866f5 100644 --- a/sources/AppBundle/Association/Event/UserDisabledEvent.php +++ b/sources/AppBundle/Association/Event/UserDisabledEvent.php @@ -1,5 +1,7 @@ user = $user; } - public function getUser() + public function getUser(): User { return $this->user; } diff --git a/sources/AppBundle/Association/Factory/UserFactory.php b/sources/AppBundle/Association/Factory/UserFactory.php index 82c50ae0d..f32a7f430 100644 --- a/sources/AppBundle/Association/Factory/UserFactory.php +++ b/sources/AppBundle/Association/Factory/UserFactory.php @@ -1,5 +1,7 @@ add('companyName', TextType::class, ['label' => 'Company']) @@ -30,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => CompanyMember::class, diff --git a/sources/AppBundle/Association/Form/BadgeType.php b/sources/AppBundle/Association/Form/BadgeType.php index bb954ff91..49f3a0d78 100644 --- a/sources/AppBundle/Association/Form/BadgeType.php +++ b/sources/AppBundle/Association/Form/BadgeType.php @@ -1,5 +1,7 @@ add( @@ -49,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { } } diff --git a/sources/AppBundle/Association/Form/CompanyMemberInvitationType.php b/sources/AppBundle/Association/Form/CompanyMemberInvitationType.php index 17822bcea..8a71cd071 100644 --- a/sources/AppBundle/Association/Form/CompanyMemberInvitationType.php +++ b/sources/AppBundle/Association/Form/CompanyMemberInvitationType.php @@ -1,5 +1,7 @@ add('email', EmailType::class) @@ -20,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => CompanyMemberInvitation::class, diff --git a/sources/AppBundle/Association/Form/CompanyMemberType.php b/sources/AppBundle/Association/Form/CompanyMemberType.php index 44389fd7d..8604d9455 100644 --- a/sources/AppBundle/Association/Form/CompanyMemberType.php +++ b/sources/AppBundle/Association/Form/CompanyMemberType.php @@ -1,5 +1,7 @@ setDefaults([ 'data_class' => CompanyMember::class, diff --git a/sources/AppBundle/Association/Form/CompanyPublicProfile.php b/sources/AppBundle/Association/Form/CompanyPublicProfile.php index bbcb66ad8..60e7e0cc1 100644 --- a/sources/AppBundle/Association/Form/CompanyPublicProfile.php +++ b/sources/AppBundle/Association/Form/CompanyPublicProfile.php @@ -1,5 +1,7 @@ setDefaults([ 'logo_required' => true, ]); } - private function getMembershipReasonHelp() + private function getMembershipReasonHelp(): string { return <<countryService = $countryService; } - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $builder ->add('email', EmailType::class, [ @@ -95,14 +100,17 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => User::class, ]); } - private function getOfficesList() + /** + * @return mixed[] + */ + private function getOfficesList(): array { $officesCollection = new OfficesCollection(); $offices = ['' => '-Aucune-']; @@ -112,7 +120,10 @@ private function getOfficesList() return $offices; } - private function getCountyChoices() + /** + * @return mixed[] + */ + private function getCountyChoices(): array { $choices = []; foreach ($this->countryService->obtenirPays() as $id => $country) { diff --git a/sources/AppBundle/Association/Form/HTML_QuickForm.php b/sources/AppBundle/Association/Form/HTML_QuickForm.php index c022339cd..83a028db0 100644 --- a/sources/AppBundle/Association/Form/HTML_QuickForm.php +++ b/sources/AppBundle/Association/Form/HTML_QuickForm.php @@ -1,5 +1,7 @@ vars['help'] = $options['help'] ?? ''; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults(['help' => null]); } diff --git a/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php b/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php index c7f4ce4ec..9919946d6 100644 --- a/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php +++ b/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php @@ -1,5 +1,7 @@ add('userCommonInfo', UserType::class, [ @@ -42,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]); } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => User::class, diff --git a/sources/AppBundle/Association/Form/TicketEventType.php b/sources/AppBundle/Association/Form/TicketEventType.php index 4da43e4a7..c4d6c1957 100644 --- a/sources/AppBundle/Association/Form/TicketEventType.php +++ b/sources/AppBundle/Association/Form/TicketEventType.php @@ -1,5 +1,7 @@ add('ticketType', ChoiceType::class, [ @@ -62,7 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]); } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => ModelTicketEventType::class, @@ -73,7 +75,10 @@ public function configureOptions(OptionsResolver $resolver) ]); } - private function ticketTypesToChoices($ticketTypes) + /** + * @return mixed[] + */ + private function ticketTypesToChoices($ticketTypes): array { $choices = []; diff --git a/sources/AppBundle/Association/Form/UserBadgeType.php b/sources/AppBundle/Association/Form/UserBadgeType.php index 74afa5698..f07ea8555 100644 --- a/sources/AppBundle/Association/Form/UserBadgeType.php +++ b/sources/AppBundle/Association/Form/UserBadgeType.php @@ -1,5 +1,7 @@ userBadgeRepository = $userBadgeRepository; } - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $userBadgesIds = []; foreach ($this->userBadgeRepository->findByUserId($options['user']->getId()) as $userBadge) { @@ -78,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ); } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setRequired(['user']); } diff --git a/sources/AppBundle/Association/Form/UserEditFormData.php b/sources/AppBundle/Association/Form/UserEditFormData.php index 80052bd12..179dcac53 100644 --- a/sources/AppBundle/Association/Form/UserEditFormData.php +++ b/sources/AppBundle/Association/Form/UserEditFormData.php @@ -1,5 +1,7 @@ roles, true))) { $context->buildViolation('Les roles ne sont pas valides') diff --git a/sources/AppBundle/Association/Form/UserEditType.php b/sources/AppBundle/Association/Form/UserEditType.php index f55aba65a..619175c99 100644 --- a/sources/AppBundle/Association/Form/UserEditType.php +++ b/sources/AppBundle/Association/Form/UserEditType.php @@ -1,5 +1,7 @@ pays = $pays; } - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $civilities = ['M.', 'Mme']; $builder @@ -231,12 +231,12 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->get('companyId')->addModelTransformer(new CallbackTransformer( - fn ($value): string => $value, + fn ($value): string => (string) $value, fn ($value): int => (int) $value )); } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => User::class, diff --git a/sources/AppBundle/Association/Form/UserType.php b/sources/AppBundle/Association/Form/UserType.php index 9c945c582..7d6e26883 100644 --- a/sources/AppBundle/Association/Form/UserType.php +++ b/sources/AppBundle/Association/Form/UserType.php @@ -1,5 +1,7 @@ add('firstName', TextType::class, ['label' => 'Firstname']) @@ -36,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => User::class, diff --git a/sources/AppBundle/Association/MembershipFeeReferenceGenerator.php b/sources/AppBundle/Association/MembershipFeeReferenceGenerator.php index abdee9b19..0047c03f6 100644 --- a/sources/AppBundle/Association/MembershipFeeReferenceGenerator.php +++ b/sources/AppBundle/Association/MembershipFeeReferenceGenerator.php @@ -1,5 +1,7 @@ format('Y') . '-' . $currentDate->format('dmYHi') . '-' . $typePersonne . '-' . $idPersonne . '-' . substr(supprimerAccents($nomPersonne), 0, 5)); $reference = supprimerAccents($reference); $reference = preg_replace('/[^A-Z0-9_\-\:\.;]/', '', $reference); - $reference .= '-' . strtoupper(substr(md5($reference), - 3)); - return $reference; + return $reference . ('-' . strtoupper(substr(md5($reference), - 3))); } } diff --git a/sources/AppBundle/Association/MembershipReminderInterface.php b/sources/AppBundle/Association/MembershipReminderInterface.php index a4bd122e6..e12629df5 100644 --- a/sources/AppBundle/Association/MembershipReminderInterface.php +++ b/sources/AppBundle/Association/MembershipReminderInterface.php @@ -1,5 +1,7 @@ id = $id; return $this; @@ -173,9 +174,8 @@ public function getFirstName() /** * @param string $firstName - * @return CompanyMember */ - public function setFirstName($firstName) + public function setFirstName($firstName): self { $this->propertyChanged('firstName', $this->firstName, $firstName); $this->firstName = $firstName; @@ -192,9 +192,8 @@ public function getLastName() /** * @param string $lastName - * @return CompanyMember */ - public function setLastName($lastName) + public function setLastName($lastName): self { $this->propertyChanged('lastName', $this->lastName, $lastName); $this->lastName = $lastName; @@ -211,9 +210,8 @@ public function getEmail() /** * @param string $email - * @return CompanyMember */ - public function setEmail($email) + public function setEmail($email): self { $this->propertyChanged('email', $this->email, $email); $this->email = $email; @@ -230,9 +228,8 @@ public function getCompanyName() /** * @param string $companyName - * @return CompanyMember */ - public function setCompanyName($companyName) + public function setCompanyName($companyName): self { $this->propertyChanged('companyName', $this->companyName, $companyName); $this->companyName = $companyName; @@ -249,9 +246,8 @@ public function getSiret() /** * @param string $siret - * @return CompanyMember */ - public function setSiret($siret) + public function setSiret($siret): self { $this->propertyChanged('siret', $this->siret, $siret); $this->siret = $siret; @@ -268,9 +264,8 @@ public function getAddress() /** * @param string $address - * @return CompanyMember */ - public function setAddress($address) + public function setAddress($address): self { $this->propertyChanged('address', $this->address, $address); $this->address = $address; @@ -287,9 +282,8 @@ public function getZipCode() /** * @param string $zipCode - * @return CompanyMember */ - public function setZipCode($zipCode) + public function setZipCode($zipCode): self { $this->propertyChanged('zipCode', $this->zipCode, $zipCode); $this->zipCode = $zipCode; @@ -306,9 +300,8 @@ public function getCity() /** * @param string $city - * @return CompanyMember */ - public function setCity($city) + public function setCity($city): self { $this->propertyChanged('city', $this->city, $city); $this->city = $city; @@ -325,9 +318,8 @@ public function getCountry() /** * @param string $country - * @return CompanyMember */ - public function setCountry($country) + public function setCountry($country): self { $this->propertyChanged('country', $this->country, $country); $this->country = $country; @@ -344,9 +336,8 @@ public function getPhone() /** * @param string $phone - * @return CompanyMember */ - public function setPhone($phone) + public function setPhone($phone): self { $this->propertyChanged('phone', $this->phone, $phone); $this->phone = $phone; @@ -363,9 +354,8 @@ public function getStatus() /** * @param int $status - * @return CompanyMember */ - public function setStatus($status) + public function setStatus($status): self { $this->propertyChanged('status', $this->status, $status); $this->status = $status; @@ -375,18 +365,17 @@ public function setStatus($status) /** * @return CompanyMemberInvitation[] */ - public function getInvitations() + public function getInvitations(): ?array { return $this->invitations; } /** * @param CompanyMemberInvitation[] $invitations - * @return CompanyMember */ - public function setInvitations($invitations) + public function setInvitations($invitations): self { - $this->invitations = array_filter($invitations, static fn ($invitation) => $invitation instanceof CompanyMemberInvitation); + $this->invitations = array_filter($invitations, static fn ($invitation): bool => $invitation instanceof CompanyMemberInvitation); return $this; } @@ -401,29 +390,23 @@ public function getMaxMembers() /** * @param int $maxMembers - * @return CompanyMember */ - public function setMaxMembers($maxMembers) + public function setMaxMembers($maxMembers): self { $this->propertyChanged('maxMembers', $this->maxMembers, $maxMembers); $this->maxMembers = $maxMembers; return $this; } - /** - * @return bool - */ - public function getPublicProfileEnabled() + public function getPublicProfileEnabled(): bool { return (bool) $this->publicProfileEnabled; } /** * @param bool $publicProfileEnabled - * - * @return CompanyMember */ - public function setPublicProfileEnabled($publicProfileEnabled) + public function setPublicProfileEnabled($publicProfileEnabled): self { $this->propertyChanged('publicProfileEnabled', $this->publicProfileEnabled, $publicProfileEnabled); $this->publicProfileEnabled = $publicProfileEnabled; @@ -444,7 +427,7 @@ public function getDescription() * * @return $this */ - public function setDescription($description = null) + public function setDescription($description = null): self { $this->propertyChanged('description', $this->description, $description); $this->description = $description; @@ -452,10 +435,7 @@ public function setDescription($description = null) return $this; } - /** - * @return bool - */ - public function hasLogoUrl() + public function hasLogoUrl(): bool { return null !== $this->getLogoUrl(); } @@ -473,7 +453,7 @@ public function getLogoUrl() * * @return $this */ - public function setLogoUrl($logoUrl) + public function setLogoUrl($logoUrl): self { $this->propertyChanged('logoUrl', $this->logoUrl, $logoUrl); $this->logoUrl = $logoUrl; @@ -491,10 +471,8 @@ public function getWebsiteUrl() /** * @param string|null $websiteUrl - * - * @return CompanyMember */ - public function setWebsiteUrl($websiteUrl) + public function setWebsiteUrl($websiteUrl): self { $this->propertyChanged('websiteUrl', $this->websiteUrl, $websiteUrl); $this->websiteUrl = $websiteUrl; @@ -515,7 +493,7 @@ public function getContactPageUrl() * * @return $this */ - public function setContactPageUrl($contactPageUrl) + public function setContactPageUrl($contactPageUrl): self { $this->propertyChanged('contactPageUrl', $this->contactPageUrl, $contactPageUrl); $this->contactPageUrl = $contactPageUrl; @@ -536,7 +514,7 @@ public function getCareersPageUrl() * * @return $this */ - public function setCareersPageUrl($careersPageUrl) + public function setCareersPageUrl($careersPageUrl): self { $this->propertyChanged('careersPageUrl', $this->careersPageUrl, $careersPageUrl); $this->careersPageUrl = $careersPageUrl; @@ -557,11 +535,11 @@ public function getTwitterHandle() */ public function getCleanedTwitterHandle() { - $twitter = $this->getTwitterHandle(); + $twitter = (string) $this->getTwitterHandle(); $twitter = trim($twitter, '@'); $twitter = preg_replace('!^https?://twitter.com/!', '', $twitter); - if (0 === strlen(trim($twitter))) { + if (trim($twitter) === '') { return null; } @@ -573,7 +551,7 @@ public function getCleanedTwitterHandle() * * @return $this */ - public function setTwitterHandle($twitterHandle) + public function setTwitterHandle($twitterHandle): self { $this->propertyChanged('twitterHandle', $this->twitterHandle, $twitterHandle); $this->twitterHandle = $twitterHandle; @@ -594,7 +572,7 @@ public function getRelatedAfupOffices() * * @return $this */ - public function setRelatedAfupOffices($relatedAfupOffices) + public function setRelatedAfupOffices($relatedAfupOffices): self { $this->propertyChanged('relatedAfupOffices', $this->relatedAfupOffices, $relatedAfupOffices); $this->relatedAfupOffices = $relatedAfupOffices; @@ -612,19 +590,15 @@ public function getFormattedRelatedAfupOffices() return []; } - $relatedAfupOffices = explode(',', $relatedAfupOffices); - - return $relatedAfupOffices; + return explode(',', $relatedAfupOffices); } /** - * @param array $relatedAfupOffices - * * @return $this */ - public function setFormattedRelatedAfupOffices(array $relatedAfupOffices) + public function setFormattedRelatedAfupOffices(array $relatedAfupOffices): self { - if (count($relatedAfupOffices)) { + if ($relatedAfupOffices !== []) { sort($relatedAfupOffices); $this->setRelatedAfupOffices(implode(',', $relatedAfupOffices)); @@ -653,16 +627,16 @@ public function getLastSubscription() return $this->lastSubscription; } - public function setLastSubscription(?string $sub) + public function setLastSubscription(?string $sub): void { if ($sub !== null) { $this->lastSubscription = \DateTimeImmutable::createFromFormat('U', $sub); } } - public function hasUpToDateMembershipFee(\DateTimeInterface $now = null) + public function hasUpToDateMembershipFee(\DateTimeInterface $now = null): bool { - if (null === $now) { + if (!$now instanceof \DateTimeInterface) { $now = new \DateTime(); } return $this->getLastSubscription() > $now; @@ -681,7 +655,7 @@ public function getMembershipReason() * * @return $this */ - public function setMembershipReason($membershipReason) + public function setMembershipReason($membershipReason): self { $this->propertyChanged('membershipReason', $this->membershipReason, $membershipReason); $this->membershipReason = $membershipReason; diff --git a/sources/AppBundle/Association/Model/CompanyMemberInvitation.php b/sources/AppBundle/Association/Model/CompanyMemberInvitation.php index 148688ffa..b77378051 100644 --- a/sources/AppBundle/Association/Model/CompanyMemberInvitation.php +++ b/sources/AppBundle/Association/Model/CompanyMemberInvitation.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -80,9 +78,8 @@ public function getCompanyId() /** * @param int $companyId - * @return CompanyMemberInvitation */ - public function setCompanyId($companyId) + public function setCompanyId($companyId): self { $this->propertyChanged('companyId', $this->companyId, $companyId); $this->companyId = $companyId; @@ -99,9 +96,8 @@ public function getEmail() /** * @param string $email - * @return CompanyMemberInvitation */ - public function setEmail($email) + public function setEmail($email): self { $this->propertyChanged('email', $this->email, $email); $this->email = $email; @@ -118,9 +114,8 @@ public function getManager() /** * @param boolean $manager - * @return CompanyMemberInvitation */ - public function setManager($manager) + public function setManager($manager): self { $this->propertyChanged('manager', $this->manager, $manager); $this->manager = $manager; @@ -130,16 +125,12 @@ public function setManager($manager) /** * @return \DateTime */ - public function getSubmittedOn() + public function getSubmittedOn(): ?\DateTime { return $this->submittedOn; } - /** - * @param \DateTime $submittedOn - * @return CompanyMemberInvitation - */ - public function setSubmittedOn(\DateTime $submittedOn) + public function setSubmittedOn(\DateTime $submittedOn): self { $this->propertyChanged('submittedOn', $this->submittedOn, $submittedOn); $this->submittedOn = $submittedOn; @@ -156,9 +147,8 @@ public function getStatus() /** * @param int $status - * @return CompanyMemberInvitation */ - public function setStatus($status) + public function setStatus($status): self { $this->propertyChanged('status', $this->status, $status); $this->status = $status; @@ -175,9 +165,8 @@ public function getToken() /** * @param string $token - * @return CompanyMemberInvitation */ - public function setToken($token) + public function setToken($token): self { $this->propertyChanged('token', $this->token, $token); $this->token = $token; diff --git a/sources/AppBundle/Association/Model/GeneralMeetingQuestion.php b/sources/AppBundle/Association/Model/GeneralMeetingQuestion.php index 2ad8c3607..5f337ff11 100644 --- a/sources/AppBundle/Association/Model/GeneralMeetingQuestion.php +++ b/sources/AppBundle/Association/Model/GeneralMeetingQuestion.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -67,17 +57,15 @@ public function setId($id) /** * @return \DateTime */ - public function getDate() + public function getDate(): ?\DateTimeInterface { return $this->date; } /** - * @param \DateTimeInterface $date - * * @return $this */ - public function setDate(\DateTimeInterface $date) + public function setDate(\DateTimeInterface $date): self { $this->propertyChanged('date', $this->date, $date); $this->date = $date; @@ -96,7 +84,7 @@ public function getLabel() /** * @param string $label */ - public function setLabel($label) + public function setLabel($label): self { $this->propertyChanged('label', $this->label, $label); $this->label = $label; @@ -107,7 +95,7 @@ public function setLabel($label) /** * @return \DateTime */ - public function getOpenedAt() + public function getOpenedAt(): ?\DateTime { return $this->openedAt; } @@ -115,7 +103,7 @@ public function getOpenedAt() /** * @return $this */ - public function setOpenedAt(\DateTime $openedAt = null) + public function setOpenedAt(\DateTime $openedAt = null): self { $this->propertyChanged('openedAt', $this->openedAt, $openedAt); $this->openedAt = $openedAt; @@ -126,7 +114,7 @@ public function setOpenedAt(\DateTime $openedAt = null) /** * @return \DateTime */ - public function getClosedAt() + public function getClosedAt(): ?\DateTime { return $this->closedAt; } @@ -134,7 +122,7 @@ public function getClosedAt() /** * @return $this */ - public function setClosedAt(\DateTime $closedAt = null) + public function setClosedAt(\DateTime $closedAt = null): self { $this->propertyChanged('closedAt', $this->closedAt, $closedAt); $this->closedAt = $closedAt; @@ -145,17 +133,15 @@ public function setClosedAt(\DateTime $closedAt = null) /** * @return \DateTime */ - public function getCreatedAt() + public function getCreatedAt(): ?\DateTime { return $this->createdAt; } /** - * @param \DateTime $createdAt - * * @return $this */ - public function setCreatedAt(\DateTime $createdAt) + public function setCreatedAt(\DateTime $createdAt): self { $this->propertyChanged('createdAt', $this->createdAt, $createdAt); $this->createdAt = $createdAt; @@ -165,11 +151,11 @@ public function setCreatedAt(\DateTime $createdAt) public function getStatus(): string { - if (null !== $this->getClosedAt()) { + if ($this->getClosedAt() instanceof \DateTime) { return self::STATUS_CLOSED; } - if (null !== $this->getOpenedAt()) { + if ($this->getOpenedAt() instanceof \DateTime) { return self::STATUS_OPENED; } diff --git a/sources/AppBundle/Association/Model/GeneralMeetingResponse.php b/sources/AppBundle/Association/Model/GeneralMeetingResponse.php index 92c14a002..8be477b10 100644 --- a/sources/AppBundle/Association/Model/GeneralMeetingResponse.php +++ b/sources/AppBundle/Association/Model/GeneralMeetingResponse.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -67,7 +66,7 @@ public function getUserid() * * @return $this */ - public function setUserId($userid) + public function setUserId($userid): self { $this->propertyChanged('manager', $this->userId, $userid); $this->userId = $userid; @@ -78,7 +77,7 @@ public function setUserId($userid) /** * @return \DateTime */ - public function getDate() + public function getDate(): ?\DateTime { return $this->date; } @@ -86,7 +85,7 @@ public function getDate() /** * @return $this */ - public function setDate(\DateTime $date) + public function setDate(\DateTime $date): self { $this->propertyChanged('date', $this->date, $date); $this->date = $date; @@ -107,7 +106,7 @@ public function getStatus() * * @return $this */ - public function setStatus($status) + public function setStatus($status): self { $this->propertyChanged('status', $this->status, $status); $this->status = $status; @@ -115,7 +114,7 @@ public function setStatus($status) return $this; } - public function isPresent() + public function isPresent(): bool { return self::STATUS_PRESENT === $this->getStatus(); } diff --git a/sources/AppBundle/Association/Model/GeneralMeetingVote.php b/sources/AppBundle/Association/Model/GeneralMeetingVote.php index 7afbcd8bb..c5cf1fc84 100644 --- a/sources/AppBundle/Association/Model/GeneralMeetingVote.php +++ b/sources/AppBundle/Association/Model/GeneralMeetingVote.php @@ -1,5 +1,7 @@ propertyChanged('questionId', $this->questionId, $questionId); $this->questionId = $questionId; @@ -72,7 +71,7 @@ public function getUserId() * * @return $this */ - public function setUserId($userId) + public function setUserId($userId): self { $this->propertyChanged('userId', $this->userId, $userId); $this->userId = $userId; @@ -93,7 +92,7 @@ public function getWeight() * * @return $this */ - public function setWeight($weight) + public function setWeight($weight): self { $this->propertyChanged('weight', $this->weight, $weight); $this->weight = $weight; @@ -123,7 +122,7 @@ public function getValueLabel() /** * @param string $value */ - public function setValue($value) + public function setValue($value): self { $this->propertyChanged('value', $this->value, $value); $this->value = $value; @@ -134,17 +133,15 @@ public function setValue($value) /** * @return \DateTime */ - public function getCreatedAt() + public function getCreatedAt(): ?\DateTime { return $this->createdAt; } /** - * @param \DateTime $createdAt - * * @return $this */ - public function setCreatedAt(\DateTime $createdAt) + public function setCreatedAt(\DateTime $createdAt): self { $this->propertyChanged('createdAt', $this->createdAt, $createdAt); $this->createdAt = $createdAt; @@ -152,7 +149,7 @@ public function setCreatedAt(\DateTime $createdAt) return $this; } - public static function isValueAllowed($value) + public static function isValueAllowed($value): bool { return in_array($value, self::getAllValues()); } @@ -162,7 +159,7 @@ private static function getAllValues() return array_keys(self::getVoteLabelsByValue()); } - public static function getVoteLabelsByValue() + public static function getVoteLabelsByValue(): array { return [ self::VALUE_YES => 'Oui', diff --git a/sources/AppBundle/Association/Model/Repository/CompanyMemberInvitationRepository.php b/sources/AppBundle/Association/Model/Repository/CompanyMemberInvitationRepository.php index c0ce12de8..3a57ed055 100644 --- a/sources/AppBundle/Association/Model/Repository/CompanyMemberInvitationRepository.php +++ b/sources/AppBundle/Association/Model/Repository/CompanyMemberInvitationRepository.php @@ -1,5 +1,7 @@ getQueryBuilderWithCompleteCompanyMember(); $queryBuilder->where('apm.public_profile_enabled = 1'); @@ -27,7 +29,7 @@ public function findDisplayableCompanies() return array_filter( $companies, - fn (CompanyMember $companyMember) => true === $companyMember->hasUpToDateMembershipFee() + fn (CompanyMember $companyMember): bool => $companyMember->hasUpToDateMembershipFee() ); } diff --git a/sources/AppBundle/Association/Model/Repository/GeneralMeetingQuestionRepository.php b/sources/AppBundle/Association/Model/Repository/GeneralMeetingQuestionRepository.php index e3b174339..7ffeac63a 100644 --- a/sources/AppBundle/Association/Model/Repository/GeneralMeetingQuestionRepository.php +++ b/sources/AppBundle/Association/Model/Repository/GeneralMeetingQuestionRepository.php @@ -1,5 +1,7 @@ setOpenedAt(new \DateTime()); $this->save($question); } - public function close(GeneralMeetingQuestion $question) + public function close(GeneralMeetingQuestion $question): void { $question->setClosedAt(new \DateTime()); $this->save($question); diff --git a/sources/AppBundle/Association/Model/Repository/GeneralMeetingResponseRepository.php b/sources/AppBundle/Association/Model/Repository/GeneralMeetingResponseRepository.php index d48e1d9f0..11d4ba23b 100644 --- a/sources/AppBundle/Association/Model/Repository/GeneralMeetingResponseRepository.php +++ b/sources/AppBundle/Association/Model/Repository/GeneralMeetingResponseRepository.php @@ -1,5 +1,7 @@ where('id_personne_morale = 0'); - } elseif ($userType === UserRepository::USER_TYPE_COMPANY) { - $queryBuilder->where('id_personne_morale <> 0'); - } elseif ($userType !== UserRepository::USER_TYPE_ALL) { - throw new \UnexpectedValueException(sprintf('Unknown user type "%s"', $userType)); - } - } - /** * @inheritDoc */ diff --git a/sources/AppBundle/Association/Model/Repository/TechletterSubscriptionsRepository.php b/sources/AppBundle/Association/Model/Repository/TechletterSubscriptionsRepository.php index 82c84ba9b..f37576778 100644 --- a/sources/AppBundle/Association/Model/Repository/TechletterSubscriptionsRepository.php +++ b/sources/AppBundle/Association/Model/Repository/TechletterSubscriptionsRepository.php @@ -1,5 +1,7 @@ getQueryBuilderWithCompleteUser() - ->orderBy(array_map(static fn ($field) => $field . ' ' . $direction, $sorts[$sort])); + ->orderBy(array_map(static fn ($field): string => $field . ' ' . $direction, $sorts[$sort])); // On filtre sur tous les mots possibles. Donc plus on a de mots dans la recherche plus on aura de résultats. // Mais ça peut aussi permettre de trouver des personnes en entrant par exemple "Prénom email" dans le champ de recherche : @@ -224,7 +227,7 @@ public function search( /** * Ajoute une personne physique */ - public function create(User $user) + public function create(User $user): void { if ($this->loginExists($user->getUsername())) { throw new InvalidArgumentException('Il existe déjà un compte pour ce login.'); @@ -241,7 +244,7 @@ public function create(User $user) try { $this->save($user); } catch (Exception $e) { - throw new RuntimeException("Impossible d'enregistrer l'utilisateur à cause d'une erreur SQL. Veuillez contacter le bureau !"); + throw new RuntimeException("Impossible d'enregistrer l'utilisateur à cause d'une erreur SQL. Veuillez contacter le bureau !", $e->getCode(), $e); } } @@ -251,14 +254,14 @@ public function create(User $user) * * @return bool Login in use (TRUE) or not (FALSE) */ - public function loginExists($login, $id = 0) + public function loginExists($login, $id = 0): bool { return 0 < $this->getQuery('SELECT 1 FROM afup_personnes_physiques WHERE login = :login AND id <> :id') ->setParams(['login' => $login, 'id' => $id]) ->query()->count(); } - public function edit(User $user) + public function edit(User $user): void { if ($this->loginExists($user->getUsername(), $user->getId())) { throw new InvalidArgumentException('Il existe déjà un compte pour ce login.'); @@ -272,7 +275,7 @@ public function edit(User $user) $this->save($user); } - public function remove(User $user) + public function remove(User $user): void { $nbCotisations = (int) $this->getQuery('SELECT COUNT(*) nb FROM afup_cotisations WHERE type_personne = :memberType AND id_personne = :id') ->setParams(['memberType' => AFUP_PERSONNES_PHYSIQUES, 'id' => $user->getId()]) @@ -306,7 +309,7 @@ public function getAdministrators() * * @return bool TRUE if the email exists, FALSE otherwise */ - private function emailExists($email, $id = 0) + private function emailExists($email, $id = 0): bool { return 0 < $this->getQuery('SELECT 1 FROM afup_personnes_physiques WHERE email = :email AND id <> :id') ->setParams(['email' => $email, 'id' => $id]) @@ -318,7 +321,7 @@ private function emailExists($email, $id = 0) * * @return bool TRUE if the company exists, FALSE otherwise */ - private function companyExists($companyId) + private function companyExists($companyId): bool { return 0 < $this->getQuery('SELECT 1 FROM afup_personnes_morales WHERE id = :id') ->setParams(['id' => $companyId]) @@ -330,7 +333,7 @@ private function companyExists($companyId) * * @return bool TRUE if the country exists, FALSE otherwise */ - private function countryExists($countryId) + private function countryExists($countryId): bool { return 0 < $this->getQuery('SELECT 1 FROM afup_pays WHERE id = :id') ->setParams(['id' => $countryId]) @@ -379,10 +382,9 @@ private function getQueryBuilderWithCompleteUser() /** * Add a condition about the type of users: physical, legal or all * - * @param SelectInterface $queryBuilder * @param $userType */ - private function addUserTypeCondition(SelectInterface $queryBuilder, $userType) + private function addUserTypeCondition(SelectInterface $queryBuilder, $userType): void { if ($userType === self::USER_TYPE_PHYSICAL) { $queryBuilder->where('id_personne_morale = 0'); @@ -406,7 +408,7 @@ private function getHydratorForUser() * Retrieve all users by the date of end of membership. * * @param int $userType one of self::USER_TYPE_* - * @return \CCMBenchmark\Ting\Repository\CollectionInterface + * @return CollectionInterface */ public function getActiveMembers($userType = self::USER_TYPE_PHYSICAL) { @@ -430,9 +432,8 @@ public function getActiveMembers($userType = self::USER_TYPE_PHYSICAL) /** * Retrieve all users by the date of end of membership. * - * @param \DateTimeImmutable $endOfSubscription * @param int $userType one of self::USER_TYPE_* - * @return \CCMBenchmark\Ting\Repository\CollectionInterface + * @return CollectionInterface */ public function getUsersByEndOfMembership(\DateTimeImmutable $endOfSubscription, $userType = self::USER_TYPE_PHYSICAL) { diff --git a/sources/AppBundle/Association/Model/SubscriptionReminderLog.php b/sources/AppBundle/Association/Model/SubscriptionReminderLog.php index 2d6409b69..1cbfaab2c 100644 --- a/sources/AppBundle/Association/Model/SubscriptionReminderLog.php +++ b/sources/AppBundle/Association/Model/SubscriptionReminderLog.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -67,16 +59,15 @@ public function setId($id) /** * @return int */ - public function getUserId() + public function getUserId(): ?int { return $this->userId; } /** * @param int $userId - * @return SubscriptionReminderLog */ - public function setUserId($userId) + public function setUserId($userId): self { $userId = (int) $userId; $this->propertyChanged('userId', $this->userId, $userId); @@ -94,9 +85,8 @@ public function getEmail() /** * @param string $email - * @return SubscriptionReminderLog */ - public function setEmail($email) + public function setEmail($email): self { $this->propertyChanged('email', $this->email, $email); $this->email = $email; @@ -113,9 +103,8 @@ public function getUserType() /** * @param int $userType - * @return SubscriptionReminderLog */ - public function setUserType($userType) + public function setUserType($userType): self { $this->propertyChanged('userType', $this->userType, $userType); $this->userType = $userType; @@ -132,9 +121,8 @@ public function getReminderKey() /** * @param string $reminderKey - * @return SubscriptionReminderLog */ - public function setReminderKey($reminderKey) + public function setReminderKey($reminderKey): self { $this->propertyChanged('reminderKey', $this->reminderKey, $reminderKey); $this->reminderKey = $reminderKey; @@ -144,16 +132,12 @@ public function setReminderKey($reminderKey) /** * @return \DateTime */ - public function getReminderDate() + public function getReminderDate(): ?\DateTime { return $this->reminderDate; } - /** - * @param \DateTime $reminderDate - * @return SubscriptionReminderLog - */ - public function setReminderDate(\DateTime $reminderDate) + public function setReminderDate(\DateTime $reminderDate): self { $this->propertyChanged('reminderDate', $this->reminderDate, $reminderDate); $this->reminderDate = $reminderDate; @@ -163,16 +147,15 @@ public function setReminderDate(\DateTime $reminderDate) /** * @return bool */ - public function getMailSent() + public function getMailSent(): ?bool { return $this->mailSent; } /** * @param bool $mailSent - * @return SubscriptionReminderLog */ - public function setMailSent($mailSent) + public function setMailSent($mailSent): self { $this->propertyChanged('mailSent', $this->mailSent, (bool) $mailSent); $this->mailSent = (bool) $mailSent; diff --git a/sources/AppBundle/Association/Model/TechletterSubscription.php b/sources/AppBundle/Association/Model/TechletterSubscription.php index 8457e6d58..a69dd8120 100644 --- a/sources/AppBundle/Association/Model/TechletterSubscription.php +++ b/sources/AppBundle/Association/Model/TechletterSubscription.php @@ -1,5 +1,7 @@ id = $id; return $this; @@ -50,16 +42,15 @@ public function setId($id) /** * @return int */ - public function getUserId() + public function getUserId(): ?int { return $this->userId; } /** * @param int $userId - * @return TechletterSubscription */ - public function setUserId($userId) + public function setUserId($userId): self { $userId = (int) $userId; $this->propertyChanged('userId', $this->userId, $userId); @@ -70,16 +61,12 @@ public function setUserId($userId) /** * @return \DateTime */ - public function getSubscriptionDate() + public function getSubscriptionDate(): ?\DateTime { return $this->subscriptionDate; } - /** - * @param \DateTime $subscriptionDate - * @return TechletterSubscription - */ - public function setSubscriptionDate(\DateTime $subscriptionDate) + public function setSubscriptionDate(\DateTime $subscriptionDate): self { $this->propertyChanged('subscriptionDate', $this->subscriptionDate, $subscriptionDate); $this->subscriptionDate = $subscriptionDate; @@ -89,16 +76,12 @@ public function setSubscriptionDate(\DateTime $subscriptionDate) /** * @return User */ - public function getUser() + public function getUser(): ?User { return $this->user; } - /** - * @param User $user - * @return TechletterSubscription - */ - public function setUser(User $user) + public function setUser(User $user): self { $this->user = $user; return $this; diff --git a/sources/AppBundle/Association/Model/TechletterUnsubscription.php b/sources/AppBundle/Association/Model/TechletterUnsubscription.php index 3aca3c5ce..66c390aa1 100644 --- a/sources/AppBundle/Association/Model/TechletterUnsubscription.php +++ b/sources/AppBundle/Association/Model/TechletterUnsubscription.php @@ -1,5 +1,7 @@ id = $id; @@ -67,7 +66,7 @@ public function getEmail() * * @return $this */ - public function setEmail($email) + public function setEmail($email): self { $this->propertyChanged('email', $this->email, $email); $this->email = $email; @@ -78,17 +77,15 @@ public function setEmail($email) /** * @return \DateTime */ - public function getUnSubscriptionDate() + public function getUnSubscriptionDate(): ?\DateTime { return $this->unsubscriptionDate; } /** - * @param \DateTime $unsubscriptionDate - * * @return $this */ - public function setUnsubscriptionDate(\DateTime $unsubscriptionDate) + public function setUnsubscriptionDate(\DateTime $unsubscriptionDate): self { $this->propertyChanged('unsubscriptionDate', $this->unsubscriptionDate, $unsubscriptionDate); $this->unsubscriptionDate = $unsubscriptionDate; @@ -109,7 +106,7 @@ public function getReason() * * @return $this */ - public function setReason($reason) + public function setReason($reason): self { $this->propertyChanged('reason', $this->reason, $reason); $this->reason = $reason; @@ -130,7 +127,7 @@ public function getMailchimpId() * * @return $this */ - public function setMailchimpId($mailchimpId) + public function setMailchimpId($mailchimpId): self { $this->propertyChanged('mailchimpId', $this->mailchimpId, $mailchimpId); $this->mailchimpId = $mailchimpId; diff --git a/sources/AppBundle/Association/Model/User.php b/sources/AppBundle/Association/Model/User.php index 5f5a05683..95d4890d9 100644 --- a/sources/AppBundle/Association/Model/User.php +++ b/sources/AppBundle/Association/Model/User.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -190,9 +185,8 @@ public function getMobilephone() /** * @param string $mobilephone - * @return User */ - public function setMobilephone($mobilephone) + public function setMobilephone($mobilephone): self { $this->propertyChanged('mobilephone', $this->mobilephone, $mobilephone); $this->mobilephone = $mobilephone; @@ -209,9 +203,8 @@ public function getNearestOffice() /** * @param string $nearestOffice - * @return User */ - public function setNearestOffice($nearestOffice) + public function setNearestOffice($nearestOffice): self { $this->propertyChanged('nearestOffice', $this->nearestOffice, $nearestOffice); $this->nearestOffice = $nearestOffice; @@ -223,7 +216,7 @@ public function getNearestOfficeLabel() $code = $this->getNearestOffice(); // FIXME corriger ça dans le formulaire - if (null === $code || '-Aucune-' === $code || 0 === strlen(trim($code))) { + if (null === $code || '-Aucune-' === $code || trim($code) === '') { return null; } @@ -243,9 +236,8 @@ public function getCompanyId() /** * @param int $companyId - * @return User */ - public function setCompanyId($companyId) + public function setCompanyId($companyId): self { $this->propertyChanged('companyId', $this->companyId, $companyId); $this->companyId = $companyId; @@ -262,9 +254,8 @@ public function getUsername() /** * @param string $username - * @return User */ - public function setUsername($username) + public function setUsername($username): self { $this->propertyChanged('username', $this->username, $username); $this->username = $username; @@ -281,9 +272,8 @@ public function getPassword() /** * @param string $password - * @return User */ - public function setPassword($password) + public function setPassword($password): self { $this->propertyChanged('password', $this->password, $password); $this->password = $password; @@ -293,7 +283,7 @@ public function setPassword($password) /** * @param string $password */ - public function setPlainPassword($password) + public function setPlainPassword($password): void { $this->setPassword(md5($password)); } @@ -308,9 +298,8 @@ public function getLevel() /** * @param int $level - * @return User */ - public function setLevel($level) + public function setLevel($level): self { $this->propertyChanged('level', $this->level, $level); $this->level = $level; @@ -327,9 +316,8 @@ public function getLevelModules() /** * @param int $levelModules - * @return User */ - public function setLevelModules($levelModules) + public function setLevelModules($levelModules): self { $this->propertyChanged('levelModules', $this->levelModules, $levelModules); $this->levelModules = $levelModules; @@ -346,9 +334,8 @@ public function getCivility() /** * @param string $civility - * @return User */ - public function setCivility($civility) + public function setCivility($civility): self { $this->propertyChanged('civility', $this->civility, $civility); $this->civility = $civility; @@ -365,9 +352,8 @@ public function getFirstName() /** * @param string $firstName - * @return User */ - public function setFirstName($firstName) + public function setFirstName($firstName): self { $this->propertyChanged('firstName', $this->firstName, $firstName); $this->firstName = $firstName; @@ -384,9 +370,8 @@ public function getLastName() /** * @param string $lastName - * @return User */ - public function setLastName($lastName) + public function setLastName($lastName): self { $this->propertyChanged('lastName', $this->lastName, $lastName); $this->lastName = $lastName; @@ -403,9 +388,8 @@ public function getEmail() /** * @param string $email - * @return User */ - public function setEmail($email) + public function setEmail($email): self { $this->propertyChanged('email', $this->email, $email); $this->email = $email; @@ -422,9 +406,8 @@ public function getAddress() /** * @param string $address - * @return User */ - public function setAddress($address) + public function setAddress($address): self { $this->propertyChanged('address', $this->address, $address); $this->address = $address; @@ -441,9 +424,8 @@ public function getZipCode() /** * @param string $zipCode - * @return User */ - public function setZipCode($zipCode) + public function setZipCode($zipCode): self { $this->propertyChanged('zipCode', $this->zipCode, $zipCode); $this->zipCode = $zipCode; @@ -460,9 +442,8 @@ public function getCity() /** * @param string $city - * @return User */ - public function setCity($city) + public function setCity($city): self { $this->propertyChanged('city', $this->city, $city); $this->city = $city; @@ -479,9 +460,8 @@ public function getCountry() /** * @param string $country - * @return User */ - public function setCountry($country) + public function setCountry($country): self { $this->propertyChanged('country', $this->country, $country); $this->country = $country; @@ -498,9 +478,8 @@ public function getPhone() /** * @param string $phone - * @return User */ - public function setPhone($phone) + public function setPhone($phone): self { $this->propertyChanged('phone', $this->phone, $phone); $this->phone = $phone; @@ -517,9 +496,8 @@ public function getStatus() /** * @param int $status - * @return User */ - public function setStatus($status) + public function setStatus($status): self { $this->propertyChanged('status', $this->status, $status); $this->status = $status; @@ -529,16 +507,12 @@ public function setStatus($status) /** * @return \DateTime */ - public function getReminderDate() + public function getReminderDate(): ?\DateTime { return $this->reminderDate; } - /** - * @param \DateTime $reminderDate - * @return User - */ - public function setReminderDate(\DateTime $reminderDate = null) + public function setReminderDate(\DateTime $reminderDate = null): self { $this->propertyChanged('reminderDate', $this->reminderDate, $reminderDate); $this->reminderDate = $reminderDate; @@ -555,16 +529,15 @@ public function getHash() /** * @param string $hash - * @return User */ - public function setHash($hash) + public function setHash($hash): self { $this->propertyChanged('hash', $this->hash, $hash); $this->hash = $hash; return $this; } - public function getLabel() + public function getLabel(): string { return $this->firstName . ' ' . $this->lastName; } @@ -577,16 +550,16 @@ public function getLastSubscription() return $this->lastSubscription; } - public function setLastSubscription(?string $sub) + public function setLastSubscription(?string $sub): void { if ($sub !== null) { $this->lastSubscription = \DateTimeImmutable::createFromFormat('U', $sub); } } - public function hasUpToDateMembershipFee(\DateTimeInterface $now = null) + public function hasUpToDateMembershipFee(\DateTimeInterface $now = null): bool { - if (null === $now) { + if (!$now instanceof \DateTimeInterface) { $now = new \DateTime(); } return $this->getLastSubscription() > $now; @@ -594,7 +567,7 @@ public function hasUpToDateMembershipFee(\DateTimeInterface $now = null) public function getDaysBeforeMembershipExpiration(\DateTimeInterface $now = null) { - if (null === $now) { + if (!$now instanceof \DateTimeInterface) { $now = new \DateTime(); } @@ -610,16 +583,12 @@ public function getDaysBeforeMembershipExpiration(\DateTimeInterface $now = null /** * @return CompanyMember */ - public function getCompany() + public function getCompany(): ?CompanyMember { return $this->company; } - /** - * @param CompanyMember $company - * @return User - */ - public function setCompany(CompanyMember $company) + public function setCompany(CompanyMember $company): self { $this->company = $company; return $this; @@ -635,10 +604,8 @@ public function getSlackInviteStatus() /** * @param int $slackInviteStatus - * - * @return User */ - public function setSlackInviteStatus($slackInviteStatus) + public function setSlackInviteStatus($slackInviteStatus): self { $this->propertyChanged('slackInviteStatus', $this->slackInviteStatus, $slackInviteStatus); $this->slackInviteStatus = $slackInviteStatus; @@ -646,23 +613,17 @@ public function setSlackInviteStatus($slackInviteStatus) return $this; } - /** - * @return bool - */ - public function canRequestSlackInvite() + public function canRequestSlackInvite(): bool { return false === $this->hasRole('ROLE_MEMBER_EXPIRED') && $this->getSlackInviteStatus() === self::SLACK_INVITE_STATUS_NONE; } - /** - * @return bool - */ - public function slackInviteRequested() + public function slackInviteRequested(): bool { return $this->getSlackInviteStatus() === self::SLACK_INVITE_STATUS_REQUESTED; } - public function canAccessAdmin() + public function canAccessAdmin(): int { $roles = $this->getRoles(); @@ -672,10 +633,7 @@ public function canAccessAdmin() return count($diff); } - /** - * @return boolean - */ - public function isMemberForCompany() + public function isMemberForCompany(): bool { return ($this->companyId !== null && $this->companyId > 0); } @@ -713,23 +671,14 @@ public function getRoles() /** * @param $role - * @return bool */ - public function hasRole($role) + public function hasRole($role): bool { $roles = $this->getRoles(); - if (in_array($role, $roles)) { - return true; - } - - return false; + return in_array($role, $roles); } - /** - * @param array $roles - * @return User - */ - public function setRoles(array $roles = null) + public function setRoles(array $roles = null): self { if ($roles === null) { $roles = []; @@ -741,9 +690,8 @@ public function setRoles(array $roles = null) /** * @param string $role - * @return User */ - public function addRole($role) + public function addRole($role): self { $roles = $this->roles; $this->roles[] = $role; @@ -756,9 +704,8 @@ public function addRole($role) /** * @param string $role - * @return User */ - public function removeRole($role) + public function removeRole($role): self { if ($this->hasRole($role)) { $roleNum = array_search($role, $this->roles); @@ -775,7 +722,7 @@ public function getSalt() return null; } - public function eraseCredentials() + public function eraseCredentials(): void { } @@ -788,7 +735,7 @@ public function serialize() ]); } - public function unserialize($serialized) + public function unserialize($serialized): void { $array = unserialize($serialized); $this->id = $array['id']; @@ -815,7 +762,7 @@ public function getWebsiteLevel() return $this->levelModules[2]; } - public function setWebsiteLevel($level) + public function setWebsiteLevel($level): void { $oldLevelModules = $this->levelModules; $this->levelModules[2] = $level; @@ -827,7 +774,7 @@ public function getEventLevel() return $this->levelModules[3]; } - public function setEventLevel($level) + public function setEventLevel($level): void { $oldLevelModules = $this->levelModules; $this->levelModules[3] = $level; @@ -839,7 +786,7 @@ public function getOfficeLevel() return $this->levelModules[4]; } - public function setOfficeLevel($level) + public function setOfficeLevel($level): void { $oldLevelModules = $this->levelModules; $this->levelModules[4] = $level; @@ -851,7 +798,7 @@ public function getAlternateEmail() return $this->alternateEmail; } - public function setAlternateEmail($alternateEmail) + public function setAlternateEmail($alternateEmail): void { $this->propertyChanged('alternateEmail', $this->alternateEmail, $alternateEmail); $this->alternateEmail = $alternateEmail; @@ -862,7 +809,7 @@ public function getNeedsUpToDateMembership() return $this->needsUpToDateMembership; } - public function setNeedsUpToDateMembership($needsUpToDateMembership) + public function setNeedsUpToDateMembership($needsUpToDateMembership): void { $this->propertyChanged('needsUpToDateMembership', $this->needsUpToDateMembership, $needsUpToDateMembership); $this->needsUpToDateMembership = $needsUpToDateMembership; diff --git a/sources/AppBundle/Association/NotifiableInterface.php b/sources/AppBundle/Association/NotifiableInterface.php index deda29dad..91c70d40f 100644 --- a/sources/AppBundle/Association/NotifiableInterface.php +++ b/sources/AppBundle/Association/NotifiableInterface.php @@ -1,5 +1,7 @@ generalMeetingResponseRepository = $generalMeetingResponseRepository; } - public function getBadges(User $user) + public function getBadges(User $user): array { $badgesInfos = $this->prepareBadgesInfos($user); @@ -47,7 +37,10 @@ public function getBadges(User $user) return $this->filterExistingBadges($badgesInfos); } - private function getSpecificBadges(User $user) + /** + * @return array{date: mixed, id: mixed, tooltip: mixed}[] + */ + private function getSpecificBadges(User $user): array { $specific = []; @@ -64,7 +57,7 @@ private function getSpecificBadges(User $user) return $specific; } - public function getCompanyBadges(CompanyMember $companyMember) + public function getCompanyBadges(CompanyMember $companyMember): array { $badgesInfos = $this->prepareCompanyBadgesInfos($companyMember); @@ -72,12 +65,13 @@ public function getCompanyBadges(CompanyMember $companyMember) $badges = $this->filterExistingBadges($badgesInfos); - $badges = $this->mapBadgesCodes($badges); - - return $badges; + return $this->mapBadgesCodes($badges); } - private function prepareCompanyBadgesInfos(CompanyMember $companyMember) + /** + * @return array{date: (non-falsy-string & uppercase-string), code: non-falsy-string, tooltip: non-falsy-string}[] + */ + private function prepareCompanyBadgesInfos(CompanyMember $companyMember): array { $seniorityInfos = $this->seniorityComputer->computeCompanyAndReturnInfos($companyMember); $maxBadgesSeniority = 10; @@ -95,7 +89,10 @@ private function prepareCompanyBadgesInfos(CompanyMember $companyMember) return $badgesCodes; } - private function prepareBadgesInfos(User $user) + /** + * @return mixed[] + */ + private function prepareBadgesInfos(User $user): array { $badgesCodes = []; @@ -114,11 +111,9 @@ private function prepareBadgesInfos(User $user) // a partir de 2022 les badges pour l'AFUP Day ne sont plus par ville mais // identiques pour toutes les villes (cela permet de les créer en amont et // en simplifie la maintenance). - $isolateTownPattern = '/afupday(?P [0-9]{4})/'; - if (preg_match($isolateTownPattern, $eventInfo['path'], $pathMatches)) { - if ($pathMatches['year'] >= 2022) { - $code = 'jy-etais-afupday' . $pathMatches['year']; - } + $isolateTownPattern = '/afupday(?P \d{4})/'; + if (preg_match($isolateTownPattern, $eventInfo['path'], $pathMatches) && $pathMatches['year'] >= 2022) { + $code = 'jy-etais-afupday' . $pathMatches['year']; } $badgesCodes[$code] = [ @@ -148,12 +143,13 @@ private function prepareBadgesInfos(User $user) ]; } - $badgesCodes = array_merge($badgesCodes, $this->getSpecificBadges($user)); - - return $badgesCodes; + return array_merge($badgesCodes, $this->getSpecificBadges($user)); } - private function mapBadgesCodes(array $badgesInfos) + /** + * @return mixed[] + */ + private function mapBadgesCodes(array $badgesInfos): array { $badgesCodes = []; foreach ($badgesInfos as $badgeInfo) { @@ -163,17 +159,20 @@ private function mapBadgesCodes(array $badgesInfos) return $badgesCodes; } - private function sortBadgesInfos(array $badgesInfos) + private function sortBadgesInfos(array $badgesInfos): array { usort( $badgesInfos, - fn (array $a, array $b) => $b['date'] <=> $a['date'] + fn (array $a, array $b): int => $b['date'] <=> $a['date'] ); return $badgesInfos; } - private function filterExistingBadges(array $badgesInfos) + /** + * @return mixed[] + */ + private function filterExistingBadges(array $badgesInfos): array { $badgespath = __DIR__ . '/../../../../htdocs/images/badges/'; @@ -194,7 +193,10 @@ private function filterExistingBadges(array $badgesInfos) return $filteredBadges; } - private function getEventsInfos(User $user) + /** + * @return array{path: mixed, date: mixed, title: mixed}[] + */ + private function getEventsInfos(User $user): array { $events = $this->eventRepository->getAllPastEventWithTegistrationEmail($user->getEmail()); @@ -210,7 +212,10 @@ private function getEventsInfos(User $user) return $eventInfos; } - private function getSpeakerYears(User $user) + /** + * @return mixed[] + */ + private function getSpeakerYears(User $user): array { $events = $this->eventRepository->getAllPastEventWithSpeakerEmail($user->getEmail()); @@ -226,7 +231,10 @@ private function getSpeakerYears(User $user) return $years; } - private function getGeneralMeetingYears(User $user) + /** + * @return mixed[] + */ + private function getGeneralMeetingYears(User $user): array { $responses = $this->generalMeetingResponseRepository->getByUser($user); $currentTimestamp = (new \DateTime())->format('U'); diff --git a/sources/AppBundle/Association/UserMembership/Reminder15DaysAfterEnd.php b/sources/AppBundle/Association/UserMembership/Reminder15DaysAfterEnd.php index b013d39e8..210f59d25 100644 --- a/sources/AppBundle/Association/UserMembership/Reminder15DaysAfterEnd.php +++ b/sources/AppBundle/Association/UserMembership/Reminder15DaysAfterEnd.php @@ -1,11 +1,13 @@ Bonjour, @@ -25,12 +27,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Votre adhésion à l’AFUP : vous nous manquez !'; } - protected function getKey() + protected function getKey(): string { return '15DaysAfter'; } diff --git a/sources/AppBundle/Association/UserMembership/Reminder15DaysBeforeEnd.php b/sources/AppBundle/Association/UserMembership/Reminder15DaysBeforeEnd.php index 20c0da08a..5e4990940 100644 --- a/sources/AppBundle/Association/UserMembership/Reminder15DaysBeforeEnd.php +++ b/sources/AppBundle/Association/UserMembership/Reminder15DaysBeforeEnd.php @@ -1,11 +1,13 @@ Votre adhésion d’un an à l’AFUP approche de son terme ! Déjà presque une année que vous bénéficiez de nos tarifs @@ -25,12 +27,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Votre adhésion à l’AFUP arrive à son terme : J-15'; } - protected function getKey() + protected function getKey(): string { return '15DaysBefore'; } diff --git a/sources/AppBundle/Association/UserMembership/Reminder7DaysBeforeEnd.php b/sources/AppBundle/Association/UserMembership/Reminder7DaysBeforeEnd.php index 6cb236d9e..f674d165d 100644 --- a/sources/AppBundle/Association/UserMembership/Reminder7DaysBeforeEnd.php +++ b/sources/AppBundle/Association/UserMembership/Reminder7DaysBeforeEnd.php @@ -1,11 +1,13 @@ Cher membre AFUP,
@@ -30,12 +32,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Votre adhésion à l’AFUP arrive à son terme : J-7 !'; } - protected function getKey() + protected function getKey(): string { return '7DaysBefore'; } diff --git a/sources/AppBundle/Association/UserMembership/ReminderDDay.php b/sources/AppBundle/Association/UserMembership/ReminderDDay.php index 464f44b9a..d72cebba0 100644 --- a/sources/AppBundle/Association/UserMembership/ReminderDDay.php +++ b/sources/AppBundle/Association/UserMembership/ReminderDDay.php @@ -1,11 +1,13 @@ Cher membre AFUP, @@ -26,12 +28,12 @@ protected function getText() '; } - protected function getSubject() + protected function getSubject(): string { return 'Fin de validité de votre adhésion à l’AFUP'; } - protected function getKey() + protected function getKey(): string { return 'DDay'; } diff --git a/sources/AppBundle/Association/UserMembership/SeniorityComputer.php b/sources/AppBundle/Association/UserMembership/SeniorityComputer.php index dc81d9862..00547051d 100644 --- a/sources/AppBundle/Association/UserMembership/SeniorityComputer.php +++ b/sources/AppBundle/Association/UserMembership/SeniorityComputer.php @@ -1,5 +1,7 @@ cotisations->obtenirListe(AFUP_PERSONNES_MORALES, $companyMember->getId()); @@ -41,14 +40,14 @@ public function compute(User $user) return $infos['years']; } - public function computeAndReturnInfos(User $user) + public function computeAndReturnInfos(User $user): array { $cotis = $this->cotisations->obtenirListe(AFUP_PERSONNES_PHYSIQUES, $user->getId()); return $this->computeFromCotisationsAndReturnInfos($cotis); } - private function computeFromCotisationsAndReturnInfos(array $cotisations) + private function computeFromCotisationsAndReturnInfos(array $cotisations): array { $now = new \DateTime(); $diffs = []; @@ -72,7 +71,7 @@ private function computeFromCotisationsAndReturnInfos(array $cotisations) $firstYear = null; - if (count($years)) { + if ($years !== []) { $firstYear = min($years); } diff --git a/sources/AppBundle/Association/UserMembership/Statistics.php b/sources/AppBundle/Association/UserMembership/Statistics.php index 3f749cf24..be9c6807f 100644 --- a/sources/AppBundle/Association/UserMembership/Statistics.php +++ b/sources/AppBundle/Association/UserMembership/Statistics.php @@ -1,5 +1,7 @@ personnesMorales = $personnesMorales; } - public function computeStatistics() + public function computeStatistics(): Statistics { $statistics = new Statistics(); /** @var User[] $users */ diff --git a/sources/AppBundle/Association/UserMembership/UserReminderFactory.php b/sources/AppBundle/Association/UserMembership/UserReminderFactory.php index 40e86607c..f4d96dc16 100644 --- a/sources/AppBundle/Association/UserMembership/UserReminderFactory.php +++ b/sources/AppBundle/Association/UserMembership/UserReminderFactory.php @@ -1,5 +1,7 @@ mailer = $mailer; $this->urlGenerator = $urlGenerator; $this->cotisations = $cotisations; - $this->sender = MailUser::DEFAULT_SENDER_EMAIL; } public function generateRandomPassword(): string @@ -42,7 +38,7 @@ public function generateRandomPassword(): string return bin2hex(random_bytes(8)); } - public function resetPassword(User $user) + public function resetPassword(User $user): void { $newPassword = $this->generateRandomPassword(); $user->setPlainPassword($newPassword); @@ -71,7 +67,7 @@ public function resetPassword(User $user) /** * @param string $email */ - public function resetPasswordForEmail($email) + public function resetPasswordForEmail($email): void { $user = $this->userRepository->loadUserByEmaiOrAlternateEmail($email); if (null !== $user) { @@ -79,7 +75,7 @@ public function resetPasswordForEmail($email) } } - public function sendWelcomeEmail(User $user) + public function sendWelcomeEmail(User $user): bool { $message = new Message( 'Votre compte afup.org', diff --git a/sources/AppBundle/CFP/PhotoStorage.php b/sources/AppBundle/CFP/PhotoStorage.php index b122961ed..c2f688adc 100644 --- a/sources/AppBundle/CFP/PhotoStorage.php +++ b/sources/AppBundle/CFP/PhotoStorage.php @@ -1,5 +1,7 @@ filesystem = new Filesystem(); } - public function store(File $photo, Speaker $speaker) + public function store(File $photo, Speaker $speaker): string { $fileName = $speaker->getId() . '.' . $photo->guessExtension(); $directory = $this->basePath . '/' . $speaker->getEventId() . '/' . self::DIR_ORIGINAL; $this->createDirectory($directory); // delete all formats if ($speaker->getId() !== null) { - foreach (self::FORMAT as $format => $sizes) { + foreach (array_keys(self::FORMAT) as $format) { $files = glob($this->basePath . '/' . $speaker->getEventId() . '/' . $format . '/' . $speaker->getId() . '.*'); $this->filesystem->remove($files); } @@ -54,7 +55,7 @@ public function store(File $photo, Speaker $speaker) return $fileName; } - public function getUrl(Speaker $speaker, $format = null) + public function getUrl(Speaker $speaker, $format = null): ?string { if ($format === null) { $format = self::DIR_THUMBS; @@ -62,11 +63,9 @@ public function getUrl(Speaker $speaker, $format = null) if (!in_array($format, [self::DIR_ORIGINAL, self::DIR_THUMBS])) { throw new \UnexpectedValueException(sprintf('Bad format: %s', $format)); } - if ($format !== self::DIR_ORIGINAL) { - // We have to check if the file exists or create it from the original size - if (!$this->filesystem->exists($this->getPath($speaker, $format))) { - $this->generateFormat($speaker, $format); - } + // We have to check if the file exists or create it from the original size + if ($format !== self::DIR_ORIGINAL && !$this->filesystem->exists($this->getPath($speaker, $format))) { + $this->generateFormat($speaker, $format); } if ($this->filesystem->exists($this->getPath($speaker, $format))) { @@ -76,7 +75,7 @@ public function getUrl(Speaker $speaker, $format = null) return null; } - public function getPath(Speaker $speaker, $format) + public function getPath(Speaker $speaker, string $format): string { if (!in_array($format, [self::DIR_ORIGINAL, self::DIR_THUMBS])) { throw new \UnexpectedValueException(sprintf('Bad format: %s', $format)); @@ -88,10 +87,7 @@ public function getPath(Speaker $speaker, $format) return $directory . '/' . $speaker->getPhoto(); } - /** - * @return string - */ - public function storeLegacy(UploadedFile $photo, Event $event, Speaker $speaker) + public function storeLegacy(UploadedFile $photo, Event $event, Speaker $speaker): string { $dir = '/templates/' . $event->getPath() . '/images/intervenants'; $path = $dir . '/' . $speaker->getId() . '.jpg'; @@ -114,10 +110,7 @@ public function storeLegacy(UploadedFile $photo, Event $event, Speaker $speaker) return $path; } - /** - * @return string|null - */ - public function getLegacyUrl(Event $event, Speaker $speaker) + public function getLegacyUrl(Event $event, Speaker $speaker): ?string { $path = '/templates/' . $event->getPath() . '/images/intervenants/' . $speaker->getId() . '.jpg'; if (is_file($this->legacyBasePath . $path)) { @@ -127,7 +120,7 @@ public function getLegacyUrl(Event $event, Speaker $speaker) return null; } - public function storeFromGravatar(Speaker $speaker) + public function storeFromGravatar(Speaker $speaker): ?string { $tmpImagePath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('gravatar-', true) . '.jpg'; // Transformation en 90x120 JPG pour simplifier @@ -143,7 +136,7 @@ public function storeFromGravatar(Speaker $speaker) return null; } - private function generateFormat(Speaker $speaker, $format) + private function generateFormat(Speaker $speaker, string $format): void { $originalPath = $this->getPath($speaker, self::DIR_ORIGINAL); $formatPath = $this->getPath($speaker, $format); @@ -193,7 +186,7 @@ private function generateFormat(Speaker $speaker, $format) } $img = imagecreatetruecolor($width, $height); - if ($transparent === true) { + if ($transparent) { imagecolortransparent($img, imagecolorallocatealpha($img, 0, 0, 0, 127)); imagealphablending($img, false); imagesavealpha($img, true); @@ -207,7 +200,7 @@ private function generateFormat(Speaker $speaker, $format) } } - private function createDirectory($directory) + private function createDirectory(string $directory): void { try { $this->filesystem->mkdir($directory, 0755); diff --git a/sources/AppBundle/CFP/SpeakerFactory.php b/sources/AppBundle/CFP/SpeakerFactory.php index 426ce46eb..94cd87a59 100644 --- a/sources/AppBundle/CFP/SpeakerFactory.php +++ b/sources/AppBundle/CFP/SpeakerFactory.php @@ -1,17 +1,21 @@ speakerRepository->getOneBy(['user' => $this->tokenStorage->getToken()->getUser()->getId(), 'eventId' => $event->getId()]); + $user = null; + if ($this->tokenStorage->getToken() instanceof TokenInterface) { + $user = $this->tokenStorage->getToken()->getUser(); + if ($user instanceof GithubUser) { + $user = $user->getId(); + } + } + + $speaker = $this->speakerRepository->getOneBy([ + 'user' => $user, + 'eventId' => $event->getId() + ]); if ($speaker === null) { $speaker = new Speaker(); $speaker - ->setUser($this->tokenStorage->getToken()->getUser()->getId()) + ->setUser($user) ->setEventId($event->getId()) ; } diff --git a/sources/AppBundle/CFP/ViewModel/EventTalkList.php b/sources/AppBundle/CFP/ViewModel/EventTalkList.php index f94b89d40..45e9e1365 100644 --- a/sources/AppBundle/CFP/ViewModel/EventTalkList.php +++ b/sources/AppBundle/CFP/ViewModel/EventTalkList.php @@ -1,5 +1,7 @@ talks[$talk->getId()] = $talk; } - /** - * @return Event - */ - public function getEvent() + public function getEvent(): Event { return $this->event; } @@ -36,7 +34,7 @@ public function getEvent() /** * @return Talk[] */ - public function getTalks() + public function getTalks(): array { return $this->talks; } diff --git a/sources/AppBundle/Calendar/IcsPLanningGenerator.php b/sources/AppBundle/Calendar/IcsPLanningGenerator.php index f3d4cda18..f2ea563e9 100644 --- a/sources/AppBundle/Calendar/IcsPLanningGenerator.php +++ b/sources/AppBundle/Calendar/IcsPLanningGenerator.php @@ -1,5 +1,7 @@ talkRepository = $talkRepository; $this->photoStorage = $photoStorage; } - /** - * @param Event $event - * - * @return array - */ - public function generate(Event $event) + public function generate(Event $event): array { $talks = $this->talkRepository->getByEventWithSpeakers($event); diff --git a/sources/AppBundle/Calendar/TechnoWatchCalendarGenerator.php b/sources/AppBundle/Calendar/TechnoWatchCalendarGenerator.php index 872a0c423..6c39180ab 100644 --- a/sources/AppBundle/Calendar/TechnoWatchCalendarGenerator.php +++ b/sources/AppBundle/Calendar/TechnoWatchCalendarGenerator.php @@ -1,5 +1,7 @@ 0 && (!($firstChair == $filter || $secondChair == $filter))) { + if (strlen($filter) > 0 && ($firstChair != $filter && $secondChair != $filter)) { continue; } - if (0 === strlen($firstChair) || 0 == strlen($secondChair)) { + if ($firstChair === '' || 0 == strlen($secondChair)) { continue; } diff --git a/sources/AppBundle/Command/CfpNotificationCommand.php b/sources/AppBundle/Command/CfpNotificationCommand.php index f5cb2e639..59ba629da 100644 --- a/sources/AppBundle/Command/CfpNotificationCommand.php +++ b/sources/AppBundle/Command/CfpNotificationCommand.php @@ -1,11 +1,16 @@ messageFactory = $messageFactory; + $this->slackNotifier = $slackNotifier; + $this->ting = $ting; + } /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('cfp-stats-notification') @@ -28,11 +45,9 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { - $ting = $this->getContainer()->get('ting'); - $eventRepository = $this->getContainer()->get('ting')->get(EventRepository::class); - + $eventRepository = $this->ting->get(EventRepository::class); $since = null; if ($input->getOption('display-diff')) { @@ -48,15 +63,15 @@ protected function execute(InputInterface $input, OutputInterface $output) continue; } - $message = $this->getContainer()->get(\AppBundle\Slack\MessageFactory::class)->createMessageForCfpStats( + $message = $this->messageFactory->createMessageForCfpStats( $event, - $ting->get(TalkRepository::class), - $ting->get(TalkToSpeakersRepository::class), + $this->ting->get(TalkRepository::class), + $this->ting->get(TalkToSpeakersRepository::class), $currentDate, $since ); - $this->getContainer()->get(\AppBundle\Notifier\SlackNotifier::class)->sendMessage($message); + $this->slackNotifier->sendMessage($message); } return 0; diff --git a/sources/AppBundle/Command/CleanThrottlingCommand.php b/sources/AppBundle/Command/CleanThrottlingCommand.php index 2a3b18280..58553915d 100644 --- a/sources/AppBundle/Command/CleanThrottlingCommand.php +++ b/sources/AppBundle/Command/CleanThrottlingCommand.php @@ -1,17 +1,25 @@ actionThrottling = $actionThrottling; + } /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('throttling:clean') @@ -21,9 +29,9 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { - $this->getContainer()->get(\AppBundle\Security\ActionThrottling\ActionThrottling::class)->clearOldLogs(); + $this->actionThrottling->clearOldLogs(); return 0; } diff --git a/sources/AppBundle/Command/DevCallBackPayboxCotisationCommand.php b/sources/AppBundle/Command/DevCallBackPayboxCotisationCommand.php index 69fa35045..a48ac55c1 100644 --- a/sources/AppBundle/Command/DevCallBackPayboxCotisationCommand.php +++ b/sources/AppBundle/Command/DevCallBackPayboxCotisationCommand.php @@ -1,5 +1,7 @@ getArgument('url_paiement_effectue')); diff --git a/sources/AppBundle/Command/GeneralMeetupNotificationCommand.php b/sources/AppBundle/Command/GeneralMeetupNotificationCommand.php index 8cceadddd..d00a5f6cb 100644 --- a/sources/AppBundle/Command/GeneralMeetupNotificationCommand.php +++ b/sources/AppBundle/Command/GeneralMeetupNotificationCommand.php @@ -1,5 +1,7 @@ setName('general-meeting-notification'); } @@ -50,7 +47,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { if ($this->generalMeetingRepository->hasGeneralMeetingPlanned()) { $this->slackNotifier->sendMessage($this->messageFactory->createMessageForGeneralMeeting( diff --git a/sources/AppBundle/Command/IndexMeetupsCommand.php b/sources/AppBundle/Command/IndexMeetupsCommand.php index 70581e6ce..ddbb340aa 100644 --- a/sources/AppBundle/Command/IndexMeetupsCommand.php +++ b/sources/AppBundle/Command/IndexMeetupsCommand.php @@ -1,5 +1,7 @@ setName('indexing:meetups') @@ -28,7 +30,7 @@ protected function configure() * @throws AlgoliaException * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $container = $this->getContainer(); $ting = $this->getContainer()->get('ting'); @@ -47,7 +49,7 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } - private function runScraping($output) + private function runScraping(OutputInterface $output): void { $greetInput = new ArrayInput([ 'command' => 'scrapping-meetup-event', diff --git a/sources/AppBundle/Command/IndexTalksCommand.php b/sources/AppBundle/Command/IndexTalksCommand.php index 0a0a064e6..3171cf79c 100644 --- a/sources/AppBundle/Command/IndexTalksCommand.php +++ b/sources/AppBundle/Command/IndexTalksCommand.php @@ -1,5 +1,7 @@ runner = $runner; } - protected function configure() + protected function configure(): void { $this ->setName('indexing:talks'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->runner->run(); diff --git a/sources/AppBundle/Command/QrCodesGeneratorCommand.php b/sources/AppBundle/Command/QrCodesGeneratorCommand.php index fa8a55c79..542f25745 100644 --- a/sources/AppBundle/Command/QrCodesGeneratorCommand.php +++ b/sources/AppBundle/Command/QrCodesGeneratorCommand.php @@ -1,5 +1,7 @@ qrCodeGenerator = $qrCodeGenerator; @@ -25,7 +26,7 @@ public function __construct(QrCodeGenerator $qrCodeGenerator, $name = null) /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('generate-qr-codes') @@ -41,9 +42,8 @@ protected function configure() * @see Command * * @throws \Exception - * @return int */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $io = new SymfonyStyle($input, $output); $io->title('Génération des QR codes pour les badges des participant.e.s pour les évènements.'); diff --git a/sources/AppBundle/Command/RegistrationsExporterCommand.php b/sources/AppBundle/Command/RegistrationsExporterCommand.php index 3994cd376..edf3a1df1 100644 --- a/sources/AppBundle/Command/RegistrationsExporterCommand.php +++ b/sources/AppBundle/Command/RegistrationsExporterCommand.php @@ -1,7 +1,11 @@ setName('export-registrations') @@ -23,18 +27,18 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $container = $this->getContainer(); - if (null === ($event = $container->get(\AppBundle\Event\Model\Repository\EventRepository::class)->getNextEvent())) { + if (null === ($event = $container->get(EventRepository::class)->getNextEvent())) { $output->writeln('No event found'); - return; + return 0; } $file = new \SplFileObject($input->getArgument('file'), 'w+'); - $container->get(\AppBundle\Event\Ticket\RegistrationsExportGenerator::class)->export($event, $file); + $container->get(RegistrationsExportGenerator::class)->export($event, $file); return 0; } diff --git a/sources/AppBundle/Command/ScrappingMeetupEventsCommand.php b/sources/AppBundle/Command/ScrappingMeetupEventsCommand.php index 217d29ca7..90640a0a6 100644 --- a/sources/AppBundle/Command/ScrappingMeetupEventsCommand.php +++ b/sources/AppBundle/Command/ScrappingMeetupEventsCommand.php @@ -1,5 +1,7 @@ setName('scrapping-meetup-event') @@ -31,9 +33,8 @@ protected function configure() * @see Command * * @throws \Exception - * @return int */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $io = new SymfonyStyle($input, $output); $io->title('Import des events meetups via scrapping de meetup.com'); diff --git a/sources/AppBundle/Command/SlackMemberNotificationCommand.php b/sources/AppBundle/Command/SlackMemberNotificationCommand.php index e6e269d0d..44ae8e1dd 100644 --- a/sources/AppBundle/Command/SlackMemberNotificationCommand.php +++ b/sources/AppBundle/Command/SlackMemberNotificationCommand.php @@ -1,7 +1,11 @@ usersChecker = $usersChecker; + $this->messageFactory = $messageFactory; + $this->slackNotifier = $slackNotifier; + } /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('slack-member-notification') @@ -22,13 +35,13 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { - $results = $this->getContainer()->get(UsersChecker::class)->checkUsersValidity(); + $results = $this->usersChecker->checkUsersValidity(); if (($nbResults = count($results)) > 0) { - $message = $this->getContainer()->get(\AppBundle\Slack\MessageFactory::class)->createMessageForMemberNotification($nbResults); - $this->getContainer()->get(\AppBundle\Notifier\SlackNotifier::class)->sendMessage($message); + $message = $this->messageFactory->createMessageForMemberNotification($nbResults); + $this->slackNotifier->sendMessage($message); } return 0; diff --git a/sources/AppBundle/Command/SubscriptionReminderCommand.php b/sources/AppBundle/Command/SubscriptionReminderCommand.php index ca73dfa17..240c2b99b 100644 --- a/sources/AppBundle/Command/SubscriptionReminderCommand.php +++ b/sources/AppBundle/Command/SubscriptionReminderCommand.php @@ -1,9 +1,21 @@ mailer = $mailer; + } /** * @inheritDoc */ - protected function configure() + protected function configure(): void { $this ->setName('subscription:reminder') @@ -27,19 +44,19 @@ protected function configure() /** * @inheritDoc */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { - $mailer = $this->getContainer()->get(\AppBundle\Email\Mailer\Mailer::class); - $factory = new Association\UserMembership\UserReminderFactory($mailer, $this->getContainer()->get('ting')->get(Association\Model\Repository\SubscriptionReminderLogRepository::class)); - $companyFactory = new Association\CompanyMembership\CompanyReminderFactory( + $mailer = $this->mailer; + $factory = new UserReminderFactory($mailer, $this->getContainer()->get('ting')->get(SubscriptionReminderLogRepository::class)); + $companyFactory = new CompanyReminderFactory( $mailer, - $this->getContainer()->get('ting')->get(Association\Model\Repository\SubscriptionReminderLogRepository::class) + $this->getContainer()->get('ting')->get(SubscriptionReminderLogRepository::class) ); /** - * @var Association\Model\Repository\UserRepository $repository + * @var UserRepository $repository */ - $repository = $this->getContainer()->get('ting')->get(Association\Model\Repository\UserRepository::class); + $repository = $this->getContainer()->get('ting')->get(UserRepository::class); $dryRun = $input->getOption('dry-run'); @@ -48,22 +65,22 @@ protected function execute(InputInterface $input, OutputInterface $output) $reminders = [ 'in 15 days' => [ 'date' => $today->add(new \DateInterval('P15D')), - 'physical' => Association\UserMembership\Reminder15DaysBeforeEnd::class, + 'physical' => Reminder15DaysBeforeEnd::class, 'company' => Association\CompanyMembership\Reminder15DaysBeforeEnd::class ], 'in 7 days' => [ 'date' => $today->add(new \DateInterval('P7D')), - 'physical' => Association\UserMembership\Reminder7DaysBeforeEnd::class, + 'physical' => Reminder7DaysBeforeEnd::class, 'company' => Association\CompanyMembership\Reminder7DaysBeforeEnd::class ], 'Today' => [ 'date' => $today, - 'physical' => Association\UserMembership\ReminderDDay::class, + 'physical' => ReminderDDay::class, 'company' => Association\CompanyMembership\ReminderDDay::class ], '15 days ago' => [ 'date' => $today->sub(new \DateInterval('P15D')), - 'physical' => Association\UserMembership\Reminder15DaysAfterEnd::class, + 'physical' => Reminder15DaysAfterEnd::class, 'company' => Association\CompanyMembership\Reminder15DaysAfterEnd::class ], ]; @@ -71,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln('Reminders des souscriptions '); foreach ($reminders as $name => $details) { $reminder = $factory->getReminder($details['physical']); - $users = $repository->getUsersByEndOfMembership($details['date'], Association\Model\Repository\UserRepository::USER_TYPE_PHYSICAL); + $users = $repository->getUsersByEndOfMembership($details['date'], UserRepository::USER_TYPE_PHYSICAL); $output->writeln(sprintf('%s (%s)', $name, $details['date']->format('d/m/Y'))); $output->writeln(sprintf('%s membres ', $users->count())); @@ -79,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $reminder = $companyFactory->getReminder($details['company']); - $users = $repository->getUsersByEndOfMembership($details['date'], Association\Model\Repository\UserRepository::USER_TYPE_COMPANY); + $users = $repository->getUsersByEndOfMembership($details['date'], UserRepository::USER_TYPE_COMPANY); $output->writeln(sprintf('%s entreprises ', $users->count())); $this->handleReminders($output, $reminder, $users, $dryRun); } @@ -89,10 +106,10 @@ protected function execute(InputInterface $input, OutputInterface $output) private function handleReminders( OutputInterface $output, - Association\MembershipReminderInterface $reminder, + MembershipReminderInterface $reminder, CollectionInterface $users, $dryRun = true - ) { + ): void { foreach ($users as $user) { /** * @var $user Association\Model\User diff --git a/sources/AppBundle/Command/SynchMembersCommand.php b/sources/AppBundle/Command/SynchMembersCommand.php index aa532b021..7d40e75db 100644 --- a/sources/AppBundle/Command/SynchMembersCommand.php +++ b/sources/AppBundle/Command/SynchMembersCommand.php @@ -1,5 +1,7 @@ setName('sync-members'); } @@ -19,7 +21,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $container = $this->getContainer(); diff --git a/sources/AppBundle/Command/SynchTechLetterCommand.php b/sources/AppBundle/Command/SynchTechLetterCommand.php index 90ddf0fa7..7c934293b 100644 --- a/sources/AppBundle/Command/SynchTechLetterCommand.php +++ b/sources/AppBundle/Command/SynchTechLetterCommand.php @@ -1,5 +1,7 @@ setName('sync-techletter'); } @@ -19,7 +21,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $container = $this->getContainer(); diff --git a/sources/AppBundle/Command/TicketStatsNotificationCommand.php b/sources/AppBundle/Command/TicketStatsNotificationCommand.php index fb521f1be..fa156a232 100644 --- a/sources/AppBundle/Command/TicketStatsNotificationCommand.php +++ b/sources/AppBundle/Command/TicketStatsNotificationCommand.php @@ -1,11 +1,15 @@ messageFactory = $messageFactory; + $this->eventStatsRepository = $eventStatsRepository; + $this->slackNotifier = $slackNotifier; + } /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('ticket-stats-notification') @@ -27,7 +40,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $eventReposotory = $this->getContainer()->get('ting')->get(EventRepository::class); $ticketRepository = $this->getContainer()->get('ting')->get(TicketTypeRepository::class); @@ -41,14 +54,14 @@ protected function execute(InputInterface $input, OutputInterface $output) /** @var Event $event */ foreach ($eventReposotory->getNextEvents() as $event) { - $message = $this->getContainer()->get(\AppBundle\Slack\MessageFactory::class)->createMessageForTicketStats( + $message = $this->messageFactory->createMessageForTicketStats( $event, - $this->getContainer()->get(EventStatsRepository::class), + $this->eventStatsRepository, $ticketRepository, $date ); - $this->getContainer()->get(\AppBundle\Notifier\SlackNotifier::class)->sendMessage($message); + $this->slackNotifier->sendMessage($message); } return 0; diff --git a/sources/AppBundle/Command/TwitterBotCommand.php b/sources/AppBundle/Command/TwitterBotCommand.php index 2c514b060..0c3b75e48 100644 --- a/sources/AppBundle/Command/TwitterBotCommand.php +++ b/sources/AppBundle/Command/TwitterBotCommand.php @@ -1,5 +1,7 @@ setName('twitter-bot:run') @@ -29,7 +31,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $container = $this->getContainer(); $ting = $container->get('ting'); @@ -46,11 +48,6 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } - /** - * @param InputInterface $input - * - * @return null - */ protected function getEventFilter(InputInterface $input) { if (null === ($eventPath = $input->getOption('event-path'))) { diff --git a/sources/AppBundle/Command/UpdateCompanyMemberStateCommand.php b/sources/AppBundle/Command/UpdateCompanyMemberStateCommand.php index 3c010d517..ffcf9fabf 100644 --- a/sources/AppBundle/Command/UpdateCompanyMemberStateCommand.php +++ b/sources/AppBundle/Command/UpdateCompanyMemberStateCommand.php @@ -1,5 +1,7 @@ setName('update-company-member-state') @@ -24,7 +26,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { /** @var CompanyMemberRepository $companyMemberRepository */ $companyMemberRepository = $this->getContainer()->get('ting')->get(CompanyMemberRepository::class); diff --git a/sources/AppBundle/Command/UpdateMailchimpMembersCommand.php b/sources/AppBundle/Command/UpdateMailchimpMembersCommand.php index cb4603c75..33fcb4f4d 100644 --- a/sources/AppBundle/Command/UpdateMailchimpMembersCommand.php +++ b/sources/AppBundle/Command/UpdateMailchimpMembersCommand.php @@ -1,9 +1,13 @@ mailchimp = $mailchimp; + $this->mailchimpMembersList = $mailchimpMembersList; + $this->ting = $ting; + } /** * @see Command */ - protected function configure() + protected function configure(): void { $this ->setName('mailchimp:update-members') @@ -22,31 +38,22 @@ protected function configure() ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { - $container = $this->getContainer(); - $ting = $container->get('ting'); - - $membersListId = $this->getContainer()->getParameter('mailchimp_members_list'); - /** * @var UserRepository $userRepository */ - $userRepository = $ting->get(UserRepository::class); + $userRepository = $this->ting->get(UserRepository::class); - $mailchimp = $this->getContainer()->get(\AppBundle\Mailchimp\Mailchimp::class); + $mailchimp = $this->mailchimp; $runner = new Runner( $mailchimp, $userRepository, - $membersListId + $this->mailchimpMembersList ); - if ($input->getOption('init') === true) { - $errors = $runner->initList(); - } else { - $errors = $runner->updateList(); - } + $errors = $input->getOption('init') === true ? $runner->initList() : $runner->updateList(); if ($errors !== []) { $table = new Table($output); $table diff --git a/sources/AppBundle/Command/UpdateUserStateCommand.php b/sources/AppBundle/Command/UpdateUserStateCommand.php index 3e74a9e15..ce6fa919d 100644 --- a/sources/AppBundle/Command/UpdateUserStateCommand.php +++ b/sources/AppBundle/Command/UpdateUserStateCommand.php @@ -1,5 +1,7 @@ setName('update-user-state') @@ -24,7 +26,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { /** @var UserRepository $userRepository */ $userRepository = $this->getContainer()->get('ting')->get(UserRepository::class); diff --git a/sources/AppBundle/Command/VideosDataCommand.php b/sources/AppBundle/Command/VideosDataCommand.php index d81e7291f..e6763070f 100644 --- a/sources/AppBundle/Command/VideosDataCommand.php +++ b/sources/AppBundle/Command/VideosDataCommand.php @@ -1,5 +1,7 @@ setName('videos:extract-data-for-youtube-import') @@ -28,7 +30,7 @@ protected function configure() /** * @see Command */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $ting = $this->getContainer()->get('ting'); diff --git a/sources/AppBundle/Compta/BankAccount/BankAccount.php b/sources/AppBundle/Compta/BankAccount/BankAccount.php index 981f24492..97e80ff2d 100644 --- a/sources/AppBundle/Compta/BankAccount/BankAccount.php +++ b/sources/AppBundle/Compta/BankAccount/BankAccount.php @@ -1,5 +1,7 @@ setTime(0, 0, 1); - if (null === $applicationDate || $applicationDate > $comparisonDate) { + if (!$applicationDate instanceof \DateTimeInterface || $applicationDate > $comparisonDate) { return new BankAccount( '10278', '06076', diff --git a/sources/AppBundle/Compta/Importer/AutoQualifier.php b/sources/AppBundle/Compta/Importer/AutoQualifier.php index 4728d9a4c..8af3bab61 100644 --- a/sources/AppBundle/Compta/Importer/AutoQualifier.php +++ b/sources/AppBundle/Compta/Importer/AutoQualifier.php @@ -1,5 +1,7 @@ rules as $rule) { - if (($operation->isCredit() === (bool) $rule['is_credit']) || is_null($rule['is_credit'])) { - if (false !== strpos($operationQualified['description'], (string) $rule['condition'])) { - if (null !== $rule['event_id']) { - $operationQualified['evenement'] = $rule['event_id']; - } - if (null !== $rule['category_id']) { - $operationQualified['categorie'] = $rule['category_id']; - } - if (null !== $rule['attachment_required']) { - $operationQualified['attachmentRequired'] = $rule['attachment_required']; - } - if (null !== $rule['mode_regl_id']) { - $operationQualified['idModeReglement'] = $rule['mode_regl_id']; - } - if (null !== $rule['vat']) { - $tx = ['0' => 0, '5_5' => 0.055, '10' => 0.1, '20' => 0.2]; - $operationQualified['montant_ht_soumis_tva_' . $rule['vat']] = Vat::getRoundedWithoutVatPriceFromPriceWithVat($operationQualified['montant'], $tx[$rule['vat']]); - } - break; + if (($operation->isCredit() === (bool) $rule['is_credit'] || is_null($rule['is_credit'])) && false !== strpos($operationQualified['description'], (string) $rule['condition'])) { + if (null !== $rule['event_id']) { + $operationQualified['evenement'] = $rule['event_id']; + } + if (null !== $rule['category_id']) { + $operationQualified['categorie'] = $rule['category_id']; + } + if (null !== $rule['attachment_required']) { + $operationQualified['attachmentRequired'] = $rule['attachment_required']; } + if (null !== $rule['mode_regl_id']) { + $operationQualified['idModeReglement'] = $rule['mode_regl_id']; + } + if (null !== $rule['vat']) { + $tx = ['0' => 0, '5_5' => 0.055, '10' => 0.1, '20' => 0.2]; + $operationQualified['montant_ht_soumis_tva_' . $rule['vat']] = Vat::getRoundedWithoutVatPriceFromPriceWithVat($operationQualified['montant'], $tx[$rule['vat']]); + } + break; } } diff --git a/sources/AppBundle/Compta/Importer/CaisseEpargne.php b/sources/AppBundle/Compta/Importer/CaisseEpargne.php index 673e458fa..9827ebf70 100644 --- a/sources/AppBundle/Compta/Importer/CaisseEpargne.php +++ b/sources/AppBundle/Compta/Importer/CaisseEpargne.php @@ -1,5 +1,7 @@ filePath; - } - - public function initialize($filePath) + public function initialize($filePath): void { $this->file = new \SplFileObject($filePath, 'r'); $this->file->setCsvControl(';'); $this->file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY); } - public function validate() + public function validate(): bool { $this->file->rewind(); $firstLine = $this->file->current(); @@ -38,13 +27,8 @@ public function validate() if (!is_array($firstLine)) { return false; } - // On vérifie la première ligne - if (0 !== strpos($firstLine[0], 'Code de la banque')) { - return false; - } - - return true; + return 0 === strpos($firstLine[0], 'Code de la banque'); } /** @@ -87,7 +71,7 @@ public function extract() } } - public function getCompteId() + public function getCompteId(): int { return ComptaCompte::COURANT_CE; } diff --git a/sources/AppBundle/Compta/Importer/CreditMutuel.php b/sources/AppBundle/Compta/Importer/CreditMutuel.php index c555da2ec..76513aca1 100644 --- a/sources/AppBundle/Compta/Importer/CreditMutuel.php +++ b/sources/AppBundle/Compta/Importer/CreditMutuel.php @@ -1,5 +1,7 @@ file = new \SplFileObject($filePath, 'r'); $this->file->setCsvControl(';'); $this->file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY); } - /** - * @return boolean - */ - public function validate() + public function validate(): bool { $this->file->rewind(); $firstLine = $this->file->current(); @@ -31,12 +27,7 @@ public function validate() if (!is_array($firstLine)) { return false; } - - if (count($firstLine) === 6 && $firstLine[1] === 'Date de valeur') { - return true; - } - - return false; + return count($firstLine) === 6 && $firstLine[1] === 'Date de valeur'; } /** @@ -65,10 +56,10 @@ public function extract() $description = implode(' ', array_filter(explode(' ', $description))); if ('' === $data[3]) { - $montant = abs(str_replace(',', '.', $data[2])); + $montant = abs((float) str_replace(',', '.', $data[2])); $type = Operation::DEBIT; } else { - $montant = abs(str_replace(',', '.', $data[3])); + $montant = abs((float) str_replace(',', '.', $data[3])); $type = Operation::CREDIT; } @@ -77,13 +68,13 @@ public function extract() // Malheureusement le cmut, contrairement à la caisse d'epargne, n'a pas cette clé dans le fichier. // Donc on va sortir ça avec un sha1 de la ligne et croiser les doigts pour que l'ordonnancement soit le même. // En théorie ça devrait le faire, le solde faisant partie de l'export, mais il ne faut sous-estimer personne - $numeroOperation = substr(sha1(implode($data)), 0, 20); + $numeroOperation = substr(sha1(implode('', $data)), 0, 20); yield new Operation($dateEcriture, $description, $montant, $type, $numeroOperation); } } - public function getCompteId() + public function getCompteId(): int { return ComptaCompte::COURANT_CMUT; } diff --git a/sources/AppBundle/Compta/Importer/CreditMutuelLivret.php b/sources/AppBundle/Compta/Importer/CreditMutuelLivret.php index 8184c5286..29a33cef7 100644 --- a/sources/AppBundle/Compta/Importer/CreditMutuelLivret.php +++ b/sources/AppBundle/Compta/Importer/CreditMutuelLivret.php @@ -1,5 +1,7 @@ numeroOperation; } - /** - * @return bool - */ - public function isCredit() + public function isCredit(): bool { return self::CREDIT === $this->getType(); } diff --git a/sources/AppBundle/Controller/Admin/Event/BadgesGenerateAction.php b/sources/AppBundle/Controller/Admin/Event/BadgesGenerateAction.php index bf7e7a3cc..800d67bde 100644 --- a/sources/AppBundle/Controller/Admin/Event/BadgesGenerateAction.php +++ b/sources/AppBundle/Controller/Admin/Event/BadgesGenerateAction.php @@ -1,5 +1,7 @@ registrationsExportGenerator = $registrationsExportGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): BinaryFileResponse { $event = $this->eventActionHelper->getEventById($request->query->get('id'), false); $file = new SplFileObject(sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('badges_', true), 'w+'); diff --git a/sources/AppBundle/Controller/Admin/Event/ListAction.php b/sources/AppBundle/Controller/Admin/Event/ListAction.php index ec1894722..1879a507d 100644 --- a/sources/AppBundle/Controller/Admin/Event/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Event/ListAction.php @@ -1,5 +1,7 @@ session = $session; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { //TODO : à supprimer quand les actions via le formulaire auront été migée if (isset($_SESSION['flash']['message'])) { diff --git a/sources/AppBundle/Controller/Admin/Event/PendingBankwiresAction.php b/sources/AppBundle/Controller/Admin/Event/PendingBankwiresAction.php index eec19e908..b8ad3ed9a 100644 --- a/sources/AppBundle/Controller/Admin/Event/PendingBankwiresAction.php +++ b/sources/AppBundle/Controller/Admin/Event/PendingBankwiresAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $id = $request->query->get('id'); @@ -101,7 +93,7 @@ public function __invoke(Request $request) ])); } - private function setInvoicePaid(Event $event, Invoice $invoice) + private function setInvoicePaid(Event $event, Invoice $invoice): void { $invoice ->setStatus(Ticket::STATUS_PAID) @@ -119,7 +111,7 @@ private function setInvoicePaid(Event $event, Invoice $invoice) ->setInvoiceStatus(Ticket::INVOICE_SENT); $this->ticketRepository->save($ticket); - $this->eventDispatcher->addListener(KernelEvents::TERMINATE, function () use ($event, $ticket) { + $this->eventDispatcher->addListener(KernelEvents::TERMINATE, function () use ($event, $ticket): int { $this->emails->sendInscription($event, new MailUser($ticket->getEmail(), $ticket->getLabel())); return 1; diff --git a/sources/AppBundle/Controller/Admin/Event/PreviousRegistrationsAction.php b/sources/AppBundle/Controller/Admin/Event/PreviousRegistrationsAction.php index 625f5678c..48d5f4780 100644 --- a/sources/AppBundle/Controller/Admin/Event/PreviousRegistrationsAction.php +++ b/sources/AppBundle/Controller/Admin/Event/PreviousRegistrationsAction.php @@ -1,5 +1,7 @@ ticketRepository = $ticketRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): BinaryFileResponse { $file = new SplFileObject(sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('inscrits_', true), 'w+'); $events = $this->eventRepository->getPreviousEvents($request->query->getInt('event_count', 4)); diff --git a/sources/AppBundle/Controller/Admin/Event/PricesAction.php b/sources/AppBundle/Controller/Admin/Event/PricesAction.php index d8774ccbe..1701bf005 100644 --- a/sources/AppBundle/Controller/Admin/Event/PricesAction.php +++ b/sources/AppBundle/Controller/Admin/Event/PricesAction.php @@ -1,5 +1,7 @@ formFactory = $formFactory; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $id = $request->query->get('id'); $event = $this->eventActionHelper->getEventById($id); diff --git a/sources/AppBundle/Controller/Admin/Event/PricesAddAction.php b/sources/AppBundle/Controller/Admin/Event/PricesAddAction.php index 7615926bc..018c609b4 100644 --- a/sources/AppBundle/Controller/Admin/Event/PricesAddAction.php +++ b/sources/AppBundle/Controller/Admin/Event/PricesAddAction.php @@ -1,5 +1,7 @@ eventRepository = $eventRepository; - $this->twig = $twig; $this->csrfTokenManager = $csrfTokenManager; $this->urlGenerator = $urlGenerator; $this->flashBag = $flashBag; @@ -45,9 +29,8 @@ public function __construct(EventRepository $eventRepository, Environment $twig, /** * @param int $id * @param string $token - * @return RedirectResponse */ - public function __invoke($id, $token) + public function __invoke($id, $token): RedirectResponse { if (false === $this->csrfTokenManager->isTokenValid(new CsrfToken('forum_delete', $token))) { $this->flashBag->add('error', 'Token invalide'); diff --git a/sources/AppBundle/Controller/Admin/Event/ResendSponsorTokenAction.php b/sources/AppBundle/Controller/Admin/Event/ResendSponsorTokenAction.php index d8f61594f..7d05aa71b 100644 --- a/sources/AppBundle/Controller/Admin/Event/ResendSponsorTokenAction.php +++ b/sources/AppBundle/Controller/Admin/Event/ResendSponsorTokenAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $event = $this->eventActionHelper->getEventById($request->query->get('id')); $token = $this->sponsorTicketRepository->get($request->request->get('sponsor_token_id')); diff --git a/sources/AppBundle/Controller/Admin/Event/RoomAction.php b/sources/AppBundle/Controller/Admin/Event/RoomAction.php index a422853f8..b96c9fe04 100644 --- a/sources/AppBundle/Controller/Admin/Event/RoomAction.php +++ b/sources/AppBundle/Controller/Admin/Event/RoomAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $event = $this->eventActionHelper->getEventById($request->query->get('id'), false); /** @var SponsorTicket[] $tokens */ diff --git a/sources/AppBundle/Controller/Admin/Event/SendTestInscriptionEmailAction.php b/sources/AppBundle/Controller/Admin/Event/SendTestInscriptionEmailAction.php index fc66fdd8b..6268a183c 100644 --- a/sources/AppBundle/Controller/Admin/Event/SendTestInscriptionEmailAction.php +++ b/sources/AppBundle/Controller/Admin/Event/SendTestInscriptionEmailAction.php @@ -1,5 +1,7 @@ flashBag = $flashBag; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $event = $this->eventActionHelper->getEventById($request->query->get('id'), false); $this->emails->sendInscription($event, MailUserFactory::bureau()); diff --git a/sources/AppBundle/Controller/Admin/Event/SpeakerInfosAction.php b/sources/AppBundle/Controller/Admin/Event/SpeakerInfosAction.php index e0969ebfe..1a0fea249 100644 --- a/sources/AppBundle/Controller/Admin/Event/SpeakerInfosAction.php +++ b/sources/AppBundle/Controller/Admin/Event/SpeakerInfosAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $id = $request->query->get('id'); $comparedEventId = $request->query->get('compared_event_id'); @@ -106,7 +101,7 @@ public function __invoke(Request $request) $rawStatsByType = $this->eventStatsRepository->getStats($event->getId())->ticketType->paying; $totalInscrits = array_sum($rawStatsByType); - array_walk($rawStatsByType, function (&$item, $key) use (&$ticketTypes, $totalInscrits) { + array_walk($rawStatsByType, function (&$item, $key) use (&$ticketTypes, $totalInscrits): void { if (isset($ticketTypes[$key]) === false) { $type = $this->ticketTypeRepository->get($key); $ticketTypes[$key] = $type->getPrettyName(); diff --git a/sources/AppBundle/Controller/Admin/GetMenuAction.php b/sources/AppBundle/Controller/Admin/GetMenuAction.php index 07a5e0086..b3e5dea0b 100644 --- a/sources/AppBundle/Controller/Admin/GetMenuAction.php +++ b/sources/AppBundle/Controller/Admin/GetMenuAction.php @@ -1,5 +1,7 @@ */ - private $backOfficePages; - /** @var Environment */ - private $twig; - /** @var RequestStack */ - private $requestStack; + private array $backOfficePages; + private Environment $twig; + private RequestStack $requestStack; public function __construct( RequestStack $requestStack, @@ -26,7 +26,7 @@ public function __construct( $this->twig = $twig; } - public function __invoke() + public function __invoke(): Response { $masterRequest = $this->requestStack->getMasterRequest(); Assertion::notNull($masterRequest); diff --git a/sources/AppBundle/Controller/Admin/GithubUser/GithubUserAddAction.php b/sources/AppBundle/Controller/Admin/GithubUser/GithubUserAddAction.php index df16e0679..c2b0235fd 100644 --- a/sources/AppBundle/Controller/Admin/GithubUser/GithubUserAddAction.php +++ b/sources/AppBundle/Controller/Admin/GithubUser/GithubUserAddAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $githubUsers = $this->githubUserRepository->getAllOrderedByLogin(); diff --git a/sources/AppBundle/Controller/Admin/HomeAction.php b/sources/AppBundle/Controller/Admin/HomeAction.php index 82a9bca0a..caca5e445 100644 --- a/sources/AppBundle/Controller/Admin/HomeAction.php +++ b/sources/AppBundle/Controller/Admin/HomeAction.php @@ -1,5 +1,7 @@ generalMeetingRepository = $generalMeetingRepository; } - public function __invoke() + public function __invoke(): Response { $nextevents = $this->eventRepository->getNextEvents(); $cards = []; @@ -82,7 +75,7 @@ public function __invoke() } } - $info['statistics']['montant total'] = number_format($montantTotal, 0, ',', ' ') . ' €'; + $info['statistics']['montant total'] = number_format($montantTotal, 0, ',', "\u{a0}") . "\u{a0}€"; $info['url'] = '/pages/administration/index.php?page=forum_inscriptions&id_forum=' . $event->getId(); $cards[] = $info; diff --git a/sources/AppBundle/Controller/Admin/LoginAction.php b/sources/AppBundle/Controller/Admin/LoginAction.php index c1c2a8430..0641b0112 100644 --- a/sources/AppBundle/Controller/Admin/LoginAction.php +++ b/sources/AppBundle/Controller/Admin/LoginAction.php @@ -1,15 +1,17 @@ view = $view; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { // get the login error if there is one $error = $this->authenticationUtils->getLastAuthenticationError(); diff --git a/sources/AppBundle/Controller/Admin/LostPasswordAction.php b/sources/AppBundle/Controller/Admin/LostPasswordAction.php index 253f00bd3..608a1559f 100644 --- a/sources/AppBundle/Controller/Admin/LostPasswordAction.php +++ b/sources/AppBundle/Controller/Admin/LostPasswordAction.php @@ -1,5 +1,7 @@ formFactory = $formFactory; $this->userPasswordService = $userPasswordService; @@ -33,7 +33,7 @@ public function __construct( $this->flashBag = $flashBag; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $form = $this->formFactory->createBuilder(FormType::class) ->add('email', EmailType::class) diff --git a/sources/AppBundle/Controller/Admin/Members/BadgeListAction.php b/sources/AppBundle/Controller/Admin/Members/BadgeListAction.php index 473886ca8..5a492881b 100644 --- a/sources/AppBundle/Controller/Admin/Members/BadgeListAction.php +++ b/sources/AppBundle/Controller/Admin/Members/BadgeListAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $infos = []; foreach ($this->badgeRepository->getAll() as $badge) { diff --git a/sources/AppBundle/Controller/Admin/Members/BadgeNewAction.php b/sources/AppBundle/Controller/Admin/Members/BadgeNewAction.php index 918aa1a5b..b2bc83631 100644 --- a/sources/AppBundle/Controller/Admin/Members/BadgeNewAction.php +++ b/sources/AppBundle/Controller/Admin/Members/BadgeNewAction.php @@ -1,5 +1,7 @@ badgeRepository = $badgeRepository; $this->formFactory = $formFactory; diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/EditAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/EditAction.php index 7ebcd8aee..0655e0f14 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/EditAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/EditAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $latestDate = $this->generalMeetingRepository->getLatestDate(); $sort = $request->query->get('sort', 'nom'); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/ListingAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/ListingAction.php index 957add1af..9dafcb2fa 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/ListingAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/ListingAction.php @@ -1,5 +1,7 @@ generalMeetingRepository = $generalMeetingRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): BinaryFileResponse { $latestDate = $this->generalMeetingRepository->getLatestDate(); Assertion::notNull($latestDate); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/PrepareAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/PrepareAction.php index c63357b0d..ec1645534 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/PrepareAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeeting/PrepareAction.php @@ -1,5 +1,7 @@ humanFilesize(filesize($file)); $report['mtime'] = filemtime($file); $reports[] = $report; } @@ -84,7 +82,7 @@ public function __invoke(Request $request): Response ])); } - private static function humanFilesize($bytes): string + private function humanFilesize($bytes): string { $sz = 'BKMGTP'; $factor = floor((strlen((string) $bytes) - 1) / 3); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/AddAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/AddAction.php index ffa291dad..bc6301c4c 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/AddAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/AddAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request, $id) + public function __invoke(Request $request, $id): RedirectResponse { /** @var GeneralMeetingQuestion $question */ $question = $this->generalMeetingQuestionRepository->get($id); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/EditAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/EditAction.php index c65f7118c..ece6af78c 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/EditAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingQuestion/EditAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $questionId = $request->query->getInt('id'); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/ListAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/ListAction.php index 08701fd4b..a3fdae742 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/ListAction.php @@ -1,5 +1,7 @@ generalMeetingVoteRepository = $generalMeetingVoteRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $dates = $this->generalMeetingRepository->getAllDates(); $latestDate = $this->generalMeetingRepository->getLatestDate(); diff --git a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/OpenAction.php b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/OpenAction.php index c713c32f2..5f1513e93 100644 --- a/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/OpenAction.php +++ b/sources/AppBundle/Controller/Admin/Members/GeneralMeetingVote/OpenAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $questionId = $request->query->getInt('id'); diff --git a/sources/AppBundle/Controller/Admin/Members/UserAddAction.php b/sources/AppBundle/Controller/Admin/Members/UserAddAction.php index 3c729c4f5..8d7a8a541 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserAddAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserAddAction.php @@ -1,5 +1,7 @@ userBadgeRepository = $userBadgeRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $userBadge = $this->userBadgeRepository->getOneBy([ 'badgeId' => $request->attributes->get('badgeId'), diff --git a/sources/AppBundle/Controller/Admin/Members/UserBadgeNewAction.php b/sources/AppBundle/Controller/Admin/Members/UserBadgeNewAction.php index dd9566e33..17b71fd15 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserBadgeNewAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserBadgeNewAction.php @@ -1,5 +1,7 @@ userBadgeRepository = $userBadgeRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $user = $this->userRepository->get($request->get('user_id')); $userBadgeForm = $this->formFactory->create(UserBadgeType::class, [], ['user' => $user]); diff --git a/sources/AppBundle/Controller/Admin/Members/UserDeleteAction.php b/sources/AppBundle/Controller/Admin/Members/UserDeleteAction.php index f84d05869..d8c0b8dec 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserDeleteAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserDeleteAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $user = $this->userRepository->get($request->query->get('id')); if (null === $user) { diff --git a/sources/AppBundle/Controller/Admin/Members/UserEditAction.php b/sources/AppBundle/Controller/Admin/Members/UserEditAction.php index be3dbaacc..9811f2fa7 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserEditAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserEditAction.php @@ -1,5 +1,7 @@ userRepository = $userRepository; } - public function __invoke(Request $request) + public function __invoke(Request $request): BinaryFileResponse { $isActive = $request->query->getBoolean('isActive'); $isCompanyManager = $request->query->getBoolean('isCompanyManager'); diff --git a/sources/AppBundle/Controller/Admin/Members/UserListAction.php b/sources/AppBundle/Controller/Admin/Members/UserListAction.php index be202876c..c257bc748 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserListAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserListAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { // Modification des paramètres de tri en fonction des demandes passées en GET $sort = $request->query->get('sort', 'lastname'); diff --git a/sources/AppBundle/Controller/Admin/Members/UserResetPasswordAction.php b/sources/AppBundle/Controller/Admin/Members/UserResetPasswordAction.php index 00454fbae..e8c008740 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserResetPasswordAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserResetPasswordAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $user = $this->userRepository->get($request->query->get('id')); if (null === $user) { diff --git a/sources/AppBundle/Controller/Admin/Members/UserSendWelcomeAction.php b/sources/AppBundle/Controller/Admin/Members/UserSendWelcomeAction.php index c3bd4739d..e27dce65b 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserSendWelcomeAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserSendWelcomeAction.php @@ -1,5 +1,7 @@ urlGenerator = $urlGenerator; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $user = $this->userRepository->get($request->query->get('id')); if (null === $user) { diff --git a/sources/AppBundle/Controller/Admin/Membership/ReminderLogAction.php b/sources/AppBundle/Controller/Admin/Membership/ReminderLogAction.php index 335da1d27..0685faa9b 100644 --- a/sources/AppBundle/Controller/Admin/Membership/ReminderLogAction.php +++ b/sources/AppBundle/Controller/Admin/Membership/ReminderLogAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $page = $request->attributes->getInt('page', 1); $limit = 50; diff --git a/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php b/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php index b96355e4f..53f4539e8 100644 --- a/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php +++ b/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $sort = $request->query->get('sort', 'title'); $direction = $request->query->get('direction', 'asc'); diff --git a/sources/AppBundle/Controller/Admin/Planete/FeedDeleteAction.php b/sources/AppBundle/Controller/Admin/Planete/FeedDeleteAction.php index 944d0090d..e1993de3d 100644 --- a/sources/AppBundle/Controller/Admin/Planete/FeedDeleteAction.php +++ b/sources/AppBundle/Controller/Admin/Planete/FeedDeleteAction.php @@ -1,5 +1,7 @@ flashBag = $flashBag; } - public function __invoke(Request $request) + public function __invoke(Request $request): RedirectResponse { $id = $request->query->get('id'); if ($this->feedRepository->delete($id)) { diff --git a/sources/AppBundle/Controller/Admin/Planete/FeedEditAction.php b/sources/AppBundle/Controller/Admin/Planete/FeedEditAction.php index bfd69fa3a..486009911 100644 --- a/sources/AppBundle/Controller/Admin/Planete/FeedEditAction.php +++ b/sources/AppBundle/Controller/Admin/Planete/FeedEditAction.php @@ -1,5 +1,7 @@ query->getInt('id'); $feed = $this->feedRepository->get($id); - if (null === $feed) { - throw new NotFoundHttpException('Flux introuvable'); - } $data = new FeedFormData(); $data->name = $feed->getName(); $data->feed = $feed->getFeed(); diff --git a/sources/AppBundle/Controller/Admin/Planete/FeedListAction.php b/sources/AppBundle/Controller/Admin/Planete/FeedListAction.php index 56380bb2d..278d2330d 100644 --- a/sources/AppBundle/Controller/Admin/Planete/FeedListAction.php +++ b/sources/AppBundle/Controller/Admin/Planete/FeedListAction.php @@ -1,5 +1,7 @@ twig = $twig; } - public function __invoke(Request $request) + public function __invoke(Request $request): Response { $testFeeds = $request->query->getBoolean('testFeeds'); $filter = $request->query->get('filter'); @@ -48,7 +48,7 @@ public function __invoke(Request $request) * * @return array*/ public function getTalksBySpeaker(Event $event, Speaker $speaker) @@ -62,8 +63,6 @@ public function getTalksBySpeaker(Event $event, Speaker $speaker) } /** - * @param Event $event - * @param Speaker $speaker * @return CollectionInterface */ public function getPreviousTalksBySpeaker(Event $event, Speaker $speaker) @@ -87,8 +86,6 @@ public function getPreviousTalksBySpeaker(Event $event, Speaker $speaker) * It retrieve $limit + 1 row. So if `count($results) <= $limit` there is no more result. * Otherwise you should add a "next" item on your paginator * - * @param Event $event - * @param GithubUser $user * @param int $randomSeed used to create a consistent random * @param int $page starting from 1 * @param int $limit @@ -134,8 +131,6 @@ public function getTalkOfTheDay(\DateTime $currentDate) * It retrieve $limit + 1 row. So if `count($results) <= $limit` there is no more result. * Otherwise you should add a "next" item on your paginator * - * @param Event $event - * @param GithubUser $user * @param int $randomSeed used to create a consistent random * @param int $page starting from 1 * @param int $limit @@ -193,17 +188,10 @@ public function getByTalkWithSpeakers(Talk $talk) } /** - * @param Event $event * @param bool $applyPublicationdateFilters * - * @return CollectionInterface&iterable $events * @param bool $applyPublicationdateFilters * - * @return CollectionInterface&iterable connection->prepare(<<<'SQL' SELECT COUNT(*) c @@ -128,7 +123,7 @@ public function countAttendeesAndPowers(DateTimeInterface $date) return (int) $query->fetch()['c']; } - public function countAttendees(DateTimeInterface $date) + public function countAttendees(DateTimeInterface $date): int { $query = $this->connection->prepare(<<<'SQL' SELECT COUNT(*) c @@ -164,7 +159,7 @@ public function obtenirDescription(DateTimeInterface $date) * * @return Attendee[] */ - public function getAttendees(DateTimeInterface $date, $order = 'nom', $direction = 'asc', $idPersonneAvecPouvoir = null) + public function getAttendees(DateTimeInterface $date, $order = 'nom', $direction = 'asc', $idPersonneAvecPouvoir = null): array { $query = $this->connection->createQueryBuilder() ->from('afup_personnes_physiques', 'app') @@ -192,7 +187,7 @@ public function getAttendees(DateTimeInterface $date, $order = 'nom', $direction ->setParameter('pouvoir', $idPersonneAvecPouvoir); } - return array_map(static fn (array $row) => new Attendee( + return array_map(static fn (array $row): Attendee => new Attendee( (int) $row['id'], $row['email'], $row['login'], @@ -212,7 +207,7 @@ public function getAttendees(DateTimeInterface $date, $order = 'nom', $direction * * @return array */ - public function transformMeetupsForIndexation($meetupsCollection) + public function transformMeetupsForIndexation($meetupsCollection): array { $meetupsArray = []; /** @var Meetup $meetup */ diff --git a/sources/AppBundle/Indexation/Meetups/Transformer.php b/sources/AppBundle/Indexation/Meetups/Transformer.php index 5f69c9477..cd5e0416d 100644 --- a/sources/AppBundle/Indexation/Meetups/Transformer.php +++ b/sources/AppBundle/Indexation/Meetups/Transformer.php @@ -1,5 +1,7 @@ officesCollection = $officesCollection; } /** - * @param Meetup $meetup * * @return array * @throws Exception */ - public function transform(Meetup $meetup) + public function transform(Meetup $meetup): ?array { $codeOffice = $meetup->getAntenneName(); $office = $this->officesCollection->findByCode($codeOffice); @@ -71,12 +66,7 @@ public function transform(Meetup $meetup) return $item; } - /** - * @param array $office - * @param Meetup $meetup - * @return string - */ - public function getEventUrl($office, Meetup $meetup) + public function getEventUrl(array $office, Meetup $meetup): string { return self::MEETUP_URL . $office['meetup_urlname'] . '/events/' . $meetup->getId(); } diff --git a/sources/AppBundle/Indexation/Talks/Runner.php b/sources/AppBundle/Indexation/Talks/Runner.php index f90530999..afff5d417 100644 --- a/sources/AppBundle/Indexation/Talks/Runner.php +++ b/sources/AppBundle/Indexation/Talks/Runner.php @@ -1,8 +1,11 @@ algoliaClient = $algoliaClient; @@ -41,7 +31,7 @@ public function __construct(Client $algoliaClient, RepositoryFactory $ting) /** * */ - public function run() + public function run(): void { $index = $this->initIndex(); @@ -60,7 +50,7 @@ public function run() } /** - * @return \AlgoliaSearch\Index + * @return Index */ protected function initIndex() { @@ -102,12 +92,7 @@ protected function getAllPlannings() return $this->ting->get(PlanningRepository::class)->getAll(); } - /** - * @param Planning $planning - * - * @return array|null - */ - protected function prepareObject(Planning $planning) + protected function prepareObject(Planning $planning): ?array { if ($planning->getStart() > new \DateTime()) { return null; diff --git a/sources/AppBundle/Indexation/Talks/Transformer.php b/sources/AppBundle/Indexation/Talks/Transformer.php index 0a696d001..be526dc35 100644 --- a/sources/AppBundle/Indexation/Talks/Transformer.php +++ b/sources/AppBundle/Indexation/Talks/Transformer.php @@ -1,5 +1,7 @@ $planning->getId(), @@ -27,7 +25,7 @@ public function transform(Planning $planning, Talk $talk, Event $event, \Travers 'event' => [ 'id' => $event->getId(), 'title' => $event->getTitle(), - 'start_date' => $event->getDateStart() ? $event->getDateStart()->format('Y-m-d') : null, + 'start_date' => $event->getDateStart() instanceof \DateTime ? $event->getDateStart()->format('Y-m-d') : null, ], 'type' => [ 'id' => $talk->getType(), diff --git a/sources/AppBundle/Joindin/JoindinComments.php b/sources/AppBundle/Joindin/JoindinComments.php index 461560b6d..6ac56e87e 100644 --- a/sources/AppBundle/Joindin/JoindinComments.php +++ b/sources/AppBundle/Joindin/JoindinComments.php @@ -1,5 +1,7 @@ cache = $cache; } - /** - * @param Talk $talk - * - * @return array - */ - public function getCommentsFromTalk(Talk $talk) + public function getCommentsFromTalk(Talk $talk): array { if (!$talk->hasJoindinId()) { return []; @@ -40,10 +31,8 @@ public function getCommentsFromTalk(Talk $talk) /** * @param int $joindinId - * - * @return array */ - protected function getCommmentsFromId($joindinId) + protected function getCommmentsFromId($joindinId): array { return $this->prepareCommentsFromJoindinResponse($this->callJoindInApi($joindinId)); } @@ -68,11 +57,11 @@ private function callJoindInApi($joindinId) /** * @param string $response * - * @return mixed + * @return array{comment: mixed, user_display_name: mixed, created_date: mixed, rating: mixed}[] * * @throws \Exception */ - private function prepareCommentsFromJoindinResponse($response) + private function prepareCommentsFromJoindinResponse($response): array { $decodedResponse = json_decode($response, true); if (!is_array($decodedResponse) || !isset($decodedResponse['comments'])) { @@ -81,7 +70,7 @@ private function prepareCommentsFromJoindinResponse($response) $comments = []; foreach ($decodedResponse['comments'] as $comment) { - if (0 === strlen($comment['user_display_name'])) { + if ((string) $comment['user_display_name'] === '') { $comment['user_display_name'] = 'Anonyme'; } diff --git a/sources/AppBundle/Joindin/JoindinTalk.php b/sources/AppBundle/Joindin/JoindinTalk.php index ac27d9570..0cf9d14a8 100644 --- a/sources/AppBundle/Joindin/JoindinTalk.php +++ b/sources/AppBundle/Joindin/JoindinTalk.php @@ -1,5 +1,7 @@ cache = $cache; diff --git a/sources/AppBundle/LegacyModelFactory.php b/sources/AppBundle/LegacyModelFactory.php index 9a4d21a94..c100ef98f 100644 --- a/sources/AppBundle/LegacyModelFactory.php +++ b/sources/AppBundle/LegacyModelFactory.php @@ -1,5 +1,7 @@ defaultLocale = $defaultLocale; } - public function onKernelRequest(GetResponseEvent $event) + public function onKernelRequest(GetResponseEvent $event): void { if ($event->isMasterRequest() === false) { return ; @@ -32,4 +36,11 @@ public function onKernelRequest(GetResponseEvent $event) } $event->getRequest()->setLocale($locale); } + /** + * @return array %d Oauth login test
"; - foreach ($this->getTestUsersDetails() as $name => $infos) { + foreach (array_keys($this->getTestUsersDetails()) as $name) { $uri = $request->getUri(); $uri .= $request->query->count() ? '&' : '?'; $uri .= 'github_test_user=' . $name; diff --git a/sources/AppBundle/Site/Form/NewsFiltersType.php b/sources/AppBundle/Site/Form/NewsFiltersType.php index 81c616628..c7daa2af9 100644 --- a/sources/AppBundle/Site/Form/NewsFiltersType.php +++ b/sources/AppBundle/Site/Form/NewsFiltersType.php @@ -1,5 +1,7 @@ articleRepository = $articleRepository; } - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $yearValues = []; foreach ($this->articleRepository->getAllYears() as $year) { @@ -33,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) } $builder - ->setMethod('GET') + ->setMethod(Request::METHOD_GET) ->add( 'year', ChoiceType::class, @@ -68,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'csrf_protection' => false, diff --git a/sources/AppBundle/Site/Form/RubriqueType.php b/sources/AppBundle/Site/Form/RubriqueType.php index c9aff118f..6b5fe64db 100644 --- a/sources/AppBundle/Site/Form/RubriqueType.php +++ b/sources/AppBundle/Site/Form/RubriqueType.php @@ -1,5 +1,7 @@ userRepository = $userRepository; } - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $users = []; foreach ($this->userRepository->getAll() as $user) { diff --git a/sources/AppBundle/Site/Model/Article.php b/sources/AppBundle/Site/Model/Article.php index 6d2d1d578..8dede724a 100644 --- a/sources/AppBundle/Site/Model/Article.php +++ b/sources/AppBundle/Site/Model/Article.php @@ -1,5 +1,7 @@ id; } @@ -77,7 +70,7 @@ public function getId() * * @return $this */ - public function setId($id) + public function setId($id): self { $id = (int) $id; $this->propertyChanged('id', $this->id, $id); @@ -98,7 +91,7 @@ public function getRubricId() * * @return $this */ - public function setRubricId($rubricId) + public function setRubricId($rubricId): self { $this->propertyChanged('rubricId', $this->rubricId, $rubricId); $this->rubricId = $rubricId; @@ -119,7 +112,7 @@ public function getTitle() * * @return $this */ - public function setTitle($title) + public function setTitle($title): self { $this->propertyChanged('title', $this->title, $title); $this->title = $title; @@ -141,7 +134,7 @@ public function getPath() * * @return $this */ - public function setPath($path) + public function setPath($path): self { $this->propertyChanged('path', $this->path, $path); @@ -170,7 +163,7 @@ public function getLeadParagraph() * * @return $this */ - public function setLeadParagraph($leadParagraph) + public function setLeadParagraph($leadParagraph): self { $this->propertyChanged('leadParagraph', $this->leadParagraph, $leadParagraph); $this->leadParagraph = $leadParagraph; @@ -198,7 +191,7 @@ public function getContent() * * @return $this */ - public function setContent($content) + public function setContent($content): self { $this->propertyChanged('content', $this->content, $content); $this->content = $content; @@ -219,7 +212,7 @@ public function getContentType() * * @return $this */ - public function setContentType($contentType) + public function setContentType($contentType): self { $this->propertyChanged('contentType', $this->contentType, $contentType); $this->contentType = $contentType; @@ -227,10 +220,7 @@ public function setContentType($contentType) return $this; } - /** - * @return bool - */ - public function isContentTypeMarkdown() + public function isContentTypeMarkdown(): bool { return $this->contentType == \Afup\Site\Corporate\Article::TYPE_CONTENU_MARKDOWN; } @@ -238,17 +228,15 @@ public function isContentTypeMarkdown() /** * @return \DateTime */ - public function getPublishedAt() + public function getPublishedAt(): ?\DateTime { return $this->publishedAt; } /** - * @param \DateTime $publishedAt - * * @return $this */ - public function setPublishedAt(\DateTime $publishedAt) + public function setPublishedAt(\DateTime $publishedAt): self { $this->propertyChanged('publishedAt', $this->publishedAt, $publishedAt); $this->publishedAt = $publishedAt; @@ -269,7 +257,7 @@ public function getTheme() * * @return $this */ - public function setTheme($theme) + public function setTheme($theme): self { $this->propertyChanged('theme', $this->theme, $theme); $this->theme = $theme; @@ -302,7 +290,7 @@ public function getEventId() * * @return $this */ - public function setEventId($eventId) + public function setEventId($eventId): self { $this->propertyChanged('eventId', $this->eventId, $eventId); $this->eventId = $eventId; @@ -315,32 +303,26 @@ public function setEventId($eventId) */ public function getTeaser() { - if (strlen($leadParagraph = $this->getLeadParagraph())) { + if (strlen($leadParagraph = $this->getLeadParagraph()) !== 0) { return strip_tags($leadParagraph); } return substr(strip_tags($this->getContent()), 0, 200); } - /** - * @return string - */ - public function getTextTeaser() + public function getTextTeaser(): string { return html_entity_decode($this->getTeaser()); } - /** - * @return string - */ - public function getSlug() + public function getSlug(): string { return $this->getId() . '-' . $this->getPath(); } /** * @return int */ - public function getState() + public function getState(): ?int { return $this->state; } @@ -350,7 +332,7 @@ public function getState() * * @return $this */ - public function setState($state) + public function setState($state): self { $state = (int) $state; $this->propertyChanged('state', $this->state, $state); diff --git a/sources/AppBundle/Site/Model/Repository/ArticleRepository.php b/sources/AppBundle/Site/Model/Repository/ArticleRepository.php index afab7c41b..c13238020 100644 --- a/sources/AppBundle/Site/Model/Repository/ArticleRepository.php +++ b/sources/AppBundle/Site/Model/Repository/ArticleRepository.php @@ -1,5 +1,7 @@ getPublishedAt())) { + if (!($publishedAt = $article->getPublishedAt()) instanceof \DateTime) { return null; } @@ -117,7 +125,7 @@ public function findPrevious(Article $article) public function findNext(Article $article) { - if (null === ($publishedAt = $article->getPublishedAt())) { + if (!($publishedAt = $article->getPublishedAt()) instanceof \DateTime) { return null; } @@ -136,7 +144,7 @@ public function findNext(Article $article) return $collection->first(); } - private function getSqlPublishedNews(array $filters, $order = 'DESC') + private function getSqlPublishedNews(array $filters, string $order = 'DESC'): array { $yearParams = []; $themeParams = []; diff --git a/sources/AppBundle/Site/Model/Repository/RubriqueRepository.php b/sources/AppBundle/Site/Model/Repository/RubriqueRepository.php index 07a9ee73d..57cd52ca9 100644 --- a/sources/AppBundle/Site/Model/Repository/RubriqueRepository.php +++ b/sources/AppBundle/Site/Model/Repository/RubriqueRepository.php @@ -1,5 +1,7 @@ id; } - public function setId($id) + public function setId($id): void { $this->propertyChanged('id', $this->id, $id); $this->id = $id; @@ -61,7 +63,7 @@ public function getIdPersonnePhysique() return $this->idPersonnePhysique; } - public function setIdPersonnePhysique($id) + public function setIdPersonnePhysique($id): void { $this->propertyChanged('idPersonnePhysique', $this->idPersonnePhysique, $id); $this->idPersonnePhysique = $id; @@ -72,7 +74,7 @@ public function getIdParent() return $this->idParent; } - public function setIdParent($id) + public function setIdParent($id): void { $this->propertyChanged('idParent', $this->idParent, $id); $this->idParent = $id; @@ -83,7 +85,7 @@ public function getNom() return $this->nom; } - public function setNom($nom) + public function setNom($nom): void { $this->propertyChanged('nom', $this->nom, $nom); $this->nom = $nom; @@ -94,7 +96,7 @@ public function getRaccourci() return $this->raccourci; } - public function setRaccourci($raccourci) + public function setRaccourci($raccourci): void { $this->propertyChanged('raccourci', $this->raccourci, $raccourci); $this->raccourci = $raccourci; @@ -105,7 +107,7 @@ public function getDescriptif() return $this->descriptif; } - public function setDescriptif($descriptif) + public function setDescriptif($descriptif): void { $this->descriptif = $descriptif; $this->propertyChanged('descriptif', $this->descriptif, $descriptif); @@ -116,7 +118,7 @@ public function getContenu() return $this->contenu; } - public function setContenu($contenu) + public function setContenu($contenu): void { $this->propertyChanged('contenu', $this->contenu, $contenu); $this->contenu = $contenu; @@ -127,7 +129,7 @@ public function getPosition() return $this->position; } - public function setPosition($position) + public function setPosition($position): void { $this->propertyChanged('position', $this->position, $position); $this->position = $position; @@ -138,7 +140,7 @@ public function getIcone() return $this->icone; } - public function setIcone($icone) + public function setIcone($icone): void { $this->propertyChanged('icone', $this->icone, $icone); $this->icone = $icone; @@ -149,7 +151,7 @@ public function getDate() return $this->date; } - public function setDate($date) + public function setDate($date): void { $this->propertyChanged('date', $this->date, $date); $this->date = $date; @@ -160,7 +162,7 @@ public function getEtat() return $this->etat; } - public function setEtat($etat) + public function setEtat($etat): void { $this->propertyChanged('etat', $this->etat, $etat); $this->etat = $etat; @@ -171,7 +173,7 @@ public function getPagination() return $this->pagination; } - public function setPagination($pagination = 0) + public function setPagination($pagination = 0): void { $pagination = is_null($pagination) ? 0 : $pagination; $this->propertyChanged('pagination', $this->pagination, $pagination); @@ -183,7 +185,7 @@ public function getFeuilleAssociee() return $this->feuilleAssociee; } - public function setFeuilleAssociee($feuilleAssociee) + public function setFeuilleAssociee($feuilleAssociee): void { $this->propertyChanged('feuilleAssociee', $this->feuilleAssociee, $feuilleAssociee); $this->feuilleAssociee = $feuilleAssociee; diff --git a/sources/AppBundle/Slack/Attachment.php b/sources/AppBundle/Slack/Attachment.php index 4ce56b9a5..f19b87392 100644 --- a/sources/AppBundle/Slack/Attachment.php +++ b/sources/AppBundle/Slack/Attachment.php @@ -17,10 +17,10 @@ final class Attachment private ?string $color = null; /** @var Field[] */ - private $fields = []; + private array $fields = []; /** @var string[] */ - private $mrkdwnIn = []; + private array $mrkdwnIn = []; public function getFallback(): ?string { diff --git a/sources/AppBundle/Slack/LegacyClient.php b/sources/AppBundle/Slack/LegacyClient.php index 8d0f46f38..a837e88da 100644 --- a/sources/AppBundle/Slack/LegacyClient.php +++ b/sources/AppBundle/Slack/LegacyClient.php @@ -1,5 +1,7 @@ token = $token; } - public function invite($email) + public function invite($email): void { $return = file_get_contents(sprintf("https://slack.com/api/users.admin.invite?token=%s&email=%s", $this->token, $email)); diff --git a/sources/AppBundle/Slack/MessageFactory.php b/sources/AppBundle/Slack/MessageFactory.php index af27151af..aa66f0db4 100644 --- a/sources/AppBundle/Slack/MessageFactory.php +++ b/sources/AppBundle/Slack/MessageFactory.php @@ -1,5 +1,7 @@ translator = $translator; } - /** - * @param Vote $vote - * @return Message - */ - public function createMessageForVote(Vote $vote) + public function createMessageForVote(Vote $vote): Message { $attachment = new Attachment(); $attachment @@ -83,12 +77,10 @@ public function createMessageForVote(Vote $vote) } /** - * @param Talk $talk - * @param Event $event * * @return Message $message */ - public function createMessageForTalk(Talk $talk, Event $event) + public function createMessageForTalk(Talk $talk, Event $event): Message { $attachment = new Attachment(); $attachment @@ -134,7 +126,7 @@ public function createMessageForTalk(Talk $talk, Event $event) return $message; } - public function createMessageForMemberNotification($membersToCheckCount) + public function createMessageForMemberNotification(string $membersToCheckCount): Message { $attachment = new Attachment(); $attachment @@ -157,7 +149,7 @@ public function createMessageForMemberNotification($membersToCheckCount) return $message; } - public function createMessageForGeneralMeeting(GeneralMeetingRepository $generalMeetingRepository, UserRepository $userRepository, UrlGeneratorInterface $urlGenerator) + public function createMessageForGeneralMeeting(GeneralMeetingRepository $generalMeetingRepository, UserRepository $userRepository, UrlGeneratorInterface $urlGenerator): Message { $latestDate = $generalMeetingRepository->getLatestDate(); Assertion::notNull($latestDate); @@ -187,10 +179,7 @@ public function createMessageForGeneralMeeting(GeneralMeetingRepository $general return $message; } - /** - * @return Message - */ - public function createMessageForTicketStats(Event $event, EventStatsRepository $eventStatsRepository, TicketTypeRepository $ticketRepository, \DateTime $date = null) + public function createMessageForTicketStats(Event $event, EventStatsRepository $eventStatsRepository, TicketTypeRepository $ticketRepository, \DateTime $date = null): Message { $eventStats = $eventStatsRepository->getStats($event->getId()); $message = new Message(); @@ -200,7 +189,7 @@ public function createMessageForTicketStats(Event $event, EventStatsRepository $ ->setIconUrl('https://pbs.twimg.com/profile_images/600291061144145920/Lpf3TDQm_400x400.png') ; - if (null !== $date) { + if ($date instanceof \DateTime) { $eventStatsFiltered = $eventStatsRepository->getStats($event->getId(), $date); $attachment = new Attachment(); @@ -242,7 +231,7 @@ public function createMessageForTicketStats(Event $event, EventStatsRepository $ } - public function createMessageForCfpStats(Event $event, TalkRepository $talkRepository, TalkToSpeakersRepository $talkToSpeakersRepository, \DateTime $currentDate, \DateTime $since = null) + public function createMessageForCfpStats(Event $event, TalkRepository $talkRepository, TalkToSpeakersRepository $talkToSpeakersRepository, \DateTime $currentDate, \DateTime $since = null): Message { $message = new Message(); $message @@ -251,14 +240,14 @@ public function createMessageForCfpStats(Event $event, TalkRepository $talkRepos ->setIconUrl('https://pbs.twimg.com/profile_images/600291061144145920/Lpf3TDQm_400x400.png') ; - if (null !== $since) { + if ($since instanceof \DateTime) { //Il n'y a pas les heures dans les dates de soumission en base $since = clone $since; $since->setTime(0, 0, 0); $fields = $this->prepareCfpStatsFields($talkRepository, $talkToSpeakersRepository, $event, $since); - if (count($fields)) { + if ($fields !== []) { $attachment = new Attachment(); $attachment ->setTitle(sprintf('Réponses au CFP du %s depuis le %s : ', $event->getTitle(), $since->format('d/m/Y H:i'))) @@ -293,7 +282,10 @@ public function createMessageForCfpStats(Event $event, TalkRepository $talkRepos return $message; } - private function prepareCfpStatsFields(TalkRepository $talkRepository, TalkToSpeakersRepository $talkToSpeakersRepository, Event $event, \DateTime $since = null) + /** + * @return Field[] + */ + private function prepareCfpStatsFields(TalkRepository $talkRepository, TalkToSpeakersRepository $talkToSpeakersRepository, Event $event, \DateTime $since = null): array { $infos = [ 'Nombre de talks' => $talkRepository->getNumberOfTalksByEvent($event, $since)['talks'], diff --git a/sources/AppBundle/Slack/UsersChecker.php b/sources/AppBundle/Slack/UsersChecker.php index 336c9c92e..6f8c80abf 100644 --- a/sources/AppBundle/Slack/UsersChecker.php +++ b/sources/AppBundle/Slack/UsersChecker.php @@ -1,21 +1,19 @@ translator = $translator; } - /** - * @param FormBuilderInterface $builder - * @param array $options - */ - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { /** * @var Event $event @@ -76,7 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'choices' => $choices, 'constraints' => [ new Choice(['choices' => array_values($choices), 'multiple' => true, 'min' => 1]), - new Callback(['callback' => function ($values, ExecutionContextInterface $context) { + new Callback(['callback' => function ($values, ExecutionContextInterface $context): void { if (in_array(self::NIGHT_NONE, $values) && 1 !== count($values)) { $context @@ -92,7 +84,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'event' => null, diff --git a/sources/AppBundle/SpeakerInfos/Form/SpeakersContactType.php b/sources/AppBundle/SpeakerInfos/Form/SpeakersContactType.php index 632a0644e..ab0c63c7e 100644 --- a/sources/AppBundle/SpeakerInfos/Form/SpeakersContactType.php +++ b/sources/AppBundle/SpeakerInfos/Form/SpeakersContactType.php @@ -1,5 +1,7 @@ add( @@ -25,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'csrf_protection' => false diff --git a/sources/AppBundle/SpeakerInfos/Form/SpeakersDinerType.php b/sources/AppBundle/SpeakerInfos/Form/SpeakersDinerType.php index 7a74d0db1..2265a8ae8 100644 --- a/sources/AppBundle/SpeakerInfos/Form/SpeakersDinerType.php +++ b/sources/AppBundle/SpeakerInfos/Form/SpeakersDinerType.php @@ -1,5 +1,7 @@ add( @@ -50,7 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'csrf_protection' => false diff --git a/sources/AppBundle/SpeakerInfos/Form/SpeakersExpensesType.php b/sources/AppBundle/SpeakerInfos/Form/SpeakersExpensesType.php index 94438b570..26e9d615e 100644 --- a/sources/AppBundle/SpeakerInfos/Form/SpeakersExpensesType.php +++ b/sources/AppBundle/SpeakerInfos/Form/SpeakersExpensesType.php @@ -1,5 +1,7 @@ add( @@ -44,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'csrf_protection' => false diff --git a/sources/AppBundle/SpeakerInfos/SpeakersExpensesStorage.php b/sources/AppBundle/SpeakerInfos/SpeakersExpensesStorage.php index 1f79ba23f..0b84d21dd 100644 --- a/sources/AppBundle/SpeakerInfos/SpeakersExpensesStorage.php +++ b/sources/AppBundle/SpeakerInfos/SpeakersExpensesStorage.php @@ -1,5 +1,7 @@ basePath = $basePath; - $this->publicPath = $publicPath; $this->filesystem = new Filesystem(); } - public function store(UploadedFile $file, Speaker $speaker) + public function store(UploadedFile $file, Speaker $speaker): string { $fileName = $this->buildFilename($file->getClientOriginalName(), $speaker); $directory = $this->getDir($speaker); @@ -34,7 +34,7 @@ public function store(UploadedFile $file, Speaker $speaker) return $fileName; } - public function delete($filename, Speaker $speaker) + public function delete($filename, Speaker $speaker): void { $file = $this->buildFilename($filename, $speaker); $dirname = $this->getDir($speaker); @@ -44,7 +44,10 @@ public function delete($filename, Speaker $speaker) } } - public function getFiles(Speaker $speaker) + /** + * @return array{basename: (array | string), path: non-falsy-string}[] + */ + public function getFiles(Speaker $speaker): array { $directory = $this->getDir($speaker); $this->createDirectory($directory); @@ -63,7 +66,7 @@ public function getFiles(Speaker $speaker) return $files; } - private function createDirectory($directory) + private function createDirectory(string $directory): void { try { $this->filesystem->mkdir($directory, 0755); @@ -72,17 +75,12 @@ private function createDirectory($directory) } } - private function getDir(Speaker $speaker) + private function getDir(Speaker $speaker): string { return $this->basePath . '/' . $speaker->getEventId(); } - private function getPath(Speaker $speaker) - { - return $this->publicPath . '/' . $speaker->getEventId() . '/'; - } - - private function buildFilename($file, $speaker) + private function buildFilename($file, Speaker $speaker): string { return sprintf('%d_%s', $speaker->getId(), $file); } diff --git a/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php b/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php index 93670d7e0..d7fdbdc42 100644 --- a/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php +++ b/sources/AppBundle/Subscriber/SitemapXmlSubscriber.php @@ -1,5 +1,7 @@ getCues() as $cue) { if (null === $currentText) { $currentText = $cue->getText(); diff --git a/sources/AppBundle/TechLetter/DataExtractor.php b/sources/AppBundle/TechLetter/DataExtractor.php index 72a76a339..f4f9a92e2 100644 --- a/sources/AppBundle/TechLetter/DataExtractor.php +++ b/sources/AppBundle/TechLetter/DataExtractor.php @@ -1,5 +1,7 @@ format('Y-m-d'); - } - if (isset($schema['articleBody'])) { - $body = strip_tags($schema['articleBody']); - $data['readingTime'] = floor(str_word_count($body) / self::WORD_READ_BY_MINUTES); - } + if (isset($schema['datePublished'])) { + $date = new \DateTimeImmutable($schema['datePublished']); + $data['date'] = $date->format('Y-m-d'); + } + if (isset($schema['articleBody'])) { + $body = strip_tags($schema['articleBody']); + $data['readingTime'] = floor(str_word_count($body) / self::WORD_READ_BY_MINUTES); } } - $data = array_map(fn ($value) => trim($value), $data); - - return $data; + return array_map(fn ($value): string => trim($value), $data); } } diff --git a/sources/AppBundle/TechLetter/Form/SendingType.php b/sources/AppBundle/TechLetter/Form/SendingType.php index fddc14708..5c7a1dca7 100644 --- a/sources/AppBundle/TechLetter/Form/SendingType.php +++ b/sources/AppBundle/TechLetter/Form/SendingType.php @@ -1,5 +1,7 @@ add('sendingDate', DateType::class, ['label' => 'Date planifiée', 'data' => new \DateTime('next wednesday')]) @@ -20,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => Sending::class, diff --git a/sources/AppBundle/TechLetter/HtmlParser.php b/sources/AppBundle/TechLetter/HtmlParser.php index a0d2da737..7ae4dc96a 100644 --- a/sources/AppBundle/TechLetter/HtmlParser.php +++ b/sources/AppBundle/TechLetter/HtmlParser.php @@ -1,24 +1,20 @@ */ - private $meta; + private \DOMNodeList $meta; - /** - * @var \DOMXPath - */ - private $xpath; + private \DOMXPath $xpath; const OPEN_GRAPH_PREFIX = 'og'; const TWITTER_PREFIX = 'twitter'; @@ -43,9 +39,8 @@ public function __construct($html) * If no meta has been found, null is returned. * * @param $meta string - * @return string|null */ - private function getSocialMeta($meta) + private function getSocialMeta(string $meta): ?string { $value = $this->getOpenGraphMeta($meta); if ($value === null) { @@ -54,25 +49,21 @@ private function getSocialMeta($meta) return $value; } - private function getOpenGraphMeta($property) + private function getOpenGraphMeta(string $property): ?string { foreach ($this->meta as $meta) { - if ($meta->hasAttribute('property') === true) { - if ($meta->getAttribute('property') === self::OPEN_GRAPH_PREFIX . ':' . $property) { - return $meta->getAttribute('content'); - } + if ($meta->hasAttribute('property') && $meta->getAttribute('property') === self::OPEN_GRAPH_PREFIX . ':' . $property) { + return $meta->getAttribute('content'); } } return null; } - private function getTwitterMeta($name) + private function getTwitterMeta(string $name): ?string { foreach ($this->meta as $meta) { - if ($meta->hasAttribute('name') === true) { - if ($meta->getAttribute('name') === self::TWITTER_PREFIX . ':' . $name) { - return $meta->getAttribute('content'); - } + if ($meta->hasAttribute('name') && $meta->getAttribute('name') === self::TWITTER_PREFIX . ':' . $name) { + return $meta->getAttribute('content'); } } return null; @@ -80,21 +71,18 @@ private function getTwitterMeta($name) /** * @param $name - * @return null|string */ - private function getStandardMeta($name) + private function getStandardMeta($name): ?string { foreach ($this->meta as $meta) { - if ($meta->hasAttribute('name') === true) { - if ($meta->getAttribute('name') === $name) { - return $meta->getAttribute('content'); - } + if ($meta->hasAttribute('name') && $meta->getAttribute('name') === $name) { + return $meta->getAttribute('content'); } } return null; } - public function getMeta($name) + public function getMeta($name): ?string { $value = $this->getSocialMeta($name); if ($value === null) { @@ -112,7 +100,10 @@ public function getTitle() return $item->textContent; } - public function getRichSchema() + /** + * @return mixed[] + */ + public function getRichSchema(): array { $jsonScripts = $this->xpath->query('//script[@type="application/ld+json"]'); diff --git a/sources/AppBundle/TechLetter/MailchimpSynchronizer.php b/sources/AppBundle/TechLetter/MailchimpSynchronizer.php index cd7e0bc8d..85e8f857e 100644 --- a/sources/AppBundle/TechLetter/MailchimpSynchronizer.php +++ b/sources/AppBundle/TechLetter/MailchimpSynchronizer.php @@ -1,5 +1,7 @@ logger = new NullLogger(); } - public function synchronize() + public function synchronize(): void { $subscribdedEmailsOnMailchimp = $this->getSubscribedEmailsOnMailchimp(); $subscribdedEmailsOnWebsite = $this->getSubscribedEmailsOnWebsite(); @@ -53,7 +46,7 @@ public function setLogger(LoggerInterface $logger): self return $this; } - private function unsubscribeAddresses(array $emails) + private function unsubscribeAddresses(array $emails): void { foreach ($emails as $email) { $this->logger->info('Unsubscribe {address} to techletter', ['address' => $email]); @@ -65,7 +58,7 @@ private function unsubscribeAddresses(array $emails) } } - private function subscribeAddresses(array $emails) + private function subscribeAddresses(array $emails): void { foreach ($emails as $email) { $this->logger->info('Subscribe {address} to techletter', ['address' => $email]); diff --git a/sources/AppBundle/TechLetter/Model/Article.php b/sources/AppBundle/TechLetter/Model/Article.php index ab22f7491..03ed9d15b 100644 --- a/sources/AppBundle/TechLetter/Model/Article.php +++ b/sources/AppBundle/TechLetter/Model/Article.php @@ -1,5 +1,7 @@ title; } - /** - * @return \DateTimeImmutable - */ - public function getDate() + public function getDate(): \DateTimeImmutable { return $this->date; } diff --git a/sources/AppBundle/TechLetter/Model/Project.php b/sources/AppBundle/TechLetter/Model/Project.php index 155a52e4f..f0050858a 100644 --- a/sources/AppBundle/TechLetter/Model/Project.php +++ b/sources/AppBundle/TechLetter/Model/Project.php @@ -1,5 +1,7 @@ propertyChanged('id', $this->id, $id); $this->id = $id; @@ -56,16 +54,12 @@ public function setId($id) /** * @return \DateTime */ - public function getSendingDate() + public function getSendingDate(): ?\DateTime { return $this->sendingDate; } - /** - * @param \DateTime $sendingDate - * @return Sending - */ - public function setSendingDate(\DateTime $sendingDate = null) + public function setSendingDate(\DateTime $sendingDate = null): self { $this->propertyChanged('sendingDate', $this->sendingDate, $sendingDate); $this->sendingDate = $sendingDate; @@ -82,9 +76,8 @@ public function getSentToMailchimp() /** * @param bool $sentToMailchimp - * @return Sending */ - public function setSentToMailchimp($sentToMailchimp) + public function setSentToMailchimp($sentToMailchimp): self { $this->propertyChanged('sentToMailchimp', $this->sentToMailchimp, $sentToMailchimp); $this->sentToMailchimp = $sentToMailchimp; @@ -101,9 +94,8 @@ public function getTechletter() /** * @param string $techletter - * @return Sending */ - public function setTechletter($techletter) + public function setTechletter($techletter): self { $this->propertyChanged('techletter', $this->techletter, $techletter); $this->techletter = $techletter; @@ -123,7 +115,7 @@ public function getArchiveUrl() * * @return $this */ - public function setArchiveUrl($archiveUrl) + public function setArchiveUrl($archiveUrl): self { $this->propertyChanged('archiveUrl', $this->archiveUrl, $archiveUrl); $this->archiveUrl = $archiveUrl; diff --git a/sources/AppBundle/TechLetter/Model/TechLetter.php b/sources/AppBundle/TechLetter/Model/TechLetter.php index b2e75fd1f..1a58f8dd9 100644 --- a/sources/AppBundle/TechLetter/Model/TechLetter.php +++ b/sources/AppBundle/TechLetter/Model/TechLetter.php @@ -1,25 +1,15 @@ projects = $projects; } - /** - * @return News|null - */ - public function getFirstNews() + public function getFirstNews(): ?News { return $this->firstNews; } - /** - * @return News|null - */ - public function getSecondNews() + public function getSecondNews(): ?News { return $this->secondNews; } - /** - * @return array - */ - public function getArticles() + public function getArticles(): array { return $this->articles; } - /** - * @return array - */ - public function getProjects() + public function getProjects(): array { return $this->projects; } @@ -67,8 +45,8 @@ public function getProjects() public function jsonSerialize() { return [ - 'firstNews' => $this->firstNews ? $this->firstNews->jsonSerialize() : null, - 'secondNews' => $this->secondNews ? $this->secondNews->jsonSerialize() : null, + 'firstNews' => $this->firstNews instanceof News ? $this->firstNews->jsonSerialize() : null, + 'secondNews' => $this->secondNews instanceof News ? $this->secondNews->jsonSerialize() : null, 'articles' => array_map(fn (Article $article) => $article->jsonSerialize(), $this->articles), 'projects' => array_map(fn (Project $project) => $project->jsonSerialize(), $this->projects) ]; diff --git a/sources/AppBundle/TechLetter/Model/TechLetterFactory.php b/sources/AppBundle/TechLetter/Model/TechLetterFactory.php index c57704e9e..f7b7aa3a8 100644 --- a/sources/AppBundle/TechLetter/Model/TechLetterFactory.php +++ b/sources/AppBundle/TechLetter/Model/TechLetterFactory.php @@ -1,10 +1,12 @@ kernelRootDir . '/../htdocs/' . $url; return substr(md5_file($path), 0, 8); @@ -26,12 +28,12 @@ public function getFunctions() ]; } - public function getName() + public function getName(): string { return 'assets'; } - public function getGlobals() + public function getGlobals(): array { return []; } diff --git a/sources/AppBundle/Twig/OfficesExtension.php b/sources/AppBundle/Twig/OfficesExtension.php index 2fd9761eb..b3e14808f 100644 --- a/sources/AppBundle/Twig/OfficesExtension.php +++ b/sources/AppBundle/Twig/OfficesExtension.php @@ -1,5 +1,7 @@ twig = $twig; } - public function render(string $view, array $parameters = []): Response + + /** + * Renders a view. + * + * @param string $view The view name + * @param array $parameters An array of parameters to pass to the view + * @param Response|null $response A response instance + * + * @return Response A Response instance + */ + public function render(string $view, array $parameters = [], Response $response = null): Response { $blocks = []; if ($this->requestStack->getCurrentRequest()) { @@ -38,7 +50,10 @@ public function render(string $view, array $parameters = []): Response $content = $this->twig->render($view, $parameters + $blocks); - $response = new Response(); + if (!$response instanceof Response) { + $response = new Response(); + } + return $response->setContent($content); } } diff --git a/sources/AppBundle/Validator/Constraints/UniqueEntity.php b/sources/AppBundle/Validator/Constraints/UniqueEntity.php index 19718efb0..04673abb3 100644 --- a/sources/AppBundle/Validator/Constraints/UniqueEntity.php +++ b/sources/AppBundle/Validator/Constraints/UniqueEntity.php @@ -1,5 +1,7 @@ tweetGenerator = new TweetGenerator(); @@ -69,10 +44,8 @@ public function __construct(PlanningRepository $planningRepository, TalkReposito /** * @param Event|null $eventToFilter - * - * @return Tweet */ - public function execute(Event $eventToFilter = null) + public function execute(Event $eventToFilter = null): Tweet { $talkInfos = $this->getNextTalkInformations($eventToFilter); $tweet = $this->tweetGenerator->generate($talkInfos['talk'], $talkInfos['speakers']); @@ -89,7 +62,7 @@ private function getNextTalkInformations(Event $eventToFilter = null) { $all = $this->getAllTalkInformations($eventToFilter); $tweetsFromThisRound = $this->removeTweetsFromLastRound($all); - if (0 === count($tweetsFromThisRound)) { + if ([] === $tweetsFromThisRound) { throw new \LogicException("No talk found"); } return $this->getRandomTalkInformations($tweetsFromThisRound); @@ -97,10 +70,8 @@ private function getNextTalkInformations(Event $eventToFilter = null) /** * @param Event|null $eventToFilter - * - * @return array */ - protected function getAllTalkInformations(Event $eventToFilter = null) + protected function getAllTalkInformations(Event $eventToFilter = null): array { $plannings = $this->planningRepository->getAll(); $minimumEventDate = $this->getMinimumEventDate(); @@ -117,13 +88,13 @@ protected function getAllTalkInformations(Event $eventToFilter = null) continue; } - if (!($talk->getType() == Talk::TYPE_FULL_LONG || $talk->getType() == Talk::TYPE_FULL_SHORT)) { + if ($talk->getType() != Talk::TYPE_FULL_LONG && $talk->getType() != Talk::TYPE_FULL_SHORT) { continue; } $eventId = $planning->getEventId(); - if (null !== $eventToFilter && $eventToFilter->getId() != $eventId) { + if ($eventToFilter instanceof Event && $eventToFilter->getId() != $eventId) { continue; } @@ -145,10 +116,7 @@ protected function getAllTalkInformations(Event $eventToFilter = null) return $talkInformations; } - /** - * @return \DateTime - */ - protected function getMinimumEventDate() + protected function getMinimumEventDate(): \DateTime { $datetime = new \DateTime('now'); $datetime->modify('-2 years'); @@ -157,8 +125,6 @@ protected function getMinimumEventDate() } /** - * @param array $talksInformations - * * @return string */ protected function getRandomTalkInformations(array $talksInformations) @@ -166,12 +132,7 @@ protected function getRandomTalkInformations(array $talksInformations) return $talksInformations[array_rand($talksInformations)]; } - /** - * @param array $talksInformations - * - * @return array - */ - protected function removeTweetsFromLastRound(array $talksInformations) + protected function removeTweetsFromLastRound(array $talksInformations): array { $maxCount = 0; $minCount = PHP_INT_MAX; @@ -224,12 +185,10 @@ private function sendTweet($tweet) } /** - * @param Talk $talk * @param string $tweetId * - * @return Tweet */ - private function saveTweet(Talk $talk, $tweetId) + private function saveTweet(Talk $talk, $tweetId): Tweet { $tweet = new Tweet(); $tweet->setId($tweetId); diff --git a/sources/AppBundle/VideoNotifier/TweetGenerator.php b/sources/AppBundle/VideoNotifier/TweetGenerator.php index 9ac96b03a..462dfa5f7 100644 --- a/sources/AppBundle/VideoNotifier/TweetGenerator.php +++ b/sources/AppBundle/VideoNotifier/TweetGenerator.php @@ -1,7 +1,10 @@ feedUrl; } - public function setContent($content) + public function setContent($content): void { $this->content = $content; } diff --git a/sources/PlanetePHP/Feed.php b/sources/PlanetePHP/Feed.php index d1b03737e..16ffca7ec 100644 --- a/sources/PlanetePHP/Feed.php +++ b/sources/PlanetePHP/Feed.php @@ -1,5 +1,7 @@ connection = $connection; - $this->pertinenceRegex = '/'.self::PERTINENCE_LIST.'/i'; + $this->pertinenceRegex = '/' . self::PERTINENCE_LIST . '/i'; } public function count(): int @@ -47,7 +48,7 @@ public function countRelevant(): int * * @return FeedArticle[] */ - public function search($sort, $direction, $limit = 20) + public function search($sort, $direction, $limit = 20): array { $sorts = [ 'title' => 'b.titre', @@ -114,16 +115,16 @@ public function truncateContent($content, $url, $characters = 3000) * * @return DisplayableFeedArticle[] */ - public function findLatestTruncated($page = 0, $format = DATE_ATOM) + public function findLatestTruncated($page = 0, $format = DATE_ATOM): array { - return array_map(function (DisplayableFeedArticle $article) { + return array_map(function (DisplayableFeedArticle $article): DisplayableFeedArticle { $article->setContent($this->truncateContent($article->getContent(), $article->getUrl())); return $article; }, $this->findLatest($page, $format)); } - public function findLatest($page = 0, $format = DATE_ATOM, $nombre = 10) + public function findLatest($page = 0, $format = DATE_ATOM, $nombre = 10): array { $query = $this->connection->prepare('SELECT b.titre, b.url, b.maj, b.auteur, b.contenu, f.nom feed_name, f.url feed_url FROM afup_planete_billet b @@ -140,7 +141,7 @@ public function findLatest($page = 0, $format = DATE_ATOM, $nombre = 10) return $this->hydrateDisplayable($query->fetchAll(), $format); } - public function isRelevant($content) + public function isRelevant($content): int { $content = strip_tags($content); $relevant = self::IRRELEVANT; @@ -204,9 +205,9 @@ private function insert(FeedArticle $billet) ]); } - private function hydrate(array $rows) + private function hydrate(array $rows): array { - return array_map(static fn(array $row) => new FeedArticle( + return array_map(static fn (array $row): FeedArticle => new FeedArticle( $row['id'], $row['afup_planete_flux_id'], $row['clef'], @@ -220,12 +221,12 @@ private function hydrate(array $rows) ), $rows); } - private function hydrateDisplayable(array $rows, $format = DATE_ATOM) + private function hydrateDisplayable(array $rows, $format = DATE_ATOM): array { - return array_map(static fn(array $row) => new DisplayableFeedArticle( + return array_map(static fn (array $row): DisplayableFeedArticle => new DisplayableFeedArticle( $row['titre'], $row['url'], - date($format, $row['maj']), + date($format, (int) $row['maj']), $row['auteur'], $row['contenu'], $row['feed_name'], diff --git a/sources/PlanetePHP/FeedCrawler.php b/sources/PlanetePHP/FeedCrawler.php index b7af89231..427f97936 100644 --- a/sources/PlanetePHP/FeedCrawler.php +++ b/sources/PlanetePHP/FeedCrawler.php @@ -1,5 +1,7 @@ feedRepository = $feedRepository; $this->feedArticleRepository = $feedArticleRepository; - define('MAGPIE_CACHE_DIR', __DIR__.'/../../var/cache/prod/planete'); + define('MAGPIE_CACHE_DIR', __DIR__ . '/../../var/cache/prod/planete'); define('MAGPIE_OUTPUT_ENCODING', 'UTF-8'); - require_once __DIR__.'/../../dependencies/magpierss/rss_fetch.inc'; + require_once __DIR__ . '/../../dependencies/magpierss/rss_fetch.inc'; } - public function crawl() + public function crawl(): void { $startMicrotime = microtime(true); $billets = $success = 0; $feeds = $this->feedRepository->findActive(); foreach ($feeds as $feed) { - echo $feed->getFeed().' : début...
', PHP_EOL; + echo $feed->getFeed() . ' : début...
', PHP_EOL; $rss = fetch_rss($feed->getFeed()); $rss->items = array_reverse($rss->items); foreach ($rss->items as $item) { @@ -62,7 +62,7 @@ public function crawl() $item['timestamp'] = strtotime($item['updated']); if ($item['timestamp'] > time() - 7 * 24 * 3600) { echo sprintf(' - contenu récent : "%s"', $item['title']), PHP_EOL; - $contenu = $item['title']." ".$item['atom_content']; + $contenu = $item['title'] . " " . $item['atom_content']; $item['etat'] = $this->feedArticleRepository->isRelevant($contenu); $success += $this->feedArticleRepository->save(new FeedArticle( null, @@ -86,4 +86,3 @@ public function crawl() $this->log(sprintf('Exploration de %s flux -- %d erreur(s) -- en %ss', count($feeds), $errors, $duration)); } } - diff --git a/sources/PlanetePHP/FeedRepository.php b/sources/PlanetePHP/FeedRepository.php index c36e7a813..91b52983b 100644 --- a/sources/PlanetePHP/FeedRepository.php +++ b/sources/PlanetePHP/FeedRepository.php @@ -1,5 +1,7 @@ connection->prepare('SELECT id, nom, url, feed, etat, id_personne_physique FROM afup_planete_flux f WHERE f.etat = :status ORDER BY f.nom'); @@ -35,7 +36,7 @@ public function findActive() * * @return Feed[] */ - public function find($sort = 'name', $direction = 'asc', $filter = null) + public function find($sort = 'name', $direction = 'asc', $filter = null): array { $sorts = [ 'name' => 'f.nom', @@ -49,13 +50,13 @@ public function find($sort = 'name', $direction = 'asc', $filter = null) ->orderBy($sorts[$sort], $direction); if (null !== $filter) { $qb->where('nom LIKE :filter') - ->setParameter('filter', '%'.$filter.'%'); + ->setParameter('filter', '%' . $filter . '%'); } return $this->hydrateAll($qb->execute()->fetchAll()); } - public function get($id) + public function get($id): Feed { $query = $this->connection->prepare('SELECT id, nom, url, feed, etat, id_personne_physique FROM afup_planete_flux f WHERE f.id = :id'); @@ -109,12 +110,12 @@ public function getListByLatest() )->fetchAll(); } - private function hydrateAll(array $rows) + private function hydrateAll(array $rows): array { - return array_map(fn(array $row) => $this->hydrate($row), $rows); + return array_map(fn (array $row): Feed => $this->hydrate($row), $rows); } - private function hydrate(array $row) + private function hydrate(array $row): Feed { return new Feed( $row['id'], diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php index 1aa4561fb..57237e586 100644 --- a/tests/behat/bootstrap/FeatureContext.php +++ b/tests/behat/bootstrap/FeatureContext.php @@ -1,5 +1,7 @@ minkContext->visitPath('/admin/login'); $this->minkContext->fillField('utilisateur', $username); @@ -292,9 +294,9 @@ public function clearEmails(): void curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); - $result = curl_exec($ch); - if (curl_errno($ch)) { - throw new \RuntimeException(sprintf('Error : ' . curl_error($ch))); + curl_exec($ch); + if (curl_errno($ch) !== 0) { + throw new \RuntimeException('Error : ' . curl_error($ch)); } curl_close($ch); @@ -513,7 +515,7 @@ public function iRequestAPasswordReset(string $arg1): void */ public function iShouldReceiveAnEmail(): void { - $content = file_get_contents(self::MAILCATCHER_URL.'/messages'); + $content = file_get_contents(self::MAILCATCHER_URL . '/messages'); $decodedContent = json_decode($content, true); $foundEmails = []; @@ -539,7 +541,7 @@ public function iShouldReceiveAnEmail(): void */ public function theEmailShouldContainAFullUrlStartingWith(string $arg1): void { - $content = file_get_contents(self::MAILCATCHER_URL.'/messages'); + $content = file_get_contents(self::MAILCATCHER_URL . '/messages'); $decodedContent = json_decode($content, true); $foundEmails = []; @@ -559,8 +561,8 @@ public function theEmailShouldContainAFullUrlStartingWith(string $arg1): void ) ); } - - $content = file_get_contents(self::MAILCATCHER_URL.'/messages/'.$foundEmails[0]['id'].'.plain'); + + $content = file_get_contents(self::MAILCATCHER_URL . '/messages/' . $foundEmails[0]['id'] . '.plain'); if (false === strpos($content, $arg1)) { throw new ExpectationException( sprintf( diff --git a/tests/units/Afup/Association/Cotisations.php b/tests/units/Afup/Association/Cotisations.php index c343e6d5c..17621820b 100644 --- a/tests/units/Afup/Association/Cotisations.php +++ b/tests/units/Afup/Association/Cotisations.php @@ -1,7 +1,8 @@ newMockInstance(Base_De_Donnees::class, null, null, [ 'hostname', @@ -75,7 +76,7 @@ protected function accountCmdProvider() /** * @dataProvider accountCmdProvider */ - public function testGetAccountFromCmd($case, $cmd, $expected) + public function testGetAccountFromCmd($case, $cmd, $expected): void { $bdd = $this->newMockInstance(Base_De_Donnees::class, null, null, [ 'hostname', diff --git a/tests/units/Afup/Utils/Utils.php b/tests/units/Afup/Utils/Utils.php index 68bb040cf..4b9e374bf 100644 --- a/tests/units/Afup/Utils/Utils.php +++ b/tests/units/Afup/Utils/Utils.php @@ -1,5 +1,7 @@ string(UtilsToTest::cryptFromText($decrypted)) @@ -45,10 +47,10 @@ public function testCryptFromText($decrypted, $encrypted) /** * @dataProvider dataProvider */ - public function testDecryptFromText($decrypted, $encrypted) + public function testDecryptFromText($decrypted, $encrypted): void { $this ->string(UtilsToTest::decryptFromText($encrypted)) ->isEqualTo($decrypted); } -} \ No newline at end of file +} diff --git a/tests/units/AppBundle/Association/MembershipFeeReferenceGenerator.php b/tests/units/AppBundle/Association/MembershipFeeReferenceGenerator.php index 756f2f0e0..1dc454e51 100644 --- a/tests/units/AppBundle/Association/MembershipFeeReferenceGenerator.php +++ b/tests/units/AppBundle/Association/MembershipFeeReferenceGenerator.php @@ -1,5 +1,7 @@ assert($case) diff --git a/tests/units/AppBundle/Compta/Importer/AutoQualifier.php b/tests/units/AppBundle/Compta/Importer/AutoQualifier.php index b712f2af1..0d4c3e6c6 100644 --- a/tests/units/AppBundle/Compta/Importer/AutoQualifier.php +++ b/tests/units/AppBundle/Compta/Importer/AutoQualifier.php @@ -1,17 +1,18 @@ fakeBD()); @@ -102,10 +103,10 @@ public function testQualifier($operationDescription, $operationType, if ($expectedHTKey) { $this->float($actual[$expectedHTKey])->isEqualTo($expectedHT); } - } - private function fakeBD():array { + private function fakeBD():array + { return [ [ 'id' => 1, diff --git a/tests/units/AppBundle/Compta/Importer/CreditMutuel.php b/tests/units/AppBundle/Compta/Importer/CreditMutuel.php index 9e2a2161a..6041761f2 100644 --- a/tests/units/AppBundle/Compta/Importer/CreditMutuel.php +++ b/tests/units/AppBundle/Compta/Importer/CreditMutuel.php @@ -1,5 +1,7 @@ initialize(__DIR__ . '/_data/cmut.csv'); @@ -20,7 +21,7 @@ public function testValidate() $this->boolean($importerCE->validate())->isFalse(); } - public function testExtract() + public function testExtract(): void { $importer = new TestedClass(); $importer->initialize(__DIR__ . '/_data/cmut.csv'); diff --git a/tests/units/AppBundle/Event/Model/Speaker.php b/tests/units/AppBundle/Event/Model/Speaker.php index c0eedae11..366fb515d 100644 --- a/tests/units/AppBundle/Event/Model/Speaker.php +++ b/tests/units/AppBundle/Event/Model/Speaker.php @@ -1,12 +1,14 @@ given($speaker = new TestedClass()) ->when($speaker->setMastodon($expected[0])) @@ -29,7 +31,7 @@ public function testMastodon() } - public function testTwitter() + public function testTwitter(): void { $data = [ ['', '', ''], @@ -38,7 +40,7 @@ public function testTwitter() ['http://twitter.com/username', 'username', 'https://x.com/username'], ]; - foreach($data as $expected) { + foreach ($data as $expected) { $this ->given($speaker = new TestedClass()) ->when($speaker->setTwitter($expected[0])) diff --git a/tests/units/AppBundle/Event/Model/Talk/Talk.php b/tests/units/AppBundle/Event/Model/Talk/Talk.php index 2793930c4..973070e8a 100644 --- a/tests/units/AppBundle/Event/Model/Talk/Talk.php +++ b/tests/units/AppBundle/Event/Model/Talk/Talk.php @@ -1,12 +1,14 @@ given($talk = new TestedClass()) @@ -19,7 +21,7 @@ public function testYoutubeUrl() ; } - public function testSlug() + public function testSlug(): void { $this ->given($talk = new TestedClass()) @@ -32,5 +34,4 @@ public function testSlug() ->isEqualTo('utiliser-postgresql-en-2014') ; } - } diff --git a/tests/units/AppBundle/Indexation/Meetups/MeetupDateTimeConverter.php b/tests/units/AppBundle/Indexation/Meetups/MeetupDateTimeConverter.php index 7b48bcf39..33e084be9 100644 --- a/tests/units/AppBundle/Indexation/Meetups/MeetupDateTimeConverter.php +++ b/tests/units/AppBundle/Indexation/Meetups/MeetupDateTimeConverter.php @@ -1,5 +1,7 @@ given($meetupDateTimeConverter = new TestedClass()) - ->exception(function () use ($meetupDateTimeConverter, $invalidDateString) { + ->exception(function () use ($meetupDateTimeConverter, $invalidDateString): void { $meetupDateTimeConverter->convertStringToDateTime($invalidDateString); }) ->isInstanceOf(\Exception::class); // Remplacez par le type de l'exception personnalisée si nécessaire @@ -97,4 +96,4 @@ public function invalidDateStringProvider() ['ven. 18 dece. 2023, 15:45 UTC',], ]; } -} \ No newline at end of file +} diff --git a/tests/units/AppBundle/Indexation/Meetups/MeetupScrapper.php b/tests/units/AppBundle/Indexation/Meetups/MeetupScrapper.php index 8e8c87cdc..9e99c5f0c 100644 --- a/tests/units/AppBundle/Indexation/Meetups/MeetupScrapper.php +++ b/tests/units/AppBundle/Indexation/Meetups/MeetupScrapper.php @@ -1,5 +1,7 @@ exception(function () use ($meetupScraper, $antenneUrl) { + ->exception(function () use ($meetupScraper, $antenneUrl): void { $meetupScraper->getDomContent($antenneUrl); }) ->isInstanceOf(\Exception::class) @@ -32,7 +34,7 @@ public function testGetDomContentWithInvalidMeetupUrl($antenneUrl) * * @dataProvider validMeetupUrlProvider */ - public function testGetDomContentWithValidMeetupUrl($antenneUrl) + public function testGetDomContentWithValidMeetupUrl($antenneUrl): void { $meetupScraper = new TestedClass(); $xpath = $meetupScraper->getDomContent($antenneUrl); @@ -45,7 +47,7 @@ public function testGetDomContentWithValidMeetupUrl($antenneUrl) /** * @throws \Exception */ - public function testGetMeetupEvents() + public function testGetMeetupEvents(): void { $meetupScraper = new TestedClass(); $events = $meetupScraper->getEvents(); @@ -56,7 +58,7 @@ public function testGetMeetupEvents() ->integer($eventLength) ->isGreaterThan(0); - foreach ($events as $antenneEvents){ + foreach ($events as $antenneEvents) { foreach ($antenneEvents as $event) { $title = $event->getTitle(); $date = $event->getDate(); @@ -70,7 +72,7 @@ public function testGetMeetupEvents() /** * @throws \Exception */ - public function testGetAntennesFromOfficesCollection() + public function testGetAntennesFromOfficesCollection(): void { $meetupScraper = new TestedClass(); $antennes = $meetupScraper->getAntennesFromOfficesCollection(); @@ -80,7 +82,7 @@ public function testGetAntennesFromOfficesCollection() ->isNotEmpty(); } - public function testGetArrayValueByKey() + public function testGetArrayValueByKey(): void { $meetupScraper = new TestedClass(); $array = ['key' => 'value']; diff --git a/tests/units/AppBundle/Indexation/Meetups/Transformer.php b/tests/units/AppBundle/Indexation/Meetups/Transformer.php index 8b23bd75f..47ce11c14 100644 --- a/tests/units/AppBundle/Indexation/Meetups/Transformer.php +++ b/tests/units/AppBundle/Indexation/Meetups/Transformer.php @@ -1,15 +1,16 @@ given( @@ -30,7 +31,7 @@ public function testTransform() ->when($transformer = new TestedClass(new OfficesCollection())) ->then ->array($transformer->transform($meetup)) - ->isEqualTo( [ + ->isEqualTo([ 'meetup_id' => '244992881', 'label' => 'Apéro PHP', 'event_url' => 'https://www.meetup.com/fr-FR/afup-reims-php/events/244992881', diff --git a/tests/units/AppBundle/Indexation/Talks/Transformer.php b/tests/units/AppBundle/Indexation/Talks/Transformer.php index a31bec0f5..4e4190a16 100644 --- a/tests/units/AppBundle/Indexation/Talks/Transformer.php +++ b/tests/units/AppBundle/Indexation/Talks/Transformer.php @@ -1,5 +1,7 @@ given( @@ -113,7 +115,7 @@ public function testTransform() ; } - public function testTransformEmpty() + public function testTransformEmpty(): void { $this ->given($talk = new Talk()) diff --git a/tests/units/AppBundle/Payment/Paybox.php b/tests/units/AppBundle/Payment/Paybox.php index e8f695bbf..da2848629 100644 --- a/tests/units/AppBundle/Payment/Paybox.php +++ b/tests/units/AppBundle/Payment/Paybox.php @@ -1,5 +1,7 @@ assert($case) @@ -115,7 +117,7 @@ protected function generateDateProvider() 'rang' => $testRang, 'identifiant' => $testIdentifiant, 'current_date' => new \DateTimeImmutable('2018-03-02 20:20:19'), - 'callback' => function(TestedClass $paybox) { + 'callback' => function (TestedClass $paybox): void { $paybox->setTotal(2500); $paybox->setCmd('TEST Paybox'); $paybox->setPorteur('test@paybox.com'); @@ -131,7 +133,7 @@ protected function generateDateProvider() 'rang' => $testRang, 'identifiant' => $testIdentifiant, 'current_date' => new \DateTimeImmutable('2018-03-02 20:20:19'), - 'callback' => function(TestedClass $paybox) { + 'callback' => function (TestedClass $paybox): void { $paybox->setTotal(2500); $paybox->setCmd('TEST Paybox'); $paybox->setPorteur('test@paybox.com'); @@ -147,7 +149,7 @@ protected function generateDateProvider() 'rang' => $testRang, 'identifiant' => $testIdentifiant, 'current_date' => new \DateTimeImmutable('2018-03-02 20:20:19'), - 'callback' => function(TestedClass $paybox) { + 'callback' => function (TestedClass $paybox): void { $paybox->setTotal(2500); $paybox->setCmd('TEST Paybox'); $paybox->setPorteur('test@paybox.com'); diff --git a/tests/units/AppBundle/Subtitles/Parser.php b/tests/units/AppBundle/Subtitles/Parser.php index 783c85c09..9df3449e5 100644 --- a/tests/units/AppBundle/Subtitles/Parser.php +++ b/tests/units/AppBundle/Subtitles/Parser.php @@ -1,5 +1,7 @@ assert($case) diff --git a/tests/units/AppBundle/VideoNotifier/TweetGenerator.php b/tests/units/AppBundle/VideoNotifier/TweetGenerator.php index 23cdfd234..b868989e4 100644 --- a/tests/units/AppBundle/VideoNotifier/TweetGenerator.php +++ b/tests/units/AppBundle/VideoNotifier/TweetGenerator.php @@ -1,5 +1,7 @@ given(
- ';
}
- function content()
+ public function content()
{
return $this->content;
}
- function social() {
+ public function social(): string
+ {
return
'