Skip to content

Hydration package refactor #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkraczkowski wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hydration package refactor #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d05578
Removed hydration classes
dkraczkowski Apr 18, 2019
9e2d879
PSR-12 fixes
dkraczkowski Apr 18, 2019
03a2984
Clean up
dkraczkowski Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"ext-mbstring" : "*",
"ext-json" : "*",
"ext-mongodb" : ">=1.5.0",
"fatcode/enum": ">=1.0.0"
"fatcode/enum": ">=1.0.0",
"fatcode/hydration": ">=1.0.0"
},
"require-dev": {
"phpunit/phpunit": ">=8.0",
"mockery/mockery": ">=1.2",
"fzaninotto/faker": ">=1.8",
"squizlabs/php_codesniffer": ">=3.0",
"vimeo/psalm": ">=3.2"
"squizlabs/php_codesniffer": ">=3.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

interface Command
{
public function execute(callable $handler, Connection $connection): void;
public function execute(callable $handler, Connection $connection) : void;
}
6 changes: 3 additions & 3 deletions src/Driver/Cursor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

interface Cursor extends Iterator
{
public function getConnection(): Connection;
public function close(): void;
public function isClosed(): bool;
public function getConnection() : Connection;
public function close() : void;
public function isClosed() : bool;
}
4 changes: 2 additions & 2 deletions src/Driver/MongoDb/Command/Aggregate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public function __construct(string $collection, PipelineOperation ...$pipeline)
$this->pipeline = $pipeline;
}

public function setCollation(Collation $collation): void
public function setCollation(Collation $collation) : void
{
$this->collation = $collation;
}

