diff --git a/composer.json b/composer.json index 95fbdc10..3e5a29c2 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "erusev/parsedown-extra": "^0.7.1", "gregwar/rst": "^1.0", "maciejczyzewski/bottomline": "dev-master", - "mikey179/vfsstream": "^1.6", + "mikey179/vfsstream": "dev-prepare_class_changes", "psr/log": "^1.0.2", "react/http": "^0.8.3", "scrivo/highlight.php": "^9.12", diff --git a/composer.lock b/composer.lock index d293c58d..1d7a0a95 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5f06c274264564e885ed35c5c65f6de9", + "content-hash": "aa8f1b3dd6fc029cb548e8d9e575b4d9", "packages": [ { "name": "erusev/parsedown", @@ -245,20 +245,20 @@ }, { "name": "mikey179/vfsstream", - "version": "v1.6.7", + "version": "dev-prepare_class_changes", "source": { "type": "git", "url": "https://github.com/bovigo/vfsStream.git", - "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb" + "reference": "10d70c59771192595599fc191c3454f7fd136bd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb", - "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/10d70c59771192595599fc191c3454f7fd136bd7", + "reference": "10d70c59771192595599fc191c3454f7fd136bd7", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.6.0" }, "require-dev": { "phpunit/phpunit": "^4.5|^5.0" @@ -266,12 +266,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { - "psr-0": { - "org\\bovigo\\vfs\\": "src/main/php" + "psr-4": { + "bovigo\\vfs\\": "src", + "org\\bovigo\\vfs\\": "org/bovigo/vfs" } }, "notification-url": "https://packagist.org/downloads/", @@ -281,13 +282,13 @@ "authors": [ { "name": "Frank Kleine", - "role": "Developer", - "homepage": "http://frankkleine.de/" + "homepage": "http://frankkleine.de/", + "role": "Developer" } ], "description": "Virtual file system to mock the real file system in unit tests.", "homepage": "http://vfs.bovigo.org/", - "time": "2019-08-01T01:38:37+00:00" + "time": "2020-03-05T12:15:14+00:00" }, { "name": "psr/container", @@ -2855,7 +2856,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "maciejczyzewski/bottomline": 20 + "maciejczyzewski/bottomline": 20, + "mikey179/vfsstream": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/src/allejo/stakx/Document/BasePageView.php b/src/allejo/stakx/Document/BasePageView.php index 15caee9d..36411178 100644 --- a/src/allejo/stakx/Document/BasePageView.php +++ b/src/allejo/stakx/Document/BasePageView.php @@ -9,8 +9,8 @@ use allejo\stakx\Filesystem\File; use allejo\stakx\Filesystem\FilesystemLoader as fs; -use org\bovigo\vfs\vfsStream; -use org\bovigo\vfs\vfsStreamWrapper; +use bovigo\vfs\vfsStream; +use bovigo\vfs\StreamWrapper; use Symfony\Component\Yaml\Yaml; abstract class BasePageView extends PermalinkFrontMatterDocument implements PermalinkDocument @@ -76,7 +76,7 @@ public static function create(File $filePath, array $complexVariables = []) */ public static function createVirtual($frontMatter, $body) { - if (vfsStreamWrapper::getRoot() == null) + if (StreamWrapper::getRoot() == null) { vfsStream::setup(); } @@ -84,7 +84,7 @@ public static function createVirtual($frontMatter, $body) $redirectFile = vfsStream::newFile(sprintf('redirect_%s.html.twig', uniqid())); $redirectFile ->setContent(sprintf(self::TEMPLATE, Yaml::dump($frontMatter, 2), $body)) - ->at(vfsStreamWrapper::getRoot()) + ->at(StreamWrapper::getRoot()) ; $file = new File($redirectFile->url()); diff --git a/tests/allejo/stakx/Test/AssetEngine/SassEngineTest.php b/tests/allejo/stakx/Test/AssetEngine/SassEngineTest.php index c74d39a3..f192816d 100644 --- a/tests/allejo/stakx/Test/AssetEngine/SassEngineTest.php +++ b/tests/allejo/stakx/Test/AssetEngine/SassEngineTest.php @@ -21,7 +21,7 @@ use allejo\stakx\Service; use allejo\stakx\Test\PHPUnit_Stakx_TestCase; use ScssPhp\ScssPhp\Compiler as SassCompiler; -use org\bovigo\vfs\vfsStream; +use bovigo\vfs\vfsStream; class SassEngineTest extends PHPUnit_Stakx_TestCase { diff --git a/tests/allejo/stakx/Test/CompilerTest.php b/tests/allejo/stakx/Test/CompilerTest.php index 2b7bf37a..9eea6a93 100644 --- a/tests/allejo/stakx/Test/CompilerTest.php +++ b/tests/allejo/stakx/Test/CompilerTest.php @@ -11,7 +11,7 @@ use allejo\stakx\Filesystem\WritableFolder; use allejo\stakx\Manager\PageManager; use allejo\stakx\Templating\Twig\TwigStakxBridgeFactory; -use org\bovigo\vfs\vfsStream; +use bovigo\vfs\vfsStream; class CompilerTest extends PHPUnit_Stakx_TestCase { diff --git a/tests/allejo/stakx/Test/ConfigurationTest.php b/tests/allejo/stakx/Test/ConfigurationTest.php index 55991c51..a61aad2f 100644 --- a/tests/allejo/stakx/Test/ConfigurationTest.php +++ b/tests/allejo/stakx/Test/ConfigurationTest.php @@ -10,7 +10,7 @@ use allejo\stakx\Configuration; use allejo\stakx\Filesystem\File; use allejo\stakx\Service; -use org\bovigo\vfs\vfsStream; +use bovigo\vfs\vfsStream; class ConfigurationTest extends PHPUnit_Stakx_TestCase { diff --git a/tests/allejo/stakx/Test/Document/ContentItemTest.php b/tests/allejo/stakx/Test/Document/ContentItemTest.php index aaf19efb..6e7f7ac5 100644 --- a/tests/allejo/stakx/Test/Document/ContentItemTest.php +++ b/tests/allejo/stakx/Test/Document/ContentItemTest.php @@ -16,7 +16,7 @@ use allejo\stakx\MarkupEngine\MarkdownEngine; use allejo\stakx\MarkupEngine\RstEngine; use allejo\stakx\Test\PHPUnit_Stakx_TestCase; -use org\bovigo\vfs\vfsStream; +use bovigo\vfs\vfsStream; use Symfony\Component\Filesystem\Exception\FileNotFoundException; use Symfony\Component\Yaml\Exception\ParseException; diff --git a/tests/allejo/stakx/Test/Filesystem/FileExplorerTest.php b/tests/allejo/stakx/Test/Filesystem/FileExplorerTest.php index b9b3f217..77944a80 100644 --- a/tests/allejo/stakx/Test/Filesystem/FileExplorerTest.php +++ b/tests/allejo/stakx/Test/Filesystem/FileExplorerTest.php @@ -11,7 +11,7 @@ use allejo\stakx\Filesystem\FileExplorer; use allejo\stakx\Filesystem\FileExplorerMatcher; use allejo\stakx\Test\PHPUnit_Stakx_TestCase; -use org\bovigo\vfs\vfsStream; +use bovigo\vfs\vfsStream; class FileExplorerTest extends PHPUnit_Stakx_TestCase { diff --git a/tests/allejo/stakx/Test/PHPUnit_Stakx_TestCase.php b/tests/allejo/stakx/Test/PHPUnit_Stakx_TestCase.php index d1a66df4..79a03e2b 100644 --- a/tests/allejo/stakx/Test/PHPUnit_Stakx_TestCase.php +++ b/tests/allejo/stakx/Test/PHPUnit_Stakx_TestCase.php @@ -11,7 +11,6 @@ use allejo\stakx\Configuration; use allejo\stakx\Document\FrontMatterDocument; use allejo\stakx\Filesystem\File; -use allejo\stakx\Filesystem\Filesystem; use allejo\stakx\Filesystem\FilesystemLoader as fs; use allejo\stakx\Filesystem\WritableFolder; use allejo\stakx\Logger; @@ -30,9 +29,9 @@ use allejo\stakx\Templating\Twig\TwigExtension; use allejo\stakx\Templating\Twig\TwigStakxBridge; use allejo\stakx\Templating\Twig\TwigStakxBridgeFactory; -use org\bovigo\vfs\vfsStream; -use org\bovigo\vfs\vfsStreamDirectory; -use org\bovigo\vfs\vfsStreamFile; +use bovigo\vfs\vfsStream; +use bovigo\vfs\vfsDirectory; +use bovigo\vfs\vfsFile; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Output\ConsoleOutput; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -44,9 +43,9 @@ abstract class PHPUnit_Stakx_TestCase extends \PHPUnit_Framework_TestCase /** @var string */ protected $assetFolder; - /** @var vfsStreamFile */ + /** @var vfsFile */ protected $dummyFile; - /** @var vfsStreamDirectory */ + /** @var vfsDirectory */ protected $rootDir; public function setUp()