Merge remote-tracking branch 'upstream/master'

stakovicz · Dec 6, 2024 · cd132b2 · cd132b2
2 parents 0376f0a + 0d08d61
commit cd132b2
Show file tree

Hide file tree

Showing 27 changed files with 117 additions and 77 deletions.
diff --git a/app/Resources/views/site/offices.html.twig b/app/Resources/views/site/offices.html.twig
@@ -18,6 +18,10 @@
             text-decoration: none;
         }
 
+        .map-container img {
+            max-width: 100%;
+        }
+
         .city-link {
             line-height: 1.909em;
             font-size: 1.46em;
@@ -295,16 +299,8 @@
     <p>Une quinzaine d'antennes locales, représentantes de l'AFUP en région, organise rencontres, meetups et apéros PHP
         tout au long de l'année, tisse des liens au sein de la communauté  de développeuses et de développeurs et fait la promotion du PHP dans les entreprises partout en France.</p>
 
-    <div class="container">
-        <div class="col-md-8">
-            <div class="map-container">
-                <div class="map">Carte de France des antennes de l'AFUP.</div>
-            </div>
-        </div>
-        <div class="col-md-4 tablet-hidden">
-            <a class="twitter-timeline" data-lang="fr" data-chrome="noheader,nofooter,noborders" data-height="800" data-dnt="true" data-theme="light" href="https://twitter.com/afup/lists/antennes-afup">A Twitter List by afup</a>
-            <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-        </div>
+    <div class="map-container">
+        <div class="map">Carte de France des antennes de l'AFUP.</div>
     </div>
 
     <h2>Concrètement que se passe-t-il près de chez moi ?</h2>

diff --git a/compose.yml b/compose.yml
@@ -1,5 +1,3 @@
-version: "2.2"
-
 services:
   db:
     build: ./docker/dockerfiles/mysql
@@ -21,7 +19,7 @@ services:
     volumes:
       - ./data/mysqltest:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
       timeout: 20s
       retries: 10
 
@@ -58,7 +56,7 @@ services:
     links:
       - statictestresources
     healthcheck:
-      test: ["CMD", "curl", "-f", "https://apachephptest:80"]
+      test: [ "CMD", "curl", "-f", "https://apachephptest:80" ]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -76,8 +74,8 @@ services:
       .env
     user: localUser
     volumes:
-        - ./data/composer:/home/localUser/.composer
-        - ./:/var/www/html
+      - ./data/composer:/home/localUser/.composer
+      - ./:/var/www/html
     links:
       - db
       - apachephp

diff --git a/db/migrations/20180526091813_init.sql b/db/migrations/20180526091813_init.sql
@@ -394,8 +394,8 @@ CREATE TABLE `afup_forum` (
   `trello_list_id` varchar(100) CHARACTER SET utf8 DEFAULT NULL,
   `logo_url` varchar(100) CHARACTER SET utf8 DEFAULT NULL,
   `nb_places` int(11) unsigned NOT NULL DEFAULT '0',
-  `date_debut` date NOT NULL DEFAULT '0000-00-00',
-  `date_fin` date NOT NULL DEFAULT '0000-00-00',
+  `date_debut` date NULL,
+  `date_fin` date NULL,
   `annee` int(11) DEFAULT NULL,
   `text` text,
   `date_fin_appel_projet` int(11) DEFAULT NULL,
@@ -935,7 +935,7 @@ DROP TABLE IF EXISTS `afup_sessions`;
 CREATE TABLE `afup_sessions` (
   `session_id` int(11) NOT NULL AUTO_INCREMENT,
   `id_forum` smallint(6) NOT NULL DEFAULT '0',
-  `date_soumission` date NOT NULL DEFAULT '0000-00-00',
+  `date_soumission` date NOT NULL,
   `titre` varchar(255) NOT NULL DEFAULT '',
   `abstract` text NOT NULL,
   `staff_notes` text,
@@ -985,7 +985,7 @@ CREATE TABLE `afup_sessions_note` (
   `session_id` int(11) NOT NULL DEFAULT '0',
   `note` tinyint(4) NOT NULL DEFAULT '0',
   `salt` char(32) NOT NULL DEFAULT '',
-  `date_soumission` date NOT NULL DEFAULT '0000-00-00',
+  `date_soumission` date NOT NULL,
   PRIMARY KEY (`note`,`session_id`,`salt`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1441,7 +1441,7 @@ CREATE TABLE `compta` (
   `attachment_filename` varchar(255) DEFAULT NULL,
   `numero` varchar(50) NOT NULL,
   `idmode_regl` tinyint(5) NOT NULL,
-  `date_regl` date NOT NULL,
+  `date_regl` date NULL,
   `obs_regl` varchar(255) NOT NULL,
   `idevenement` tinyint(5) NOT NULL,
   `idcompte` tinyint(2) NOT NULL DEFAULT '1',

diff --git a/db/migrations/20241202162110_mariadb_to_mysql.php b/db/migrations/20241202162110_mariadb_to_mysql.php
@@ -0,0 +1,22 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class MariaDBToMysql extends AbstractMigration
+{
+    public function change()
+    {
+        $this->execute("ALTER TABLE afup_sessions ALTER COLUMN skill SET DEFAULT 0");
+        $this->execute("ALTER TABLE afup_forum MODIFY date_debut date NULL");
+        $this->execute("ALTER TABLE afup_forum MODIFY date_fin date NULL");
+        $this->execute("ALTER TABLE afup_sessions ALTER COLUMN has_allowed_to_sharing_with_local_offices SET DEFAULT 0");
+        $this->execute("ALTER TABLE compta MODIFY idevenement TINYINT(5) NULL");
+        $this->execute("ALTER TABLE compta MODIFY date_regl date NULL");
+        $this->execute("ALTER TABLE compta_categorie MODIFY idevenement TINYINT(5) NULL");
+        $this->execute("ALTER TABLE afup_compta_facture MODIFY date_facture DATE NULL");
+        $this->execute("ALTER TABLE afup_compta_facture MODIFY numero_facture VARCHAR(50) NULL");
+        $this->execute("ALTER TABLE compta MODIFY idclef VARCHAR(20) NULL");
+        $this->execute("ALTER TABLE afup_inscription_forum MODIFY transport_mode SMALLINT NULL");
+    }
+}
+
diff --git a/db/seeds/Compta.php b/db/seeds/Compta.php
@@ -69,7 +69,7 @@ public function run()
                 'idoperation' => 0,
                 'idcategorie' => 0,
                 'idmode_regl' => 0,
-                'date_regl' => '0000-00-00',
+                'date_regl' => null,
                 'idevenement' => 0,
             ],
             [
@@ -89,7 +89,7 @@ public function run()
                 'idoperation' => 0,
                 'idcategorie' => 0,
                 'idmode_regl' => 0,
-                'date_regl' => '0000-00-00',
+                'date_regl' => null,
                 'idevenement' => 0,
             ],
         ];

diff --git a/db/seeds/Event.php b/db/seeds/Event.php
@@ -40,7 +40,7 @@ public function run()
                 'date_fin_saisie_nuites_hotel' => $event - $oneDayInSeconds * 7,
                 'place_name' => 'Paris',
                 'place_address' => 'Marriott Rive Gauche',
-                'date_annonce_planning' => date('Y-m-d H:i:s', $now - $oneMonthInSeconds),
+                'date_annonce_planning' => $now - $oneMonthInSeconds,
                 'transport_information_enabled' => 1,
                 'has_prices_defined_with_vat' => 1,
             ],
@@ -70,7 +70,7 @@ public function run()
                 'date_fin_saisie_nuites_hotel' => $event - $oneDayInSeconds * 7,
                 'place_name' => 'Paris',
                 'place_address' => 'Marriott Rive Gauche',
-                'date_annonce_planning' => date('Y-m-d H:i:s', $now - $oneMonthInSeconds),
+                'date_annonce_planning' => $now - $oneMonthInSeconds,
                 'transport_information_enabled' => 1,
                 'has_prices_defined_with_vat' => 1,
             ],

diff --git a/docker/dockerfiles/mysql/Dockerfile b/docker/dockerfiles/mysql/Dockerfile
@@ -1,4 +1,4 @@
-FROM mariadb:10.0.29
+FROM mysql:5.7
 
 COPY my.cnf /etc/mysql/my.cnf
 COPY mysql /opt/mysql

diff --git a/docker/dockerfiles/mysql/my.cnf b/docker/dockerfiles/mysql/my.cnf
@@ -2,3 +2,4 @@
 skip-host-cache
 skip-name-resolve
 innodb_file_per_table=1
+sql-mode="STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"
diff --git a/docker/dockerfiles/mysqltest/Dockerfile b/docker/dockerfiles/mysqltest/Dockerfile
@@ -1,4 +1,4 @@
-FROM mariadb:10.0.29
+FROM mysql:5.7
 
 COPY my.cnf /etc/mysql/my.cnf
 COPY mysql /opt/mysql

diff --git a/docker/dockerfiles/mysqltest/my.cnf b/docker/dockerfiles/mysqltest/my.cnf
@@ -2,3 +2,4 @@
 skip-host-cache
 skip-name-resolve
 innodb_file_per_table=1
+sql-mode="STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"
diff --git a/htdocs/pages/administration/compta_devis.php b/htdocs/pages/administration/compta_devis.php
@@ -239,9 +239,9 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
                 $ok = $comptaFact->ajouter_details(
                                     $valeur['ref'.$i],
                                     $valeur['designation'.$i],
-                                    $valeur['quantite'.$i],
-                                    $valeur['pu'.$i],
-                                    $valeur['tva'.$i]
+                                    (int)$valeur['quantite'.$i],
+                                    (float)$valeur['pu'.$i],
+                                    (int)$valeur['tva'.$i]
                                     );
             }
         } else {
@@ -264,7 +264,7 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
                                     $valeur['ref_clt2'],
                                     $valeur['ref_clt3'],
                                     $valeur['numero_devis'],
-                  $valeur['numero_facture'],
+                  $valeur['numero_facture'] ?? null,
                   0,
                   null,
                                     $valeur['devise_facture']
@@ -275,9 +275,9 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
                                     $valeur['id'.$i],
                                     $valeur['ref'.$i],
                                     $valeur['designation'.$i],
-                                    $valeur['quantite'.$i],
-                                    $valeur['pu'.$i],
-                                    $valeur['tva'.$i]
+                                    (int)$valeur['quantite'.$i],
+                                    (float)$valeur['pu'.$i],
+                                    (int)$valeur['tva'.$i]
                                     );
             }
 

