Merge branch 'master' into improve/travis-build

Author: renatomefi

Resolver/AbstractResolver.php

@@ -42,14 +42,19 @@ public function addSolution($name, callable $solutionFunc, array $solutionFuncAr
         return $this;
     }
 
+    public function hasSolution($name)
+    {
+        return isset($this->solutions[$name]);
+    }
+
     /**
      * @param $name
      *
      * @return mixed
      */
     public function getSolution($name)
     {
-        return isset($this->solutions[$name]) ? $this->loadSolution($name) : null;
+        return $this->loadSolution($name);
     }
 
     /**
@@ -77,6 +82,10 @@ public function getSolutionOptions($name)
      */
     private function loadSolution($name)
     {
+        if (!$this->hasSolution($name)) {
+            return null;
+        }
+
         if ($this->fullyLoadedSolutions[$name]) {
             return $this->solutions[$name];
         } else {

Resolver/TypeResolver.php

@@ -102,7 +102,7 @@ private function hasNeedListOfWrapper($alias)
     protected function postLoadSolution($solution)
     {
         // also add solution with real type name if needed for typeLoader when using autoMapping
-        if ($solution && !isset($this->getSolutions()[$solution->name])) {
+        if ($solution && !$this->hasSolution($solution->name)) {
             $this->addSolution($solution->name, function () use ($solution) {
                 return $solution;
             });