Merge pull request #172 from remicollet/issue-php73

Fix for 7.3: streamed directory are now also executable
bovigo · Jul 23, 2019 · 3446552 · 3446552
2 parents 68b5523 + 00df77b
commit 3446552
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 
 php:
   - 7.2
+  - 7.3
   - nightly
 
 matrix:

diff --git a/src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php b/src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php
@@ -255,11 +255,18 @@ public function isExecutableWithCorrectPermission()
     /**
      * @test
      */
-    public function directoriesAreNeverExecutable()
+    public function directoriesAreSometimesExecutable()
     {
         $this->root->chmod(0766);
-        assertFalse(is_executable($this->root->url()));
-        assertFalse(is_executable($this->root->url() . '/.'));
+        // Inconsistent behavior has been fixed in 7.3
+        // see https://github.com/php/php-src/commit/94b4abdbc4d
+        if (PHP_VERSION_ID >= 70300) {
+            assertTrue(is_executable($this->root->url()));
+            assertTrue(is_executable($this->root->url() . '/.'));
+        } else {
+            assertFalse(is_executable($this->root->url()));
+            assertFalse(is_executable($this->root->url() . '/.'));
+        }
     }
 
     /**