Skip to content

Commit

Permalink
Webmozart/path vendoring (#1009)
Browse files Browse the repository at this point in the history
* Vendored webmozart/path

* Add note

* Fix CS
  • Loading branch information
dantleech authored Oct 15, 2022
1 parent 44d1568 commit a6a25bb
Show file tree
Hide file tree
Showing 14 changed files with 838 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ master

Improvements:

- Remove dependency on `webmozaty/path` (copied the class into PHPBench)
- Update PHPStan to 1.0 and fix new errors #1006
- Use `webmozart/glob` instead of `glob` for benchmark paths and config
include paths #1005
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
"symfony/finder": "^4.2 || ^5.0 || ^6.0",
"symfony/options-resolver": "^4.2 || ^5.0 || ^6.0",
"symfony/process": "^4.2 || ^5.0 || ^6.0",
"webmozart/glob": "^4.6",
"webmozart/path-util": "^2.3"
"webmozart/glob": "^4.6"
},
"require-dev": {
"dantleech/invoke": "^2.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/xdebug/lib/Command/Handler/OutputDirHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

namespace PhpBench\Extensions\XDebug\Command\Handler;

use PhpBench\Path\Path;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Filesystem\Filesystem;
use Webmozart\PathUtil\Path;

class OutputDirHandler
{
Expand Down
2 changes: 1 addition & 1 deletion extensions/xdebug/lib/Executor/ProfileExecutor.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
use PhpBench\Executor\ExecutionContext;
use PhpBench\Executor\ExecutionResults;
use PhpBench\Extensions\XDebug\XDebugUtil;
use PhpBench\Path\Path;
use PhpBench\Registry\Config;
use RuntimeException;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Webmozart\PathUtil\Path;

class ProfileExecutor implements BenchmarkExecutorInterface
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Benchmark/BenchmarkFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
use Generator;
use PhpBench\Benchmark\Metadata\BenchmarkMetadata;
use PhpBench\Benchmark\Metadata\MetadataFactory;
use PhpBench\Path\Path;
use Psr\Log\LoggerInterface;
use SplFileInfo;
use Symfony\Component\Finder\Finder;
use Webmozart\PathUtil\Path;

/**
* This class finds a benchmark (or benchmarks depending on the path), loads
Expand Down
2 changes: 1 addition & 1 deletion lib/Config/Processor/IncludeGlobProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use PhpBench\Config\ConfigLoader;
use PhpBench\Config\ConfigProcessor;
use PhpBench\Path\Path;
use Webmozart\Glob\Glob;
use Webmozart\PathUtil\Path;

class IncludeGlobProcessor implements ConfigProcessor
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Config/Processor/IncludeProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use PhpBench\Config\ConfigLoader;
use PhpBench\Config\ConfigProcessor;
use Webmozart\PathUtil\Path;
use PhpBench\Path\Path;

class IncludeProcessor implements ConfigProcessor
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Extension/RunnerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
use PhpBench\Expression\Printer;
use PhpBench\Expression\Printer\EvaluatingPrinter;
use PhpBench\Json\JsonDecoder;
use PhpBench\Path\Path;
use PhpBench\Progress\Logger\BlinkenLogger;
use PhpBench\Progress\Logger\DotsLogger;
use PhpBench\Progress\Logger\HistogramLogger;
Expand All @@ -58,7 +59,6 @@
use Symfony\Component\Finder\Finder;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Process\ExecutableFinder;
use Webmozart\PathUtil\Path;

class RunnerExtension implements ExtensionInterface
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Extension/StorageExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use PhpBench\Console\Command\LogCommand;
use PhpBench\DependencyInjection\Container;
use PhpBench\DependencyInjection\ExtensionInterface;
use PhpBench\Path\Path;
use PhpBench\Serializer\XmlDecoder;
use PhpBench\Serializer\XmlEncoder;
use PhpBench\Storage\Driver\Xml\XmlDriver;
Expand All @@ -29,7 +30,6 @@
use PhpBench\Storage\UuidResolver\TagResolver;
use PhpBench\Util\TimeUnit;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Webmozart\PathUtil\Path;

class StorageExtension implements ExtensionInterface
{
Expand Down
Loading

0 comments on commit a6a25bb

Please sign in to comment.