Skip to content

Commit 65610ae

Browse files
jfcherngjfcherng
committed
style: reformat with php-cs-fixer
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
1 parent 664ff0f commit 65610ae

32 files changed

+215
-214
lines changed

‎example/demo_base.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
include __DIR__ . '/../vendor/autoload.php';
46

57
use Jfcherng\Diff\Differ;
@@ -8,8 +10,8 @@
810
// the two sample files for comparison
911
$oldFile = __DIR__ . '/old_file.txt';
1012
$newFile = __DIR__ . '/new_file.txt';
11-
$oldString = \file_get_contents($oldFile);
12-
$newString = \file_get_contents($newFile);
13+
$oldString = file_get_contents($oldFile);
14+
$newString = file_get_contents($newFile);
1315

1416
// options for Diff class
1517
$diffOptions = [

‎example/demo_cli.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
include __DIR__ . '/demo_base.php';
46

57
use Jfcherng\Diff\DiffHelper;
@@ -19,7 +21,7 @@
1921
$newString,
2022
'Unified',
2123
$diffOptions,
22-
$rendererOptions
24+
$rendererOptions,
2325
);
2426

2527
echo $unifiedResult . $manyNewlines;
@@ -32,7 +34,7 @@
3234
$newString,
3335
'Context',
3436
$diffOptions,
35-
$rendererOptions
37+
$rendererOptions,
3638
);
3739

3840
echo $contextResult . $manyNewlines;

‎example/demo_web.php‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
include __DIR__ . '/demo_base.php';
46

57
use Jfcherng\Diff\DiffHelper;
@@ -28,7 +30,7 @@
2830
font-weight: normal;
2931
}
3032

31-
<?php echo DiffHelper::getStyleSheet(); ?>
33+
<?= DiffHelper::getStyleSheet(); ?>
3234
</style>
3335
</head>
3436
<body>
@@ -41,7 +43,7 @@
4143
$newString,
4244
'Inline',
4345
$diffOptions,
44-
['detailLevel' => 'none'] + $rendererOptions
46+
['detailLevel' => 'none'] + $rendererOptions,
4547
);
4648

4749
echo $inlineResult;
@@ -57,7 +59,7 @@
5759
$newString,
5860
'Inline',
5961
$diffOptions,
60-
['detailLevel' => 'line'] + $rendererOptions
62+
['detailLevel' => 'line'] + $rendererOptions,
6163
);
6264

6365
echo $inlineResult;
@@ -73,7 +75,7 @@
7375
$newString,
7476
'Inline',
7577
$diffOptions,
76-
['detailLevel' => 'word'] + $rendererOptions
78+
['detailLevel' => 'word'] + $rendererOptions,
7779
);
7880

7981
echo $inlineResult;
@@ -89,7 +91,7 @@
8991
$newString,
9092
'Inline',
9193
$diffOptions,
92-
['detailLevel' => 'char'] + $rendererOptions
94+
['detailLevel' => 'char'] + $rendererOptions,
9395
);
9496

9597
echo $inlineResult;
@@ -105,7 +107,7 @@
105107
$newFile,
106108
'SideBySide',
107109
$diffOptions,
108-
$rendererOptions
110+
$rendererOptions,
109111
);
110112

111113
echo $sideBySideResult;
@@ -121,7 +123,7 @@
121123
$newFile,
122124
'Inline',
123125
$diffOptions,
124-
$rendererOptions
126+
$rendererOptions,
125127
);
126128

127129
echo $inlineResult;
@@ -137,7 +139,7 @@
137139
$newFile,
138140
'Combined',
139141
$diffOptions,
140-
$rendererOptions
142+
$rendererOptions,
141143
);
142144

143145
echo $sideBySideResult;
@@ -153,10 +155,10 @@
153155
$newFile,
154156
'Unified',
155157
$diffOptions,
156-
$rendererOptions
158+
$rendererOptions,
157159
);
158160

