Merge branch 'hotfix/140' into develop

Forward port #140

Author: weierophinney

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
@@ -19,7 +23,14 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#140](https://github.com/zendframework/zend-code/pull/140) fixes `MethodScanner::setVisibility()` such that it no longer
+  casts the provided visibility token to lower case; this fix is necessary, as
+  the method is supposed to expect only the appropriate
+  `T_(PUBLIC|PROTECTED|PRIVATE)` token values, which are integers.
+
+- [#140](https://github.com/zendframework/zend-code/pull/140) updates the `MethodScanner::setVisibility()` method to raise
+  a package-specific `InvalidArgumentException` instead of the non-existent
+  package `Exception` class when an invalid visibility is provided.
 
 ## 3.3.0 - 2017-10-20
 
@@ -258,6 +269,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
+- [#140](https://github.com/zendframework/zend-code/pull/140) updates the `MethodScanner::setVisibility()` method to raise a package-specific `InvalidArgumentException` instead of
+  the non-existent package `Exception` class when an invalid visibility is provided.
+
 This section refers to breaking changes: please refer to
 [docs/book/migration.md](docs/book/migration.md) for migration instructions.
 

src/Scanner/MethodScanner.php

@@ -265,11 +265,11 @@ public function setName($name)
      *
      * @param int $visibility   T_PUBLIC | T_PRIVATE | T_PROTECTED
      * @return self
-     * @throws \Zend\Code\Exception
+     * @throws \Zend\Code\Exception\InvalidArgumentException
      */
     public function setVisibility($visibility)
     {
-        switch (strtolower($visibility)) {
+        switch ($visibility) {
             case T_PUBLIC:
                 $this->isPublic = true;
                 $this->isPrivate = false;
@@ -289,7 +289,7 @@ public function setVisibility($visibility)
                 break;
 
             default:
-                throw new Exception('Invalid visibility argument passed to setVisibility.');
+                throw new Exception\InvalidArgumentException('Invalid visibility argument passed to setVisibility.');
         }
 
         return $this;

test/Scanner/MethodScannerTest.php

@@ -12,6 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Zend\Code\Scanner\FileScanner;
 use Zend\Code\Scanner\ParameterScanner;
+use Zend\Code\Scanner\MethodScanner;
 use ZendTest\Code\TestAsset\AbstractClass;
 use ZendTest\Code\TestAsset\BarClass;
 use ZendTest\Code\TestAsset\FooClass;
@@ -110,4 +111,24 @@ public function testMethodScannerWorksWithSingleAbstractFunction()
 
         self::assertTrue($method->isAbstract());
     }
+
+    public function testMethodScannerSetVisibilityThrowsInvalidArgumentException()
+    {
+        $methodScanner = new MethodScanner([]);
+
+        // make sure test argument is invalid
+        $invalidArgument = max(T_PUBLIC, T_PROTECTED, T_PRIVATE) + 1;
+
+        $this->expectException('\Zend\Code\Exception\InvalidArgumentException');
+        $methodScanner->setVisibility($invalidArgument);
+    }
+
+    public function testMethodScannerSetVisibilityAcceptsIntegerTokens()
+    {
+        $methodScanner = new MethodScanner([]);
+
+        $this->assertSame($methodScanner->setVisibility(T_PUBLIC), $methodScanner);
+        $this->assertSame($methodScanner->setVisibility(T_PROTECTED), $methodScanner);
+        $this->assertSame($methodScanner->setVisibility(T_PRIVATE), $methodScanner);
+    }
 }