Merge branch '1.x' into 2.x

* 1.x:
  fixed typos

lib/Twig/Cache/Filesystem.php

@@ -24,8 +24,8 @@ class Twig_Cache_Filesystem implements CacheInterface
     private $options;
 
     /**
-     * @param $directory string The root cache directory
-     * @param $options   int    A set of options
+     * @param string $directory The root cache directory
+     * @param int $options      A set of options
      */
     public function __construct($directory, $options = 0)
     {

lib/Twig/Environment.php

@@ -518,13 +518,12 @@ class Twig_Environment
             try {
                 return $this->loadTemplate($name);
             } catch (LoaderError $e) {
+                if (1 === \count($names)) {
+                    throw $e;
+                }
             }
         }
 
-        if (1 === \count($names)) {
-            throw $e;
-        }
-
         throw new LoaderError(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
     }