Fixes, run CS on PHP 7.4

diff --git a/.travis.yml b/.travis.yml
index cd3d5505adc4af71a963d45098d7ed94db00bba1..65418650d414d00b60c914af93373a88005c6d1e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ before_script:
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -d galette_tests -a -f galette/install/scripts/pgsql.sql -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS galette_tests;'; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'use galette_tests; source galette/install/scripts/mysql.sql;'; fi"
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.3" && $DB == "mysql" ]]; then cd galette && composer require squizlabs/php_codesniffer && cd ..; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.4" && $DB == "mysql" ]]; then cd galette && composer require squizlabs/php_codesniffer && cd ..; fi
 
 script:
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.3" && $DB == "mysql" ]]; then galette/vendor/bin/phpcs -n -p --ignore=galette_tcpdf_config.php --standard=phpcs-rules.xml galette/lib/ tests/ galette/webroot/index.php galette/includes/fields_defs/ galette/includes/smarty_plugins/ galette/includes/functions.inc.php galette/includes/galette.inc.php galette/includes/dependencies.php galette/includes/main.inc.php; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.4" && $DB == "mysql" ]]; then galette/vendor/bin/phpcs -n -p --ignore=galette_tcpdf_config.php --standard=phpcs-rules.xml galette/lib/ tests/ galette/webroot/index.php galette/includes/fields_defs/ galette/includes/smarty_plugins/ galette/includes/functions.inc.php galette/includes/galette.inc.php galette/includes/dependencies.php galette/includes/main.inc.php; fi
   - php galette/vendor/bin/atoum -mcn 1 -bf tests/TestsBootstrap.php -d tests/Galette/
   - php galette/cron/reminder.php
 

diff --git a/galette/lib/Galette/Controllers/AuthController.php b/galette/lib/Galette/Controllers/AuthController.php
index 9b3941dd85ee2b8b5b92d66912d5396d4ac49a5a..952249d4cf7ea2c6479e6f5701f3a903718c8aa8 100644 (file)
--- a/galette/lib/Galette/Controllers/AuthController.php
+++ b/galette/lib/Galette/Controllers/AuthController.php
@@ -203,7 +203,7 @@ class AuthController extends AbstractController
         } else {
             $msg = str_replace(
                 '%id',
-                $id,
+                $args['id'],
                 _T("Unable to impersonate as %id")
             );
             $this->flash->addMessage(

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index bf36e6ca54a473629d28a106b44cf6b19cd4bbfc..9acaddb944421b8426ade27dba1c46eb92e6dbc9 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -421,7 +421,7 @@ class ContributionsController extends CrudController
                         $field = _T("end date filter");
                         $filters->end_date_filter = $post['end_date_filter'];
                     }
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $error_detected[] = $e->getMessage();
                 }
             }
@@ -622,12 +622,8 @@ class ContributionsController extends CrudController
                                     $sent = $mail->send();
 
                                     if (!$sent) {
-                                        $txt = preg_replace(
-                                            array('/%name/', '/%email/'),
-                                            array($adh->sname, $adh->getEmail()),
-                                            _T("A problem happened while sending to admin post contribution notification for user %name (%email) contribution")
-                                        );
-                                        $this->history->add($txt);
+                                        $txt = _T('Post contribution script has failed.');
+                                        $this->history->add($txt, $message);
                                         $warning_detected[] = $txt;
                                         //Mails are disabled... We log (not safe, but)...
                                         Analog::log(
@@ -833,20 +829,6 @@ class ContributionsController extends CrudController
             }
         }
 
