Add master back as 5, mark 4.0 as stable

This commit is contained in:
Damian Mooyman 2017-11-08 16:21:11 +13:00
parent 554070a617
commit 8901421e4f
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 148 additions and 60 deletions

View File

@ -6,6 +6,10 @@ After:
--- ---
RefreshMarkdownTask: RefreshMarkdownTask:
documentation_repositories: documentation_repositories:
-
- silverstripe/silverstripe-framework
- framework
- "master"
- -
- silverstripe/silverstripe-framework - silverstripe/silverstripe-framework
- framework - framework

View File

@ -9,12 +9,20 @@ DocumentationSearch:
DocumentationManifest: DocumentationManifest:
automatic_registration: false automatic_registration: false
register_entities: register_entities:
-
Path: "assets/src/framework_master/docs/"
Title: "Framework"
VersionTitle: "5.x"
Version: "5"
Branch: "master"
DefaultEntity: true
- -
Path: "assets/src/framework_4/docs/" Path: "assets/src/framework_4/docs/"
Title: "Framework" Title: "Framework"
VersionTitle: "4.x" VersionTitle: "4.x"
Version: "4" Version: "4"
Branch: "4" Branch: "4"
Stable: true
DefaultEntity: true DefaultEntity: true
- -
Path: "assets/src/framework_3/docs/" Path: "assets/src/framework_3/docs/"

196
composer.lock generated
View File

