diff --git a/.github/travis.php b/.github/travis.php index 6773a6edcc..2e255e995f 100644 --- a/.github/travis.php +++ b/.github/travis.php @@ -4,6 +4,7 @@ if (4 > $_SERVER['argc']) { echo "Usage: branch version dir1 dir2 ... dirN\n"; exit(1); } +chdir(dirname(__DIR__)); $dirs = $_SERVER['argv']; array_shift($dirs); @@ -30,15 +31,15 @@ foreach ($dirs as $dir) { $package->repositories = array(array( 'type' => 'composer', - 'url' => 'file://'.__DIR__.'/', + 'url' => 'file://'.dirname(__DIR__).'/', )); $json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1); file_put_contents($dir.'/composer.json', $json); passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *"); - $package->version = 'master' !== $version ? $version.'.x-dev' : 'dev-master'; + $package->version = 'master' !== $version ? $version.'.999' : 'dev-master'; $package->dist['type'] = 'tar'; - $package->dist['url'] = 'file://'.__DIR__."/$dir/package.tar"; + $package->dist['url'] = 'file://'.dirname(__DIR__)."/$dir/package.tar"; $packages[$package->name][$package->version] = $package; diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md index 134dfa4e5d..ca60dcbf81 100644 --- a/UPGRADE-3.1.md +++ b/UPGRADE-3.1.md @@ -88,13 +88,9 @@ FrameworkBundle - `"form.type.submit"` - `"form.type.reset"` - * The service `serializer.mapping.cache.apc` has been deprecated in favor of - `serializer.mapping.cache.doctrine.apc` to be consistent with the validator - cache service. If you are using `serializer.mapping.cache.apc`, use - `serializer.mapping.cache.doctrine.apc` instead. - - * The `framework.serializer.cache` option has been deprecated. APCu should now - be automatically used when available so you can remove this configuration key. + * The `framework.serializer.cache` option and the service + `serializer.mapping.cache.apc` have been deprecated. APCu should now be + automatically used when available. HttpKernel ---------- diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 358c72b674..4645b46215 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -114,11 +114,9 @@ FrameworkBundle - `"form.type.submit"` - `"form.type.reset"` - * The service `serializer.mapping.cache.apc` has been removed; use - `serializer.mapping.cache.doctrine.apc` instead. - - * The `framework.serializer.cache` option has been removed. APCu should now - be automatically used when available so you can remove this configuration key. + * The `framework.serializer.cache` option and the service + `serializer.mapping.cache.apc` have been removed. APCu should now + be automatically used when available. HttpKernel ----------