From 924e2a714f0e85ff28b2a2e00e1e7a14ff4fb1c7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 4 Oct 2017 08:26:10 +0100 Subject: [PATCH 1/2] Fix sake path relative to vendor --- docs/en/02_Developer_Guides/14_Files/04_File_Migration.md | 2 +- docs/en/02_Developer_Guides/17_CLI/index.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/02_Developer_Guides/14_Files/04_File_Migration.md b/docs/en/02_Developer_Guides/14_Files/04_File_Migration.md index e0cf8cd9a..d430de95a 100644 --- a/docs/en/02_Developer_Guides/14_Files/04_File_Migration.md +++ b/docs/en/02_Developer_Guides/14_Files/04_File_Migration.md @@ -8,7 +8,7 @@ has been added to assist in migration of legacy files. You can run this task on the command line: ``` -$ ./framework/sake dev/tasks/MigrateFileTask +$ ./vendor/silverstripe/framework/sake dev/tasks/MigrateFileTask ``` This task will also support migration of existing File DataObjects to file versioning. Any diff --git a/docs/en/02_Developer_Guides/17_CLI/index.md b/docs/en/02_Developer_Guides/17_CLI/index.md index 2e0b227c5..33b419d01 100644 --- a/docs/en/02_Developer_Guides/17_CLI/index.md +++ b/docs/en/02_Developer_Guides/17_CLI/index.md @@ -11,7 +11,7 @@ For example, to run a database rebuild from the command line, use this command: ```bash cd your-webroot/ - php vendor/bin/framework/cli-script.php dev/build + php vendor/silverstripe/framework/cli-script.php dev/build ```
@@ -32,10 +32,10 @@ when running the command php -v, then you may not have php-cli installed so sake ### Installation -`sake` can be invoked using `./framework/sake`. For easier access, copy the `sake` file into `/usr/bin/sake`. +`sake` can be invoked using `./vendor/silverstripe/framework/sake`. For easier access, copy the `sake` file into `/usr/bin/sake`. ``` cd your-webroot/ - sudo ./framework/sake installsake + sudo ./vendor/silverstripe/framework/sake installsake ```
This currently only works on UNIX like systems, not on Windows. @@ -139,7 +139,7 @@ Parameters can be added to the command. All parameters will be available in `$_G ```bash cd your-webroot/ - php framework/cli-script.php myurl myparam=1 myotherparam=2 + php vendor/silverstripe/framework/cli-script.php myurl myparam=1 myotherparam=2 ``` Or if you're using `sake` From 7d63acb2212507c06c9b6388aeddca50d633990c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 4 Oct 2017 09:51:29 +0100 Subject: [PATCH 2/2] Better .htaccess upgrading instructions --- docs/en/04_Changelogs/4.0.0.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md index 2aa9109f0..a9b21db12 100644 --- a/docs/en/04_Changelogs/4.0.0.md +++ b/docs/en/04_Changelogs/4.0.0.md @@ -84,6 +84,17 @@ to adjust the path to this file from `framework/main.php` to `vendor/silverstrip If you are running Apache, adjust your `.htaccess` file. For other webservers, please consult the [installation guides](getting_started/installation/). +For websites served by Apache, here's an adjusted `.htaccess` excerpt: + +```diff ++RewriteCond %{REQUEST_URI} !^/vendor/silverstripe/framework/main\.php +RewriteRule ^vendor(/|$) - [F,L,NC] + +# ... + +-RewriteRule .* framework/main.php?url=%1 [QSA] ++RewriteRule .* vendor/silverstripe/framework/main.php?url=%1 [QSA] +``` #### Upgrade references to renamed and namespaced classes