public function execute(callable $handler, Connection $connection): void
public function execute(callable $handler, Connection $connection) : void
{
$command = [
'aggregate' => $this->collection,
Expand Down
1 change: 1 addition & 0 deletions src/Driver/MongoDb/Command/Changeset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use FatCode\Storage\Driver\MongoDb\Command\Operation\UpdateOperation;
use stdClass;

use function array_merge_recursive;

class Changeset
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/AddToSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function __construct(string $field, ...$values)
$this->values = $values;
}

public function apply(): array
public function apply() : array
{

if (count($this->values) > 1) {
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/ConstrainMaximum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function __construct(string $field, $value)
$this->value = $value;
}

public function apply(): array
public function apply() : array
{
return [
'$min' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/ConstrainMinimum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function __construct(string $field, $value)
$this->value = $value;
}

public function apply(): array
public function apply() : array
{
return [
'$max' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/FindOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

interface FindOperation
{
public function apply(): array;
public function apply() : array;
}
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Increment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function __construct(string $field, int $value)
$this->value = $value;
}

public function apply(): array
public function apply() : array
{
return [
'$inc' => [
Expand Down
4 changes: 2 additions & 2 deletions src/Driver/MongoDb/Command/Operation/Join.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public function __construct(string $from, string $localKey, string $foreignKey,
];
}

public function addToPipeline(): array
public function addToPipeline() : array
{
return ['$lookup' => $this->join];
}

public function apply(): array
public function apply() : array
{
return [];
}
Expand Down
4 changes: 2 additions & 2 deletions src/Driver/MongoDb/Command/Operation/Limit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function __construct(int $limit, int $offset = null)
$this->offset = $offset;
}

public function addToPipeline(): array
public function addToPipeline() : array
{
if ($this->offset !== null) {
return ['$limit' => $this->limit, '$skip' => $this->offset];
Expand All @@ -22,7 +22,7 @@ public function addToPipeline(): array
return ['$limit' => $this->limit];
}

public function apply(): array
public function apply() : array
{
if ($this->offset !== null) {
return ['limit' => $this->limit, 'skip' => $this->offset];
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Match.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public function __construct(array $query)
$this->query = $query;
}

public function addToPipeline(): array
public function addToPipeline() : array
{
return ['$match' => $this->query];
}
Expand Down
5 changes: 3 additions & 2 deletions src/Driver/MongoDb/Command/Operation/Multiply.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace FatCode\Storage\Driver\MongoDb\Command\Operation;

use FatCode\Storage\Exception\DriverException;

use function is_float;
use function is_int;
use FatCode\Storage\Exception\DriverException;

/**
* Delete operator deletes the specified field
Expand All @@ -30,7 +31,7 @@ public function __construct(string $field, $value)
$this->value = $value;
}

public function apply(): array
public function apply() : array
{
return [
'$mul' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/PipelineOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

interface PipelineOperation
{
public function addToPipeline(): array;
public function addToPipeline() : array;
}
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Pop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function __construct(string $field)
$this->field = $field;
}

public function apply(): array
public function apply() : array
{
return [
'$pop' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Rename.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function __construct(string $oldName, string $newName)
$this->value = $newName;
}

public function apply(): array
public function apply() : array
{
return [
'$rename' => [
Expand Down
4 changes: 2 additions & 2 deletions src/Driver/MongoDb/Command/Operation/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public function __construct(string ...$fields)
}
}

public function addToPipeline(): array
public function addToPipeline() : array
{
return ['$project' => $this->select];
}

public function apply(): array
public function apply() : array
{
return ['projection' => $this->select];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Set.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function __construct(string $field, $value)
$this->value = $value;
}

public function apply(): array
public function apply() : array
{
return [
'$set' => [
Expand Down
4 changes: 2 additions & 2 deletions src/Driver/MongoDb/Command/Operation/Sort.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public function __construct(string ...$fields)
}
}

public function addToPipeline(): array
public function addToPipeline() : array
{
return ['$sort' => $this->sort];
}

public function apply(): array
public function apply() : array
{
return ['sort' => $this->sort];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/UnsetField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function __construct(string ...$fields)
$this->fields = $fields;
}

public function apply(): array
public function apply() : array
{
$delete = [];
foreach ($this->fields as $field) {
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/Unshift.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function __construct(string $field)
$this->field = $field;
}

public function apply(): array
public function apply() : array
{
return [
'$pop' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/UpdateDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function __construct(array $document)
$this->document = $document;
}

public function apply(): array
public function apply() : array
{
return $this->document;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/MongoDb/Command/Operation/UpdateOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

interface UpdateOperation
{
public function apply(): array;
public function apply() : array;
}
6 changes: 3 additions & 3 deletions src/Driver/MongoDb/MongoConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ function (array $command) use (&$nativeCursor) {
}
}

public function getOptions(): ConnectionOptions
public function getOptions() : ConnectionOptions
{
return $this->options;
}

public function connect(): void
public function connect() : void
{
$this->handler = new MongoDB\Driver\Manager(
'mongodb://' . $this->host . '/' . $this->options->getDatabase(),
Expand Down Expand Up @@ -141,7 +141,7 @@ public function listCollections() : array
return $collections;
}

public function isConnected(): bool
public function isConnected() : bool
{
return $this->handler !== null;
}
Expand Down
28 changes: 12 additions & 16 deletions src/Driver/MongoDb/MongoConnectionOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,30 @@ final class MongoConnectionOptions implements ConnectionOptions
/** @var resource */
private $sslContext;

/** @var string */
private $name;

public function __construct(string $database, string $username = null, string $password = null)
{
$this->username = $username;
$this->password = $password;
$this->database = $database;
$this->readPreference = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
$this->name = 'default mongo connection';
}

public function setReadConcern(MongoDB\Driver\ReadConcern $concern): void
public function setReadConcern(MongoDB\Driver\ReadConcern $concern) : void
{
$this->readConcern = $concern;
}

public function setWriteConcern(MongoDB\Driver\WriteConcern $concern): void
public function setWriteConcern(MongoDB\Driver\WriteConcern $concern) : void
{
$this->writeConcern = $concern;
}

public function setReadPreference(MongoDB\Driver\ReadPreference $preference): void
public function setReadPreference(MongoDB\Driver\ReadPreference $preference) : void
{
$this->readPreference = $preference;
}

public function setAppName(string $appName): void
public function setAppName(string $appName) : void
{
$this->appName = $appName;
}
Expand All @@ -97,28 +93,28 @@ public function setAppName(string $appName): void
* @param array $options
* @see https://github.com/mongodb/specifications/blob/master/source/auth/auth.rst#auth-related-options
*/
public function setAuth(string $mechanism, array $options = []): void
public function setAuth(string $mechanism, array $options = []) : void
{
$this->authMechanism = $mechanism;
$this->authOptions = $options;
}

public function setConnectionTimeout(int $milliseconds): void
public function setConnectionTimeout(int $milliseconds) : void
{
$this->connectTimeout = $milliseconds;
}

public function setSocketTimeout(int $milliseconds): void
public function setSocketTimeout(int $milliseconds) : void
{
$this->socketTimeout = $milliseconds;
}

public function setReplicaSet(string $name): void
public function setReplicaSet(string $name) : void
{
$this->replicaSet = $name;
}

public function useSSL(string $pemFile, string $pemPassword = null, array $context = null): void
public function useSSL(string $pemFile, string $pemPassword = null, array $context = null) : void
{
if ($context !== null) {
$this->sslContext = stream_context_create([
Expand All @@ -130,7 +126,7 @@ public function useSSL(string $pemFile, string $pemPassword = null, array $conte
$this->sslPemPassword = $pemPassword;
}

public function getURIOptions(): array
public function getURIOptions() : array
{
$options = [];
if ($this->username !== null) {
Expand Down Expand Up @@ -178,7 +174,7 @@ public function getURIOptions(): array
return $options;
}

public function getDriverOptions(): array
public function getDriverOptions() : array
{
if (!$this->sslPemFile) {
return [];
Expand All @@ -198,7 +194,7 @@ public function getDriverOptions(): array
return $options;
}

public function getDatabase(): string
public function getDatabase() : string
{
return $this->database;
}
Expand Down
Loading