tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 09:05:53 +00:00
Code Issues Projects Releases Wiki Activity

API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-01 18:30:24 +01:00
parent 7645f5fb22
commit 4abe136db5
3 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/LeftAndMain.php
View File

@ -1109,34 +1109,21 @@ JS;
/** /**
* Return the version number of this application. * Return the version number of this application.
* Uses the subversion path information in <mymodule>/silverstripe_version * Uses the subversion path information in <mymodule>/silverstripe_version
* (automacially replaced $URL$ placeholder). * (automacially replaced by build scripts).
* *
* @return string * @return string
*/ */
public function CMSVersion() { public function CMSVersion() {
$sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version'); $cmsVersion = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
$cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version'); $sapphireVersion = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version');
if(!$cmsVersion || !$sapphireVersion) return;
$sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile); if($cmsVersion == $sapphireVersion) {
$cmsVersion = $this->versionFromVersionFile($cmsVersionFile);
if($sapphireVersion == $cmsVersion) {
return $sapphireVersion; return $sapphireVersion;
} else { } else {
return "cms: $cmsVersion, sapphire: $sapphireVersion"; return sprintf("cms: %s, sapphire: %s", $cmsVersion, $sapphireVersion);
}
} }
/**
* Return the version from the content of a silverstripe_version file
*/
public function versionFromVersionFile($fileContent) {
if(preg_match('/\/trunk\/silverstripe_version/', $fileContent)) {
return "trunk";
} else {
preg_match("/\/(?:branches|tags\/rc|tags\/beta|tags\/alpha|tags)\/([A-Za-z0-9._-]+)\/silverstripe_version/", $fileContent, $matches);
return ($matches) ? $matches[1] : null;
}
} }
/** /**

1
silverstripe_version
View File

@ -1 +0,0 @@
$URL$

19
tests/LeftAndMainTest.php
View File

@ -14,25 +14,6 @@ class LeftAndMainTest extends FunctionalTest {
CMSMenu::populate_menu(); CMSMenu::populate_menu();
} }
/**
* Test that CMS versions can be interpreted appropriately
*/
public function testCMSVersion() {
$l = new LeftAndMain();
$this->assertEquals("2.4", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/branches/2.4/silverstripe_version $'));
$this->assertEquals("2.2.0", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/tags/2.2.0/silverstripe_version $'));
$this->assertEquals("trunk", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/trunk/silverstripe_version $'));
$this->assertEquals("2.4.0-alpha1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/tags/alpha/2.4.0-alpha1/silverstripe_version $'));
$this->assertEquals("2.4.0-beta1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/tags/beta/2.4.0-beta1/silverstripe_version $'));
$this->assertEquals("2.4.0-rc1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/cms/tags/rc/2.4.0-rc1/silverstripe_version $'));
}
/** /**
* Check that all subclasses of leftandmain can be accessed * Check that all subclasses of leftandmain can be accessed
*/ */