-        /* TODO: remove */
-        if (!isset($contribution['duree_mois_cotis'])
-            || $contribution['duree_mois_cotis'] == ''
-        ) {
-            // On error restore entered value or default to display the form again
-            if (isset($_POST['duree_mois_cotis'])
-                && $_POST['duree_mois_cotis'] != ''
-            ) {
-                $contribution['duree_mois_cotis'] = $_POST['duree_mois_cotis'];
-            } else {
-                $contribution['duree_mois_cotis'] = $this->preferences->pref_membership_ext;
-            }
-        }
-
         if (count($error_detected) > 0) {
             //something went wrong.
             //store entity in session

diff --git a/galette/lib/Galette/Controllers/Crud/GroupsController.php b/galette/lib/Galette/Controllers/Crud/GroupsController.php
index 10f22f5731f84e64b0632fc38b3cc019b83b2d8e..70ec2a166d5b6c09f6068acb0772f7820e4633db 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/GroupsController.php
+++ b/galette/lib/Galette/Controllers/Crud/GroupsController.php
@@ -379,7 +379,7 @@ class GroupsController extends CrudController
                     _T("An error occurred while storing the group.")
                 );
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->flash->addMessage(
                 'error_detected',
                 $e->getMessage()

diff --git a/galette/lib/Galette/Controllers/Crud/MailingsController.php b/galette/lib/Galette/Controllers/Crud/MailingsController.php
index e713946ef6a37fab6bb387b02f535d03281d4f90..0764a1c4dd5b91daa3bc191209f298169088dcb0 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MailingsController.php
+++ b/galette/lib/Galette/Controllers/Crud/MailingsController.php
@@ -551,7 +551,7 @@ class MailingsController extends CrudController
                         $field = _T("end date filter");
                         $filters->end_date_filter = $post['end_date_filter'];
                     }
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $error_detected[] = $e->getMessage();
                 }
             }

diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php
index b48940db0eda761a540d332213c15a1a9a616fe3..02f2d3a7af808324aa1d4f0fbba509e859310a86 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MembersController.php
+++ b/galette/lib/Galette/Controllers/Crud/MembersController.php
@@ -43,6 +43,7 @@ use Slim\Http\Request;
 use Slim\Http\Response;
 use Galette\Core\Authentication;
 use Galette\Core\GaletteMail;
+use Galette\Core\Password;
 use Galette\Core\PasswordImage;
 use Galette\Core\Picture;
 use Galette\Entity\Adherent;
@@ -1696,8 +1697,8 @@ class MembersController extends CrudController
                                     $password = new Password($this->zdb);
                                     $res = $password->generateNewPassword($member->id);
                                     if ($res == true) {
-                                        $link_validity = new DateTime();
-                                        $link_validity->add(new DateInterval('PT24H'));
+                                        $link_validity = new \DateTime();
+                                        $link_validity->add(new \DateInterval('PT24H'));
                                         $mreplaces['change_pass_uri'] = $this->preferences->getURL() .
                                             $this->router->pathFor(
                                                 'password-recovery',
@@ -1707,7 +1708,7 @@ class MembersController extends CrudController
                                     } else {
                                         $str = str_replace(
                                             '%s',
-                                            $login_adh,
+                                            $member->sfullname,
                                             _T("An error occurred storing temporary password for %s. Please inform an admin.")
                                         );
                                         $this->history->add($str);

diff --git a/galette/lib/Galette/Controllers/CsvController.php b/galette/lib/Galette/Controllers/CsvController.php
index 5f9f1e0498918df58b8d4a14acf019249af66e1b..31daeb1ec22cabfa9da3528764f4189dd58036e9 100644 (file)
--- a/galette/lib/Galette/Controllers/CsvController.php
+++ b/galette/lib/Galette/Controllers/CsvController.php
@@ -40,6 +40,7 @@ namespace Galette\Controllers;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Galette\Entity\ImportModel;
+use Galette\Filters\MembersList;
 use Galette\IO\Csv;
 use Galette\IO\CsvIn;
 use Galette\IO\CsvOut;

diff --git a/galette/lib/Galette/Controllers/DynamicTranslationsController.php b/galette/lib/Galette/Controllers/DynamicTranslationsController.php
index c5fafce7d72ad13d99a0ff0b00a70014de9c5232..574feaf10b1363a85ef0b44b244ec3767ac49095 100644 (file)
--- a/galette/lib/Galette/Controllers/DynamicTranslationsController.php
+++ b/galette/lib/Galette/Controllers/DynamicTranslationsController.php
@@ -88,7 +88,7 @@ class DynamicTranslationsController extends AbstractController
             $results = $this->zdb->execute($select);
             $result = $results->current();
             $nb_fields = $result->nb;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Analog::log(
                 'An error occurred counting l10n entries | ' .
                 $e->getMessage(),

diff --git a/galette/lib/Galette/Controllers/HistoryController.php b/galette/lib/Galette/Controllers/HistoryController.php
index 011709c36cd497c1a5915439c5cfbfa7b7e83640..cd8f314f112cb4769964df7b671418bc9d08bb32 100644 (file)
--- a/galette/lib/Galette/Controllers/HistoryController.php
+++ b/galette/lib/Galette/Controllers/HistoryController.php
@@ -157,7 +157,7 @@ class HistoryController extends AbstractController
                         $field = _T("end date filter");
                         $filters->end_date_filter = $post['end_date_filter'];
                     }
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $error_detected[] = $e->getMessage();
                 }
             }

