Skip to content

Commit da7b860

Browse files
rodberrodber
committed
remove puller
1 parent 553668e commit da7b860

File tree

14 files changed

+13
-86
lines changed

14 files changed

+13
-86
lines changed

‎demo/output/html.html

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

‎demo/output/plain.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private output Chevere\VarDump\Outputs\PlainOutput#9
2424
line => int 30 (length=2)
2525
function => string process (length=7)
2626
class => string Chevere\VarDump\VarDump (length=23)
27-
object => Chevere\VarDump\VarDump#44
27+
object => Chevere\VarDump\VarDump#45
2828
private variables array (size=1)
2929
0 => Chevere\VarDump\VarDump#7 (circular reference #7)
3030
private shift int 0 (length=1)
@@ -34,7 +34,7 @@ private output Chevere\VarDump\Outputs\PlainOutput#9
3434
line => int 30 (length=2)
3535
function => string process (length=7)
3636
class => string Chevere\VarDump\VarDump (length=23)
37-
object => Chevere\VarDump\VarDump#44 (circular reference #44)
37+
object => Chevere\VarDump\VarDump#45 (circular reference #45)
3838
type => string -> (length=2)
3939
args => array (size=1)
4040
0 => Chevere\Writer\StreamWriter#16 (circular reference #16)

‎src/Formats/HtmlFormat.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ final class HtmlFormat implements FormatInterface
2929

3030
public const HTML_SUMMARY = '<summary class="chv-dump-summary"></summary>';
3131

32-
public const DETAILS_PULL_UP = '<div class="chv-details-pull-up"></div>';
33-
3432
public function indent(int $indent): string
3533
{
3634
// @infection-ignore-all
@@ -65,9 +63,4 @@ public function detailsClose(): string
6563
{
6664
return self::HTML_DETAILS_CLOSE;
6765
}
68-
69-
public function detailsPullUp(): string
70-
{
71-
return self::DETAILS_PULL_UP;
72-
}
7366
}

‎src/Interfaces/FormatInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,4 @@ public function highlight(string $key, string $string): string;
4343
public function detailsOpen(bool $open): string;
4444

4545
public function detailsClose(): string;
46-
47-
public function detailsPullUp(): string;
4846
}

‎src/Interfaces/VarDumperInterface.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,4 @@ public function depth(): int;
111111
public function withProcess(): self;
112112

113113
public function objectReferences(): ObjectReferencesInterface;
114-
115-
public function needsPullUp(): bool;
116-
117-
public function withNeedsPullUp(bool $needsPull): self;
118114
}

‎src/Outputs/HtmlOutput.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ final class HtmlOutput extends Output
7676
.chv-dump-summary::-webkit-details-marker {
7777
margin-top: 0.3em;
7878
}
79-
.chv-details-pull-up {
80-
margin-top: -1.242857em;
81-
height: 0;
82-
}
8379
.chv-dump-float {
8480
color: #ff8700;
8581
}

‎src/Processors/ArrayProcessor.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@ private function processMembers(): void
109109
$this->varDumper->writer()->write("\n");
110110
}
111111
} else {
112-
if ($this->varDumper->needsPullUp()) {
113-
$this->varDumper->writer()->write(
114-
$this->varDumper->format()->detailsPullUp()
115-
);
116-
$this->varDumper = $this->varDumper->withNeedsPullUp(false);
117-
}
118112
$this->varDumper->writer()->write("\n");
119113
}
120114

@@ -127,7 +121,6 @@ private function processMembers(): void
127121
$this->varDumper->writer()->write(
128122
$this->varDumper->format()->detailsClose()
129123
);
130-
$this->varDumper = $this->varDumper->withNeedsPullUp(true);
131124
}
132125
}
133126
}

‎src/Processors/ObjectProcessor.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ private function setProperties(object $object): void
116116
$this->varDumper->writer()->write(
117117
$this->varDumper->format()->detailsClose()
118118
);
119-
$this->varDumper = $this->varDumper->withNeedsPullUp(true);
120119
}
121120
}
122121

