Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

API CHANGE silverstripe_version file now contains the plain version n…

…umber, rather than an SVN path
  • Loading branch information...
commit 4abe136db5955de9dd263821f8db65d5b3e0db25 1 parent 7645f5f
@chillu chillu authored
View
27 code/LeftAndMain.php
@@ -1109,34 +1109,21 @@ public function EditorToolbar() {
/**
* Return the version number of this application.
* Uses the subversion path information in <mymodule>/silverstripe_version
- * (automacially replaced $URL$ placeholder).
+ * (automacially replaced by build scripts).
*
* @return string
*/
public function CMSVersion() {
- $sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version');
- $cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
-
- $sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile);
- $cmsVersion = $this->versionFromVersionFile($cmsVersionFile);
+ $cmsVersion = file_get_contents(BASE_PATH . '/cms/silverstripe_version');
+ $sapphireVersion = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version');
+ if(!$cmsVersion || !$sapphireVersion) return;
- if($sapphireVersion == $cmsVersion) {
+ if($cmsVersion == $sapphireVersion) {
return $sapphireVersion;
- } else {
- return "cms: $cmsVersion, sapphire: $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;
+ return sprintf("cms: %s, sapphire: %s", $cmsVersion, $sapphireVersion);
}
+
}
/**
View
1  silverstripe_version
@@ -1 +0,0 @@
-$URL$
View
19 tests/LeftAndMainTest.php
@@ -15,25 +15,6 @@ function setUp() {
}
/**
- * 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
*/
public function testLeftAndMainSubclasses() {
Please sign in to comment.
Something went wrong with that request. Please try again.