Port #209 to 1.x as suggested in #221

.travis.yml

@@ -11,13 +11,6 @@ php:
 
 matrix:
   fast_finish: true
-  include:
-    - php: 5.5
-      dist: precise
-    - php: 5.4
-      dist: precise
-    - php: 5.3
-      dist: precise
   allow_failures:
     - php: nightly
     - php: 7.4snapshot

CHANGELOG.md

@@ -1,3 +1,12 @@
+=======
+1.7.0 (20??-??-??)
+------------------
+
+  * Namespace changed from `org\bovigo\vfs` to `bovigo\vfs`
+    - The old namespace still works, but has been deprecated. It will be removed in version 2.
+  * raised requirement for minimum PHP version to 5.6.0
+
+
 1.6.8 (2019-10-30)
 ------------------
 

composer.json

@@ -17,17 +17,25 @@
         "wiki": "https://github.com/bovigo/vfsStream/wiki"
     },
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.5|^5.0"
     },
     "autoload": {
-        "psr-0": { "org\\bovigo\\vfs\\": "src/main/php" }
+        "psr-4": {
+            "bovigo\\vfs\\": "src",
+            "org\\bovigo\\vfs\\": "org/bovigo/vfs"
+        }
+    },
+    "autoload-dev": {
+       "psr-4": {
+           "bovigo\\vfs\\tests\\": "tests/phpunit"
+       }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.6.x-dev"
+            "dev-master": "1.7.x-dev"
         }
     }
 }

examples/Example.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 /**
  * Example class.
  */
@@ -51,4 +51,4 @@ public function setDirectory($directory)
 
     // more source code here...
 }
-?>
+?>

examples/ExampleTestCaseOldWay.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 require_once 'Example.php';
 /**
  * Test case for class Example.
@@ -45,4 +45,4 @@ public function directoryIsCreated()
         $this->assertTrue(file_exists(__DIR__ . '/id'));
     }
 }
-?>
+?>

examples/ExampleTestCaseWithVfsStream.php

@@ -5,10 +5,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
-use org\bovigo\vfs\vfsStream;
+namespace bovigo\vfs\example;
+use bovigo\vfs\vfsStream;
 require_once 'Example.php';
 /**
  * Test case for class Example.
@@ -44,4 +44,4 @@ public function directoryIsCreated()
         $this->assertTrue($this->root->hasChild('id'));
     }
 }
-?>
+?>

examples/FailureExample.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 /**
  * Example class to demonstrate testing of failure behaviour with vfsStream.
  */
@@ -47,4 +47,4 @@ public function writeData($data)
 
     // more source code here...
 }
-?>
+?>

examples/FailureExampleTestCase.php

@@ -5,10 +5,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
-use org\bovigo\vfs\vfsStream;
+namespace bovigo\vfs\example;
+use bovigo\vfs\vfsStream;
 require_once 'FailureExample.php';
 /**
  * Test case for class FailureExample.
@@ -55,4 +55,4 @@ public function returnsErrorMessageIfWritingToFileFails()
         $this->assertSame('notoverwritten', $this->root->getChild('test.txt')->getContent());
     }
 }
-?>
+?>

examples/FileModeExampleTestCaseOldWay.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 require_once 'FilemodeExample.php';
 /**
  * Test case for class FilemodeExample.
@@ -64,4 +64,4 @@ public function testDirectoryHasCorrectDifferentFilePermissions()
         }
     }
 }
-?>
+?>

examples/FilePermissionsExample.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 /**
  * Example showing correct file permission support introduced with 0.7.0.
  */
@@ -26,4 +26,4 @@ public function writeConfig($config, $configFile)
 
     // more methods here
 }
-?>
+?>

examples/FilePermissionsExampleTestCase.php

@@ -5,10 +5,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
-use org\bovigo\vfs\vfsStream;
+namespace bovigo\vfs\example;
+use bovigo\vfs\vfsStream;
 require_once 'FilePermissionsExample.php';
 /**
  * Test for FilePermissionsExample.
@@ -41,4 +41,4 @@ public function directoryNotWritable()
         );
     }
 }
-?>
+?>

examples/FilemodeExample.php

@@ -5,9 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
+namespace bovigo\vfs\example;
 /**
  * Example class.
  */
