summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-12-02 08:42:28 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-12-02 08:42:28 +0100
commit87e795a693c9671d5564815e71f3821348f2b9d5 (patch)
tree81dc6b1f8c47b63954069e007c61a8dc2d9c1422
parent93b0bd0a9e0c5f4986eb305126e29ca6d9a08cf9 (diff)
downloadnextcloud-server-87e795a693c9671d5564815e71f3821348f2b9d5.tar.gz
nextcloud-server-87e795a693c9671d5564815e71f3821348f2b9d5.zip
fixing PHPDoc and spelling
-rw-r--r--lib/private/setup/abstractdatabase.php4
-rw-r--r--lib/private/setup/oci.php10
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 0beada7bd29..84625a217ee 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -3,6 +3,10 @@
namespace OC\Setup;
abstract class AbstractDatabase {
+
+ /**
+ * @var \OC_L10N
+ */
protected $trans;
protected $dbDefinitionFile;
protected $dbuser;
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index a19206ecf3d..24863b9e38a 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -68,7 +68,7 @@ class OCI extends AbstractDatabase {
$this->dbpassword=\OC_Util::generateRandomBytes(30);
//oracle passwords are treated as identifiers:
- // must start with aphanumeric char
+ // must start with alphanumeric char
// needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
$this->dbpassword=substr($this->dbpassword, 0, 30);
@@ -78,7 +78,7 @@ class OCI extends AbstractDatabase {
\OC_Config::setValue('dbname', $this->dbuser);
\OC_Config::setValue('dbpassword', $this->dbpassword);
- //create the database not neccessary, oracle implies user = schema
+ //create the database not necessary, oracle implies user = schema
//$this->createDatabase($this->dbname, $this->dbuser, $connection);
} else {
@@ -86,7 +86,7 @@ class OCI extends AbstractDatabase {
\OC_Config::setValue('dbname', $this->dbname);
\OC_Config::setValue('dbpassword', $this->dbpassword);
- //create the database not neccessary, oracle implies user = schema
+ //create the database not necessary, oracle implies user = schema
//$this->createDatabase($this->dbname, $this->dbuser, $connection);
}
@@ -133,9 +133,6 @@ class OCI extends AbstractDatabase {
}
/**
- *
- * @param String $name
- * @param String $password
* @param resource $connection
*/
private function createDBUser($connection) {
@@ -210,6 +207,7 @@ class OCI extends AbstractDatabase {
/**
* @param resource $connection
+ * @return string
*/
protected function getLastError($connection = null) {
if ($connection) {