tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 07:29:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6750 from open-sausages/pulls/4.0/fix-module-resource-trim

Browse Source 
Root-level module support in Module->getResourcePath()
This commit is contained in:
Damian Mooyman 2017-03-29 10:44:16 +13:00 committed by GitHub
commit 1aa2677353
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Manifest/Module.php
View File

@ -162,9 +162,9 @@ class Module implements Serializable
*/
public function getResourcePath($path)
{
$base = rtrim($this->getRelativePath(), '/\\');
$path = rtrim($path, '/\\');
return "{$base}/{$path}";
$base = trim($this->getRelativePath(), '/\\');
$path = trim($path, '/\\');
return trim("{$base}/{$path}", '/\\');
}
/**

17
tests/php/Core/Manifest/ModuleManifestTest.php
View File

@ -31,6 +31,7 @@ class ModuleManifestTest extends SapphireTest
$modules = $this->manifest->getModules();
$this->assertEquals(
[
'silverstripe/root-module',
'module',
'silverstripe/awesome-module',
],
@ -74,7 +75,7 @@ class ModuleManifestTest extends SapphireTest
* Note: Tests experimental API
* @internal
*/
public function testGetResource()
public function testGetResourcePath()
{
$module = $this->manifest->getModule('moduleb');
$this->assertTrue($module->hasResource('composer.json'));
@ -84,4 +85,18 @@ class ModuleManifestTest extends SapphireTest
$module->getResourcePath('composer.json')
);
}
/*
* Note: Tests experimental API
* @internal
*/
public function testGetResourcePathOnRoot()
{
$module = $this->manifest->getModule('silverstripe/root-module');
$this->assertTrue($module->hasResource('composer.json'));
$this->assertEquals(
'composer.json',
$module->getResourcePath('composer.json')
);
}
}

1
tests/php/Core/Manifest/fixtures/classmanifest/_config.php Normal file
View File

@ -0,0 +1 @@
<?php

8
tests/php/Core/Manifest/fixtures/classmanifest/composer.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "silverstripe/root-module",
"description": "dummy test module",
"require": {},
"extra": {
"installer-name": "root-module"
}
}