@@ -191,12 +190,6 @@ private function processProperty(
191190
$this->varDumper->writer()->write("\n");
192191
}
193192
} else {
194-
if ($this->varDumper->needsPullUp()) {
195-
$this->varDumper->writer()->write(
196-
$this->varDumper->format()->detailsPullUp()
197-
);
198-
$this->varDumper = $this->varDumper->withNeedsPullUp(false);
199-
}
200193
$this->varDumper->writer()->write("\n");
201194
}
202195
$indentString = $this->varDumper->indentString();

‎src/Processors/Traits/HandleDepthTrait.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ private function handleDepth(mixed $variable): void
4141
new VarDumpable($variable),
4242
$this->varDumper->objectReferences(),
4343
))
44-
->withNeedsPullUp($this->varDumper->needsPullUp())
4544
->withDepth($deep)
4645
->withIndent($this->varDumper->indent())
4746
->withProcess();

‎src/VarDumper.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ final class VarDumper implements VarDumperInterface
3030
*/
3131
public VectorInterface $knownObjectsId;
3232

33-
public static bool $needsPull = false;
34-
3533
private int $indent = 0;
3634

3735
private string $indentString = '';
@@ -45,7 +43,6 @@ public function __construct(
4543
private ObjectReferencesInterface $objectReferences,
4644
) {
4745
$this->knownObjectsId = new Vector();
48-
self::$needsPull = false;
4946
}
5047

5148
public function objectReferences(): ObjectReferencesInterface
@@ -113,17 +110,4 @@ public function withProcess(): VarDumperInterface
113110

114111
return $new;
115112
}
116-
117-
public function needsPullUp(): bool
118-
{
119-
return self::$needsPull;
120-
}
121-
122-
public function withNeedsPullUp(bool $needsPull): VarDumperInterface
123-
{
124-
$new = clone $this;
125-
self::$needsPull = $needsPull;
126-
127-
return $new;
128-
}
129113
}

‎tests/Formats/HtmlFormatTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,4 @@ public function testDetailsClose(): void
8181
(new HtmlFormat())->detailsClose()
8282
);
8383
}
84-
85-
public function testDetailsPullUp(): void
86-
{
87-
$needle = '<div ';
88-
$details = (new HtmlFormat())->detailsPullUp();
89-
$this->assertStringContainsString($needle, $details);
90-
}
9184
}

