Fix errors detected by require-checker

- fix functions case
- Adapter\Exception no longer exists
- missing explicit dependencies

diff --git a/galette/composer.json b/galette/composer.json
index 72d7e53e016d5ae1577eaef612af265170e6e58f..57f232d74a2ea0bf1f808219e844a63d39ac94fe 100644 (file)
--- a/galette/composer.json
+++ b/galette/composer.json
@@ -43,7 +43,11 @@
         "soundasleep/html2text": "^0.5.0",
         "laminas/laminas-dependency-plugin": "^1.0",
         "aneek/slim-event-dispatcher": "^1.0",
-        "slim/flash": "^0.4.0"
+        "slim/flash": "^0.4.0",
+        "league/event": "^2.1",
+        "smarty/smarty": "~3.1",
+        "psr/http-message": "^1.0",
+        "psr/container": "^1.0"
     },
     "require-dev": {
         "atoum/atoum": "dev-master",

diff --git a/galette/composer.lock b/galette/composer.lock
index 29426ed9f3d1628905d4db752374b7bfacbd49db..ce1d52788d4d92ec1e3995390ad4649c0d61771c 100644 (file)
--- a/galette/composer.lock
+++ b/galette/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ab4385194ba68db560723d55c70415d7",
+    "content-hash": "a9c3944dc4b30ba1cc8f9303cc61699b",
     "packages": [
         {
             "name": "akrabat/rka-slim-session-middleware",

diff --git a/galette/lib/Galette/Core/AbstractPassword.php b/galette/lib/Galette/Core/AbstractPassword.php
index 2bccc2ed5506f6b135f8e3693b150f1f302d19a3..8c6b54351b826c05a13114afb87bbc6f187149ac 100644 (file)
--- a/galette/lib/Galette/Core/AbstractPassword.php
+++ b/galette/lib/Galette/Core/AbstractPassword.php
@@ -40,7 +40,6 @@
 namespace Galette\Core;
 
 use Analog\Analog;
-use Laminas\Db\Adapter\Exception as AdapterException;
 use Galette\Entity\Adherent;
 
 /**

diff --git a/galette/lib/Galette/Core/Login.php b/galette/lib/Galette/Core/Login.php
index 090e0fdaa6ca6399b0a10265a63ffed5a6701615..b702fc306daf71ed7c0f48476094e7632cb06f24 100644 (file)
--- a/galette/lib/Galette/Core/Login.php
+++ b/galette/lib/Galette/Core/Login.php
@@ -36,7 +36,6 @@
 
 namespace Galette\Core;
 
-use Laminas\Db\Adapter\Exception as AdapterException;
 use Galette\Repository\Groups;
 use Galette\Repository\Members;
 use Galette\Entity\Adherent;
@@ -172,13 +171,6 @@ class Login extends Authentication
                 $this->logUser($row);
                 return true;
             }
-        } catch (AdapterException $e) {
-            Analog::log(
-                'An error occurred: ' . $e->getChainedException()->getMessage(),
-                Analog::WARNING
-            );
-            Analog::log($e->getTrace(), Analog::ERROR);
-            return false;
         } catch (\Exception $e) {
             Analog::log(
                 'An error occurred: ' . $e->getMessage(),
@@ -304,13 +296,6 @@ class Login extends Authentication
                 $this->logUser($row);
                 return true;
             }
-        } catch (AdapterException $e) {
-            Analog::log(
-                'An error occurred: ' . $e->getChainedException()->getMessage(),
-                Analog::WARNING
-            );
-            Analog::log($e->getTrace(), Analog::ERROR);
-            return false;
         } catch (\Exception $e) {
             Analog::log(
                 'An error occurred: ' . $e->getMessage(),

diff --git a/galette/lib/Galette/Core/Picture.php b/galette/lib/Galette/Core/Picture.php
index 12b95e0d7c40653e3789730978c6a1ab79c12dcc..484955d67b64ab938d359cff92ccf1fdc9c81fb3 100644 (file)
--- a/galette/lib/Galette/Core/Picture.php
+++ b/galette/lib/Galette/Core/Picture.php
@@ -731,12 +731,12 @@ class Picture implements FileInterface
             $thumb = imagecreatetruecolor($w, $h);
             switch ($ext) {
                 case 'jpg':
-                    $image = ImageCreateFromJpeg($source);
+                    $image = imagecreatefromjpeg($source);
                     imagecopyresampled($thumb, $image, 0, 0, 0, 0, $w, $h, $cur_width, $cur_height);
                     imagejpeg($thumb, $dest);
                     break;
                 case 'png':
-                    $image = ImageCreateFromPng($source);
+                    $image = imagecreatefrompng($source);
                     // Turn off alpha blending and set alpha flag. That prevent alpha
                     // transparency to be saved as an arbitrary color (black in my tests)
                     imagealphablending($thumb, false);
@@ -747,7 +747,7 @@ class Picture implements FileInterface
                     imagepng($thumb, $dest);
                     break;
                 case 'gif':
-                    $image = ImageCreateFromGif($source);
+                    $image = imagecreatefromgif($source);
                     imagecopyresampled($thumb, $image, 0, 0, 0, 0, $w, $h, $cur_width, $cur_height);
                     imagegif($thumb, $dest);
                     break;

diff --git a/galette/lib/Galette/IO/Pdf.php b/galette/lib/Galette/IO/Pdf.php
index 3103dfa69e84ad2affceafe9ec72d8c77213082c..5813565ca4bad00f995a09e4d4f8b8e72a06b1e4 100644 (file)
--- a/galette/lib/Galette/IO/Pdf.php
+++ b/galette/lib/Galette/IO/Pdf.php
@@ -204,7 +204,7 @@ class Pdf extends \TCPDF
      */
     protected function parsegif($file)
     {
-        $a = GetImageSize($file);
+        $a = getimagesize($file);
         if (empty($a)) {
             $this->Error(_T("Missing or incorrect image file ") . $file);
         }