tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7429 from open-sausages/pulls/4/fix-sake-path

Browse Source 
Fix sake path, improve .htaccess upgrading instructions
This commit is contained in:
Damian Mooyman 2017-10-05 08:59:47 +13:00 committed by GitHub
commit daad9761cc
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/02_Developer_Guides/14_Files/04_File_Migration.md
View File

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

8
docs/en/02_Developer_Guides/17_CLI/index.md
View File

@ -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
```
<div class="notice">
@ -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
```
<div class="warning">
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`

11
docs/en/04_Changelogs/4.0.0.md
View File

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