Update versions in composer.json

nicolas-grekas · nicolas-grekas · commit 8f714a2fd6ee · 2020-10-06T17:25:25.000+02:00
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -54,7 +54,6 @@
         echo "Missing \"version\" in composer.json.\n";
         exit(1);
     }
-    $package->version = str_replace('-dev', '.x-dev', $package->version);
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 
diff --git a/.travis.yml b/.travis.yml
@@ -228,7 +228,7 @@ install:
           git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
           git rm -rq src/Symfony/Bridge/PhpUnit
           git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
-          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
+          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
           sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
           rm -rf .phpunit
       fi
@@ -262,7 +262,7 @@ install:
           git checkout -m FETCH_HEAD &&
           export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       else
-          export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
+          export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
       fi
 
     - |
diff --git a/composer.json b/composer.json
@@ -134,5 +134,5 @@
         "files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -57,5 +57,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -43,5 +43,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -38,12 +38,10 @@
     ],
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.4-dev"
-        },
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-    }
+    },
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -67,5 +67,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -41,5 +41,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -91,5 +91,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -62,5 +62,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -45,5 +45,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/WebServerBundle/composer.json b/src/Symfony/Bundle/WebServerBundle/composer.json
@@ -35,5 +35,5 @@
         "symfony/expression-language": "For using the filter option of the log server."
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
@@ -32,5 +32,5 @@
             "/Tests/"
         ]
     },
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
@@ -40,5 +40,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -48,5 +48,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -47,5 +47,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json
@@ -28,5 +28,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
@@ -40,5 +40,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -27,5 +27,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
@@ -26,5 +26,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json
@@ -25,5 +25,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -58,5 +58,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -66,5 +66,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json
@@ -41,5 +41,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json
@@ -28,5 +28,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
@@ -25,5 +25,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json
@@ -25,5 +25,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
@@ -46,5 +46,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
@@ -43,5 +43,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
@@ -37,5 +37,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json
@@ -30,5 +30,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -44,5 +44,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -59,5 +59,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -55,5 +55,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
@@ -25,5 +25,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -46,5 +46,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -62,5 +62,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
@@ -39,5 +39,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json
@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json
@@ -35,5 +35,5 @@
         "psr-4": { "Symfony\\Component\\Workflow\\": "" }
     },
     "minimum-stability": "dev",
-    "version": "3.4-dev"
+    "version": "3.4.x-dev"
 }
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@`
`54`	`54`	`echo "Missing \"version\" in composer.json.\n";`
`55`	`55`	`exit(1);`
`56`	`56`	`}`
`57`		`- $package->version = str_replace('-dev', '.x-dev', $package->version);`
`58`	`57`	`$package->dist['type'] = 'tar';`
`59`	`58`	`$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";`
`60`	`59`
Original file line number	Diff line number	Diff line change
`@@ -134,5 +134,5 @@`
`134`	`134`	`"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]`
`135`	`135`	`},`
`136`	`136`	`"minimum-stability": "dev",`
`137`		`- "version": "3.4-dev"`
	`137`	`+ "version": "3.4.x-dev"`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@`
`57`	`57`	`]`
`58`	`58`	`},`
`59`	`59`	`"minimum-stability": "dev",`
`60`		`- "version": "3.4-dev"`
	`60`	`+ "version": "3.4.x-dev"`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,5 @@`
`43`	`43`	`]`
`44`	`44`	`},`
`45`	`45`	`"minimum-stability": "dev",`
`46`		`- "version": "3.4-dev"`
	`46`	`+ "version": "3.4.x-dev"`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@`
`30`	`30`	`]`
`31`	`31`	`},`
`32`	`32`	`"minimum-stability": "dev",`
`33`		`- "version": "3.4-dev"`
	`33`	`+ "version": "3.4.x-dev"`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@`
`67`	`67`	`]`
`68`	`68`	`},`
`69`	`69`	`"minimum-stability": "dev",`
`70`		`- "version": "3.4-dev"`
	`70`	`+ "version": "3.4.x-dev"`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@`
`41`	`41`	`]`
`42`	`42`	`},`
`43`	`43`	`"minimum-stability": "dev",`
`44`		`- "version": "3.4-dev"`
	`44`	`+ "version": "3.4.x-dev"`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,5 @@`
`91`	`91`	`]`
`92`	`92`	`},`
`93`	`93`	`"minimum-stability": "dev",`
`94`		`- "version": "3.4-dev"`
	`94`	`+ "version": "3.4.x-dev"`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,5 @@`
`62`	`62`	`]`
`63`	`63`	`},`
`64`	`64`	`"minimum-stability": "dev",`
`65`		`- "version": "3.4-dev"`
	`65`	`+ "version": "3.4.x-dev"`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,5 @@`
`51`	`51`	`]`
`52`	`52`	`},`
`53`	`53`	`"minimum-stability": "dev",`
`54`		`- "version": "3.4-dev"`
	`54`	`+ "version": "3.4.x-dev"`
`55`	`55`	`}`