From 12247cb56ea10f37bc11f34654a304bbf59b165e Mon Sep 17 00:00:00 2001
From: Guilhem Niot <guilhem.niot@gmail.com>
Date: Fri, 17 Mar 2017 19:37:41 +0100
Subject: [PATCH] Add return types

---
 Describer/SwaggerPhpDescriber.php           | 4 ++--
 Model/Model.php                             | 2 +-
 Model/ModelRegistry.php                     | 3 ++-
 ModelDescriber/CollectionModelDescriber.php | 2 +-
 ModelDescriber/ModelDescriberInterface.php  | 2 +-
 ModelDescriber/ObjectModelDescriber.php     | 2 +-
 ModelDescriber/ScalarModelDescriber.php     | 2 +-
 RouteDescriber/RouteDescriberTrait.php      | 4 ++--
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Describer/SwaggerPhpDescriber.php b/Describer/SwaggerPhpDescriber.php
index 92aa455..8c317e8 100644
--- a/Describer/SwaggerPhpDescriber.php
+++ b/Describer/SwaggerPhpDescriber.php
@@ -135,7 +135,7 @@ final class SwaggerPhpDescriber extends ExternalDocDescriber implements ModelReg
         return $analysis;
     }
 
-    private function getMethodsToParse()
+    private function getMethodsToParse(): \Generator
     {
         foreach ($this->routeCollection->all() as $route) {
             if (!$route->hasDefault('_controller')) {
@@ -154,7 +154,7 @@ final class SwaggerPhpDescriber extends ExternalDocDescriber implements ModelReg
         }
     }
 
-    private function normalizePath(string $path)
+    private function normalizePath(string $path): string
     {
         if (substr($path, -10) === '.{_format}') {
             $path = substr($path, 0, -10);
diff --git a/Model/Model.php b/Model/Model.php
index 82693fe..1ffb7e1 100644
--- a/Model/Model.php
+++ b/Model/Model.php
@@ -30,7 +30,7 @@ final class Model
         return $this->type;
     }
 
-    public function getHash()
+    public function getHash(): string
     {
         return md5(serialize($this->type));
     }
diff --git a/Model/ModelRegistry.php b/Model/ModelRegistry.php
index 197a336..6f42f54 100644
--- a/Model/ModelRegistry.php
+++ b/Model/ModelRegistry.php
@@ -101,11 +101,12 @@ final class ModelRegistry
         return $name;
     }
 
-    private function getTypeShortName(Type $type)
+    private function getTypeShortName(Type $type): string
     {
         if (null !== $type->getCollectionValueType()) {
             return $this->getTypeShortName($type->getCollectionValueType()).'[]';
         }
+
         if (Type::BUILTIN_TYPE_OBJECT === $type->getBuiltinType()) {
             $parts = explode('\\', $type->getClassName());
 
diff --git a/ModelDescriber/CollectionModelDescriber.php b/ModelDescriber/CollectionModelDescriber.php
index c75d7ee..304076a 100644
--- a/ModelDescriber/CollectionModelDescriber.php
+++ b/ModelDescriber/CollectionModelDescriber.php
@@ -28,7 +28,7 @@ class CollectionModelDescriber implements ModelDescriberInterface, ModelRegistry
         );
     }
 
-    public function supports(Model $model)
+    public function supports(Model $model): bool
     {
         return $model->getType()->isCollection() && null !== $model->getType()->getCollectionValueType();
     }
diff --git a/ModelDescriber/ModelDescriberInterface.php b/ModelDescriber/ModelDescriberInterface.php
index 698226c..5029ba0 100644
--- a/ModelDescriber/ModelDescriberInterface.php
+++ b/ModelDescriber/ModelDescriberInterface.php
@@ -18,5 +18,5 @@ interface ModelDescriberInterface
 {
     public function describe(Model $model, Schema $schema);
 
-    public function supports(Model $model);
+    public function supports(Model $model): bool;
 }
diff --git a/ModelDescriber/ObjectModelDescriber.php b/ModelDescriber/ObjectModelDescriber.php
index 909be74..d7ec920 100644
--- a/ModelDescriber/ObjectModelDescriber.php
+++ b/ModelDescriber/ObjectModelDescriber.php
@@ -55,7 +55,7 @@ class ObjectModelDescriber implements ModelDescriberInterface, ModelRegistryAwar
         }
     }
 
-    public function supports(Model $model)
+    public function supports(Model $model): bool
     {
         return Type::BUILTIN_TYPE_OBJECT === $model->getType()->getBuiltinType();
     }
diff --git a/ModelDescriber/ScalarModelDescriber.php b/ModelDescriber/ScalarModelDescriber.php
index 48a502f..2ce8a86 100644
--- a/ModelDescriber/ScalarModelDescriber.php
+++ b/ModelDescriber/ScalarModelDescriber.php
@@ -30,7 +30,7 @@ class ScalarModelDescriber implements ModelDescriberInterface
         $schema->setType($type);
     }
 
-    public function supports(Model $model)
+    public function supports(Model $model): bool
     {
         return isset(self::$supportedTypes[$model->getType()->getBuiltinType()]);
     }
diff --git a/RouteDescriber/RouteDescriberTrait.php b/RouteDescriber/RouteDescriberTrait.php
index 0cd69cf..0de075b 100644
--- a/RouteDescriber/RouteDescriberTrait.php
+++ b/RouteDescriber/RouteDescriberTrait.php
@@ -25,7 +25,7 @@ trait RouteDescriberTrait
      *
      * @return Operation[]
      */
-    private function getOperations(Swagger $api, Route $route)
+    private function getOperations(Swagger $api, Route $route): array
     {
         $path = $api->getPaths()->get($this->normalizePath($route->getPath()));
         $methods = $route->getMethods() ?: Swagger::$METHODS;
@@ -41,7 +41,7 @@ trait RouteDescriberTrait
         return $operations;
     }
 
-    private function normalizePath(string $path)
+    private function normalizePath(string $path): string
     {
         if (substr($path, -10) === '.{_format}') {
             $path = substr($path, 0, -10);