removal of unnecessary file, and composer update
This commit is contained in:
@@ -228,7 +228,7 @@ abstract class AbstractCloner implements ClonerInterface
|
||||
}
|
||||
|
||||
if ($this->prevErrorHandler) {
|
||||
return \call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
|
||||
return ($this->prevErrorHandler)($type, $msg, $file, $line, $context);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -30,8 +30,8 @@ class VarCloner extends AbstractCloner
|
||||
$queue = array(array($var)); // This breadth-first queue is the return value
|
||||
$indexedArrays = array(); // Map of queue indexes that hold numerically indexed arrays
|
||||
$hardRefs = array(); // Map of original zval ids to stub objects
|
||||
$objRefs = array(); // Map of original object handles to their stub object couterpart
|
||||
$resRefs = array(); // Map of original resource handles to their stub object couterpart
|
||||
$objRefs = array(); // Map of original object handles to their stub object counterpart
|
||||
$resRefs = array(); // Map of original resource handles to their stub object counterpart
|
||||
$values = array(); // Map of stub objects' ids to original values
|
||||
$maxItems = $this->maxItems;
|
||||
$maxString = $this->maxString;
|
||||
|
||||
@@ -57,7 +57,7 @@ class HtmlDescriptor implements DumpDescriptorInterface
|
||||
$sourceDescription = '';
|
||||
if (isset($context['source'])) {
|
||||
$source = $context['source'];
|
||||
$projectDir = $source['project_dir'];
|
||||
$projectDir = $source['project_dir'] ?? null;
|
||||
$sourceDescription = sprintf('%s on line %d', $source['name'], $source['line']);
|
||||
if (isset($source['file_link'])) {
|
||||
$sourceDescription = sprintf('<a href="%s">%s</a>', $source['file_link'], $sourceDescription);
|
||||
|
||||
@@ -164,7 +164,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
|
||||
*/
|
||||
protected function dumpLine($depth)
|
||||
{
|
||||
\call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
|
||||
($this->lineDumper)($this->line, $depth, $this->indentPad);
|
||||
$this->line = '';
|
||||
}
|
||||
|
||||
|
||||
2
vendor/symfony/var-dumper/LICENSE
vendored
2
vendor/symfony/var-dumper/LICENSE
vendored
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2014-2018 Fabien Potencier
|
||||
Copyright (c) 2014-2019 Fabien Potencier
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -35,7 +35,7 @@ SplFileInfo {
|
||||
aTime: %s-%s-%d %d:%d:%d
|
||||
mTime: %s-%s-%d %d:%d:%d
|
||||
cTime: %s-%s-%d %d:%d:%d
|
||||
inode: %d
|
||||
inode: %i
|
||||
size: %d
|
||||
perms: 0%d
|
||||
owner: %d
|
||||
@@ -85,7 +85,7 @@ SplFileObject {
|
||||
aTime: %s-%s-%d %d:%d:%d
|
||||
mTime: %s-%s-%d %d:%d:%d
|
||||
cTime: %s-%s-%d %d:%d:%d
|
||||
inode: %d
|
||||
inode: %i
|
||||
size: %d
|
||||
perms: 0%d
|
||||
owner: %d
|
||||
@@ -105,7 +105,7 @@ SplFileObject {
|
||||
maxLineLen: 0
|
||||
fstat: array:26 [
|
||||
"dev" => %d
|
||||
"ino" => %d
|
||||
"ino" => %i
|
||||
"nlink" => %d
|
||||
"rdev" => 0
|
||||
"blksize" => %i
|
||||
|
||||
134
vendor/symfony/var-dumper/Tests/Command/Descriptor/CliDescriptorTest.php
vendored
Normal file
134
vendor/symfony/var-dumper/Tests/Command/Descriptor/CliDescriptorTest.php
vendored
Normal file
@@ -0,0 +1,134 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\VarDumper\Tests\Command\Descriptor;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Console\Output\BufferedOutput;
|
||||
use Symfony\Component\VarDumper\Cloner\Data;
|
||||
use Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor;
|
||||
use Symfony\Component\VarDumper\Dumper\CliDumper;
|
||||
|
||||
class CliDescriptorTest extends TestCase
|
||||
{
|
||||
private static $timezone;
|
||||
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
self::$timezone = date_default_timezone_get();
|
||||
date_default_timezone_set('UTC');
|
||||
}
|
||||
|
||||
public static function tearDownAfterClass()
|
||||
{
|
||||
date_default_timezone_set(self::$timezone);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider provideContext
|
||||
*/
|
||||
public function testDescribe(array $context, string $expectedOutput)
|
||||
{
|
||||
$output = new BufferedOutput();
|
||||
$descriptor = new CliDescriptor(new CliDumper(function ($s) {
|
||||
return $s;
|
||||
}));
|
||||
|
||||
$descriptor->describe($output, new Data(array(array(123))), $context + array('timestamp' => 1544804268.3668), 1);
|
||||
|
||||
$this->assertStringMatchesFormat(trim($expectedOutput), str_replace(PHP_EOL, "\n", trim($output->fetch())));
|
||||
}
|
||||
|
||||
public function provideContext()
|
||||
{
|
||||
yield 'source' => array(
|
||||
array(
|
||||
'source' => array(
|
||||
'name' => 'CliDescriptorTest.php',
|
||||
'line' => 30,
|
||||
'file' => '/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
Received from client #1
|
||||
-----------------------
|
||||
|
||||
-------- ---------------------------------------------------------------------------------------------------
|
||||
date Fri, 14 Dec 2018 16:17:48 +0000
|
||||
source CliDescriptorTest.php on line 30
|
||||
file /Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php
|
||||
-------- ---------------------------------------------------------------------------------------------------
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'source full' => array(
|
||||
array(
|
||||
'source' => array(
|
||||
'name' => 'CliDescriptorTest.php',
|
||||
'line' => 30,
|
||||
'file_relative' => 'src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
'file' => '/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
'file_link' => 'phpstorm://open?file=/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php&line=30',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
Received from client #1
|
||||
-----------------------
|
||||
|
||||
-------- --------------------------------------------------------------------------------
|
||||
date Fri, 14 Dec 2018 16:17:48 +0000
|
||||
source CliDescriptorTest.php on line 30
|
||||
file src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php
|
||||
-------- --------------------------------------------------------------------------------
|
||||
|
||||
Open source in your IDE/browser:
|
||||
phpstorm://open?file=/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php&line=30
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'cli' => array(
|
||||
array(
|
||||
'cli' => array(
|
||||
'identifier' => 'd8bece1c',
|
||||
'command_line' => 'bin/phpunit',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
$ bin/phpunit
|
||||
-------------
|
||||
|
||||
------ ---------------------------------
|
||||
date Fri, 14 Dec 2018 16:17:48 +0000
|
||||
------ ---------------------------------
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'request' => array(
|
||||
array(
|
||||
'request' => array(
|
||||
'identifier' => 'd8bece1c',
|
||||
'controller' => new Data(array(array('FooController.php'))),
|
||||
'method' => 'GET',
|
||||
'uri' => 'http://localhost/foo',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
GET http://localhost/foo
|
||||
------------------------
|
||||
|
||||
------------ ---------------------------------
|
||||
date Fri, 14 Dec 2018 16:17:48 +0000
|
||||
controller "FooController.php"
|
||||
------------ ---------------------------------
|
||||
TXT
|
||||
);
|
||||
}
|
||||
}
|
||||
195
vendor/symfony/var-dumper/Tests/Command/Descriptor/HtmlDescriptorTest.php
vendored
Normal file
195
vendor/symfony/var-dumper/Tests/Command/Descriptor/HtmlDescriptorTest.php
vendored
Normal file
@@ -0,0 +1,195 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\VarDumper\Tests\Command\Descriptor;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Console\Output\BufferedOutput;
|
||||
use Symfony\Component\VarDumper\Cloner\Data;
|
||||
use Symfony\Component\VarDumper\Command\Descriptor\HtmlDescriptor;
|
||||
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
|
||||
|
||||
class HtmlDescriptorTest extends TestCase
|
||||
{
|
||||
private static $timezone;
|
||||
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
self::$timezone = date_default_timezone_get();
|
||||
date_default_timezone_set('UTC');
|
||||
}
|
||||
|
||||
public static function tearDownAfterClass()
|
||||
{
|
||||
date_default_timezone_set(self::$timezone);
|
||||
}
|
||||
|
||||
public function testItOutputsStylesAndScriptsOnFirstDescribeCall()
|
||||
{
|
||||
$output = new BufferedOutput();
|
||||
$dumper = $this->createMock(HtmlDumper::class);
|
||||
$dumper->method('dump')->willReturn('[DUMPED]');
|
||||
$descriptor = new HtmlDescriptor($dumper);
|
||||
|
||||
$descriptor->describe($output, new Data(array(array(123))), array('timestamp' => 1544804268.3668), 1);
|
||||
|
||||
$this->assertStringMatchesFormat('<style>%A</style><script>%A</script>%A', $output->fetch(), 'styles & scripts are output');
|
||||
|
||||
$descriptor->describe($output, new Data(array(array(123))), array('timestamp' => 1544804268.3668), 1);
|
||||
|
||||
$this->assertStringNotMatchesFormat('<style>%A</style><script>%A</script>%A', $output->fetch(), 'styles & scripts are output only once');
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider provideContext
|
||||
*/
|
||||
public function testDescribe(array $context, string $expectedOutput)
|
||||
{
|
||||
$output = new BufferedOutput();
|
||||
$dumper = $this->createMock(HtmlDumper::class);
|
||||
$dumper->method('dump')->willReturn('[DUMPED]');
|
||||
$descriptor = new HtmlDescriptor($dumper);
|
||||
|
||||
$descriptor->describe($output, new Data(array(array(123))), $context + array('timestamp' => 1544804268.3668), 1);
|
||||
|
||||
$this->assertStringMatchesFormat(trim($expectedOutput), trim(preg_replace('@<style>.*</style><script>.*</script>@s', '', $output->fetch())));
|
||||
}
|
||||
|
||||
public function provideContext()
|
||||
{
|
||||
yield 'source' => array(
|
||||
array(
|
||||
'source' => array(
|
||||
'name' => 'CliDescriptorTest.php',
|
||||
'line' => 30,
|
||||
'file' => '/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
<article data-dedup-id="%s">
|
||||
<header>
|
||||
<div class="row">
|
||||
<h2 class="col">-</h2>
|
||||
<time class="col text-small" title="2018-12-14T16:17:48+00:00" datetime="2018-12-14T16:17:48+00:00">
|
||||
Fri, 14 Dec 2018 16:17:48 +0000
|
||||
</time>
|
||||
</div>
|
||||
|
||||
</header>
|
||||
<section class="body">
|
||||
<p class="text-small">
|
||||
CliDescriptorTest.php on line 30
|
||||
</p>
|
||||
[DUMPED]
|
||||
</section>
|
||||
</article>
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'source full' => array(
|
||||
array(
|
||||
'source' => array(
|
||||
'name' => 'CliDescriptorTest.php',
|
||||
'project_dir' => 'src/Symfony/',
|
||||
'line' => 30,
|
||||
'file_relative' => 'src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
'file' => '/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php',
|
||||
'file_link' => 'phpstorm://open?file=/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php&line=30',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
<article data-dedup-id="%s">
|
||||
<header>
|
||||
<div class="row">
|
||||
<h2 class="col">-</h2>
|
||||
<time class="col text-small" title="2018-12-14T16:17:48+00:00" datetime="2018-12-14T16:17:48+00:00">
|
||||
Fri, 14 Dec 2018 16:17:48 +0000
|
||||
</time>
|
||||
</div>
|
||||
<div class="row">
|
||||
<ul class="tags">
|
||||
<li><span class="badge">project dir</span>src/Symfony/</li>
|
||||
</ul>
|
||||
</div>
|
||||
</header>
|
||||
<section class="body">
|
||||
<p class="text-small">
|
||||
<a href="phpstorm://open?file=/Users/ogi/symfony/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php&line=30">CliDescriptorTest.php on line 30</a>
|
||||
</p>
|
||||
[DUMPED]
|
||||
</section>
|
||||
</article>
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'cli' => array(
|
||||
array(
|
||||
'cli' => array(
|
||||
'identifier' => 'd8bece1c',
|
||||
'command_line' => 'bin/phpunit',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
<article data-dedup-id="d8bece1c">
|
||||
<header>
|
||||
<div class="row">
|
||||
<h2 class="col"><code>$ </code>bin/phpunit</h2>
|
||||
<time class="col text-small" title="2018-12-14T16:17:48+00:00" datetime="2018-12-14T16:17:48+00:00">
|
||||
Fri, 14 Dec 2018 16:17:48 +0000
|
||||
</time>
|
||||
</div>
|
||||
|
||||
</header>
|
||||
<section class="body">
|
||||
<p class="text-small">
|
||||
|
||||
</p>
|
||||
[DUMPED]
|
||||
</section>
|
||||
</article>
|
||||
TXT
|
||||
);
|
||||
|
||||
yield 'request' => array(
|
||||
array(
|
||||
'request' => array(
|
||||
'identifier' => 'd8bece1c',
|
||||
'controller' => new Data(array(array('FooController.php'))),
|
||||
'method' => 'GET',
|
||||
'uri' => 'http://localhost/foo',
|
||||
),
|
||||
),
|
||||
<<<TXT
|
||||
<article data-dedup-id="d8bece1c">
|
||||
<header>
|
||||
<div class="row">
|
||||
<h2 class="col"><code>GET</code> <a href="http://localhost/foo">http://localhost/foo</a></h2>
|
||||
<time class="col text-small" title="2018-12-14T16:17:48+00:00" datetime="2018-12-14T16:17:48+00:00">
|
||||
Fri, 14 Dec 2018 16:17:48 +0000
|
||||
</time>
|
||||
</div>
|
||||
<div class="row">
|
||||
<ul class="tags">
|
||||
<li><span class="badge">controller</span><span class='dumped-tag'>[DUMPED]</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
</header>
|
||||
<section class="body">
|
||||
<p class="text-small">
|
||||
|
||||
</p>
|
||||
[DUMPED]
|
||||
</section>
|
||||
</article>
|
||||
TXT
|
||||
);
|
||||
}
|
||||
}
|
||||
2
vendor/symfony/var-dumper/VarDumper.php
vendored
2
vendor/symfony/var-dumper/VarDumper.php
vendored
@@ -41,7 +41,7 @@ class VarDumper
|
||||
};
|
||||
}
|
||||
|
||||
return \call_user_func(self::$handler, $var);
|
||||
return (self::$handler)($var);
|
||||
}
|
||||
|
||||
public static function setHandler(callable $callable = null)
|
||||
|
||||
1
vendor/symfony/var-dumper/composer.json
vendored
1
vendor/symfony/var-dumper/composer.json
vendored
@@ -22,6 +22,7 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-iconv": "*",
|
||||
"symfony/console": "~3.4|~4.0",
|
||||
"symfony/process": "~3.4|~4.0",
|
||||
"twig/twig": "~1.34|~2.4"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user