Skip to content
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

Jump to bottom

Fix Shard Manager docs with more accurate docblocks in SQLAzureShardManager and PoolingShardManager #2799

Merged
merged 1 commit into from
Aug 3, 2017
Merged

Fix Shard Manager docs with more accurate docblocks in SQLAzureShardManager and PoolingShardManager #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions lib/Doctrine/DBAL/Sharding/PoolingShardManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(PoolingShardConnection $conn)
}

/**
* @return void
* {@inheritDoc}
*/
public function selectGlobal()
{
Expand All @@ -63,9 +63,7 @@ public function selectGlobal()
}

/**
* @param string $distributionValue
*
* @return void
* {@inheritDoc}
*/
public function selectShard($distributionValue)
{
Expand All @@ -75,15 +73,15 @@ public function selectShard($distributionValue)
}

/**
* @return string|null
* {@inheritDoc}
*/
public function getCurrentDistributionValue()
{
return $this->currentDistributionValue;
}

/**
* @return array
* {@inheritDoc}
*/
public function getShards()
{
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureShardManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

namespace Doctrine\DBAL\Sharding\SQLAzure;

use Doctrine\DBAL\Sharding\ShardManager;
use Doctrine\DBAL\Sharding\ShardingException;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Sharding\ShardingException;
use Doctrine\DBAL\Sharding\ShardManager;
use Doctrine\DBAL\Types\Type;

/**
Expand Down Expand Up @@ -57,7 +57,7 @@ class SQLAzureShardManager implements ShardManager
private $conn;

/**
* @var string
* @var string|null
*/
private $currentDistributionValue;

Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Sharding/ShardManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function selectShard($distributionValue);
/**
* Gets the distribution value currently used for sharding.
*
* @return string
* @return string|null
*/
function getCurrentDistributionValue();

Expand Down