Skip to content

Commit 1205aa4

Browse files
committed
fix: improve code formatting and consistency in InlineCss middleware and related tests
1 parent 2cbec6d commit 1205aa4

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/Middleware/InlineCss.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function apply($buffer)
2222

2323
$this->class = collect($matches[1])->mapWithKeys(function ($item) {
2424

25-
return [ 'page_speed_'.rand() => $item[0] ];
25+
return ['page_speed_' . rand() => $item[0]];
2626
})->unique();
2727

2828
return $this->injectStyle()->injectClass()->fixHTML()->html;
@@ -36,7 +36,8 @@ private function injectStyle()
3636

3737
$this->style[] = [
3838
'class' => $class,
39-
'attributes' => preg_quote($attributes, '/')];
39+
'attributes' => preg_quote($attributes, '/')
40+
];
4041
});
4142

4243
$injectStyle = implode(' ', $this->inline);
@@ -54,7 +55,7 @@ private function injectClass()
5455
{
5556
collect($this->style)->each(function ($item) {
5657
$replace = [
57-
'/style="'.$item['attributes'].'"/' => "class=\"{$item['class']}\"",
58+
'/style="' . $item['attributes'] . '"/' => "class=\"{$item['class']}\"",
5859
];
5960

6061
$this->html = $this->replace($replace, $this->html);
@@ -77,7 +78,7 @@ private function fixHTML()
7778

7879
if (count($matches[1]) > 1) {
7980
$replace = [
80-
'/>/' => "class=\"".implode(' ', $matches[1])."\">",
81+
'/>/' => "class=\"" . implode(' ', $matches[1]) . "\">",
8182
];
8283

8384
$newHTML[] = str_replace(

tests/Middleware/InlineCssJavaScriptFrameworksTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public function test_angularjs_ng_class_preserved(): void
3737
// ng-class attributes must be preserved exactly
3838
$this->assertStringContainsString('ng-class="{active: isActive, disabled: isDisabled}"', $result);
3939
$this->assertStringContainsString('ng-class="dynamicClass"', $result);
40-
40+
4141
// Should have style tag with converted inline styles
4242
$this->assertStringContainsString('<style>', $result);
4343
$this->assertStringContainsString('page_speed_', $result);
44-
44+
4545
// Inline styles should be converted to classes
4646
$this->assertStringNotContainsString('style="padding: 10px;"', $result);
4747
$this->assertStringNotContainsString('style="font-weight: bold;"', $result);
@@ -71,12 +71,12 @@ public function test_alpinejs_class_shorthand_preserved(): void
7171
// Alpine.js :class must be preserved
7272
$this->assertStringContainsString(':class="{ \'bg-blue\': open, \'bg-gray\': !open }"', $result);
7373
$this->assertStringContainsString(':class="open ? \'visible\' : \'hidden\'"', $result);
74-
74+
7575
// Inline styles should be converted to classes
7676
$this->assertStringNotContainsString('style="padding: 5px;"', $result);
7777
$this->assertStringNotContainsString('style="margin: 10px;"', $result);
7878
$this->assertStringNotContainsString('style="color: red;"', $result);
79-
79+
8080
// Should have page_speed classes
8181
$this->assertStringContainsString('page_speed_', $result);
8282
}
@@ -107,7 +107,7 @@ public function test_vuejs_vbind_class_preserved(): void
107107
$this->assertStringContainsString('v-bind:class="{ active: isActive, \'text-danger\': hasError }"', $result);
108108
$this->assertStringContainsString('v-bind:class="classObject"', $result);
109109
$this->assertStringContainsString('v-bind:class="[activeClass, errorClass]"', $result);
110-
110+
111111
// Inline styles should be converted
112112
$this->assertStringNotContainsString('style="padding: 20px;"', $result);
113113
$this->assertStringNotContainsString('style="font-size: 14px;"', $result);
@@ -144,13 +144,13 @@ public function test_mixed_class_and_framework_attributes(): void
144144
$this->assertStringContainsString('ng-class="{expanded: isExpanded}"', $result);
145145
$this->assertStringContainsString('v-bind:class="vueClasses"', $result);
146146
$this->assertStringContainsString(':class="alpineClasses"', $result);
147-
147+
148148
// Inline styles should be converted to page_speed classes
149149
$this->assertStringNotContainsString('style="border: 1px solid;"', $result);
150150
$this->assertStringNotContainsString('style="padding: 10px;"', $result);
151151
$this->assertStringNotContainsString('style="margin: 5px;"', $result);
152152
$this->assertStringNotContainsString('style="display: flex;"', $result);
153-
153+
154154
// Should have style tag with converted classes
155155
$this->assertStringContainsString('<style>', $result);
156156
}
@@ -179,7 +179,7 @@ public function test_normal_class_still_works(): void
179179
$this->assertStringNotContainsString('style="width: 100%;"', $result);
180180
$this->assertStringNotContainsString('style="font-weight: bold;"', $result);
181181
$this->assertStringNotContainsString('style="color: yellow;"', $result);
182-
182+
183183
// Should have page_speed classes instead
184184
$this->assertStringContainsString('class="page_speed_', $result);
185185
}
@@ -204,7 +204,7 @@ public function test_attribute_ending_with_class(): void
204204

205205
// Attribute ending with "class" should not be affected
206206
$this->assertStringContainsString('data-css-class="some-value"', $result);
207-
207+
208208
// Inline style should be converted
209209
$this->assertStringNotContainsString('style="background: blue;"', $result);
210210
}
@@ -246,13 +246,13 @@ public function test_complex_multi_framework_scenario(): void
246246
$this->assertStringContainsString(':class="open ? \'show\' : \'hide\'"', $result);
247247
$this->assertStringContainsString('v-bind:class="contentClasses"', $result);
248248
$this->assertStringContainsString('ng-class="{loading: isLoading}"', $result);
249-
249+
250250
// Inline styles should be converted
251251
$this->assertStringNotContainsString('style="background: white;"', $result);
252252
$this->assertStringNotContainsString('style="padding: 10px;"', $result);
253253
$this->assertStringNotContainsString('style="border: 1px solid;"', $result);
254254
$this->assertStringNotContainsString('style="font-size: 24px;"', $result);
255-
255+
256256
// Should have style tag
257257
$this->assertStringContainsString('<style>', $result);
258258
}

0 commit comments

Comments
 (0)