diff --git a/galette/lib/Galette/DynamicFields/DynamicField.php b/galette/lib/Galette/DynamicFields/DynamicField.php
index f869435b23e827a2b6040b01aad8a88021c806d8..fa9ed7e293833c52ff2dc2784d92ccf2af0ef638 100644 (file)
--- a/galette/lib/Galette/DynamicFields/DynamicField.php
+++ b/galette/lib/Galette/DynamicFields/DynamicField.php
@@ -224,7 +224,7 @@ abstract class DynamicField
             if ($result) {
                 $this->loadFromRs($result);
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Analog::log(
                 'Unable to retrieve field type for field ' . $id . ' | ' .
                 $e->getMessage(),
@@ -737,7 +737,7 @@ abstract class DynamicField
                     $this->addTranslation($this->name);
                 }
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Analog::log(
                 'An error occurred storing field | ' . $e->getMessage(),
                 Analog::ERROR

diff --git a/galette/lib/Galette/Entity/I18nTrait.php b/galette/lib/Galette/Entity/I18nTrait.php
index 611fd5c9a169feb740d67fdc9c03e25d35781e2f..230d2f81fe1e3fcee5474187d11e16fe5ef35e54 100644 (file)
--- a/galette/lib/Galette/Entity/I18nTrait.php
+++ b/galette/lib/Galette/Entity/I18nTrait.php
@@ -189,7 +189,7 @@ trait I18nTrait
                 $this->zdb->execute($insert);
             }
             return true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Analog::log(
                 'An error occurred updating dynamic translation for `' .
                 $text_orig . '` | ' . $e->getMessage(),
@@ -224,7 +224,7 @@ trait I18nTrait
             );
             $this->zdb->execute($delete);
             return true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Analog::log(
                 'An error occurred deleting dynamic translation for `' .
                 $text_orig . ' | ' . $e->getMessage(),

diff --git a/galette/lib/Galette/Repository/Members.php b/galette/lib/Galette/Repository/Members.php
index d836cfc6396f2d0aedc7f2a7196b641ed26fe8c1..d1d2daac5c971288bedb689e852e929eab60bb08 100644 (file)
--- a/galette/lib/Galette/Repository/Members.php
+++ b/galette/lib/Galette/Repository/Members.php
@@ -208,7 +208,7 @@ class Members
      * @param boolean $limit      true if we want records pagination
      * @param boolean $export     true if we are exporting
      *
-     * @return Adherent[]|ResultSet
+     * @return Adherent[]|Laminas\Db\ResultSet
      */
     public function getMembersList(
         $as_members = false,

diff --git a/galette/lib/Galette/Util/Telemetry.php b/galette/lib/Galette/Util/Telemetry.php
index b7381796f3e8539ae0ba7817fb8f6e809a29cfeb..ecd456b8c42d69e9f1ac5a8ff5f64e31f547cfcd 100644 (file)
--- a/galette/lib/Galette/Util/Telemetry.php
+++ b/galette/lib/Galette/Util/Telemetry.php
@@ -440,7 +440,7 @@ class Telemetry
     *
     * @param integer $length of the random string
     *
-    * @return random string
+    * @return string
     *
     * @see https://stackoverflow.com/questions/4356289/php-random-string-generator/31107425#31107425
     */