@ -71,16 +71,16 @@
}, },
{ {
"name": "composer/installers", "name": "composer/installers",
"version": "v1.2.0", "version": "v1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/installers.git", "url": "https://github.com/composer/installers.git",
"reference": "d78064c68299743e0161004f2de3a0204e33b804" "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804", "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"reference": "d78064c68299743e0161004f2de3a0204e33b804", "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -122,12 +122,17 @@
"keywords": [ "keywords": [
"Craft", "Craft",
"Dolibarr", "Dolibarr",
"Eliasis",
"Hurad", "Hurad",
"ImageCMS", "ImageCMS",
"Kanboard",
"Lan Management System",
"MODX Evo", "MODX Evo",
"Mautic", "Mautic",
"Maya",
"OXID", "OXID",
"Plentymarkets", "Plentymarkets",
"Porto",
"RadPHP", "RadPHP",
"SMF", "SMF",
"Thelia", "Thelia",
@ -145,20 +150,24 @@
"croogo", "croogo",
"dokuwiki", "dokuwiki",
"drupal", "drupal",
"eZ Platform",
"elgg", "elgg",
"expressionengine", "expressionengine",
"fuelphp", "fuelphp",
"grav", "grav",
"installer", "installer",
"itop",
"joomla", "joomla",
"kohana", "kohana",
"laravel", "laravel",
"lavalite",
"lithium", "lithium",
"magento", "magento",
"mako", "mako",
"mediawiki", "mediawiki",
"modulework", "modulework",
"moodle", "moodle",
"osclass",
"phpbb", "phpbb",
"piwik", "piwik",
"ppi", "ppi",
@ -167,6 +176,7 @@
"roundcube", "roundcube",
"shopware", "shopware",
"silverstripe", "silverstripe",
"sydes",
"symfony", "symfony",
"typo3", "typo3",
"wordpress", "wordpress",
@ -174,37 +184,41 @@
"zend", "zend",
"zikula" "zikula"
], ],
"time": "2016-08-13T20:53:52+00:00" "time": "2017-08-09T07:53:48+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.6.1", "version": "v1.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3" "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3", "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3", "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "~5.5|~7.0" "php": "~7.1"
}, },
"conflict": { "conflict": {
"doctrine/common": ">2.2,<2.4" "doctrine/common": ">2.2,<2.4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.8|~5.0", "alcaeus/mongo-php-adapter": "^1.1",
"predis/predis": "~1.0", "mongodb/mongodb": "^1.1",
"satooshi/php-coveralls": "~0.6" "phpunit/phpunit": "^5.7",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6.x-dev" "dev-master": "1.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -244,7 +258,7 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2016-10-29T11:16:17+00:00" "time": "2017-08-25T07:02:50+00:00"
}, },
{ {
"name": "erusev/parsedown", "name": "erusev/parsedown",
@ -516,21 +530,22 @@
}, },
{ {
"name": "mnapoli/front-yaml", "name": "mnapoli/front-yaml",
"version": "1.5.2", "version": "1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mnapoli/FrontYAML.git", "url": "https://github.com/mnapoli/FrontYAML.git",
"reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543" "reference": "24070ace8b741247bb3161cbb38ecc541268b296"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/f10c1dfee1604d15c2b0ab6826eecc1111d65543", "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/24070ace8b741247bb3161cbb38ecc541268b296",
"reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543", "reference": "24070ace8b741247bb3161cbb38ecc541268b296",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"erusev/parsedown": "~1.0", "erusev/parsedown": "~1.0",
"symfony/yaml": "~2.1|^3.0" "php": ">=5.4.0",
"symfony/yaml": "~2.1|^3.0|^4.0"
}, },
"require-dev": { "require-dev": {
"league/commonmark": "~0.7", "league/commonmark": "~0.7",
@ -546,20 +561,20 @@
"license": [ "license": [
"MIT" "MIT"
], ],
"time": "2016-10-01T11:06:51+00:00" "time": "2017-10-29T19:29:55+00:00"
}, },
{ {
"name": "mtdowling/cron-expression", "name": "mtdowling/cron-expression",
"version": "v1.1.0", "version": "v1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mtdowling/cron-expression.git", "url": "https://github.com/mtdowling/cron-expression.git",
"reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5" "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
"reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -570,8 +585,8 @@
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Cron": "src/" "Cron\\": "src/Cron/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -590,20 +605,70 @@
"cron", "cron",
"schedule" "schedule"
], ],
"time": "2016-01-26T21:23:30+00:00" "time": "2017-01-23T04:29:33+00:00"
}, },
{ {
"name": "silverstripe/crontask", "name": "mustangostang/spyc",
"version": "1.1.1", "version": "0.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-crontask.git", "url": "https://github.com/mustangostang/spyc.git",
"reference": "ef1992904075604b76a40cc286c0f448064ddc20" "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/ef1992904075604b76a40cc286c0f448064ddc20", "url": "https://api.github.com/repos/mustangostang/spyc/zipball/23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
"reference": "ef1992904075604b76a40cc286c0f448064ddc20", "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
"shasum": ""
},
"require": {
"php": ">=5.3.1"
},
"require-dev": {
"phpunit/phpunit": "4.3.*@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.5.x-dev"
}
},
"autoload": {
"files": [
"Spyc.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "mustangostang",
"email": "vlad.andersen@gmail.com"
}
],
"description": "A simple YAML loader/dumper class for PHP",
"homepage": "https://github.com/mustangostang/spyc/",
"keywords": [
"spyc",
"yaml",
"yml"
],
"time": "2017-02-24T16:06:33+00:00"
},
{
"name": "silverstripe/crontask",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-crontask.git",
"reference": "dda7a14ae44966b738df304af0050ddf6af4b7ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/dda7a14ae44966b738df304af0050ddf6af4b7ed",
"reference": "dda7a14ae44966b738df304af0050ddf6af4b7ed",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -614,6 +679,11 @@
"phpunit/phpunit": "~3.7@stable" "phpunit/phpunit": "~3.7@stable"
}, },
"type": "silverstripe-module", "type": "silverstripe-module",
"extra": {
"branch-alias": {
"1": "1.2.x-dev"
}
},
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
@ -633,7 +703,7 @@
"cron", "cron",
"silverstripe" "silverstripe"
], ],
"time": "2016-09-13T10:39:18+00:00" "time": "2017-04-10T21:44:50+00:00"
}, },
{ {
"name": "silverstripe/docsviewer", "name": "silverstripe/docsviewer",
@ -720,21 +790,22 @@
}, },
{ {
"name": "silverstripe/framework", "name": "silverstripe/framework",
"version": "3.5.0", "version": "3.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git", "url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "179996b5f9ccbaab8882cafbf16c389623521b72" "reference": "3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/179996b5f9ccbaab8882cafbf16c389623521b72", "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e",
"reference": "179996b5f9ccbaab8882cafbf16c389623521b72", "reference": "3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/installers": "~1.0", "composer/installers": "~1.0",
"php": ">=5.3.3,<7" "mustangostang/spyc": "^0.6.2",
"php": ">= 5.3.3, <7.2"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~3.7" "phpunit/phpunit": "~3.7"
@ -742,7 +813,7 @@
"type": "silverstripe-module", "type": "silverstripe-module",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"3.x-dev": "3.5.x-dev" "3.x-dev": "3.6.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -770,7 +841,7 @@
"framework", "framework",
"silverstripe" "silverstripe"
], ],
"time": "2016-11-28T12:35:19+00:00" "time": "2017-09-28T16:05:53+00:00"
}, },
{ {
"name": "silverstripe/raygun", "name": "silverstripe/raygun",
@ -856,16 +927,16 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.8.14", "version": "v2.8.28",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934" "reference": "7fe089232554357efb8d4af65ce209fc6e5a2186"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fe089232554357efb8d4af65ce209fc6e5a2186",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934", "reference": "7fe089232554357efb8d4af65ce209fc6e5a2186",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -873,7 +944,7 @@
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5|~3.0.0", "symfony/config": "^2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0", "symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0" "symfony/stopwatch": "~2.3|~3.0.0"
@ -912,20 +983,20 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-10-13T01:43:15+00:00" "time": "2017-10-01T21:00:16+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.8.14", "version": "v2.8.28",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff" "reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff", "url": "https://api.github.com/repos/symfony/yaml/zipball/842fb6df22180244b4c65935ce1a88d324e5ff9e",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff", "reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -961,7 +1032,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-11-14T16:15:57+00:00" "time": "2017-10-05T14:38:30+00:00"
}, },
{ {
"name": "unclecheese/display-logic", "name": "unclecheese/display-logic",
@ -1160,25 +1231,30 @@
}, },
{ {
"name": "phpunit/php-timer", "name": "phpunit/php-timer",
"version": "1.0.8", "version": "1.0.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git", "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": "^5.3.3 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4|~5" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"src/" "src/"
@ -1200,7 +1276,7 @@
"keywords": [ "keywords": [
"timer" "timer"
], ],
"time": "2016-05-12T18:03:57+00:00" "time": "2017-02-26T11:10:40+00:00"
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",