tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02: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:34 +01:00
parent a67c6ce936
commit d261f4406a
4 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/code/LeftAndMain.php
View File

@ -1131,27 +1131,17 @@ class LeftAndMain extends Controller {
/** /**
* 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'); $sapphireVersion = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
$sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile); if(!$sapphireVersion) $sapphireVersion = _t('LeftAndMain.VersionUnknown', 'unknown');
return sprintf(
return "sapphire: $sapphireVersion"; "sapphire: %s",
} $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;
}
} }
/** /**

2
admin/templates/Includes/LeftAndMain_Menu.ss
View File

@ -1,7 +1,7 @@
<div class="cms-menu cms-panel cms-panel-layout west" id="cms-menu" data-layout="{type: 'border'}"> <div class="cms-menu cms-panel cms-panel-layout west" id="cms-menu" data-layout="{type: 'border'}">
<div class="cms-panel-header cms-logo-header north"> <div class="cms-panel-header cms-logo-header north">
<div class="cms-logo"> <div class="cms-logo">
<a href="http://www.silverstripe.org/" target="_blank"> <a href="http://www.silverstripe.org/" target="_blank" title="SilverStripe (Version - $CMSVersion)">
SilverStripe <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %> SilverStripe <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
</a> </a>
<span>$SiteConfig.Title</span> <span>$SiteConfig.Title</span>

19
admin/tests/LeftAndMainTest.php
View File

@ -82,25 +82,6 @@ class LeftAndMainTest extends FunctionalTest {
$this->assertEquals(3, $page32->Sort, 'Children pages after insertion are resorted'); $this->assertEquals(3, $page32->Sort, 'Children pages after insertion are resorted');
} }
/**
* 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/sapphire/branches/2.4/silverstripe_version $'));
$this->assertEquals("2.2.0", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/2.2.0/silverstripe_version $'));
$this->assertEquals("trunk", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/sapphire/trunk/silverstripe_version $'));
$this->assertEquals("2.4.0-alpha1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/alpha/2.4.0-alpha1/silverstripe_version $'));
$this->assertEquals("2.4.0-beta1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/beta/2.4.0-beta1/silverstripe_version $'));
$this->assertEquals("2.4.0-rc1", $l->versionFromVersionFile(
'$URL: http://svn.silverstripe.com/open/modules/sapphire/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
*/ */

1
silverstripe_version
View File

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