Merge branch '3.4' into 4.4

* 3.4:
  Update versions in composer.json

Author: nicolas-grekas

.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";
 

.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
 
     - |

composer.json

@@ -161,5 +161,5 @@
         }
     ],
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

src/Symfony/Bridge/Doctrine/composer.json

@@ -71,5 +71,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

src/Symfony/Bridge/Monolog/composer.json

@@ -43,5 +43,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

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"
 }

src/Symfony/Bridge/ProxyManager/composer.json

@@ -33,5 +33,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

src/Symfony/Bridge/Twig/composer.json

@@ -79,5 +79,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

src/Symfony/Bundle/DebugBundle/composer.json

@@ -42,5 +42,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -107,5 +107,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4-dev"
+    "version": "4.4.x-dev"
 }