159-
echo \htmlspecialchars($unifiedResult);
161+
echo htmlspecialchars($unifiedResult);
160162

161163
?></code></pre>
162164

@@ -169,10 +171,10 @@
169171
$newFile,
170172
'Context',
171173
$diffOptions,
172-
$rendererOptions
174+
$rendererOptions,
173175
);
174176

175-
echo \htmlspecialchars($contextResult);
177+
echo htmlspecialchars($contextResult);
176178

177179
?></code></pre>
178180

@@ -193,10 +195,10 @@
193195
$newFile,
194196
'JsonText',
195197
$diffOptions,
196-
$rendererOptions
198+
$rendererOptions,
197199
);
198200

199-
echo \htmlspecialchars($jsonResult);
201+
echo htmlspecialchars($jsonResult);
200202

201203
?></code></pre>
202204

@@ -209,17 +211,17 @@
209211
$newFile,
210212
'JsonHtml',
211213
$diffOptions,
212-
$rendererOptions
214+
$rendererOptions,
213215
);
214216

215-
echo \htmlspecialchars($jsonResult);
217+
echo htmlspecialchars($jsonResult);
216218

217219
?></code></pre>
218220

219221
<h1>HTML Diff from the Result of JSON Diff</h1>
220222
<?php
221223

222-
$jsonArray = \json_decode($jsonResult, true);
224+
$jsonArray = json_decode($jsonResult, true);
223225

224226
$htmlRenderer = RendererFactory::make('Inline', $rendererOptions);
225227
$inlineResult = $htmlRenderer->renderArray($jsonArray);

‎src/DiffHelper.php‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static function getProjectDirectory(): string
2323
{
2424
static $path;
2525

26-
return $path = $path ?? \realpath(__DIR__ . '/..');
26+
return $path = $path ?? realpath(__DIR__ . '/..');
2727
}
2828

2929
/**
@@ -37,32 +37,30 @@ public static function getRenderersInfo(): array
3737
return $info;
3838
}
3939

40-
$glob = \implode(\DIRECTORY_SEPARATOR, [
40+
$glob = implode(\DIRECTORY_SEPARATOR, [
4141
static::getProjectDirectory(),
4242
'src',
4343
'Renderer',
44-
'{' . \implode(',', RendererConstant::RENDERER_TYPES) . '}',
44+
'{' . implode(',', RendererConstant::RENDERER_TYPES) . '}',
4545
'*.php',
4646
]);
4747

48-
$fileNames = \array_map(
48+
$fileNames = array_map(
4949
// get basename without file extension
50-
function (string $file): string {
51-
return \pathinfo($file, \PATHINFO_FILENAME);
52-
},
50+
static fn (string $file): string => pathinfo($file, \PATHINFO_FILENAME),
5351
// paths of all Renderer files
54-
\glob($glob, \GLOB_BRACE)
52+
glob($glob, \GLOB_BRACE),
5553
);
5654

57-
$renderers = \array_filter(
55+
$renderers = array_filter(
5856
$fileNames,
5957
// only normal class files are wanted
60-
function (string $fileName): bool {
58+
static function (string $fileName): bool {
6159
return
62-
\substr($fileName, 0, 8) !== 'Abstract'
63-
&& \substr($fileName, -9) !== 'Interface'
64-
&& \substr($fileName, -5) !== 'Trait';
65-
}
60+
substr($fileName, 0, 8) !== 'Abstract'
61+
&& substr($fileName, -9) !== 'Interface'
62+
&& substr($fileName, -5) !== 'Trait';
63+
},
6664
);
6765

6866
$info = [];
@@ -80,7 +78,7 @@ function (string $fileName): bool {
8078
*/
8179
public static function getAvailableRenderers(): array
8280
{
83-
return \array_keys(self::getRenderersInfo());
81+
return array_keys(self::getRenderersInfo());
8482
}
8583

