Skip to content

Commit 8f117f5

Browse files
author
Frank Kleine
committed
introduce class name changes in new namespace
This introduces the class name changes proposed with #213 into the v1.x series according to the migration strategy detailed in #221.
1 parent a76d213 commit 8f117f5

File tree

58 files changed

+2346
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2346
-290
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44

55
* Namespace changed from `org\bovigo\vfs` to `bovigo\vfs`
66
- The old namespace still works, but has been deprecated. It will be removed in version 2.
7+
* Renamed some classes in the new namespace. When moving your code to the new namespace please be aware of the following name changes:
8+
- `org\bovigo\vfs\vfsStreamBlock` => `bovigo\vfs\vfsBlock`
9+
- `org\bovigo\vfs\vfsStreamContainerIterator` => `bovigo\vfs\vfsDirectoryIterator`
10+
- `org\bovigo\vfs\vfsStreamDirectory` => `bovigo\vfs\vfsDirectory`
11+
- `org\bovigo\vfs\vfsStreamFile` => `bovigo\vfs\vfsFile`
12+
- `org\bovigo\vfs\vfsStreamWrapper` => `bovigo\vfs\StreamWrapper`
13+
- `org\bovigo\vfs\visitor\vfsStreamAbstractVisitor` => `bovigo\vfs\visitor\BaseVisitor`
14+
- `org\bovigo\vfs\visitor\vfsStreamPrintVisitor` => `bovigo\vfs\visitor\Printer`
15+
- `org\bovigo\vfs\visitor\vfsStreamStructureVisitor` => `bovigo\vfs\visitor\StructureInspector`
16+
- `org\bovigo\vfs\vfsStreamAbstractContent` => `bovigo\vfs\BasicFile`
17+
* Deprecated (internal) classes and interfaces, they will be removed in version 2.
18+
- `org\bovigo\vfs\vfsStreamContent`
19+
- `org\bovigo\vfs\vfsStreamContainer`
20+
- `org\bovigo\vfs\content\SeekableFileContent`
721
* raised requirement for minimum PHP version to 5.6.0
822

923

‎org/bovigo/vfs/content/SeekableFileContent.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
class_exists('bovigo\vfs\content\SeekableFileContent');
88

9-
@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);
9+
@trigger_error('Using the "org\bovigo\vfs\content\SeekableFileContent" class is deprecated since version 1.7 and will be removed in version 2.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\SeekableFileContent" instead */
12+
/** @deprecated since 1.7, will be removed in version 2 */
1313
abstract class SeekableFileContent extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamAbstractContent.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamAbstractContent as Base;
5+
use bovigo\vfs\BasicFile as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamAbstractContent');
7+
class_exists('bovigo\vfs\BasicFile');
88

9-
@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);
9+
@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\BasicFile" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamAbstractContent" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\BasicFile" instead */
1313
abstract class vfsStreamAbstractContent extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamBlock.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamBlock as Base;
5+
use bovigo\vfs\vfsBlock as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamBlock');
7+
class_exists('bovigo\vfs\vfsBlock');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamBlock" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamBlock" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamBlock" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsBlock" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamBlock" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\vfsBlock" instead */
1313
class vfsStreamBlock extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamContainer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
interface_exists('bovigo\vfs\vfsStreamContainer');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamContainer" interface is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamContainer" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamContainer" interface is deprecated since version 1.7 and will be removed in version 2.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamContainer" instead */
12+
/** @deprecated since 1.7, will be removed in version 2 */
1313
interface vfsStreamContainer extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamContainerIterator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamContainerIterator as Base;
5+
use bovigo\vfs\vfsDirectoryIterator as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamContainerIterator');
7+
class_exists('bovigo\vfs\vfsDirectoryIterator');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamContainerIterator" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamContainerIterator" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamContainerIterator" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsDirectoryIterator" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamContainerIterator" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\vfsDirectoryIterator" instead */
1313
class vfsStreamContainerIterator extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamDirectory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamDirectory as Base;
5+
use bovigo\vfs\vfsDirectory as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamDirectory');
7+
class_exists('bovigo\vfs\vfsDirectory');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamDirectory" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamDirectory" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamDirectory" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsDirectory" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamDirectory" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\vfsDirectory" instead */
1313
class vfsStreamDirectory extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamFile.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamFile as Base;
5+
use bovigo\vfs\vfsFile as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamFile');
7+
class_exists('bovigo\vfs\vfsFile');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamFile" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamFile" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamFile" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsFile" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamFile" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\vfsFile" instead */
1313
class vfsStreamFile extends Base
1414
{
1515
}

‎org/bovigo/vfs/vfsStreamWrapper.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace org\bovigo\vfs;
44

5-
use bovigo\vfs\vfsStreamWrapper as Base;
5+
use bovigo\vfs\StreamWrapper as Base;
66

7-
class_exists('bovigo\vfs\vfsStreamWrapper');
7+
class_exists('bovigo\vfs\StreamWrapper');
88

9-
@trigger_error('Using the "org\bovigo\vfs\vfsStreamWrapper" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\vfsStreamWrapper" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\vfsStreamWrapper" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\StreamWrapper" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamWrapper" instead */
12+
/** @deprecated since 1.7, use "bovigo\vfs\StreamWrapper" instead */
1313
class vfsStreamWrapper extends Base
1414
{
1515
}

‎org/bovigo/vfs/visitor/vfsStreamAbstractVisitor.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace org\bovigo\vfs\visitor;
44

5-
use bovigo\vfs\visitor\vfsStreamAbstractVisitor as Base;
5+
use bovigo\vfs\visitor\BaseVisitor;
66

7-
class_exists('bovigo\vfs\visitor\vfsStreamAbstractVisitor');
7+
class_exists('bovigo\vfs\visitor\BaseVisitor');
88

9-
@trigger_error('Using the "org\bovigo\vfs\visitor\vfsStreamAbstractVisitor" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\visitor\vfsStreamAbstractVisitor" instead.', E_USER_DEPRECATED);
9+
@trigger_error('Using the "org\bovigo\vfs\visitor\vfsStreamAbstractVisitor" class is deprecated since version 1.7 and will be removed in version 2, use "bovigo\vfs\visitor\BaseVisitor" instead.', E_USER_DEPRECATED);
1010

1111
if (\false) {
12-
/** @deprecated since 1.7, use "bovigo\vfs\vfsStreamAbstractVisitor" instead */
13-
abstract class vfsStreamAbstractVisitor extends Base
12+
/** @deprecated since 1.7, use "bovigo\vfs\BaseVisitor" instead */
13+
abstract class vfsStreamAbstractVisitor extends BaseVisitor
1414
{
1515
}
1616
}

0 commit comments

Comments
 (0)