From 3c0bd405a120fb775c381a195d4b5dc692ae01b9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 7 Dec 2012 00:41:03 +0100 Subject: [PATCH] Removed @stable workarounds from composer docs No longer necessary since we only add the @stable markers for release tags, and remove them for release branches again. --- docs/en/installation/composer.md | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/docs/en/installation/composer.md b/docs/en/installation/composer.md index ab1a74b85..b8184b626 100644 --- a/docs/en/installation/composer.md +++ b/docs/en/installation/composer.md @@ -114,8 +114,8 @@ To remove dependencies, or if you prefer seeing all your dependencies in a text "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.3.2", - "silverstripe/cms": "3.0.*@stable", - "silverstripe/framework": "3.0.*@stable", + "silverstripe/cms": "3.0.*", + "silverstripe/framework": "3.0.*", "silverstripe-themes/simple": "*" }, "require-dev": { @@ -148,29 +148,6 @@ Or for the latest development version in the 3.0.x series composer create-project silverstripe/installer ./my/website/folder 3.0.x-dev -You then remove any references to @stable in the created `composer.json`. For instance -if your `composer.json` contained this: - - "require": { - "php": ">=5.3.2", - "silverstripe/cms": "3.0.*@stable", - "silverstripe/framework": "3.0.*@stable", - "silverstripe-themes/simple": "*" - }, - -You would change it to read - - "require": { - "php": ">=5.3.2", - "silverstripe/cms": "3.0.*", - "silverstripe/framework": "3.0.*", - "silverstripe-themes/simple": "*" - }, - -And then run - - composer update - ## Working with project forks and unreleased modules By default, Composer will install modules listed on the packagist site. There a few reasons that you might not @@ -256,7 +233,6 @@ The `--dev` flag will add a couple modules which are useful for SilverStripe dev * The `compass` module will regenerate CSS if you update the SCSS files * The `docsviewer` module will let you preview changes to the project documentation + * The `buildtools` module which adds [phing](http://phing.info) tasks for creating SilverStripe releases -Note that you can also include those into an existing project by running `composer update --dev`. - -You will then need to edit your `composer.json` file as explained above in [Using development versions](#using-development-versions) \ No newline at end of file +Note that you can also include those into an existing project by running `composer update --dev`. \ No newline at end of file