From c4fba80a3c3e58efda9f557ba611a5705825268b Mon Sep 17 00:00:00 2001 From: Cerys Date: Thu, 6 Mar 2025 11:21:53 +0000 Subject: [PATCH] capitalisation fixes --- examples/QueryExample_Directory.php | 6 +-- examples/QueryExample_Permission.php | 6 +-- examples/QueryExample_References.php | 6 +-- examples/QueryExample_Select.php | 8 ++-- src/DataStructures/DataURL.php | 6 +-- src/DataStructures/DeegraphNodeDetails.php | 2 +- src/DataStructures/UUID.php | 2 +- src/QueryBuilder/DeleteQuery/DeleteQuery.php | 4 +- .../DeleteQuery/DeleteQueryBuilder.php | 8 ++-- .../DirectoryQuery/DirectoryQuery.php | 4 +- .../DirectoryQuery/DirectoryQueryBuilder.php | 8 ++-- .../InsertQuery/InsertQueryBuilder.php | 16 +++---- .../InsertQueryBuilderInterface.php | 2 +- src/QueryBuilder/LinkQuery/LinkQuery.php | 4 +- .../LinkQuery/LinkQueryBuilder.php | 38 +++++++-------- .../PermissionsQuery/PermissionQuery.php | 4 +- .../PermissionQueryBuilder.php | 8 ++-- .../PermissionQueryBuilderInterface.php | 2 +- .../PermissionQueryResponse.php | 2 +- src/QueryBuilder/PutQuery/PutQueryBuilder.php | 26 +++++----- .../ReferencesQuery/ReferencesQuery.php | 4 +- .../ReferencesQueryBuilder.php | 8 ++-- src/QueryBuilder/SelectQuery/SelectQuery.php | 4 +- .../SelectQuery/SelectQueryBuilder.php | 12 ++--- .../SelectQueryBuilderInterface.php | 2 +- src/QueryBuilder/UnlinkQuery/UnlinkQuery.php | 4 +- .../UnlinkQuery/UnlinkQueryBuilder.php | 14 +++--- src/Utilities/RelativePath.php | 2 +- tests/QueryBuilderDeleteTest.php | 4 +- tests/QueryBuilderDirectoryTest.php | 4 +- tests/QueryBuilderLinkTest.php | 48 +++++++++---------- tests/QueryBuilderPermissionsTest.php | 4 +- tests/QueryBuilderPutTest.php | 14 +++--- tests/QueryBuilderReferencesTest.php | 4 +- tests/QueryBuilderSelectTest.php | 12 ++--- tests/QueryBuilderUnlinkTest.php | 20 ++++---- tests/ValidateDeegraphPathTest.php | 6 +-- 37 files changed, 164 insertions(+), 164 deletions(-) diff --git a/examples/QueryExample_Directory.php b/examples/QueryExample_Directory.php index 06d16e8..e183b0c 100644 --- a/examples/QueryExample_Directory.php +++ b/examples/QueryExample_Directory.php @@ -7,9 +7,9 @@ use Darksparrow\DeegraphInteractions\QueryBuilder\QueryBuilder; $result = QueryBuilder::Directory() - ->RelativePath("{0b368d41-7c15-42c8-899c-2b178ae9d983}") - ->Build() - ->RunQuery( + ->relativePath("{0b368d41-7c15-42c8-899c-2b178ae9d983}") + ->build() + ->runQuery( actorID: DeegraphConnection::Actor(), server: DeegraphConnection::DB(), ) diff --git a/examples/QueryExample_Permission.php b/examples/QueryExample_Permission.php index e32c313..dfdfe7a 100644 --- a/examples/QueryExample_Permission.php +++ b/examples/QueryExample_Permission.php @@ -7,9 +7,9 @@ use Darksparrow\DeegraphInteractions\QueryBuilder\QueryBuilder; $permissions = QueryBuilder::Permission() - ->On("{b222c121-0ed2-5819-bbf9-4db9aab85ea3}") - ->Build() - ->RunQuery( + ->on("{b222c121-0ed2-5819-bbf9-4db9aab85ea3}") + ->build() + ->runQuery( actorID: DeegraphConnection::Actor(), server: DeegraphConnection::DB(), ) diff --git a/examples/QueryExample_References.php b/examples/QueryExample_References.php index b1e87d5..7f8305f 100644 --- a/examples/QueryExample_References.php +++ b/examples/QueryExample_References.php @@ -7,9 +7,9 @@ use Darksparrow\DeegraphInteractions\QueryBuilder\QueryBuilder; $result = QueryBuilder::References() - ->RelativePath("{0b368d41-7c15-42c8-899c-2b178ae9d983}") - ->Build() - ->RunQuery( + ->relativePath("{0b368d41-7c15-42c8-899c-2b178ae9d983}") + ->build() + ->runQuery( actorID: DeegraphConnection::Actor(), server: DeegraphConnection::DB(), ) diff --git a/examples/QueryExample_Select.php b/examples/QueryExample_Select.php index 12bcee5..486e224 100644 --- a/examples/QueryExample_Select.php +++ b/examples/QueryExample_Select.php @@ -9,10 +9,10 @@ use Darksparrow\DeegraphInteractions\QueryBuilder\QueryBuilder; $targetNode = new UUID("0b368d41-7c15-42c8-899c-2b178ae9d983"); $result = QueryBuilder::Select() - ->RelativePaths(["@id", "name"]) - ->From($targetNode) - ->Build() - ->RunQuery( + ->relativePaths(["@id", "name"]) + ->from($targetNode) + ->build() + ->runQuery( actorID: DeegraphConnection::Actor(), server: DeegraphConnection::DB(), ) diff --git a/src/DataStructures/DataURL.php b/src/DataStructures/DataURL.php index 1797597..5b9a5e9 100644 --- a/src/DataStructures/DataURL.php +++ b/src/DataStructures/DataURL.php @@ -52,7 +52,7 @@ class DataURL * * @return string|null The raw data or null if parsing failed. */ - public function GetData(): ?string + public function getData(): ?string { return $this->Data; } @@ -62,7 +62,7 @@ class DataURL * * @return int The size of the data, or 0 if data is null. */ - public function GetSize(): int + public function getSize(): int { return $this->Data ? strlen($this->Data) : 0; } @@ -72,7 +72,7 @@ class DataURL * * @return string|null The MIME type or null if parsing failed. */ - public function GetMimeType(): ?string + public function getMimeType(): ?string { return $this->MIMEType; } diff --git a/src/DataStructures/DeegraphNodeDetails.php b/src/DataStructures/DeegraphNodeDetails.php index 644e498..598eecd 100644 --- a/src/DataStructures/DeegraphNodeDetails.php +++ b/src/DataStructures/DeegraphNodeDetails.php @@ -41,7 +41,7 @@ class DeegraphNodeDetails } } - public function AsJSON(): string + public function asJSON(): string { $createdAt = null; if (isset($this->CreatedAt)) diff --git a/src/DataStructures/UUID.php b/src/DataStructures/UUID.php index 4467645..a408b8a 100644 --- a/src/DataStructures/UUID.php +++ b/src/DataStructures/UUID.php @@ -26,7 +26,7 @@ class UUID return "{" . $this->UUID . "}"; } - public function GetPlainUUID(): string + public function getPlainUUID(): string { return $this->UUID; } diff --git a/src/QueryBuilder/DeleteQuery/DeleteQuery.php b/src/QueryBuilder/DeleteQuery/DeleteQuery.php index 890142e..98db785 100644 --- a/src/QueryBuilder/DeleteQuery/DeleteQuery.php +++ b/src/QueryBuilder/DeleteQuery/DeleteQuery.php @@ -19,9 +19,9 @@ class DeleteQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): DeleteQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): DeleteQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/DeleteQuery/DeleteQueryBuilder.php b/src/QueryBuilder/DeleteQuery/DeleteQueryBuilder.php index cc9d160..d039048 100644 --- a/src/QueryBuilder/DeleteQuery/DeleteQueryBuilder.php +++ b/src/QueryBuilder/DeleteQuery/DeleteQueryBuilder.php @@ -17,16 +17,16 @@ class DeleteQueryBuilder protected string $RelativePath = ""; - public function RelativePath(string $relativePath): DeleteQueryBuilder + public function relativePath(string $relativePath): DeleteQueryBuilder { - self::ValidateDeegraphPath(target: $relativePath); + self::validateDeegraphPath(target: $relativePath); $this->RelativePath = $relativePath; return $this; } - public function Build(): DeleteQuery + public function build(): DeleteQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "DELETE " . $this->RelativePath; diff --git a/src/QueryBuilder/DirectoryQuery/DirectoryQuery.php b/src/QueryBuilder/DirectoryQuery/DirectoryQuery.php index 1ac79cb..e1ddde2 100644 --- a/src/QueryBuilder/DirectoryQuery/DirectoryQuery.php +++ b/src/QueryBuilder/DirectoryQuery/DirectoryQuery.php @@ -18,9 +18,9 @@ final class DirectoryQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): DirectoryQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): DirectoryQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/DirectoryQuery/DirectoryQueryBuilder.php b/src/QueryBuilder/DirectoryQuery/DirectoryQueryBuilder.php index fcc525b..83cca13 100644 --- a/src/QueryBuilder/DirectoryQuery/DirectoryQueryBuilder.php +++ b/src/QueryBuilder/DirectoryQuery/DirectoryQueryBuilder.php @@ -17,16 +17,16 @@ final class DirectoryQueryBuilder protected string $RelativePath = ""; - public function RelativePath(string $relativePath): DirectoryQueryBuilder + public function relativePath(string $relativePath): DirectoryQueryBuilder { - self::ValidateDeegraphPath(target: $relativePath); + self::validateDeegraphPath(target: $relativePath); $this->RelativePath = $relativePath; return $this; } - public function Build(): DirectoryQuery + public function build(): DirectoryQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "DIRECTORY " . $this->RelativePath; diff --git a/src/QueryBuilder/InsertQuery/InsertQueryBuilder.php b/src/QueryBuilder/InsertQuery/InsertQueryBuilder.php index eeec9d0..74c27ac 100644 --- a/src/QueryBuilder/InsertQuery/InsertQueryBuilder.php +++ b/src/QueryBuilder/InsertQuery/InsertQueryBuilder.php @@ -34,44 +34,44 @@ final class InsertQueryBuilder implements InsertQueryBuilderInterface } - public function RelativePath(string $relativePath): InsertQueryBuilder + public function relativePath(string $relativePath): InsertQueryBuilder { - self::ValidateDeegraphPath(target: $relativePath); + self::validateDeegraphPath(target: $relativePath); $this->RelativePath = $relativePath; return $this; } - public function Keys(string $keys): InsertQueryBuilder + public function keys(string $keys): InsertQueryBuilder { $this->Keys = $keys; return $this; } - public function Schemas(string $schemas): InsertQueryBuilder + public function schemas(string $schemas): InsertQueryBuilder { $this->Schemas = $schemas; return $this; } - public function Values(string $values): InsertQueryBuilder + public function values(string $values): InsertQueryBuilder { $this->Values .= $values; return $this; } - public function Duplicate(): InsertQueryBuilder + public function duplicate(): InsertQueryBuilder { $this->Duplicate = true; return $this; } - public function Replace(): InsertQueryBuilder + public function replace(): InsertQueryBuilder { $this->Replace = true; return $this; } - public function Build(): InsertQuery + public function build(): InsertQuery { $instance = new QueryBuilderQuery(); $instance->ValidateValues($this); diff --git a/src/QueryBuilder/InsertQuery/InsertQueryBuilderInterface.php b/src/QueryBuilder/InsertQuery/InsertQueryBuilderInterface.php index 51364d1..80adcc5 100644 --- a/src/QueryBuilder/InsertQuery/InsertQueryBuilderInterface.php +++ b/src/QueryBuilder/InsertQuery/InsertQueryBuilderInterface.php @@ -4,5 +4,5 @@ namespace Darksparrow\DeegraphInteractions\QueryBuilder\InsertQuery; interface InsertQueryBuilderInterface { - public function Build() : InsertQuery; + public function build() : InsertQuery; } diff --git a/src/QueryBuilder/LinkQuery/LinkQuery.php b/src/QueryBuilder/LinkQuery/LinkQuery.php index 805d0b4..c6bd2ca 100644 --- a/src/QueryBuilder/LinkQuery/LinkQuery.php +++ b/src/QueryBuilder/LinkQuery/LinkQuery.php @@ -19,9 +19,9 @@ class LinkQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): LinkQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): LinkQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/LinkQuery/LinkQueryBuilder.php b/src/QueryBuilder/LinkQuery/LinkQueryBuilder.php index 9502294..13abfbe 100644 --- a/src/QueryBuilder/LinkQuery/LinkQueryBuilder.php +++ b/src/QueryBuilder/LinkQuery/LinkQueryBuilder.php @@ -31,24 +31,24 @@ class LinkQueryBuilder - public function LinkToRelativePath(string $relativePath1, string $relativePath2): LinkQueryBuilder + public function linkToRelativePath(string $relativePath1, string $relativePath2): LinkQueryBuilder { - self::EnsureNotSet($this->RelativePath1); - self::EnsureNotSet($this->RelativePath2); - self::ValidateDeegraphPath(target: $relativePath1); - self::ValidateDeegraphPath(target: $relativePath2); + self::ensureNotSet($this->RelativePath1); + self::ensureNotSet($this->RelativePath2); + self::validateDeegraphPath(target: $relativePath1); + self::validateDeegraphPath(target: $relativePath2); $this->RelativePath1 = $relativePath1; $this->RelativePath2 = $relativePath2; $this->ToOrOf = "TO"; return $this; } - public function LinkOfRelativePath(string $relativePath1, string $relativePath2): LinkQueryBuilder + public function linkOfRelativePath(string $relativePath1, string $relativePath2): LinkQueryBuilder { - self::EnsureNotSet($this->RelativePath1); - self::EnsureNotSet($this->RelativePath2); - self::ValidateDeegraphPath(target: $relativePath1); - self::ValidateDeegraphPath(target: $relativePath2); + self::ensureNotSet($this->RelativePath1); + self::ensureNotSet($this->RelativePath2); + self::validateDeegraphPath(target: $relativePath1); + self::validateDeegraphPath(target: $relativePath2); $this->RelativePath1 = $relativePath1; $this->RelativePath2 = $relativePath2; @@ -58,7 +58,7 @@ class LinkQueryBuilder - public function As(string $propertyName): LinkQueryBuilder + public function as(string $propertyName): LinkQueryBuilder { $this->PropertyName = $propertyName; return $this; @@ -66,30 +66,30 @@ class LinkQueryBuilder - public function Overwrite(): LinkQueryBuilder + public function overwrite(): LinkQueryBuilder { - self::EnsureNotSet($this->Mode); + self::ensureNotSet($this->Mode); $this->Mode = "OVERWRITE"; return $this; } - public function Replace(): LinkQueryBuilder + public function replace(): LinkQueryBuilder { - self::EnsureNotSet($this->Mode); + self::ensureNotSet($this->Mode); $this->Mode = "REPLACE"; return $this; } - public function Force(): LinkQueryBuilder + public function force(): LinkQueryBuilder { - self::EnsureNotSet($this->Mode); + self::ensureNotSet($this->Mode); $this->Mode = "FORCE"; return $this; } - public function Build(): LinkQuery + public function build(): LinkQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "LINK " . $this->RelativePath1 diff --git a/src/QueryBuilder/PermissionsQuery/PermissionQuery.php b/src/QueryBuilder/PermissionsQuery/PermissionQuery.php index debddad..ce42c12 100644 --- a/src/QueryBuilder/PermissionsQuery/PermissionQuery.php +++ b/src/QueryBuilder/PermissionsQuery/PermissionQuery.php @@ -18,9 +18,9 @@ final class PermissionQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): PermissionQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): PermissionQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilder.php b/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilder.php index 3b45f30..f452a4b 100644 --- a/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilder.php +++ b/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilder.php @@ -16,16 +16,16 @@ final class PermissionQueryBuilder protected string $On = ""; - public function On(string $relativePath): PermissionQueryBuilder + public function on(string $relativePath): PermissionQueryBuilder { - self::ValidateDeegraphPath(target: $relativePath); + self::validateDeegraphPath(target: $relativePath); $this->On = $relativePath; return $this; } - public function Build(): PermissionQuery + public function build(): PermissionQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "PERMISSIONS ON ". $this->On; diff --git a/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilderInterface.php b/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilderInterface.php index 2cd3466..99013d3 100644 --- a/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilderInterface.php +++ b/src/QueryBuilder/PermissionsQuery/PermissionQueryBuilderInterface.php @@ -4,5 +4,5 @@ namespace Darksparrow\DeegraphInteractions\QueryBuilder\PermissionsQuery; interface PermissionQueryBuilderInterface { - public function Build() : PermissionQuery; + public function build() : PermissionQuery; } diff --git a/src/QueryBuilder/PermissionsQuery/PermissionQueryResponse.php b/src/QueryBuilder/PermissionsQuery/PermissionQueryResponse.php index a2f3ebc..1f785e4 100644 --- a/src/QueryBuilder/PermissionsQuery/PermissionQueryResponse.php +++ b/src/QueryBuilder/PermissionsQuery/PermissionQueryResponse.php @@ -35,7 +35,7 @@ final class PermissionQueryResponse } } - public function AsArray(): array + public function asArray(): array { return $this->AsArray; } diff --git a/src/QueryBuilder/PutQuery/PutQueryBuilder.php b/src/QueryBuilder/PutQuery/PutQueryBuilder.php index 9acfea8..ebd63a9 100644 --- a/src/QueryBuilder/PutQuery/PutQueryBuilder.php +++ b/src/QueryBuilder/PutQuery/PutQueryBuilder.php @@ -41,9 +41,9 @@ final class PutQueryBuilder /** * @throws QueryBuilderInvalidInputException */ - public function Schema(string $uri): PutQueryBuilder + public function schema(string $uri): PutQueryBuilder { - $this->PutWhat = self::RegexValidate( + $this->PutWhat = self::regexValidate( target: "SCHEMA \"$uri\"", pattern: "/SCHEMA \".+\"/" ); @@ -53,9 +53,9 @@ final class PutQueryBuilder /** * @throws QueryBuilderInvalidInputException */ - public function URI(string $uri): PutQueryBuilder + public function uri(string $uri): PutQueryBuilder { - $this->PutWhat = self::RegexValidate( + $this->PutWhat = self::regexValidate( target: "URI \"$uri\"", pattern: "/URI \".+\"/" ); @@ -65,9 +65,9 @@ final class PutQueryBuilder /** * @throws QueryBuilderInvalidInputException */ - public function DataURI(string $mimeType, string $data): PutQueryBuilder + public function dataURI(string $mimeType, string $data): PutQueryBuilder { - $this->PutWhat = self::RegexValidate( + $this->PutWhat = self::regexValidate( target: "URI \"data:$mimeType;$data\"", pattern: "/URI \"data:[a-zA-Z0-9]/[a-zA-Z0-9];.+\"/" ); @@ -79,10 +79,10 @@ final class PutQueryBuilder * @throws QueryBuilderInvalidInputException * @throws QueryBuilderConflictingFieldAlreadyExistsException */ - public function At(string $node, string $uwu): PutQueryBuilder + public function at(string $node, string $uwu): PutQueryBuilder { - self::EnsureNotSet($this->PutInto); - $this->PutAt = self::RegexValidate( + self::ensureNotSet($this->PutInto); + $this->PutAt = self::regexValidate( target: 'AT {' . $node . '}/' . $uwu, pattern: "/AT {[a-zA-Z0-9\-]+}\/[a-zA-Z0-9]+/" ); @@ -94,10 +94,10 @@ final class PutQueryBuilder * @throws QueryBuilderInvalidInputException * @throws QueryBuilderConflictingFieldAlreadyExistsException */ - public function Into(string $relativePath, string $propertyName): PutQueryBuilder + public function into(string $relativePath, string $propertyName): PutQueryBuilder { - self::EnsureNotSet($this->PutAt); - $this->PutInto = self::RegexValidate( + self::ensureNotSet($this->PutAt); + $this->PutInto = self::regexValidate( target: "INTO \"$relativePath\" AS \"$propertyName\"", pattern: "/INTO \"[a-zA-Z0-9\-]+\" AS \"[a-zA-Z0-9]+\"/" ); @@ -105,7 +105,7 @@ final class PutQueryBuilder } - public function Safe(): PutQueryBuilder + public function safe(): PutQueryBuilder { $this->Safe = true; return $this; diff --git a/src/QueryBuilder/ReferencesQuery/ReferencesQuery.php b/src/QueryBuilder/ReferencesQuery/ReferencesQuery.php index 58234d0..9db1251 100644 --- a/src/QueryBuilder/ReferencesQuery/ReferencesQuery.php +++ b/src/QueryBuilder/ReferencesQuery/ReferencesQuery.php @@ -18,9 +18,9 @@ final class ReferencesQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): ReferencesQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): ReferencesQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/ReferencesQuery/ReferencesQueryBuilder.php b/src/QueryBuilder/ReferencesQuery/ReferencesQueryBuilder.php index 59af9b2..4d428bc 100644 --- a/src/QueryBuilder/ReferencesQuery/ReferencesQueryBuilder.php +++ b/src/QueryBuilder/ReferencesQuery/ReferencesQueryBuilder.php @@ -17,16 +17,16 @@ final class ReferencesQueryBuilder protected string $RelativePath = ""; - public function RelativePath(string $relativePath): ReferencesQueryBuilder + public function relativePath(string $relativePath): ReferencesQueryBuilder { - self::ValidateDeegraphPath(target: $relativePath); + self::validateDeegraphPath(target: $relativePath); $this->RelativePath = $relativePath; return $this; } - public function Build(): ReferencesQuery + public function build(): ReferencesQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "REFERENCES " . $this->RelativePath; diff --git a/src/QueryBuilder/SelectQuery/SelectQuery.php b/src/QueryBuilder/SelectQuery/SelectQuery.php index 2839406..9af6500 100644 --- a/src/QueryBuilder/SelectQuery/SelectQuery.php +++ b/src/QueryBuilder/SelectQuery/SelectQuery.php @@ -18,9 +18,9 @@ class SelectQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): SelectQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): SelectQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/SelectQuery/SelectQueryBuilder.php b/src/QueryBuilder/SelectQuery/SelectQueryBuilder.php index 0ee2b59..cd91404 100644 --- a/src/QueryBuilder/SelectQuery/SelectQueryBuilder.php +++ b/src/QueryBuilder/SelectQuery/SelectQueryBuilder.php @@ -23,33 +23,33 @@ final class SelectQueryBuilder implements SelectQueryBuilderInterface { } - public function AddRelativePath(string $relativePath): SelectQueryBuilder + public function addRelativePath(string $relativePath): SelectQueryBuilder { $this->RelativePaths[] = $relativePath; return $this; } - public function RelativePaths(array $relativePaths): SelectQueryBuilder + public function relativePaths(array $relativePaths): SelectQueryBuilder { $this->RelativePaths = $relativePaths; return $this; } - public function From(string $target): SelectQueryBuilder + public function from(string $target): SelectQueryBuilder { $this->From = "" . $target; return $this; } - public function Where(string $target, DeegraphEqualityOperator $operator, string $value): SelectQueryBuilder + public function where(string $target, DeegraphEqualityOperator $operator, string $value): SelectQueryBuilder { $this->Where = "" . $target . " " . $operator->value . " " . $value; return $this; } - public function InstanceOf(string $schema): SelectQueryBuilder + public function instanceOf(string $schema): SelectQueryBuilder { $this->InstanceOf = "" . $schema; return $this; } - public function Build(): SelectQuery + public function build(): SelectQuery { $builder = "SELECT"; if(sizeof($this->RelativePaths)) $builder .= " " . implode(separator: ", ", array: $this->RelativePaths); diff --git a/src/QueryBuilder/SelectQuery/SelectQueryBuilderInterface.php b/src/QueryBuilder/SelectQuery/SelectQueryBuilderInterface.php index 42d676d..ab59686 100644 --- a/src/QueryBuilder/SelectQuery/SelectQueryBuilderInterface.php +++ b/src/QueryBuilder/SelectQuery/SelectQueryBuilderInterface.php @@ -4,5 +4,5 @@ namespace Darksparrow\DeegraphInteractions\QueryBuilder\SelectQuery; interface SelectQueryBuilderInterface { - public function Build() : SelectQuery; + public function build() : SelectQuery; } \ No newline at end of file diff --git a/src/QueryBuilder/UnlinkQuery/UnlinkQuery.php b/src/QueryBuilder/UnlinkQuery/UnlinkQuery.php index 7967058..4dfd950 100644 --- a/src/QueryBuilder/UnlinkQuery/UnlinkQuery.php +++ b/src/QueryBuilder/UnlinkQuery/UnlinkQuery.php @@ -19,9 +19,9 @@ class UnlinkQuery return $this->QueryString; } - public function RunQuery(UUID $actorID, DeegraphServer $server): UnlinkQueryResponse + public function runQuery(UUID $actorID, DeegraphServer $server): UnlinkQueryResponse { - $response = $server->RunQuery( + $response = $server->runQuery( actorID: $actorID, queryString: $this->QueryString, ); diff --git a/src/QueryBuilder/UnlinkQuery/UnlinkQueryBuilder.php b/src/QueryBuilder/UnlinkQuery/UnlinkQueryBuilder.php index 58c6142..8cd794a 100644 --- a/src/QueryBuilder/UnlinkQuery/UnlinkQueryBuilder.php +++ b/src/QueryBuilder/UnlinkQuery/UnlinkQueryBuilder.php @@ -23,21 +23,21 @@ class UnlinkQueryBuilder protected string $RelativePath = ""; - public function UnlinkWhat(string $propertyName): UnlinkQueryBuilder + public function unlinkWhat(string $propertyName): UnlinkQueryBuilder { $this->PropertyName = $propertyName; return $this; } - public function From(string $relativePath): UnlinkQueryBuilder + public function from(string $relativePath): UnlinkQueryBuilder { - self::EnsureNotSet($this->Mode); + self::ensureNotSet($this->Mode); $this->Mode = "FROM"; $this->RelativePath = $relativePath; return $this; } - public function Of(string $relativePath): UnlinkQueryBuilder + public function of(string $relativePath): UnlinkQueryBuilder { - self::EnsureNotSet($this->Mode); + self::ensureNotSet($this->Mode); $this->Mode = "OF"; $this->RelativePath = $relativePath; return $this; @@ -46,9 +46,9 @@ class UnlinkQueryBuilder - public function Build(): UnlinkQuery + public function build(): UnlinkQuery { - self::ValidateValues(target: $this); + self::validateValues(target: $this); $builder = "UNLINK " . $this->PropertyName diff --git a/src/Utilities/RelativePath.php b/src/Utilities/RelativePath.php index 900cc26..8022ddb 100644 --- a/src/Utilities/RelativePath.php +++ b/src/Utilities/RelativePath.php @@ -6,7 +6,7 @@ use Darksparrow\DeegraphInteractions\Exceptions\QueryBuilderInvalidInputExceptio class RelativePath { - public static function Validate(string $target): bool + public static function validate(string $target): bool { if (!preg_match(pattern: "/(^(\{[0-9a-f]{8}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{12}\})$)|(^\{[0-9a-f]{8}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{12}\}(\/([a-z][a-z0-9]*|[0-9]+|#|\*))+$)|(^(([a-z][a-z0-9]*|[0-9]+|#|\*))(\/([a-z][a-z0-9]*|[0-9]+|#|\*))*$)/", subject: $target)) return false; diff --git a/tests/QueryBuilderDeleteTest.php b/tests/QueryBuilderDeleteTest.php index 84e3776..09a8279 100644 --- a/tests/QueryBuilderDeleteTest.php +++ b/tests/QueryBuilderDeleteTest.php @@ -12,8 +12,8 @@ final class QueryBuilderDeleteTest extends TestCase public function test0() { $query = QueryBuilder::Delete() - ->RelativePath($this->TestUUID) - ->Build(); + ->relativePath($this->TestUUID) + ->build(); self::assertEquals( expected: "DELETE {$this->TestUUID}", actual: $query diff --git a/tests/QueryBuilderDirectoryTest.php b/tests/QueryBuilderDirectoryTest.php index 71389b4..43682d7 100644 --- a/tests/QueryBuilderDirectoryTest.php +++ b/tests/QueryBuilderDirectoryTest.php @@ -10,8 +10,8 @@ final class QueryBuilderDirectoryTest extends TestCase public function testReferenceQuery() { $query = QueryBuilder::Directory() - ->RelativePath("{00000000-0000-0000-0000-000000000000}") - ->Build(); + ->relativePath("{00000000-0000-0000-0000-000000000000}") + ->build(); self::assertEquals( expected: 'DIRECTORY {00000000-0000-0000-0000-000000000000}', actual: $query diff --git a/tests/QueryBuilderLinkTest.php b/tests/QueryBuilderLinkTest.php index 8b042c9..2079b42 100644 --- a/tests/QueryBuilderLinkTest.php +++ b/tests/QueryBuilderLinkTest.php @@ -14,9 +14,9 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} TO {$this->TestUUID} AS test", actual: QueryBuilder::Link() - ->LinkToRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Build() + ->linkToRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->build() ); } public function test1() @@ -24,10 +24,10 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} TO {$this->TestUUID} AS test OVERWRITE", actual: QueryBuilder::Link() - ->LinkToRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Overwrite() - ->Build() + ->linkToRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->overwrite() + ->build() ); } public function test2() @@ -35,10 +35,10 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} TO {$this->TestUUID} AS test REPLACE", actual: QueryBuilder::Link() - ->LinkToRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Replace() - ->Build() + ->linkToRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->replace() + ->build() ); } public function test3() @@ -46,10 +46,10 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} TO {$this->TestUUID} AS test FORCE", actual: QueryBuilder::Link() - ->LinkToRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Force() - ->Build() + ->linkToRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->force() + ->build() ); } public function test4() @@ -57,9 +57,9 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} OF {$this->TestUUID} AS test", actual: QueryBuilder::Link() - ->LinkOfRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Build() + ->linkOfRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->build() ); } public function test5() @@ -68,12 +68,12 @@ final class QueryBuilderLinkTest extends TestCase self::assertEquals( expected: "LINK {$this->TestUUID} OF {$this->TestUUID} AS test", actual: QueryBuilder::Link() - ->LinkOfRelativePath($this->TestUUID, $this->TestUUID) - ->As("test") - ->Overwrite() - ->Replace() - ->Force() - ->Build() + ->linkOfRelativePath($this->TestUUID, $this->TestUUID) + ->as("test") + ->overwrite() + ->replace() + ->force() + ->build() ); } } diff --git a/tests/QueryBuilderPermissionsTest.php b/tests/QueryBuilderPermissionsTest.php index 28f8e6a..a407c30 100644 --- a/tests/QueryBuilderPermissionsTest.php +++ b/tests/QueryBuilderPermissionsTest.php @@ -10,8 +10,8 @@ final class QueryBuilderPermissionsTest extends TestCase public function testReferenceQuery() { $query = QueryBuilder::Permission() - ->On("{00000000-0000-0000-0000-000000000000}") - ->Build(); + ->on("{00000000-0000-0000-0000-000000000000}") + ->build(); self::assertEquals( expected: 'PERMISSIONS ON {00000000-0000-0000-0000-000000000000}', actual: $query diff --git a/tests/QueryBuilderPutTest.php b/tests/QueryBuilderPutTest.php index 1334b7a..ff0e9f3 100755 --- a/tests/QueryBuilderPutTest.php +++ b/tests/QueryBuilderPutTest.php @@ -11,9 +11,9 @@ final class QueryBuilderPutTest extends TestCase { $queryBuilder = new QueryBuilder(); $query = $queryBuilder->Put() - ->URI("https://schemas.auxiliumsoftware.co.uk/v1/collection.json") - ->At(node: "970334ed-1f4f-465a-94d7-923a99698786", uwu: "todos") - ->Safe(); + ->uri("https://schemas.auxiliumsoftware.co.uk/v1/collection.json") + ->at(node: "970334ed-1f4f-465a-94d7-923a99698786", uwu: "todos") + ->safe(); self::assertEquals( expected: 'PUT URI "https://schemas.auxiliumsoftware.co.uk/v1/collection.json" AT {970334ed-1f4f-465a-94d7-923a99698786}/todos SAFE', actual: $query @@ -24,9 +24,9 @@ final class QueryBuilderPutTest extends TestCase $this->expectException(QueryBuilderConflictingFieldAlreadyExistsException::class); $queryBuilder = new QueryBuilder(); $query = $queryBuilder->Put() - ->URI("https://schemas.auxiliumsoftware.co.uk/v1/collection.json") - ->At(node: "970334ed-1f4f-465a-94d7-923a99698786", uwu: "todos") - ->Into(relativePath: "Relative Path", propertyName: "OwO") - ->Safe(); + ->uri("https://schemas.auxiliumsoftware.co.uk/v1/collection.json") + ->at(node: "970334ed-1f4f-465a-94d7-923a99698786", uwu: "todos") + ->into(relativePath: "Relative Path", propertyName: "OwO") + ->safe(); } } diff --git a/tests/QueryBuilderReferencesTest.php b/tests/QueryBuilderReferencesTest.php index a616507..0c5d36e 100644 --- a/tests/QueryBuilderReferencesTest.php +++ b/tests/QueryBuilderReferencesTest.php @@ -10,8 +10,8 @@ final class QueryBuilderReferencesTest extends TestCase public function testReferenceQuery() { $query = QueryBuilder::References() - ->RelativePath("{00000000-0000-0000-0000-000000000000}") - ->Build(); + ->relativePath("{00000000-0000-0000-0000-000000000000}") + ->build(); self::assertEquals( expected: 'REFERENCES {00000000-0000-0000-0000-000000000000}', actual: $query diff --git a/tests/QueryBuilderSelectTest.php b/tests/QueryBuilderSelectTest.php index e4c7824..4443020 100644 --- a/tests/QueryBuilderSelectTest.php +++ b/tests/QueryBuilderSelectTest.php @@ -16,9 +16,9 @@ final class QueryBuilderSelectTest extends TestCase self::assertEquals( expected: "SELECT @path FROM ./cases/#", actual: QueryBuilder::Select() - ->RelativePaths(["@path"]) - ->From("./cases/#") - ->Build() + ->relativePaths(["@path"]) + ->from("./cases/#") + ->build() ); } public function test1() @@ -26,9 +26,9 @@ final class QueryBuilderSelectTest extends TestCase self::assertEquals( expected: "SELECT clients/0/name FROM {0b368d41-7c15-42c8-899c-2b178ae9d983}/cases/0", actual: QueryBuilder::Select() - ->AddRelativePath("clients/0/name") - ->From("{0b368d41-7c15-42c8-899c-2b178ae9d983}/cases/0") - ->Build() + ->addRelativePath("clients/0/name") + ->from("{0b368d41-7c15-42c8-899c-2b178ae9d983}/cases/0") + ->build() ); } } diff --git a/tests/QueryBuilderUnlinkTest.php b/tests/QueryBuilderUnlinkTest.php index 34b23e0..750585d 100644 --- a/tests/QueryBuilderUnlinkTest.php +++ b/tests/QueryBuilderUnlinkTest.php @@ -16,9 +16,9 @@ final class QueryBuilderUnlinkTest extends TestCase self::assertEquals( expected: "UNLINK test FROM {$this->TestUUID}", actual: QueryBuilder::Unlink() - ->UnlinkWhat("test") - ->From($this->TestUUID) - ->Build() + ->unlinkWhat("test") + ->from($this->TestUUID) + ->build() ); } public function test1() @@ -26,9 +26,9 @@ final class QueryBuilderUnlinkTest extends TestCase self::assertEquals( expected: "UNLINK test OF {$this->TestUUID}", actual: QueryBuilder::Unlink() - ->UnlinkWhat("test") - ->Of($this->TestUUID) - ->Build() + ->unlinkWhat("test") + ->of($this->TestUUID) + ->build() ); } public function test2() @@ -37,10 +37,10 @@ final class QueryBuilderUnlinkTest extends TestCase self::assertEquals( expected: "UNLINK test FROM {$this->TestUUID}", actual: QueryBuilder::Unlink() - ->UnlinkWhat("test") - ->From($this->TestUUID) - ->Of($this->TestUUID) - ->Build() + ->unlinkWhat("test") + ->from($this->TestUUID) + ->of($this->TestUUID) + ->build() ); } } \ No newline at end of file diff --git a/tests/ValidateDeegraphPathTest.php b/tests/ValidateDeegraphPathTest.php index 3a419f2..fe569a6 100644 --- a/tests/ValidateDeegraphPathTest.php +++ b/tests/ValidateDeegraphPathTest.php @@ -11,14 +11,14 @@ final class ValidateDeegraphPathTest extends TestCase { public function testValidUUID() { - self::assertTrue(RelativePath::Validate("{00000000-0000-0000-0000-000000000000}")); + self::assertTrue(RelativePath::validate("{00000000-0000-0000-0000-000000000000}")); } public function testHash() { - self::assertTrue(RelativePath::Validate("#")); + self::assertTrue(RelativePath::validate("#")); } public function testNumber() { - self::assertTrue(RelativePath::Validate("123")); + self::assertTrue(RelativePath::validate("123")); } }