Merge pull request #29806 from sadashivdalvi/5.72

Updating php-weasyprint to latest version
civicrm · Mar 24, 2024 · 2f40bf6 · 2f40bf6
2 parents daef867 + db70836
commit 2f40bf6
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     "symfony/dependency-injection": "~4.4 || ~6.0",
     "symfony/event-dispatcher": "~4.4 || ~6.0",
     "symfony/filesystem": "~4.4 || ~6.0",
-    "symfony/process": "~4.4 || ~6.0",
+    "symfony/process": "~4.4 || ~5.0 || ~6.0",
     "symfony/var-dumper": "~4.4 || ~5.1 || ~6.0",
     "symfony/service-contracts": "~2.2 || ~3.1",
     "psr/log": "~1.0 || ~2.0 || ~3.0",
@@ -103,7 +103,7 @@
     "soundasleep/html2text": "^2.1",
     "psr/container": "~1.0 || ~2.0",
     "ext-fileinfo": "*",
-    "pontedilana/php-weasyprint": "^0.13.0",
+    "pontedilana/php-weasyprint": "^1",
     "knplabs/knp-snappy": "^1.4"
   },
   "scripts": {

diff --git a/composer.lock b/composer.lock
diff --git a/tests/phpunit/CRM/Core/ComposerConfigTest.php b/tests/phpunit/CRM/Core/ComposerConfigTest.php
@@ -26,7 +26,7 @@ public function testHardLocks(): void {
       'symfony/event-dispatcher' => '/^v4\.4\./',
       'symfony/filesystem' => '/^v4\.4\./',
       'symfony/finder' => '/^v4\.4\./',
-      'symfony/process' => '/^v4\.4\./',
+      'symfony/process' => '/^v5\.4\./',
     ];
 
     $lockFile = Civi::paths()->getPath('[civicrm.root]/composer.lock');