lib/private/ocs to PSR-4 (#24558)

* Move OC_OCS_XX to legacy

* Move \OC\OCS to PSR-4

* OC_OCS_xx to \OC\OCS\xx

* Moved OC_OCS_xx to proper namespace
* OC_OCS_xx is still there for legacy reasons as a wrapper

* No calls to OC_OCS_xx in \OC\OCS\

12 files changed, 168 insertions, 24 deletions

diff --git a/lib/private/ocs/cloud.php b/lib/private/OCS/Cloud.php
index 1d47fb208a7..9686e9bfb58 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/OCS/Cloud.php
@@ -22,7 +22,9 @@
  *
  */
 
-class OC_OCS_Cloud {
+namespace OC\OCS;
+
+class Cloud {
 
 	public static function getCapabilities() {
 		$result = array();
@@ -31,22 +33,22 @@ class OC_OCS_Cloud {
 			'major' => $major,
 			'minor' => $minor,
 			'micro' => $micro,
-			'string' => OC_Util::getVersionString(),
-			'edition' => OC_Util::getEditionString(),
+			'string' => \OC_Util::getVersionString(),
+			'edition' => \OC_Util::getEditionString(),
 			);
 			
 		$result['capabilities'] = \OC::$server->getCapabilitiesManager()->getCapabilities();
 
-		return new OC_OCS_Result($result);
+		return new Result($result);
 	}
 	
 	public static function getCurrentUser() {
-		$userObject = \OC::$server->getUserManager()->get(OC_User::getUser());
+		$userObject = \OC::$server->getUserManager()->get(\OC_User::getUser());
 		$data  = array(
 			'id' => $userObject->getUID(),
 			'display-name' => $userObject->getDisplayName(),
 			'email' => $userObject->getEMailAddress(),
 		);
-		return new OC_OCS_Result($data);
+		return new Result($data);
 	}
 }
diff --git a/lib/private/ocs/config.php b/lib/private/OCS/Config.php
index db04dcbd400..5478411d6fd 100644
--- a/lib/private/ocs/config.php
+++ b/lib/private/OCS/Config.php
@@ -21,15 +21,17 @@
  *
  */
 
-class OC_OCS_Config {
+namespace OC\OCS;
+
+class Config {
 
 	public static function apiConfig() {
 		$xml['version'] = '1.7';
 		$xml['website'] = 'ownCloud';
-		$xml['host'] = OCP\Util::getServerHost();
+		$xml['host'] = \OCP\Util::getServerHost();
 		$xml['contact'] = '';
 		$xml['ssl'] = 'false';
-		return new OC_OCS_Result($xml);
+		return new Result($xml);
 	}
 
 }
diff --git a/lib/private/ocs/corecapabilities.php b/lib/private/OCS/CoreCapabilities.php
index 388a58791b4..388a58791b4 100644
--- a/lib/private/ocs/corecapabilities.php
+++ b/lib/private/OCS/CoreCapabilities.php
diff --git a/lib/private/ocs/exception.php b/lib/private/OCS/Exception.php
index ca67ac5e841..33c88fcf7d3 100644
--- a/lib/private/ocs/exception.php
+++ b/lib/private/OCS/Exception.php
@@ -23,7 +23,7 @@ namespace OC\OCS;
 
 class Exception extends \Exception {
 
-	public function __construct(\OC_OCS_Result $result) {
+	public function __construct(Result $result) {
 		$this->result = $result;
 	}
 
diff --git a/lib/private/ocs/person.php b/lib/private/OCS/Person.php
index 7162fa5e4fb..fd33504e0a8 100644
--- a/lib/private/ocs/person.php
+++ b/lib/private/OCS/Person.php
@@ -21,20 +21,22 @@
  *
  */
 
-class OC_OCS_Person {
+namespace OC\OCS;
+
+class Person {
 
 	public static function check() {
 		$login = isset($_POST['login']) ? $_POST['login'] : false;
 		$password = isset($_POST['password']) ? $_POST['password'] : false;
 		if($login && $password) {
-			if(OC_User::checkPassword($login, $password)) {
+			if(\OC_User::checkPassword($login, $password)) {
 				$xml['person']['personid'] = $login;
-				return new OC_OCS_Result($xml);
+				return new Result($xml);
 			} else {
-				return new OC_OCS_Result(null, 102);
+				return new Result(null, 102);
 			}
 		} else {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 	}
 
diff --git a/lib/private/ocs/privatedata.php b/lib/private/OCS/PrivateData.php
index e514c05a3dd..c69d8b9cc17 100644
--- a/lib/private/ocs/privatedata.php
+++ b/lib/private/OCS/PrivateData.php
@@ -25,8 +25,9 @@
  *
  */
 
+namespace OC\OCS;
 
-class OC_OCS_Privatedata {
+class PrivateData {
 
 	/**
 	 * read keys
@@ -36,7 +37,7 @@ class OC_OCS_Privatedata {
 	 * @return \OC_OCS_Result
 	 */
 	public static function get($parameters) {
-		$user = OC_User::getUser();
+		$user = \OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null;
 		
@@ -57,7 +58,7 @@ class OC_OCS_Privatedata {
 		 	$xml[] = $data;
 		}
 
-		return new OC_OCS_Result($xml);
+		return new Result($xml);
 	}
 
 	/**
@@ -67,7 +68,7 @@ class OC_OCS_Privatedata {
 	 * @return \OC_OCS_Result
 	 */
 	public static function set($parameters) {
-		$user = OC_User::getUser();
+		$user = \OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = addslashes(strip_tags($parameters['key']));
 		$value = (string)$_POST['value'];
@@ -82,7 +83,7 @@ class OC_OCS_Privatedata {
 			$query->execute(array($user, $app, $key, $value));
 		}
 
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 
 	/**
@@ -92,10 +93,10 @@ class OC_OCS_Privatedata {
 	 * @return \OC_OCS_Result
 	 */
 	public static function delete($parameters) {
-		$user = OC_User::getUser();
+		$user = \OC_User::getUser();
 		if (!isset($parameters['app']) or !isset($parameters['key'])) {
 			//key and app are NOT optional here
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 
 		$app = addslashes(strip_tags($parameters['app']));
@@ -105,7 +106,7 @@ class OC_OCS_Privatedata {
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata`  WHERE `user` = ? AND `app` = ? AND `key` = ? ');
 		$query->execute(array($user, $app, $key ));
 
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 }
 
diff --git a/lib/private/ocs/result.php b/lib/private/OCS/Result.php
index c342bc582fe..c2c61e2383d 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/OCS/Result.php
@@ -26,7 +26,9 @@
  *
  */
 
-class OC_OCS_Result{
+namespace OC\OCS;
+
+class Result {
 
 	/** @var array  */
 	protected $data;
diff --git a/lib/private/legacy/ocs/cloud.php b/lib/private/legacy/ocs/cloud.php
new file mode 100644
index 00000000000..1430cfa94ed
--- /dev/null
+++ b/lib/private/legacy/ocs/cloud.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ * @author Tom Needham <tom@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @deprecated Since 9.1.0 use \OC\OCS\Cloud
+ */
+class OC_OCS_Cloud extends \OC\OCS\Cloud {
+}
diff --git a/lib/private/legacy/ocs/config.php b/lib/private/legacy/ocs/config.php
new file mode 100644
index 00000000000..b2e473276b4
--- /dev/null
+++ b/lib/private/legacy/ocs/config.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ * @author Tom Needham <tom@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @deprecated Since 9.1.0 use \OC\OCS\Config
+ */
+class OC_OCS_Config extends \OC\OCS\Config {
+}
diff --git a/lib/private/legacy/ocs/person.php b/lib/private/legacy/ocs/person.php
new file mode 100644
index 00000000000..edf4a7ced55
--- /dev/null
+++ b/lib/private/legacy/ocs/person.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ * @author Tom Needham <tom@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @deprecated Since 9.1.0 use \OC\OCS\Person
+ */
+class OC_OCS_Person extends \OC\OCS\Person {
+}
diff --git a/lib/private/legacy/ocs/privatedata.php b/lib/private/legacy/ocs/privatedata.php
new file mode 100644
index 00000000000..3c402457366
--- /dev/null
+++ b/lib/private/legacy/ocs/privatedata.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ * @author Tom Needham <tom@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @deprecated Since 9.1.0 use \OC\OCS\PrivateData
+ */
+class OC_OCS_Privatedata extends \OC\OCS\PrivateData {
+}
diff --git a/lib/private/legacy/ocs/result.php b/lib/private/legacy/ocs/result.php
new file mode 100644
index 00000000000..b59c6404e25
--- /dev/null
+++ b/lib/private/legacy/ocs/result.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @deprecated Since 9.1.0 use \OC\OCS\Result
+ */
+class OC_OCS_Result extends \OC\OCS\Result {
+}