diff --git a/htdocs/pages/administration/compta_facture.php b/htdocs/pages/administration/compta_facture.php
@@ -247,9 +247,9 @@
 					$valeur['id'.$i],
 					$valeur['ref'.$i],
 					$valeur['designation'.$i],
-					$valeur['quantite'.$i],
-					$valeur['pu'.$i],
-					$valeur['tva'.$i]
+					(int)$valeur['quantite'.$i],
+					(float)$valeur['pu'.$i],
+					(int)$valeur['tva'.$i]
 				);
    			}
 

diff --git a/htdocs/pages/administration/forum_inscriptions.php b/htdocs/pages/administration/forum_inscriptions.php
@@ -399,8 +399,8 @@ function updateGlobalsForTarif(
                                                            $valeurs['commentaires'],
         												   $valeurs['etat'],
                                                            $valeurs['facturation'],
-                                                           $valeurs['transport_mode'],
-                                                           $valeurs['transport_distance']);
+                                                           (int)$valeurs['transport_mode'],
+                                                           (int)$valeurs['transport_distance']);
 
             /** @var \AppBundle\Event\Model\Ticket $ticket */
             $ticket = $ticketRepository->get($_GET['id']);

diff --git a/htdocs/pages/administration/forum_sessions.php b/htdocs/pages/administration/forum_sessions.php
@@ -241,10 +241,10 @@
                 $valeurs['date_soumission']['Y'].'-'.$valeurs['date_soumission']['M'].'-'.$valeurs['date_soumission']['d'],
                 $valeurs['titre'],
                 $valeurs['abstract'],
