diff --git a/src/ContactInfo.php b/src/ContactInfo.php index 10897cf..ce627a2 100644 --- a/src/ContactInfo.php +++ b/src/ContactInfo.php @@ -1,7 +1,6 @@ name = $name; $this->homePage = $homePage; @@ -42,7 +41,7 @@ class ContactInfo { return $this->order; } - public function getTitle(): WString { + public function getTitle(): string { return $this->title; } @@ -58,7 +57,7 @@ class ContactInfo { return $this->colour; } - public function getDisplay(): WString { + public function getDisplay(): string { return $this->display; } diff --git a/src/Contacts.php b/src/Contacts.php index f6cd280..c03c3f2 100644 --- a/src/Contacts.php +++ b/src/Contacts.php @@ -45,10 +45,10 @@ class Contacts { $result->getString(0), // name $result->getInteger(1) !== 0, // homepage $result->getInteger(2), // order - $result->getWString(3, 'utf-8'), // title + $result->getString(3), // title $result->getString(4), // icon $result->getInteger(5), // colour - $result->getWString(6, 'utf-8'), // display + $result->getString(6), // display $result->isNull(7) ? null : $result->getString(7) // link ); } diff --git a/src/LanguageInfo.php b/src/LanguageInfo.php index d56a69c..dc3d725 100644 --- a/src/LanguageInfo.php +++ b/src/LanguageInfo.php @@ -1,19 +1,17 @@ id = $id; @@ -25,7 +23,7 @@ class LanguageInfo { return $this->id; } - public function getName(): WString { + public function getName(): string { return $this->name; } diff --git a/src/Languages.php b/src/Languages.php index 89c772e..cb21f5a 100644 --- a/src/Languages.php +++ b/src/Languages.php @@ -56,7 +56,7 @@ class Languages { private static function createObject(IDbResult $result): LanguageInfo { return new LanguageInfo( $result->getString(0), // id - $result->getWString(1, 'utf-8'), // name + $result->getString(1), // name $result->isNull(2) ? null : $result->getInteger(2) // colour ); } diff --git a/src/ProjectInfo.php b/src/ProjectInfo.php index 5e24948..2377871 100644 --- a/src/ProjectInfo.php +++ b/src/ProjectInfo.php @@ -1,34 +1,32 @@ id = $id; @@ -52,11 +50,11 @@ class ProjectInfo { return $this->id; } - public function getName(): WString { + public function getName(): string { return $this->name; } - public function getCleanName(): AString { + public function getCleanName(): string { return $this->nameClean; } @@ -64,7 +62,7 @@ class ProjectInfo { return $this->summary !== null; } - public function getSummary(): ?WString { + public function getSummary(): ?string { return $this->summary; } @@ -72,7 +70,7 @@ class ProjectInfo { return $this->description !== null; } - public function getDescription(): ?WString { + public function getDescription(): ?string { return $this->description; } @@ -108,7 +106,7 @@ class ProjectInfo { return $this->homepage !== null; } - public function getHomePageUrl(): ?AString { + public function getHomePageUrl(): ?string { return $this->homepage; } @@ -116,7 +114,7 @@ class ProjectInfo { return $this->source !== null; } - public function getSourceUrl(): ?AString { + public function getSourceUrl(): ?string { return $this->source; } @@ -124,7 +122,7 @@ class ProjectInfo { return $this->discussion !== null; } - public function getDiscussionUrl(): ?AString { + public function getDiscussionUrl(): ?string { return $this->discussion; } diff --git a/src/Projects.php b/src/Projects.php index bad03f4..a20d52b 100644 --- a/src/Projects.php +++ b/src/Projects.php @@ -43,17 +43,17 @@ class Projects { private static function createObject(IDbResult $result): ProjectInfo { return new ProjectInfo( $result->getString(0), // id - $result->getWString(1, 'utf-8'), // name - $result->getAString(2), // clean name - $result->isNull(3) ? null : $result->getWString(3, 'utf-8'), // summary - $result->isNull(4) ? null : $result->getWString(4, 'utf-8'), // description + $result->getString(1), // name + $result->getString(2), // clean name + $result->isNull(3) ? null : $result->getString(3), // summary + $result->isNull(4) ? null : $result->getString(4), // description $result->getInteger(5) !== 0, // featured $result->getInteger(6), // order $result->isNull(13) ? null : $result->getInteger(13), // colour $result->getString(11), // type - $result->isNull(7) ? null : $result->getAString(7), // homepage - $result->isNull(8) ? null : $result->getAString(8), // repository - $result->isNull(9) ? null : $result->getAString(9), // forum + $result->isNull(7) ? null : $result->getString(7), // homepage + $result->isNull(8) ? null : $result->getString(8), // repository + $result->isNull(9) ? null : $result->getString(9), // forum $result->getInteger(12), // created $result->isNull(10) ? null : $result->getInteger(10), // archived null // deleted diff --git a/src/SSHKeyInfo.php b/src/SSHKeyInfo.php index d3ed2bb..acdf5c0 100644 --- a/src/SSHKeyInfo.php +++ b/src/SSHKeyInfo.php @@ -1,7 +1,6 @@ body; } - public function getComment(): AString { + public function getComment(): string { return $this->comment; } diff --git a/src/SSHKeys.php b/src/SSHKeys.php index 3e4cb26..8631f55 100644 --- a/src/SSHKeys.php +++ b/src/SSHKeys.php @@ -40,7 +40,7 @@ class SSHKeys { $result->getInteger(1), $result->getString(2), $result->getString(3), - $result->getAString(4), + $result->getString(4), $result->getInteger(5), $result->isNull(6) ? null : $result->getInteger(6), );