Change Version to non-static

This commit is contained in:
Benoît Burnichon
2015-03-19 11:28:06 +01:00
parent 36a8d555e8
commit 775552f613
10 changed files with 28 additions and 23 deletions

View File

@@ -4,18 +4,20 @@ namespace Alchemy\Tests\Phrasea\Core;
use Alchemy\Phrasea\Core\Version;
class VersionTest extends \PhraseanetTestCase
class VersionTest extends \PHPUnit_Framework_TestCase
{
public function testGetNumber()
{
$this->assertTrue(is_string(Version::getNumber()));
$this->assertRegExp('/[\d]{1}\.[\d]{1,2}\.[\d]{1,2}/', Version::getNumber());
$version = new Version();
$this->assertTrue(is_string($version->getNumber()));
$this->assertRegExp('/[\d]{1}\.[\d]{1,2}\.[\d]{1,2}/', $version->getNumber());
}
public function testGetName()
{
$this->assertTrue(is_string(Version::getName()));
$this->assertTrue(strlen(Version::getName()) > 3);
$version = new Version();
$this->assertTrue(is_string($version->getName()));
$this->assertTrue(strlen($version->getName()) > 3);
}
}

View File

@@ -90,10 +90,8 @@ class ConfigurationTesterTest extends AbstractSetupTester
->disableOriginalConstructor()
->getMock();
/**
* Must return version + 1
*/
$app['phraseanet.version']::staticExpects($this->any())
// Must return version + 1
$app['phraseanet.version']->expects($this->any())
->method('getNumber')
->will($this->returnValue('3.10'));