Remove patchs

diff --git a/galette/composer.json b/galette/composer.json
index 2760f59a368f8621849316033f16c4d89a537794..0f7da5daccaeb0eacc103534c960e2deddfee759 100644 (file)
--- a/galette/composer.json
+++ b/galette/composer.json
@@ -56,12 +56,5 @@
     },
     "config": {
         "optimize-autoloader": true
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "patch -d vendor/laminas/laminas-db/ -p1 < ../patches/laminas-db-Fix-using-parameters-in-prepared-queries.patch",
-            "patch -d vendor/laminas/laminas-db/ -p1 < ../patches/laminas-db-php80.patch",
-            "patch -d vendor/tecnickcom/tcpdf/ -p1 < ../patches/tcpdf-php8-compat.patch"
-        ]
     }
 }

diff --git a/patches/laminas-db-Fix-using-parameters-in-prepared-queries.patch b/patches/laminas-db-Fix-using-parameters-in-prepared-queries.patch
deleted file mode 100644 (file)
index b4f5bbe..0000000
--- a/patches/laminas-db-Fix-using-parameters-in-prepared-queries.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3e2c78f92a3fff6ceb503944067021cd5839ea89 Mon Sep 17 00:00:00 2001
-From: Johan Cwiklinski <johan@x-tnd.be>
-Date: Sat, 7 Nov 2020 12:23:31 +0100
-Subject: [PATCH 1/2] Fix using parameters in prepared queries
-
-See https://bugs.galette.eu/issues/1299
----
- src/Sql/AbstractSql.php | 7 ++++++-
- src/Sql/Insert.php      | 8 +++++++-
- src/Sql/Update.php      | 8 +++++++-
- 3 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/src/Sql/AbstractSql.php b/src/Sql/AbstractSql.php
-index f1f88268..9c2f6f41 100644
---- a/src/Sql/AbstractSql.php
-+++ b/src/Sql/AbstractSql.php
-@@ -184,7 +184,12 @@ abstract class AbstractSql implements SqlInterface
-                     // if prepareType is set, it means that this particular value must be
-                     // passed back to the statement in a way it can be used as a placeholder value
-                     if ($parameterContainer) {
--                        $name = $namedParameterPrefix . $expressionParamIndex++;
-+                        $matches = [];
-+                        if (preg_match('/:([0-9a-zA-Z_]+)/', $value, $matches)) {
-+                            $name = $matches[1];
-+                        } else {
-+                            $name = $namedParameterPrefix . $expressionParamIndex++;
-+                        };
-                         $parameterContainer->offsetSet($name, $value);
-                         $values[$vIndex] = $driver->formatParameterName($name);
-                         continue;
-diff --git a/src/Sql/Insert.php b/src/Sql/Insert.php
-index 22820c05..b36ff6d6 100644
---- a/src/Sql/Insert.php
-+++ b/src/Sql/Insert.php
-@@ -187,8 +187,14 @@ class Insert extends AbstractPreparableSql
-             if (is_scalar($value) && $parameterContainer) {
-                 // use incremental value instead of column name for PDO
-                 // @see https://github.com/zendframework/zend-db/issues/35
-+                // Galette: only rename when needed.
-                 if ($driver instanceof Pdo) {
--                    $column = 'c_' . $i++;
-+                    $matches = [];
-+                    if (preg_match('/:([0-9a-zA-Z_]+)/', $value, $matches)) {
-+                        $column = $matches[1];
-+                    } else {
-+                        $column = 'c_' . ++$i;
-+                    };
-                 }
-                 $values[] = $driver->formatParameterName($column);
-                 $parameterContainer->offsetSet($column, $value);
-diff --git a/src/Sql/Update.php b/src/Sql/Update.php
-index 7f5d7c3c..a6206089 100644
---- a/src/Sql/Update.php
-+++ b/src/Sql/Update.php
-@@ -203,8 +203,14 @@ class Update extends AbstractPreparableSql
-             if (is_scalar($value) && $parameterContainer) {
-                 // use incremental value instead of column name for PDO
-                 // @see https://github.com/zendframework/zend-db/issues/35
-+                // Galette: only rename when needed.
-                 if ($driver instanceof Pdo) {
--                    $column = 'c_' . $i++;
-+                    $matches = [];
-+                    if (preg_match('/:([0-9a-zA-Z_]+)/', $value, $matches)) {
-+                        $column = $matches[1];
-+                    } else {
-+                        $column = 'c_' . ++$i;
-+                    };
-                 }
-                 $setSql[] = $prefix . $driver->formatParameterName($column);
-                 $parameterContainer->offsetSet($column, $value);
--- 
-2.26.2
-

diff --git a/patches/laminas-db-php80.patch b/patches/laminas-db-php80.patch
deleted file mode 100644 (file)
index 183413f..0000000
--- a/patches/laminas-db-php80.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7afda56a09f1274b690e60352023478f267b2575 Mon Sep 17 00:00:00 2001
-From: Johan Cwiklinski <johan@x-tnd.be>
-Date: Sun, 29 Nov 2020 11:10:21 +0100
-Subject: [PATCH] Fix php8
-
----
- src/Sql/AbstractSql.php | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/Sql/AbstractSql.php b/src/Sql/AbstractSql.php
-index 9c2f6f41..cc218d86 100644
---- a/src/Sql/AbstractSql.php
-+++ b/src/Sql/AbstractSql.php
-@@ -245,11 +245,10 @@ abstract class AbstractSql implements SqlInterface
-             if (isset($paramSpecs[$position]['combinedby'])) {
-                 $multiParamValues = [];
-                 foreach ($paramsForPosition as $multiParamsForPosition) {
--                    if (is_array($multiParamsForPosition)) {
--                        $ppCount = count($multiParamsForPosition);
--                    } else {
--                        $ppCount = 1;
-+                    if (!is_array($multiParamsForPosition)) {
-+                        $multiParamsForPosition = [$multiParamsForPosition];
-                     }
-+                    $ppCount = count($multiParamsForPosition);
- 
-                     if (! isset($paramSpecs[$position][$ppCount])) {
-                         throw new Exception\RuntimeException(sprintf(
--- 
-2.26.2
-

diff --git a/patches/tcpdf-php8-compat.patch b/patches/tcpdf-php8-compat.patch
deleted file mode 100644 (file)
index 988fc5a..0000000
--- a/patches/tcpdf-php8-compat.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From e5f4da5a76b44cd94740a5d293ae5558d5cb5443 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
-Date: Wed, 14 Oct 2020 10:33:59 +0200
-Subject: [PATCH 1/3] Fix optionnal "$currentfont" parameter declaration
-
----
- include/tcpdf_fonts.php | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/tcpdf_fonts.php b/include/tcpdf_fonts.php
-index 218fb6df..4f5bcf39 100644
---- a/include/tcpdf_fonts.php
-+++ b/include/tcpdf_fonts.php
-@@ -1995,7 +1995,7 @@ public static function getUniord($uch) {
-        * @author Nicola Asuni
-        * @public static
-        */
--      public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
-+      public static function UTF8StringToArray($str, $isunicode=true, &$currentfont=array()) {
-               if ($isunicode) {
-                       // requires PCRE unicode support turned on
-                       $chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
-@@ -2021,7 +2021,7 @@ public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
-        * @since 3.2.000 (2008-06-23)
-        * @public static
-        */
--      public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont) {
-+      public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont=array()) {
-               $unicode = self::UTF8StringToArray($str, $isunicode, $currentfont); // array containing UTF-8 unicode values
-               return self::UTF8ArrToLatin1($unicode);
-       }
-@@ -2037,7 +2037,7 @@ public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont) {
-        * @since 1.53.0.TC005 (2005-01-05)
-        * @public static
-        */
--      public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$currentfont) {
-+      public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$currentfont=array()) {
-               if (!$isunicode) {
-                       return $str; // string is not in unicode
-               }
-@@ -2057,7 +2057,7 @@ public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$cur
-        * @since 2.1.000 (2008-01-08)
-        * @public static
-        */
--      public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
-+      public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunicode=true, &$currentfont=array()) {
-               return self::utf8StrArrRev(self::UTF8StringToArray($str, $isunicode, $currentfont), $str, $setbom, $forcertl, $isunicode, $currentfont);
-       }
- 
-@@ -2074,7 +2074,7 @@ public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunico
-        * @since 4.9.000 (2010-03-27)
-        * @public static
-        */
--      public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
-+      public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false, $isunicode=true, &$currentfont=array()) {
-               return self::arrUTF8ToUTF16BE(self::utf8Bidi($arr, $str, $forcertl, $isunicode, $currentfont), $setbom);
-       }
- 
-@@ -2090,7 +2090,7 @@ public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=fal
-        * @since 2.4.000 (2008-03-06)
-        * @public static
-        */
--      public static function utf8Bidi($ta, $str='', $forcertl=false, $isunicode=true, &$currentfont) {
-+      public static function utf8Bidi($ta, $str='', $forcertl=false, $isunicode=true, &$currentfont=array()) {
-               // paragraph embedding level
-               $pel = 0;
-               // max level
-
-From 292fc741f82f68283fd2d8171fc1ae92ff15b946 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
-Date: Wed, 14 Oct 2020 10:35:08 +0200
-Subject: [PATCH 2/3] Fix optionnal "$k" parameter declaration
-
----
- include/tcpdf_static.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
-index 06a1dddc..56af4a06 100644
---- a/include/tcpdf_static.php
-+++ b/include/tcpdf_static.php
-@@ -2507,7 +2507,7 @@ public static function getPageSizeFromFormat($format) {
-        * @since 5.0.010 (2010-05-17)
-        * @public static
-        */
--      public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
-+      public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k=1, $pagedim=array()) {
-               if (!isset($pagedim[$page])) {
-                       // initialize array
-                       $pagedim[$page] = array();
-
-From 9616e9e44b111e79f6931763da265f05638aa839 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
-Date: Wed, 14 Oct 2020 10:35:46 +0200
-Subject: [PATCH 3/3] Fix optionnal "$tagvspaces" parameter declaration
-
----
- include/tcpdf_static.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
-index 56af4a06..56ea082e 100644
---- a/include/tcpdf_static.php
-+++ b/include/tcpdf_static.php
-@@ -1136,7 +1136,7 @@ public static function extractCSSproperties($cssdata) {
-        * @see setHtmlVSpace()
-        * @public static
-        */
--      public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
-+      public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces=array()) {
-               // configure parameters for HTML Tidy
-               if ($tidy_options === '') {
-                       $tidy_options = array (