8684
/**
@@ -133,16 +131,17 @@ public static function calculate(
133131
array $rendererOptions = []
134132
): string {
135133
// always convert into array form
136-
\is_string($old) && ($old = \explode("\n", $old));
137-
\is_string($new) && ($new = \explode("\n", $new));
134+
\is_string($old) && ($old = explode("\n", $old));
135+
\is_string($new) && ($new = explode("\n", $new));
138136

139137
return RendererFactory::getInstance($renderer)
140138
->setOptions($rendererOptions)
141139
->render(
142140
Differ::getInstance()
143141
->setOldNew($old, $new)
144-
->setOptions($differOptions)
145-
);
142+
->setOptions($differOptions),
143+
)
144+
;
146145
}
147146

148147
/**
@@ -178,7 +177,7 @@ public static function calculateFiles(
178177
$newFile->fread($newFile->getSize() + 1),
179178
$renderer,
180179
$differOptions,
181-
$rendererOptions
180+
$rendererOptions,
182181
);
183182
}
184183
}

‎src/Differ.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ public function getGroupedOpcodes(): array
318318

319319
$opcodes = $this->sequenceMatcher
320320
->setSequences($old, $new)
321-
->getGroupedOpcodes($this->options['context']);
321+
->getGroupedOpcodes($this->options['context'])
322+
;
322323

323324
$this->getGroupedOpcodesPost($opcodes);
324325

@@ -344,7 +345,8 @@ public function getGroupedOpcodesGnu(): array
344345

345346
$opcodes = $this->sequenceMatcher
346347
->setSequences($old, $new)
347-
->getGroupedOpcodes($this->options['context']);
348+
->getGroupedOpcodes($this->options['context'])
349+
;
348350

349351
$this->getGroupedOpcodesGnuPost($opcodes);
350352

@@ -368,10 +370,10 @@ private function getGroupedOpcodesPre(array &$old, array &$new): void
368370
];
369371

370372
$this->oldSrcLength = \count($old);
371-
\array_push($old, ...$eolAtEofHelperLines);
373+
array_push($old, ...$eolAtEofHelperLines);
372374

373375
$this->newSrcLength = \count($new);
374-
\array_push($new, ...$eolAtEofHelperLines);
376+
array_push($new, ...$eolAtEofHelperLines);
375377
}
376378

377379
/**

‎src/Factory/LineRendererFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public static function getInstance(string $type, ...$ctorArgs): AbstractLineRend
4848
*/
4949
public static function make(string $type, ...$ctorArgs): AbstractLineRenderer
5050
{
51-
$className = RendererConstant::RENDERER_NAMESPACE . '\\Html\\LineRenderer\\' . \ucfirst($type);
51+
$className = RendererConstant::RENDERER_NAMESPACE . '\\Html\\LineRenderer\\' . ucfirst($type);
5252

53-
if (!\class_exists($className)) {
53+
if (!class_exists($className)) {
5454
throw new \InvalidArgumentException("LineRenderer not found: {$type}");
5555
}
5656

‎src/Factory/RendererFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static function resolveRenderer(string $renderer): ?string
7373
foreach (RendererConstant::RENDERER_TYPES as $type) {
7474
$className = RendererConstant::RENDERER_NAMESPACE . "\\{$type}\\{$renderer}";
7575

76-
if (\class_exists($className)) {
76+
if (class_exists($className)) {
7777
return $cache[$renderer] = $className;
7878
}
7979
}

‎src/Renderer/AbstractRenderer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function setOptions(array $options): self
120120

121121
$this->updateLanguage(
122122
$this->options['language'] ?? '',
123-
$newOptions['language']
123+
$newOptions['language'],
124124
);
125125

126126
$this->options = $newOptions;
@@ -225,6 +225,6 @@ protected function _(string $text, bool $escapeHtml = true): string
225225
{
226226
$text = $this->t->translate($text);
227227

228-
return $escapeHtml ? \htmlspecialchars($text) : $text;
228+
return $escapeHtml ? htmlspecialchars($text) : $text;
229229
}
230230
}

0 commit comments

Comments
 (0)