-                $valeurs['genre'],
-                $valeurs['plannifie'],
-                isset($valeurs['needs_mentoring']) ? $valeurs['needs_mentoring'] : 0,
-                $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;
@@ -255,17 +255,17 @@
                                                 $valeurs['date_soumission']['Y'].'-'.$valeurs['date_soumission']['M'].'-'.$valeurs['date_soumission']['d'],
 			                                    $valeurs['titre'],
 			                                    $valeurs['abstract'],
-			                                    $valeurs['genre'],
-			                                    $valeurs['plannifie'],
+                                                (int)$valeurs['genre'],
+                                                (int)$valeurs['plannifie'],
                                                 $valeurs['joindin'],
                                                 $valeurs['youtube_id'],
                                                 $valeurs['slides_url'],
                                                 $valeurs['openfeedback_path'],
                                                 $valeurs['blog_post_url'],
                                                 $valeurs['interview_url'],
                                                 $valeurs['language_code'],
-                                                $valeurs['skill'],
-                                                $valeurs['needs_mentoring'],
+                                                (int)$valeurs['skill'],
+                                                (int)$valeurs['needs_mentoring'],
                                                 $valeurs['use_markdown'],
                                                 $valeurs['video_has_fr_subtitles'],
                                                 $valeurs['video_has_en_subtitles'],

