Merge pull request #25 from pborreli/php-56

PHPDoc + PHP 5.6
willdurand · Feb 20, 2014 · e7460fb · e7460fb
2 parents e46ea11 + d57114e
commit e7460fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
     - hhvm
 
 matrix:

diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
@@ -154,7 +154,7 @@ public function normalizePriorities($priorities)
     /**
      * @param array $priorities
      *
-     * return boolean
+     * @return boolean
      */
     private function isCatchAllEnabled(array $priorities)
     {