chore: bump dev deps overall (#183)

* chore: bump dev deps overall * chore: fix gitsplit to use main branch * chore: fix gitsplit to use main branch
sigwinhq · Jan 29, 2024 · 54d5260 · 54d5260
1 parent f57a053
commit 54d5260
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/gitsplit.yaml b/.github/workflows/gitsplit.yaml
@@ -3,7 +3,7 @@ on:
     push:
         branches:
             - "fix/gitsplit"
-            - "master"
+            - "main"
     release:
         types: [ published ]
 

diff --git a/.gitsplit.yml b/.gitsplit.yml
@@ -12,5 +12,5 @@ splits:
         prefix: "src/Bridge/Symfony"
         target: "https://${GH_TOKEN}@github.com/sigwinhq/xezilaires-symfony.git"
 origins:
-    - ^master$
+    - ^main$
     - ^\d+\.\d+\.\d+$
diff --git a/composer.json b/composer.json
@@ -16,9 +16,9 @@
         "symfony/serializer": "^6.4 || ^7.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
         "nyholm/nsa": "^1.1",
-        "nyholm/symfony-bundle-test": "^2.0",
+        "nyholm/symfony-bundle-test": "^3.0",
         "openspout/openspout": "^4.0",
         "phpoffice/phpspreadsheet": "^1.29",
         "phpunit/phpunit": "^10.5",
@@ -36,9 +36,6 @@
         "sigwin/xezilaires-spout": "self.version",
         "sigwin/xezilaires-symfony": "self.version"
     },
-    "conflict": {
-        "nikic/php-parser": "< 4.14"
-    },
     "suggest": {
         "openspout/openspout": "Read Excel files with Spout",
         "phpoffice/phpspreadsheet": "Read Excel files with PhpSpreadsheet",

diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json
@@ -20,9 +20,6 @@
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/property-info": "^6.4 || ^7.0"
     },
-    "conflict": {
-        "nikic/php-parser": "< 4.14"
-    },
     "suggest": {
         "sigwin/xezilaires-symfony": "Symfony bundle integration, bin/xezilaires use"
     },

diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json
@@ -19,16 +19,13 @@
         "symfony/validator": "^6.4 || ^7.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "nyholm/symfony-bundle-test": "^2.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
+        "nyholm/symfony-bundle-test": "^3.0",
         "phpunit/phpunit": "^10.5",
         "sigwin/xezilaires-phpspreadsheet": "^1.0",
         "sigwin/xezilaires-spout": "^1.0",
         "symfony/phpunit-bridge": "^6.4 || ^7.0"
     },
-    "conflict": {
-        "nikic/php-parser": "< 4.14"
-    },
     "suggest": {
         "sigwin/xezilaires-phpspreadsheet": "Read Excel files with PhpSpreadsheet",
         "sigwin/xezilaires-spout": "Read Excel files with Spout"

diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json
@@ -24,9 +24,6 @@
         "symfony/property-info": "^6.4 || ^7.0",
         "symfony/validator": "^6.4 || ^7.0"
     },
-    "conflict": {
-        "nikic/php-parser": "< 4.14"
-    },
     "suggest": {
         "sigwin/xezilaires-phpspreadsheet": "Read Excel files with PhpSpreadsheet",
         "sigwin/xezilaires-spout": "Read Excel files with Spout",