@@ -59,4 +59,4 @@ public function setDirectory($directory)
 
     // more source code here...
 }
-?>
+?>

examples/FilemodeExampleTestCaseWithVfsStream.php

@@ -5,10 +5,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @package  org\bovigo\vfs
+ * @package  bovigo\vfs
  */
-namespace org\bovigo\vfs\example;
-use org\bovigo\vfs\vfsStream;
+namespace bovigo\vfs\example;
+use bovigo\vfs\vfsStream;
 require_once 'FilemodeExample.php';
 /**
  * Test case for class FilemodeExample.
@@ -50,4 +50,4 @@ public function testDirectoryIsCreatedWithGivenPermissions()
         $this->assertEquals(0755, $this->root->getChild('id')->getPermissions());
     }
 }
-?>
+?>

org/bovigo/vfs/DotDirectory.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs;
+
+use bovigo\vfs\DotDirectory as Base;
+
+class_exists('bovigo\vfs\DotDirectory');
+
+@trigger_error('Using the "org\bovigo\vfs\DotDirectory" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\DotDirectory" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\DotDirectory" instead */
+    class DotDirectory extends Base
+    {
+    }
+}

org/bovigo/vfs/Quota.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs;
+
+use bovigo\vfs\Quota as Base;
+
+class_exists('bovigo\vfs\Quota');
+
+@trigger_error('Using the "org\bovigo\vfs\Quota" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\Quota" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\Quota" instead */
+    class Quota extends Base
+    {
+    }
+}

org/bovigo/vfs/content/FileContent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs\content;
+
+use bovigo\vfs\content\FileContent as Base;
+
+interface_exists('bovigo\vfs\content\FileContent');
+
+@trigger_error('Using the "org\bovigo\vfs\content\FileContent" interface is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\content\FileContent" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\FileContent" instead */
+    interface FileContent extends Base
+    {
+    }
+}

org/bovigo/vfs/content/LargeFileContent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs\content;
+
+use bovigo\vfs\content\LargeFileContent as Base;
+
+class_exists('bovigo\vfs\content\LargeFileContent');
+
+@trigger_error('Using the "org\bovigo\vfs\content\LargeFileContent" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\content\LargeFileContent" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\LargeFileContent" instead */
+    class LargeFileContent extends Base
+    {
+    }
+}

org/bovigo/vfs/content/SeekableFileContent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs\content;
+
+use bovigo\vfs\content\SeekableFileContent as Base;
+
+class_exists('bovigo\vfs\content\SeekableFileContent');
+
+@trigger_error('Using the "org\bovigo\vfs\content\SeekableFileContent" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\content\SeekableFileContent" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\SeekableFileContent" instead */
+    abstract class SeekableFileContent extends Base
+    {
+    }
+}

org/bovigo/vfs/content/StringBasedFileContent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs\content;
+
+use bovigo\vfs\content\StringBasedFileContent as Base;
+
+class_exists('bovigo\vfs\content\StringBasedFileContent');
+
+@trigger_error('Using the "org\bovigo\vfs\content\StringBasedFileContent" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\content\StringBasedFileContent" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\StringBasedFileContent" instead */
+    class StringBasedFileContent extends Base
+    {
+    }
+}

org/bovigo/vfs/vfsStream.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs;
+
+use bovigo\vfs\vfsStream as Base;
+
+class_exists('bovigo\vfs\vfsStream');
+
+@trigger_error('Using the "org\bovigo\vfs\vfsStream" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStream" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\vfsStream" instead */
+    class vfsStream extends Base
+    {
+    }
+}

org/bovigo/vfs/vfsStreamAbstractContent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace org\bovigo\vfs;
+
+use bovigo\vfs\vfsStreamAbstractContent as Base;
+
+class_exists('bovigo\vfs\vfsStreamAbstractContent');
+
+@trigger_error('Using the "org\bovigo\vfs\vfsStreamAbstractContent" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamAbstractContent" instead.', E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since 1.7, use "bovigo\vfs\vfsStreamAbstractContent" instead */
+    abstract class vfsStreamAbstractContent extends Base
+    {
+    }
+}