add scalar type hints

alekitto · Nov 1, 2017 · 254936f · 254936f
1 parent 43a00a4
commit 254936f
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/lib/ClassMetadata.php b/lib/ClassMetadata.php
@@ -78,7 +78,7 @@ public function merge(MetadataInterface $metadata): void
     /**
      * {@inheritdoc}
      */
-    public function getAttributeMetadata($name): MetadataInterface
+    public function getAttributeMetadata(string $name): MetadataInterface
     {
         if (! isset($this->attributesMetadata[$name])) {
             return new NullMetadata($name);

diff --git a/lib/ClassMetadataInterface.php b/lib/ClassMetadataInterface.php
@@ -16,7 +16,7 @@ public function getReflectionClass(): \ReflectionClass;
      *
      * @return MetadataInterface
      */
-    public function getAttributeMetadata($name): MetadataInterface;
+    public function getAttributeMetadata(string $name): MetadataInterface;
 
     /**
      * Returns all attributes' metadata.

diff --git a/lib/Factory/MetadataFactory.php b/lib/Factory/MetadataFactory.php
@@ -20,9 +20,9 @@ class MetadataFactory extends AbstractMetadataFactory
      *
      * @param string $metadataClass
      */
-    public function setMetadataClass($metadataClass): void
+    public function setMetadataClass(string $metadataClass): void
     {
-        if (! class_exists($metadataClass) || ! is_subclass_of($metadataClass, ClassMetadataInterface::class, true)) {
+        if (! class_exists($metadataClass) || ! (new \ReflectionClass($metadataClass))->implementsInterface(ClassMetadataInterface::class)) {
             throw InvalidArgumentException::create(InvalidArgumentException::INVALID_METADATA_CLASS, $metadataClass);
         }
 

diff --git a/lib/Loader/FileLoader.php b/lib/Loader/FileLoader.php
@@ -18,7 +18,7 @@ abstract class FileLoader implements LoaderInterface
      *
      * @param string $filePath
      */
-    public function __construct($filePath)
+    public function __construct(string $filePath)
     {
         $this->filePath = $filePath;
     }
@@ -41,5 +41,5 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
      *
      * @return bool
      */
-    abstract protected function loadClassMetadataFromFile($file_content, ClassMetadataInterface $classMetadata): bool;
+    abstract protected function loadClassMetadataFromFile(string $file_content, ClassMetadataInterface $classMetadata): bool;
 }
diff --git a/lib/Loader/FileLoaderTrait.php b/lib/Loader/FileLoaderTrait.php
@@ -6,7 +6,7 @@
 
 trait FileLoaderTrait
 {
-    private function loadFile($filePath): string
+    private function loadFile(string $filePath): string
     {
         $file_content = @file_get_contents($filePath);
         if (false === $file_content) {

diff --git a/lib/Loader/FilesLoader.php b/lib/Loader/FilesLoader.php
@@ -14,7 +14,7 @@ class FilesLoader extends ChainLoader
     /**
      * {@inheritdoc}
      */
-    public function __construct(array $paths, $loaderClass = null)
+    public function __construct(array $paths, string $loaderClass = null)
     {
         $this->loaderClass = $loaderClass;
 
@@ -29,11 +29,11 @@ public function __construct(array $paths, $loaderClass = null)
     /**
      * Create an instance of LoaderInterface for the path.
      *
-     * @param $path
+     * @param string $path
      *
      * @return LoaderInterface
      */
-    protected function getLoader($path): LoaderInterface
+    protected function getLoader(string $path): LoaderInterface
     {
         if (null === $this->loaderClass) {
             throw new RuntimeException('You must implement '.__METHOD__.' or pass the loader class to the constructor');

diff --git a/lib/Loader/Locator/FileLocatorInterface.php b/lib/Loader/Locator/FileLocatorInterface.php
@@ -13,5 +13,5 @@ interface FileLocatorInterface
      *
      * @return string[]
      */
-    public function locate($basePath, $extension): array;
+    public function locate(string $basePath, string $extension): array;
 }
diff --git a/lib/Loader/Locator/FinderFileLocator.php b/lib/Loader/Locator/FinderFileLocator.php
@@ -10,7 +10,7 @@ class FinderFileLocator implements FileLocatorInterface
     /**
      * {@inheritdoc}
      */
-    public function locate($basePath, $extension): array
+    public function locate(string $basePath, string $extension): array
     {
         if ('.' !== $extension[0]) {
             throw new \InvalidArgumentException('Extension argument must start with a dot');

diff --git a/lib/Loader/Locator/IteratorFileLocator.php b/lib/Loader/Locator/IteratorFileLocator.php
@@ -7,7 +7,7 @@ class IteratorFileLocator implements FileLocatorInterface
     /**
      * {@inheritdoc}
      */
-    public function locate($basePath, $extension): array
+    public function locate(string $basePath, string $extension): array
     {
         if ('.' !== $extension[0]) {
             throw new \InvalidArgumentException('Extension argument must start with a dot');

diff --git a/lib/Loader/Processor/ProcessorFactory.php b/lib/Loader/Processor/ProcessorFactory.php
@@ -22,9 +22,9 @@ class ProcessorFactory implements ProcessorFactoryInterface
      * @param string $class
      * @param string $processorClass
      */
-    public function registerProcessor($class, $processorClass): void
+    public function registerProcessor(string $class, string $processorClass): void
     {
-        if (! is_subclass_of($processorClass, ProcessorInterface::class, true)) {
+        if (! (new \ReflectionClass($processorClass))->implementsInterface(ProcessorInterface::class)) {
             throw InvalidArgumentException::create(InvalidArgumentException::INVALID_PROCESSOR_INTERFACE_CLASS, $processorClass);
         }
 

diff --git a/tests/Loader/FileLoaderTest.php b/tests/Loader/FileLoaderTest.php
@@ -11,7 +11,7 @@
 
 class TestLoader extends FileLoader
 {
-    protected function loadClassMetadataFromFile($file_content, ClassMetadataInterface $classMetadata): bool
+    protected function loadClassMetadataFromFile(string $file_content, ClassMetadataInterface $classMetadata): bool
     {
         return true;
     }

diff --git a/tests/Loader/FilesLoaderTest.php b/tests/Loader/FilesLoaderTest.php
@@ -20,7 +20,7 @@ public function __construct(array $paths, $loader)
         parent::__construct($paths);
     }
 
-    protected function getLoader($path): LoaderInterface
+    protected function getLoader(string $path): LoaderInterface
     {
         return $this->loader;
     }
@@ -37,7 +37,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
         return true;
     }
 
-    protected function loadClassMetadataFromFile($file_content, ClassMetadataInterface $classMetadata): bool
+    protected function loadClassMetadataFromFile(string $file_content, ClassMetadataInterface $classMetadata): bool
     {
         return true;
     }