From 5bcfc4e800c88508a915b1d6545d15449136dc0b Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 8 Oct 2014 22:57:09 +0200 Subject: remove redundant owncloud version check --- config/appconfig.php | 9 ++------- tests/unit/config/AppConfigTest.php | 13 ------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/config/appconfig.php b/config/appconfig.php index 5292d35a7..ae8f268f5 100644 --- a/config/appconfig.php +++ b/config/appconfig.php @@ -175,17 +175,12 @@ class AppConfig { $deps = $this->config['dependencies']; - if(array_key_exists('php', $deps)) { + if (array_key_exists('php', $deps)) { $msg .= $this->requireVersion($this->phpVersion, $deps['php'], 'PHP'); } - if(array_key_exists('owncloud', $deps)) { - $msg .= $this->requireVersion($this->ownCloudVersion, - $deps['owncloud'], 'ownCloud'); - } - - if(array_key_exists('libs', $deps)) { + if (array_key_exists('libs', $deps)) { foreach ($deps['libs'] as $lib => $versions) { if(array_key_exists($lib, $this->installedExtensions)) { $msg .= $this->requireVersion($this->installedExtensions[$lib], diff --git a/tests/unit/config/AppConfigTest.php b/tests/unit/config/AppConfigTest.php index 9053c6cbd..02a6ad8a5 100644 --- a/tests/unit/config/AppConfigTest.php +++ b/tests/unit/config/AppConfigTest.php @@ -143,19 +143,6 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { } - /** - * @expectedException \OCA\News\Config\DependencyException - */ - public function testOwnCloudVersion() { - $this->config->loadConfig([ - 'dependencies' => [ - 'owncloud' => '>=4.5,<=6.0.2' - ] - ]); - $this->config->testDependencies(); - } - - /** * @expectedException \OCA\News\Config\DependencyException */ -- cgit v1.2.3