Use preg_match to ensure just a version check (joomla#77)

photodude · mbabker · commit a13986cadfc2 · 2017-01-29T12:43:54.000-05:00
* Use preg_match to ensure just a version check

* Use preg_match to ensure just a version check
diff --git a/Tests/DriverPgsqlTest.php b/Tests/DriverPgsqlTest.php
@@ -460,11 +460,9 @@ public function testGetTableList()
 	public function testGetVersion()
 	{
 		$versionRow = self::$driver->setQuery('SELECT version();')->loadRow();
-		$versionArray = explode(' ', $versionRow[0]);
+		preg_match('/((\d+)\.)((\d+)\.)(\*|\d+)/', $versionRow[0], $versionArray);
 
-		$version = rtrim($versionArray[1], ',');
-
-		$this->assertGreaterThanOrEqual($version, self::$driver->getVersion(), __LINE__);
+		$this->assertGreaterThanOrEqual($versionArray[0], self::$driver->getVersion(), __LINE__);
 	}
 
 	/**
diff --git a/Tests/DriverPostgresqlTest.php b/Tests/DriverPostgresqlTest.php
@@ -460,11 +460,9 @@ public function testGetTableList()
 	public function testGetVersion()
 	{
 		$versionRow = self::$driver->setQuery('SELECT version();')->loadRow();
-		$versionArray = explode(' ', $versionRow[0]);
+		preg_match('/((\d+)\.)((\d+)\.)(\*|\d+)/', $versionRow[0], $versionArray);
 
-		$version = rtrim($versionArray[1], ',');
-
-		$this->assertGreaterThanOrEqual($version, self::$driver->getVersion(), __LINE__);
+		$this->assertGreaterThanOrEqual($versionArray[0], self::$driver->getVersion(), __LINE__);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -460,11 +460,9 @@ public function testGetTableList()`
`460`	`460`	`public function testGetVersion()`
`461`	`461`	`{`
`462`	`462`	`$versionRow = self::$driver->setQuery('SELECT version();')->loadRow();`
`463`		`- $versionArray = explode(' ', $versionRow[0]);`
	`463`	`+ preg_match('/((\d+)\.)((\d+)\.)(\*\|\d+)/', $versionRow[0], $versionArray);`
`464`	`464`
`465`		`- $version = rtrim($versionArray[1], ',');`
`466`		`-`
`467`		`- $this->assertGreaterThanOrEqual($version, self::$driver->getVersion(), __LINE__);`
	`465`	`+ $this->assertGreaterThanOrEqual($versionArray[0], self::$driver->getVersion(), __LINE__);`
`468`	`466`	`}`
`469`	`467`
`470`	`468`	`/**`