From 90f7fdf57eb18bf98bd2a1546089c1b4b8c9c140 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Jun 2017 14:53:47 +1200 Subject: [PATCH 1/2] FIX Add core SS4 modules --- README.md | 2 +- makedoc.sh | 9 ++++++++- src/Lookup.php | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cef855c..94e0e2d 100644 --- a/README.md +++ b/README.md @@ -69,5 +69,5 @@ Examples: * `/search/lookup.php?q=DataObject`: Shows `DataObject` docs in `trunk` version of framework * `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.0` version of framework * `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.6` version of framework (or whatever is the latest stable minor version) - * `/search/lookup.php?q=DPSPayment&module=payemnt`: Shows `DPSPayment` class docs in the `ecommerce` module + * `/search/lookup.php?q=DPSPayment&module=payment`: Shows `DPSPayment` class docs in the `ecommerce` module * `/search/lookup.php?q=SilverStripe\ORM\DataExtension::onBeforeWrite()&version=4`: Shows `SilverStripe\ORM\DataExtension::onBeforeWrite()` docs in `master` (4.x) version of framework diff --git a/makedoc.sh b/makedoc.sh index 92e0c76..af42339 100755 --- a/makedoc.sh +++ b/makedoc.sh @@ -43,10 +43,17 @@ function generate { mkdir -p "$STORAGE_DIR" # master +checkout 'git://github.com/silverstripe/silverstripe-admin.git' 'master' 'admin' +checkout 'git://github.com/silverstripe/silverstripe-asset-admin.git' 'master' 'asset-admin' +checkout 'git://github.com/silverstripe/silverstripe-assets.git' 'master' 'assets' +checkout 'git://github.com/silverstripe/silverstripe-campaign-admin.git' 'master' 'campaign-admin' checkout 'git://github.com/silverstripe/silverstripe-cms.git' 'master' 'cms' +checkout 'git://github.com/silverstripe/silverstripe-config.git' 'master' 'config' checkout 'git://github.com/silverstripe/silverstripe-framework.git' 'master' 'framework' -checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig' +checkout 'git://github.com/silverstripe/silverstripe-graphql.git' 'master' 'graphql' checkout 'git://github.com/silverstripe/silverstripe-reports.git' 'master' 'reports' +checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig' +checkout 'git://github.com/silverstripe/silverstripe-versioned.git' 'master' 'versioned' generate 'master' 'SilverStripe master API Docs' # 3.6 diff --git a/src/Lookup.php b/src/Lookup.php index 1910015..06f26be 100644 --- a/src/Lookup.php +++ b/src/Lookup.php @@ -77,7 +77,7 @@ public function handle($return = false) { $paths = array(); - // Only include modules path if we're not request core. + // Only include modules path if we're not requesting core. if ($this->getArg('module') && !in_array($this->getArg('module'), array('cms', 'framework', 'sapphire'))) { $paths[] = 'modules/' . $this->getArg('module'); } From 2854ebbc0a3c1379245762841bdba36a509f7d06 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Jun 2017 15:00:02 +1200 Subject: [PATCH 2/2] FIX Remove GraphQL example code --- conf/apigen/apigen.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/apigen/apigen.neon b/conf/apigen/apigen.neon index 4dffb5d..1440cad 100644 --- a/conf/apigen/apigen.neon +++ b/conf/apigen/apigen.neon @@ -1,5 +1,5 @@ # Mask to exclude file or directory from processing -exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*'] +exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*', '*/examples/*'] # Grouping of classes groups: packages