‎tests/VarDumpTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ public function testWithArrayNeedsPullUp(): void
181181
Arg#2 <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=2)</span></em><details class="chv-dump-details" open><summary class="chv-dump-summary"></summary>0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 0 <em><span class="chv-dump-emphasis">(length=1)</span></em>
182182
1 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 1 <em><span class="chv-dump-emphasis">(length=1)</span></em></details>
183183
184-
Arg#3 <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=4)</span></em><details class="chv-dump-details" open><summary class="chv-dump-summary"></summary>0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 1 <em><span class="chv-dump-emphasis">(length=1)</span></em></details><div class="chv-details-pull-up"></div>
184+
Arg#3 <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=4)</span></em><details class="chv-dump-details" open><summary class="chv-dump-summary"></summary>0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 1 <em><span class="chv-dump-emphasis">(length=1)</span></em></details>
185185
1 <span class="chv-dump-operator">=></span> <span class="chv-dump-null">null</span>
186-
3 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 5 <em><span class="chv-dump-emphasis">(length=1)</span></em></details></details></details><div class="chv-details-pull-up"></div>
186+
3 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 5 <em><span class="chv-dump-emphasis">(length=1)</span></em></details></details></details>
187187
2 <span class="chv-dump-operator">=></span> <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> 0 <span class="chv-dump-operator">=></span> <span class="chv-dump-int">int</span> 2 <em><span class="chv-dump-emphasis">(length=1)</span></em></details></details>
188188
189189
Arg#4 <span class="chv-dump-array">array</span> <em><span class="chv-dump-emphasis">(size=1)</span></em><details class="chv-dump-details" open><summary class="chv-dump-summary"></summary>key <span class="chv-dump-operator">=></span> <span class="chv-dump-string">string</span> value <em><span class="chv-dump-emphasis">(length=5)</span></em></details>
@@ -266,7 +266,7 @@ public function testWithObjectNeedsPullUp(): void
266266
267267
Arg#3 <span class="chv-dump-class">stdClass</span><span class="chv-dump-operator">#{$threeId}</span><details class="chv-dump-details" open><summary class="chv-dump-summary"></summary><span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">nested</span> <span class="chv-dump-class">stdClass</span><span class="chv-dump-operator">#{$nestedId}</span>
268268
<span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">two</span> <span class="chv-dump-class">stdClass</span><span class="chv-dump-operator">#{$twoId}</span><details class="chv-dump-details"><summary class="chv-dump-summary"></summary> <span class="chv-dump-inline"></span> <span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">zero</span> <span class="chv-dump-int">int</span> 0 <em><span class="chv-dump-emphasis">(length=1)</span></em>
269-
<span class="chv-dump-inline"></span> <span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">one</span> <span class="chv-dump-int">int</span> 1 <em><span class="chv-dump-emphasis">(length=1)</span></em></details><div class="chv-details-pull-up"></div>
269+
<span class="chv-dump-inline"></span> <span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">one</span> <span class="chv-dump-int">int</span> 1 <em><span class="chv-dump-emphasis">(length=1)</span></em></details>
270270
<span class="chv-dump-modifier">public</span> <span class="chv-dump-variable">three</span> <span class="chv-dump-bool">bool</span> false</details>
271271
------------------------------------------------------------
272272

‎tests/VarDumperTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function testConstruct(): void
4747
$this->assertSame($defaultDepth, $varDumper->depth());
4848
$this->assertSame($defaultIndentSting, $varDumper->indentString());
4949
$this->assertCount(0, $varDumper->objectReferences());
50-
$this->assertSame(false, $varDumper->needsPullUp());
5150
for ($int = 1; $int <= 5; $int++) {
5251
$this->hookTestWithIndent($varDumper, $int);
5352
$this->hookTestWithDepth($varDumper, $int);
@@ -58,23 +57,6 @@ public function testConstruct(): void
5857
}
5958
}
6059

