tonyair/doc.silverstripe.org
1
0
Fork 0
mirror of https://github.com/silverstripe/doc.silverstripe.org synced 2024-10-22 15:05:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #183 from creative-commoners/pulls/update-framework

Browse Source 
Update framework to 3.7.3 and docsviewer to 2.0 stable
This commit is contained in:
Robbie Averill 2019-02-21 11:50:37 +07:00 committed by GitHub
commit 436c8fba41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.platform.yml Normal file
View File

@ -0,0 +1,2 @@
php_settings:
version: 7.1

5
README.md
View File

@ -30,7 +30,8 @@ For adding functionality or editing the style of the documentation, see the
To set up a local instance of [doc.silverstripe.org](https://github.com/SpiritLevel/doc.silverstripe.org): To set up a local instance of [doc.silverstripe.org](https://github.com/SpiritLevel/doc.silverstripe.org):
* Install [Composer](https://docs.silverstripe.org/en/getting_started/composer). * Ensure you are running the required PHP version (see .platform.yml)
* Install [Composer](https://docs.silverstripe.org/en/getting_started/composer)
* Install [sake](https://docs.silverstripe.org/en/developer_guides/cli). * Install [sake](https://docs.silverstripe.org/en/developer_guides/cli).
* Clone this repository to a LAMP server. For example, the shell command * Clone this repository to a LAMP server. For example, the shell command
``` ```
@ -118,3 +119,5 @@ versions that are not stable.
## Deployment ## Deployment
Deployment is via the [SilverStripe Platform](https://www.silverstripe.com/platform/) deployment tool and uses [StackShare](http://www.silverstripe.com/platform/technical/). Deployment is via the [SilverStripe Platform](https://www.silverstripe.com/platform/) deployment tool and uses [StackShare](http://www.silverstripe.com/platform/technical/).
For platform configuration, see .platform.yml.

4
composer.json
View File

@ -4,7 +4,7 @@
"require": { "require": {
"ext-gd": "*", "ext-gd": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0@rc", "silverstripe/docsviewer": "^2.0",
"silverstripe/framework": "~3.6", "silverstripe/framework": "~3.6",
"silverstripe/toolbar": "^4.2", "silverstripe/toolbar": "^4.2",
"silverstripe/dynamodb": "^1.1", "silverstripe/dynamodb": "^1.1",
@ -12,7 +12,7 @@
"silverstripe/raygun": "^1.1" "silverstripe/raygun": "^1.1"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7@stable" "phpunit/phpunit": "~3.7@stable"
}, },
"repositories": [ "repositories": [
{ {

25
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1d2f6da0ba93e21841fdd1d85a5d60cd", "content-hash": "4f381c5fae8e2f6af144bbbcd81fa6c3",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -712,16 +712,16 @@
}, },
{ {
"name": "silverstripe/docsviewer", "name": "silverstripe/docsviewer",
"version": "2.0.0-rc3", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "03ec3d287e909e8b33811c1e7121a9f2f7554190" "reference": "171652b33821d342ac1603c3bb0e0bdddc111a26"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/03ec3d287e909e8b33811c1e7121a9f2f7554190", "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/171652b33821d342ac1603c3bb0e0bdddc111a26",
"reference": "03ec3d287e909e8b33811c1e7121a9f2f7554190", "reference": "171652b33821d342ac1603c3bb0e0bdddc111a26",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -755,7 +755,7 @@
"documentation", "documentation",
"silverstripe" "silverstripe"
], ],
"time": "2018-06-08T04:14:53+00:00" "time": "2019-02-14T07:56:02+00:00"
}, },
{ {
"name": "silverstripe/dynamodb", "name": "silverstripe/dynamodb",
@ -800,16 +800,16 @@
}, },
{ {
"name": "silverstripe/framework", "name": "silverstripe/framework",
"version": "3.7.0", "version": "3.7.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git", "url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "d9261af1f3201fcea0d67a72b6fa1408ec69effc" "reference": "bb5701b73d40909caf99d71bac02e0329d301335"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/d9261af1f3201fcea0d67a72b6fa1408ec69effc", "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/bb5701b73d40909caf99d71bac02e0329d301335",
"reference": "d9261af1f3201fcea0d67a72b6fa1408ec69effc", "reference": "bb5701b73d40909caf99d71bac02e0329d301335",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -877,7 +877,7 @@
"framework", "framework",
"silverstripe" "silverstripe"
], ],
"time": "2018-06-08T00:19:40+00:00" "time": "2019-02-12T08:44:41+00:00"
}, },
{ {
"name": "silverstripe/raygun", "name": "silverstripe/raygun",
@ -1546,7 +1546,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 5,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": true, "prefer-stable": true,