[Pkg-owncloud-commits] [owncloud] 31/49: fixing PHPDoc and spelling

David Prévot taffit at moszumanska.debian.org
Thu Dec 5 16:02:55 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6f7b394d99d3a25b78dbb6952a986b05053a3168
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Mon Dec 2 08:42:28 2013 +0100

    fixing PHPDoc and spelling
---
 lib/private/setup/abstractdatabase.php |  4 ++++
 lib/private/setup/oci.php              | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 0beada7..84625a2 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 a19206e..24863b9 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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list