Merge pull request #5 from Rican7/hotfix/new-php-test-fix

Hotfix - PHP 5.4.16 - Unit Test Fix
onemightyroar · Jun 14, 2013 · 7f56a73 · 7f56a73
2 parents 50c763a + 940f523
commit 7f56a73
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/OneMightyRoar/PhpFileManager/Tests/FileObjectTest.php b/tests/OneMightyRoar/PhpFileManager/Tests/FileObjectTest.php
@@ -394,11 +394,16 @@ public function testGetExtension()
 
         $this->assertSame('jpeg', $wrapped_binary->getExtension());
         $this->assertSame('plain', $wrapped_base64->getExtension());
-        $this->assertSame('c++', $wrapped_binary_php->getExtension());
         $this->assertSame('jpg', $raw_binary->getExtension());
         $this->assertSame('base64', $raw_base64->getExtension());
         $this->assertSame('php', $raw_binary_php->getExtension());
 
+        /**
+         * __FILE__ may show as C++ or PHP, depending on the version
+         * This should be fixed as of PHP 5.4.15 or 5.4.16 (not exactly sure)
+         */
+        $this->assertTrue(in_array($wrapped_binary_php->getExtension(), array('c++', 'php')));
+
         // With dot?
         $this->assertNotContains('.', $wrapped_binary->getExtension(false));
         $this->assertContains('.', $wrapped_binary->getExtension(true));