From 95a71566f1f00f1d8ced06861c2cd5772a601155 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 4 Dec 2017 15:26:17 +1300 Subject: [PATCH] NEW Convert to vendor module --- .travis.yml | 7 ++----- composer.json | 8 ++++++-- phpunit.xml.dist | 2 +- src/Extension/LeftAndMainSubsites.php | 12 ++++-------- src/Forms/SubsitesTreeDropdownField.php | 4 +--- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbfc80f..68957d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,14 +31,11 @@ before_script: - phpenv config-rm xdebug.ini - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - composer validate - - composer require silverstripe/recipe-cms 1.0.x-dev --no-update + - composer require silverstripe/installer 4.0.x-dev --no-update - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - echo "SS_BASE_URL=http://localhost:8080/" >> .env - # Bootstrap cms / mysite folder - - php ./vendor/silverstripe/cms/tests/bootstrap/mysite.php - # Behat bootstrapping - if [[ $BEHAT_TEST ]]; then echo "" >> .env && echo "SS_BASE_URL=http://localhost:8080/" >> .env; fi - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi @@ -50,7 +47,7 @@ before_script: script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/ ; fi + - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src tests *.php ; fi - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @subsites; fi after_success: diff --git a/composer.json b/composer.json index 659aba0..9e46ca6 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "silverstripe/subsites", "description": "Run multiple sites from a single SilverStripe install.", "license": "BSD-3-Clause", - "type": "silverstripe-module", + "type": "silverstripe-vendormodule", "keywords": ["silverstripe", "subsites", "multisite"], "authors": [ { @@ -34,7 +34,11 @@ "extra": { "branch-alias": { "dev-master": "2.0.x-dev" - } + }, + "expose": [ + "javascript", + "css" + ] }, "minimum-stability": "dev", "prefer-stable": true diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ff569fc..8b43ffd 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php diff --git a/src/Extension/LeftAndMainSubsites.php b/src/Extension/LeftAndMainSubsites.php index f86e3a4..6b52b58 100644 --- a/src/Extension/LeftAndMainSubsites.php +++ b/src/Extension/LeftAndMainSubsites.php @@ -10,7 +10,6 @@ use SilverStripe\CMS\Controllers\CMSPageEditController; use SilverStripe\Control\Controller; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Convert; -use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\HiddenField; use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\DataObject; @@ -41,11 +40,9 @@ class LeftAndMainSubsites extends LeftAndMainExtension public function init() { - $module = ModuleLoader::getModule('silverstripe/subsites'); - - Requirements::css($module->getRelativeResourcePath('css/LeftAndMain_Subsites.css')); - Requirements::javascript($module->getRelativeResourcePath('javascript/LeftAndMain_Subsites.js')); - Requirements::javascript($module->getRelativeResourcePath('javascript/VirtualPage_Subsites.js')); + Requirements::css('silverstripe/subsites:css/LeftAndMain_Subsites.css'); + Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js'); + Requirements::javascript('silverstripe/subsites:javascript/VirtualPage_Subsites.js'); } /** @@ -152,8 +149,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension return false; } - $module = ModuleLoader::getModule('silverstripe/subsites'); - Requirements::javascript($module->getRelativeResourcePath('javascript/LeftAndMain_Subsites.js')); + Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js'); $output = ArrayList::create(); diff --git a/src/Forms/SubsitesTreeDropdownField.php b/src/Forms/SubsitesTreeDropdownField.php index 5518171..dd64051 100644 --- a/src/Forms/SubsitesTreeDropdownField.php +++ b/src/Forms/SubsitesTreeDropdownField.php @@ -4,7 +4,6 @@ namespace SilverStripe\Subsites\Forms; use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPRequest; -use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\TreeDropdownField; use SilverStripe\View\Requirements; use SilverStripe\Subsites\State\SubsiteState; @@ -35,8 +34,7 @@ class SubsitesTreeDropdownField extends TreeDropdownField { $html = parent::Field($properties); - $module = ModuleLoader::getModule('silverstripe/subsites'); - Requirements::javascript($module->getRelativeResourcePath('javascript/SubsitesTreeDropdownField.js')); + Requirements::javascript('silverstripe/subsitesjavascript/SubsitesTreeDropdownField.js'); return $html; }