Skip to content

Prepare to migrate to vfsStream 1.7 #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
allejo wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Prepare to migrate to vfsStream 1.7 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8be52
Migrate vfsStream classes to new namespace
allejo Mar 18, 2020
a7abdbf
Update vfsStream in Composer to super 1.7-dev
allejo Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 15 additions & 13 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/allejo/stakx/Document/BasePageView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -76,15 +76,15 @@ public static function create(File $filePath, array $complexVariables = [])
*/
public static function createVirtual($frontMatter, $body)
{
if (vfsStreamWrapper::getRoot() == null)
if (StreamWrapper::getRoot() == null)
{
vfsStream::setup();
}

$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());
Expand Down
2 changes: 1 addition & 1 deletion tests/allejo/stakx/Test/AssetEngine/SassEngineTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/allejo/stakx/Test/CompilerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/allejo/stakx/Test/ConfigurationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/allejo/stakx/Test/Document/ContentItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/allejo/stakx/Test/Filesystem/FileExplorerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
11 changes: 5 additions & 6 deletions tests/allejo/stakx/Test/PHPUnit_Stakx_TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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()
Expand Down