Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 55396f90a33b · 2020-10-06T17:45:41.000+02:00
* 3.4:
  Update versions in composer.json
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
@@ -209,7 +209,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
@@ -244,7 +244,7 @@ install:
           git checkout -m FETCH_HEAD &&
           export COMPONENTS=$(find src/Symfony -mindepth 2 -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
@@ -161,5 +161,5 @@
         }
     ],
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -71,5 +71,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -43,5 +43,5 @@
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
     },
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -79,5 +79,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -107,5 +107,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -59,5 +59,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -53,5 +53,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -49,5 +49,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
@@ -37,5 +37,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
@@ -47,5 +47,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -61,5 +61,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -43,5 +43,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -31,5 +31,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -68,5 +68,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/composer.json b/src/Symfony/Component/Mailer/Bridge/Google/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json
@@ -29,5 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
@@ -44,5 +44,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
@@ -51,5 +51,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -34,5 +34,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
@@ -32,5 +32,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
@@ -49,5 +49,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
@@ -35,5 +35,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.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": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
diff --git a/src/Symfony/Component/VarExporter/composer.json b/src/Symfony/Component/VarExporter/composer.json
diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/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
`@@ -161,5 +161,5 @@`
`161`	`161`	`}`
`162`	`162`	`],`
`163`	`163`	`"minimum-stability": "dev",`
`164`		`- "version": "4.4-dev"`
	`164`	`+ "version": "4.4.x-dev"`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,5 @@`
`71`	`71`	`]`
`72`	`72`	`},`
`73`	`73`	`"minimum-stability": "dev",`
`74`		`- "version": "4.4-dev"`
	`74`	`+ "version": "4.4.x-dev"`
`75`	`75`	`}`
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": "4.4-dev"`
	`46`	`+ "version": "4.4.x-dev"`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@`
`33`	`33`	`]`
`34`	`34`	`},`
`35`	`35`	`"minimum-stability": "dev",`
`36`		`- "version": "4.4-dev"`
	`36`	`+ "version": "4.4.x-dev"`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,5 @@`
`79`	`79`	`]`
`80`	`80`	`},`
`81`	`81`	`"minimum-stability": "dev",`
`82`		`- "version": "4.4-dev"`
	`82`	`+ "version": "4.4.x-dev"`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@`
`42`	`42`	`]`
`43`	`43`	`},`
`44`	`44`	`"minimum-stability": "dev",`
`45`		`- "version": "4.4-dev"`
	`45`	`+ "version": "4.4.x-dev"`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,5 +107,5 @@`
`107`	`107`	`]`
`108`	`108`	`},`
`109`	`109`	`"minimum-stability": "dev",`
`110`		`- "version": "4.4-dev"`
	`110`	`+ "version": "4.4.x-dev"`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,5 @@`
`59`	`59`	`]`
`60`	`60`	`},`
`61`	`61`	`"minimum-stability": "dev",`
`62`		`- "version": "4.4-dev"`
	`62`	`+ "version": "4.4.x-dev"`
`63`	`63`	`}`
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": "4.4-dev"`
	`54`	`+ "version": "4.4.x-dev"`
`55`	`55`	`}`