From 680fd794cb90c64d23685c1d5cb5cd43e2c24ceb Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Sat, 8 Nov 2014 16:27:20 -0500 Subject: [PATCH] Interfaces should have the suffix "Interface" in their names --- src/Builder/DefaultUuidBuilder.php | 4 ++-- src/Builder/DegradedUuidBuilder.php | 4 ++-- src/Codec/GuidStringCodec.php | 2 +- src/Codec/StringCodec.php | 4 ++-- src/{Codec.php => CodecInterface.php} | 2 +- src/DegradedUuid.php | 2 +- src/Generator/MtRandGenerator.php | 4 ++-- src/Generator/OpenSslGenerator.php | 4 ++-- src/Generator/RandomLibAdapter.php | 4 ++-- src/{RandomGenerator.php => RandomGeneratorInterface.php} | 2 +- src/Uuid.php | 6 +++--- src/UuidBuilder.php | 2 +- src/UuidFactory.php | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) rename src/{Codec.php => CodecInterface.php} (94%) rename src/{RandomGenerator.php => RandomGeneratorInterface.php} (81%) diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php index b8892e7..0cf6720 100644 --- a/src/Builder/DefaultUuidBuilder.php +++ b/src/Builder/DefaultUuidBuilder.php @@ -3,7 +3,7 @@ namespace Rhumsaa\Uuid\Builder; use Rhumsaa\Uuid\Converter\NumberConverterInterface; -use Rhumsaa\Uuid\Codec; +use Rhumsaa\Uuid\CodecInterface; use Rhumsaa\Uuid\Uuid; use Rhumsaa\Uuid\UuidBuilder; @@ -17,7 +17,7 @@ class DefaultUuidBuilder implements UuidBuilder $this->converter = $converter; } - public function build(Codec $codec, array $fields) + public function build(CodecInterface $codec, array $fields) { return new Uuid($fields, $this->converter, $codec); } diff --git a/src/Builder/DegradedUuidBuilder.php b/src/Builder/DegradedUuidBuilder.php index d5a345e..21751ab 100644 --- a/src/Builder/DegradedUuidBuilder.php +++ b/src/Builder/DegradedUuidBuilder.php @@ -3,7 +3,7 @@ namespace Rhumsaa\Uuid\Builder; use Rhumsaa\Uuid\UuidBuilder; -use Rhumsaa\Uuid\Codec; +use Rhumsaa\Uuid\CodecInterface; use Rhumsaa\Uuid\DegradedUuid; use Rhumsaa\Uuid\Converter\NumberConverterInterface; @@ -17,7 +17,7 @@ class DegradedUuidBuilder implements UuidBuilder $this->converter = $converter; } - public function build(Codec $codec, array $fields) + public function build(CodecInterface $codec, array $fields) { return new DegradedUuid($fields, $this->converter, $codec); } diff --git a/src/Codec/GuidStringCodec.php b/src/Codec/GuidStringCodec.php index 53999fb..023a896 100644 --- a/src/Codec/GuidStringCodec.php +++ b/src/Codec/GuidStringCodec.php @@ -4,7 +4,7 @@ namespace Rhumsaa\Uuid\Codec; use Rhumsaa\Uuid\UuidInterface; use Rhumsaa\Uuid\Uuid; -use Rhumsaa\Uuid\Codec; +use Rhumsaa\Uuid\CodecInterface; class GuidStringCodec extends StringCodec { diff --git a/src/Codec/StringCodec.php b/src/Codec/StringCodec.php index 852116b..d9eb62d 100644 --- a/src/Codec/StringCodec.php +++ b/src/Codec/StringCodec.php @@ -3,12 +3,12 @@ namespace Rhumsaa\Uuid\Codec; use InvalidArgumentException; -use Rhumsaa\Uuid\Codec; +use Rhumsaa\Uuid\CodecInterface; use Rhumsaa\Uuid\Uuid; use Rhumsaa\Uuid\UuidBuilder; use Rhumsaa\Uuid\UuidInterface; -class StringCodec implements Codec +class StringCodec implements CodecInterface { private $builder; diff --git a/src/Codec.php b/src/CodecInterface.php similarity index 94% rename from src/Codec.php rename to src/CodecInterface.php index 7ac628f..cb934ec 100644 --- a/src/Codec.php +++ b/src/CodecInterface.php @@ -2,7 +2,7 @@ namespace Rhumsaa\Uuid; -interface Codec +interface CodecInterface { /** * @return string diff --git a/src/DegradedUuid.php b/src/DegradedUuid.php index df7a841..e19e57e 100644 --- a/src/DegradedUuid.php +++ b/src/DegradedUuid.php @@ -7,7 +7,7 @@ use Rhumsaa\Uuid\Converter\NumberConverterInterface; class DegradedUuid extends Uuid { - public function __construct(array $fields, NumberConverterInterface $converter, Codec $codec) + public function __construct(array $fields, NumberConverterInterface $converter, CodecInterface $codec) { parent::__construct($fields, $converter, $codec); } diff --git a/src/Generator/MtRandGenerator.php b/src/Generator/MtRandGenerator.php index af24dcc..c5e7c03 100644 --- a/src/Generator/MtRandGenerator.php +++ b/src/Generator/MtRandGenerator.php @@ -2,9 +2,9 @@ namespace Rhumsaa\Uuid\Generator; -use Rhumsaa\Uuid\RandomGenerator; +use Rhumsaa\Uuid\RandomGeneratorInterface; -class MtRandGenerator implements RandomGenerator +class MtRandGenerator implements RandomGeneratorInterface { public function generate($length) { diff --git a/src/Generator/OpenSslGenerator.php b/src/Generator/OpenSslGenerator.php index 200f8c0..8211d6f 100644 --- a/src/Generator/OpenSslGenerator.php +++ b/src/Generator/OpenSslGenerator.php @@ -2,9 +2,9 @@ namespace Rhumsaa\Uuid\Generator; -use Rhumsaa\Uuid\RandomGenerator; +use Rhumsaa\Uuid\RandomGeneratorInterface; -class OpenSslGenerator implements RandomGenerator +class OpenSslGenerator implements RandomGeneratorInterface { public function generate($length) diff --git a/src/Generator/RandomLibAdapter.php b/src/Generator/RandomLibAdapter.php index 4bab073..710a400 100644 --- a/src/Generator/RandomLibAdapter.php +++ b/src/Generator/RandomLibAdapter.php @@ -4,9 +4,9 @@ namespace Rhumsaa\Uuid\Generator; use RandomLib\Generator; use RandomLib\Factory; -use Rhumsaa\Uuid\RandomGenerator; +use Rhumsaa\Uuid\RandomGeneratorInterface; -class RandomLibAdapter implements RandomGenerator +class RandomLibAdapter implements RandomGeneratorInterface { private $generator; diff --git a/src/RandomGenerator.php b/src/RandomGeneratorInterface.php similarity index 81% rename from src/RandomGenerator.php rename to src/RandomGeneratorInterface.php index 5f7521c..3a1e529 100644 --- a/src/RandomGenerator.php +++ b/src/RandomGeneratorInterface.php @@ -2,7 +2,7 @@ namespace Rhumsaa\Uuid; -interface RandomGenerator +interface RandomGeneratorInterface { /** * @param integer $length diff --git a/src/Uuid.php b/src/Uuid.php index 88b18eb..0da5200 100644 --- a/src/Uuid.php +++ b/src/Uuid.php @@ -105,7 +105,7 @@ class Uuid implements UuidInterface, \JsonSerializable /** * String codec - * @var Codec + * @var CodecInterface */ protected $codec; @@ -135,10 +135,10 @@ class Uuid implements UuidInterface, \JsonSerializable * UUIDs. * * @param array $fields - * @param Codec $codec String codec + * @param CodecInterface $codec String codec * @link Rhumsaa.Uuid.Uuid.html#method_getFields */ - public function __construct(array $fields, NumberConverterInterface $converter, Codec $codec) + public function __construct(array $fields, NumberConverterInterface $converter, CodecInterface $codec) { $this->fields = $fields; $this->codec = $codec; diff --git a/src/UuidBuilder.php b/src/UuidBuilder.php index b4f490c..29b253b 100644 --- a/src/UuidBuilder.php +++ b/src/UuidBuilder.php @@ -7,5 +7,5 @@ interface UuidBuilder /** * @return Uuid */ - public function build(Codec $codec, array $fields); + public function build(CodecInterface $codec, array $fields); } diff --git a/src/UuidFactory.php b/src/UuidFactory.php index 74bcc75..5919968 100644 --- a/src/UuidFactory.php +++ b/src/UuidFactory.php @@ -13,7 +13,7 @@ class UuidFactory /** * - * @var Codec + * @var CodecInterface */ private $codec = null; @@ -30,7 +30,7 @@ class UuidFactory private $numberConverter = null; /** - * @var RandomGenerator + * @var RandomGeneratorInterface */ private $randomGenerator = null; @@ -84,7 +84,7 @@ class UuidFactory $this->timeProvider = $provider; } - public function setRandomGenerator(RandomGenerator $generator) + public function setRandomGenerator(RandomGeneratorInterface $generator) { $this->randomGenerator = $generator; }