61-
public function testWithNeedsPull(): void
62-
{
63-
$varDumper = new VarDumper(
64-
writer: new StreamWriter(streamTemp('')),
65-
format: new PlainFormat(),
66-
dumpable: new VarDumpable(['foo']),
67-
objectReferences: new ObjectReferences()
68-
);
69-
$this->assertFalse($varDumper->needsPullUp());
70-
$with = $varDumper->withNeedsPullUp(true);
71-
$this->assertNotSame($varDumper, $with);
72-
$this->assertTrue($with->needsPullUp());
73-
$with = $varDumper->withNeedsPullUp(false);
74-
$this->assertNotSame($varDumper, $with);
75-
$this->assertFalse($with->needsPullUp());
76-
}
77-
7860
public function hookTestWithIndent(VarDumperInterface $varDumper, int $indent): void
7961
{
8062
$varDumperWithIndent = $varDumper->withIndent($indent);

‎tests/src/output-html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
declare(strict_types=1);
1313

1414
return <<<HTML
15-
<html class="chv-dump"><head><meta charset="UTF-8"></head><body><style>html.chv-dump { background: #132537; } pre.chv-dump { font-size: 14px; font-family: 'Fira Code Retina', 'Operator Mono', Inconsolata, Menlo, Monaco, Consolas, monospace; line-height: normal; color: #ecf0f1; padding: 1.25em; margin: 0.8em 0; word-break: break-word; white-space: pre-wrap; background: #132537; display: block; text-align: left; border: none; border-radius: 0.2857em; } .chv-dump-hr { opacity: 0.25; } .chv-dump-inline { border-left: 1px solid rgba(108 108 108 / 35%); } .chv-dump-details { line-height: normal; display: block; margin-top: -1.2em; } * > .chv-dump-details:not(:last-child) { margin-bottom: -1.2em; } .chv-dump-summary { height: 1.2em; margin-left: -0.8em; position: relative; } .chv-dump-summary:hover { background: rgba(255, 255, 255, 0.1); } .chv-dump-summary::-webkit-details-marker { margin-top: 0.3em; } .chv-details-pull-up { margin-top: -1.2em; height: 0; } .chv-dump-float { color: #ff8700; } .chv-dump-int { color: #ff8700; } .chv-dump-string { color: #ff8700; } .chv-dump-bool { color: #ff8700; } .chv-dump-null { color: #ff8700; } .chv-dump-object { color: #fabb00; } .chv-dump-array { color: #27ae60; } .chv-dump-resource { color: #ff5f5f; } .chv-dump-file { color: #87afff; } .chv-dump-class { color: #fabb00; } .chv-dump-operator { color: #6c6c6c; } .chv-dump-function { color: #00afff; } .chv-dump-variable { color: #00afff; } .chv-dump-modifier { color: #d75fd7; } .chv-dump-emphasis { color: rgb(108 108 108 / 65%); }</style><pre class="chv-dump">class@handler->function@handler()<hr class="chv-dump-hr"><span class="chv-dump-file">file@handler:100</span>
15+
<html class="chv-dump"><head><meta charset="UTF-8"></head><body><style>@media (prefers-color-scheme: light) { :root { --textColor: #24292f; --backgroundColor: #f2f5f8; --inlineColor: #c4c5c7; } } @media (prefers-color-scheme: dark) { :root { --textColor: #ecf0f1; --backgroundColor: #132537; --inlineColor: #323e4a; } } html.chv-dump { background: var(--backgroundColor); } pre.chv-dump { font-size: 14px; font-family: 'Fira Code Retina', 'Operator Mono', Inconsolata, Menlo, Monaco, Consolas, monospace; line-height: normal; color: var(--textColor); padding: 1.25em; margin: 0.8em 0; word-break: break-word; white-space: pre-wrap; background: var(--backgroundColor); display: block; text-align: left; border: none; border-radius: 0.2857em; } .chv-dump-hr { opacity: 0.25; } .chv-dump-inline { border-left: 1px solid var(--inlineColor); } .chv-dump-details { line-height: normal; display: block; margin-top: -1.242857em; } * > .chv-dump-details:not(:last-child) { margin-bottom: -1.242857em; } .chv-dump-summary { height: 1.242857em; margin-left: -0.8em; position: relative; } .chv-dump-summary:hover { background: rgba(255, 255, 255, 0.1); } .chv-dump-summary::-webkit-details-marker { margin-top: 0.3em; } .chv-dump-float { color: #ff8700; } .chv-dump-int { color: #ff8700; } .chv-dump-string { color: #ff8700; } .chv-dump-bool { color: #ff8700; } .chv-dump-null { color: #ff8700; } .chv-dump-object { color: #fabb00; } .chv-dump-array { color: #27ae60; } .chv-dump-resource { color: #ff5f5f; } .chv-dump-file { color: #87afff; } .chv-dump-class { color: #fabb00; } .chv-dump-operator { color: #6c6c6c; } .chv-dump-function { color: #00afff; } .chv-dump-variable { color: #00afff; } .chv-dump-modifier { color: #d75fd7; } .chv-dump-emphasis { color: rgb(108 108 108 / 65%); }</style><pre class="chv-dump">class@handler->function@handler()<hr class="chv-dump-hr"><span class="chv-dump-file">file@handler:100</span>
1616
1717
Arg#name <span class="chv-dump-null">null</span></pre></body></html>
1818
HTML;

0 commit comments

Comments
 (0)