Namespacing, reusing

apps/files_versions/lib/storage.php

@@ -68,6 +68,9 @@ class Storage {
 		//until the end one version per week
 		6 => array('intervalEndsAfter' => -1,      'step' => 604800),
 	);
+	
+	/** @var \OCA\Files_Versions\AppInfo\Application */
+	private static $application;
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
@@ -709,8 +712,10 @@ class Storage {
 	 * @return Expiration
 	 */
 	protected static function getExpiration(){
-		$application = new Application();
-		return $application->getContainer()->query('Expiration');
+		if (is_null(self::$application)) {
+			self::$application = new Application();
+		}
+		return self::$application->getContainer()->query('Expiration');
 	}
 
 }

apps/files_versions/tests/expiration.php

@@ -19,9 +19,11 @@
  *
  */
 
-namespace OCA\Files_Versions;
+namespace OCA\Files_Versions\Tests;
 
-class Expiration_Test extends \PHPUnit_Framework_TestCase {
+use \OCA\Files_Versions\Expiration;
+
+class Expiration_Test extends \Test\TestCase {
 	const SECONDS_PER_DAY = 86400; //60*60*24
 
 	public function expirationData(){