Merge branch 'hotfix/10' into develop

Forward port #10
zendframework · Nov 18, 2015 · 4b024bb · 4b024bb
2 parents 39affb7 + 6cc500f
commit 4b024bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,3 +21,22 @@ All notable changes to this project will be documented in this file, in reverse
 - [#20](https://github.com/zendframework/zend-code/pull/20) updates
   the zend-eventmanager dependency to `^2.6|^3.0`, and changes its
   internal usage to use the `triggerEventUntil()` signature.
+
+## 2.5.3 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#10](https://github.com/zendframework/zend-code/pull/10) removes a
+  development dependency on zendframework/zend-version.
+
+### Fixed
+
+- Nothing.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,6 @@
     "require-dev": {
         "doctrine/common": ">=2.1",
         "zendframework/zend-stdlib": "~2.7",
-        "zendframework/zend-version": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },

diff --git a/test/Reflection/FileReflectionTest.php b/test/Reflection/FileReflectionTest.php
@@ -18,14 +18,6 @@
  */
 class FileReflectionTest extends \PHPUnit_Framework_TestCase
 {
-    public function testFileConstructor()
-    {
-        $filePath = __DIR__ . '/../../vendor/zendframework/zend-version/src/Version.php';
-        require_once $filePath;
-        $reflectionFile = new FileReflection($filePath);
-        $this->assertEquals(get_class($reflectionFile), 'Zend\Code\Reflection\FileReflection');
-    }
-
     public function testFileConstructorThrowsExceptionOnNonExistentFile()
     {
         $nonExistentFile = 'Non/Existent/File.php';
@@ -108,19 +100,15 @@ public function testFileReflectorRequiredFunctionsDoNothing()
     {
         $this->assertNull(FileReflection::export());
 
-        $filePath = __DIR__ . '/../../vendor/zendframework/zend-version/src/Version.php';
-        require_once $filePath;
-        $reflectionFile = new FileReflection($filePath);
+        $reflectionFile = new FileReflection(__FILE__);
         $this->assertEquals('', $reflectionFile->__toString());
     }
 
     public function testFileGetFilenameReturnsCorrectFilename()
     {
-        $filePath = __DIR__ . '/../../vendor/zendframework/zend-version/src/Version.php';
-        require_once $filePath;
-        $reflectionFile = new FileReflection($filePath);
+        $reflectionFile = new FileReflection(__FILE__);
 
-        $this->assertEquals('Version.php', $reflectionFile->getFileName());
+        $this->assertEquals('FileReflectionTest.php', $reflectionFile->getFileName());
     }
 
     public function testFileGetLineNumbersWorks()