Merge remote-tracking branch 'upstream/master'

# Conflicts: # composer.json # library/Zend/Test/PHPUnit/Constraint/DomQuery37.php # library/Zend/Test/PHPUnit/Constraint/DomQuery41.php # library/Zend/Test/PHPUnit/Constraint/Redirect37.php # library/Zend/Test/PHPUnit/Constraint/Redirect41.php # library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php # library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
ClarkSource · Dec 6, 2024 · 8471f57 · 8471f57
2 parents 5e7cf57 + 074fb82
commit 8471f57
Show file tree

Hide file tree

Showing 533 changed files with 5,684 additions and 4,656 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"