diff --git a/sources/Afup/Comptabilite/Facture.php b/sources/Afup/Comptabilite/Facture.php
@@ -180,7 +180,7 @@ function ajouter($date_devis, $societe, $service, $adresse, $code_postal, $ville
         return $this->_bdd->executer($requete);
     }
 
-    function ajouter_details($ref, $designation, $quantite, $pu, $tva = 0)
+    function ajouter_details($ref, $designation, int $quantite, float $pu, int $tva = 0)
     {
         $requete = 'INSERT INTO ';
         $requete .= 'afup_compta_facture_details (';
@@ -237,7 +237,7 @@ function modifier($id, $date_devis, $societe, $service, $adresse, $code_postal,
         return $this->_bdd->executer($requete);
     }
 
-    function modifier_details($id, $ref, $designation, $quantite, $pu, $tva = 0)
+    function modifier_details($id, $ref, $designation, int $quantite, float $pu, int $tva = 0)
     {
         $requete = 'UPDATE ';
         $requete .= 'afup_compta_facture_details ';

diff --git a/sources/Afup/Corporate/Feuille.php b/sources/Afup/Corporate/Feuille.php
@@ -45,7 +45,7 @@ function inserer()
         }
         $requete = 'INSERT INTO afup_site_feuille
         			SET
-        			id_parent = ' . $this->bdd->echapper($this->id_parent) . ',
+        			id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ',
         			nom       = ' . $this->bdd->echapper($this->nom) . ',
         			lien      = ' . $this->bdd->echapper($this->lien) . ',
         			alt       = ' . $this->bdd->echapper($this->alt) . ',
@@ -66,7 +66,7 @@ function modifier()
     {
         $requete = 'UPDATE afup_site_feuille
         			SET
-        			id_parent = ' . $this->bdd->echapper($this->id_parent) . ',
+        			id_parent = ' . $this->bdd->echapper(!$this->id_parent ? null : $this->id_parent) . ',
         			nom       = ' . $this->bdd->echapper($this->nom) . ',
         			lien      = ' . $this->bdd->echapper($this->lien) . ',
         			alt       = ' . $this->bdd->echapper($this->alt) . ',

diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php
@@ -404,17 +404,17 @@ public function modifierSession(
         $date_soumission,
         $titre,
         $abstract,
-        $genre,
-        $plannifie,
+        int $genre,
+        int $plannifie,
         $joindin = null,
         $youtubeId = null,
         $slidesUrl = null,
         $openfeedbackPath = null,
         $blogPostUrl = null,
         $interviewUrl = null,
         $languageCode = null,
-        $skill = null,
-        $needs_mentoring = null,
+        int $skill = null,
+        int $needs_mentoring = null,
         $use_markdown = null,
         $video_has_fr_subtitles = null,
         $video_has_en_subtitles = null,
@@ -499,10 +499,10 @@ public function ajouterSession(
         $date_soumission,
         $titre,
         $abstract,
-        $genre,
-        $plannifie = 0,
-        $needs_mentoring = 0,
-        $level = Talk::SKILL_NA,
+        int $genre,
+        int $plannifie = 0,
+        int $needs_mentoring = 0,
+        int $level = Talk::SKILL_NA,
         $useMarkdown = false
     ) {
 
@@ -541,6 +541,9 @@ function delierSession($session_id)
 
     public function lierConferencierSession($conferencier_id, $session_id)
     {
+        if (!$conferencier_id) {
+            return true;
+        }
         $donnees = array(
             $this->_bdd->echapper($conferencier_id),
             $this->_bdd->echapper($session_id),

diff --git a/sources/Afup/Forum/Inscriptions.php b/sources/Afup/Forum/Inscriptions.php
@@ -263,7 +263,7 @@ function obtenirListe($id_forum = null,
     function modifierInscription($id, $reference, $type_inscription, $civilite, $nom, $prenom,
                                  $email, $telephone, $coupon, $citer_societe, $newsletter_afup,
                                  $newsletter_nexen, $mail_partenaire, $commentaires, $etat, $facturation,
-                                 $transportMode, $transportDistance)
+                                 int $transportMode, int $transportDistance)
     {
         $requete = 'UPDATE ';
         $requete .= '  afup_inscription_forum ';

diff --git a/sources/Afup/Utils/Base_De_Donnees.php b/sources/Afup/Utils/Base_De_Donnees.php
@@ -234,6 +234,10 @@ public function getLastErrorMessage()
     function executer($requete)
     {
         $result = mysqli_query($this->getDbLink(), $requete);
+        if (!$result) {
+            throw new \RuntimeException(mysqli_error($this->getDbLink()));
+        }
+
         return $result;
     }