Skip to content

Commit bb5012b

Browse files
emmadesilvaemmadesilva
committed
Merge branch 'master' into 2.x-dev
2 parents 8c11d39 + 464bb8b commit bb5012b

31 files changed

+1108
-308
lines changed

‎.github/workflows/split-monorepo.yml‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,21 @@ jobs:
6565
- name: Commit and push changes
6666
env:
6767
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
68+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
69+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
6870
run: |
6971
cd hyde
7072
if ! [[ `git status --porcelain` ]]; then
7173
echo "No changes to this package. Exiting gracefully.";
7274
exit 0;
7375
fi
7476
75-
git config user.name github-actions
76-
git config user.email github-actions@github.com
77+
git config user.name "github-actions[bot]"
78+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
7779
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/hyde.git
7880
7981
git add .
80-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
82+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
8183
8284
git push upstream develop
8385
echo "No changes to this package. Exiting gracefully."
@@ -114,19 +116,21 @@ jobs:
114116
- name: Commit and push changes
115117
env:
116118
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
119+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
120+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
117121
run: |
118122
cd framework
119123
if ! [[ `git status --porcelain` ]]; then
120124
echo "No changes to this package. Exiting gracefully.";
121125
exit 0;
122126
fi
123127
124-
git config user.name github-actions
125-
git config user.email github-actions@github.com
128+
git config user.name "github-actions[bot]"
129+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
126130
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/framework.git
127131
128132
git add .
129-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
133+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
130134
131135
git push upstream develop
132136
echo "No changes to this package. Exiting gracefully."
@@ -163,19 +167,21 @@ jobs:
163167
- name: Commit and push changes
164168
env:
165169
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
170+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
171+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
166172
run: |
167173
cd realtime-compiler
168174
if ! [[ `git status --porcelain` ]]; then
169175
echo "No changes to this package. Exiting gracefully.";
170176
exit 0;
171177
fi
172178
173-
git config user.name github-actions
174-
git config user.email github-actions@github.com
179+
git config user.name "github-actions[bot]"
180+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
175181
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/realtime-compiler.git
176182
177183
git add .
178-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
184+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
179185
180186
git push upstream master
181187
@@ -211,19 +217,21 @@ jobs:
211217
- name: Commit and push changes
212218
env:
213219
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
220+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
221+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
214222
run: |
215223
cd hydefront
216224
if ! [[ `git status --porcelain` ]]; then
217225
echo "No changes to this package. Exiting gracefully.";
218226
exit 0;
219227
fi
220228
221-
git config user.name github-actions
222-
git config user.email github-actions@github.com
229+
git config user.name "github-actions[bot]"
230+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
223231
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/hydefront.git
224232
225233
git add .
226-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
234+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
227235
228236
git push upstream master
229237
@@ -263,19 +271,21 @@ jobs:
263271
- name: Commit and push changes
264272
env:
265273
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
274+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
275+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
266276
run: |
267277
cd website
268278
if ! [[ `git status --porcelain` ]]; then
269279
echo "No changes to this package. Exiting gracefully.";
270280
exit 0;
271281
fi
272282
273-
git config user.name github-actions
274-
git config user.email github-actions@github.com
283+
git config user.name "github-actions[bot]"
284+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
275285
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/hydephp.com.git
276286
277287
git add .
278-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
288+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
279289
280290
git push upstream upcoming
281291
echo "No changes to this package. Exiting gracefully."
@@ -312,19 +322,21 @@ jobs:
312322
- name: Commit and push changes
313323
env:
314324
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
325+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
326+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
315327
run: |
316328
cd testing
317329
if ! [[ `git status --porcelain` ]]; then
318330
echo "No changes to this package. Exiting gracefully.";
319331
exit 0;
320332
fi
321333
322-
git config user.name github-actions
323-
git config user.email github-actions@github.com
334+
git config user.name "github-actions[bot]"
335+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
324336
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/testing.git
325337
326338
git add .
327-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
339+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
328340
329341
git push upstream master
330342
@@ -360,6 +372,8 @@ jobs:
360372
- name: Commit and push changes
361373
env:
362374
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
375+
COMMIT_AUTHOR_NAME: ${{ github.event.head_commit.author.name }}
376+
COMMIT_AUTHOR_EMAIL: ${{ github.event.head_commit.author.email }}
363377
run: |
364378
cd ui-kit
365379
@@ -368,11 +382,11 @@ jobs:
368382
exit 0;
369383
fi
370384
371-
git config user.name github-actions
372-
git config user.email github-actions@github.com
385+
git config user.name "github-actions[bot]"
386+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
373387
git remote add upstream https://oauth2:${{ secrets.SPLIT_MONOREPO_TOKEN }}@github.com/hydephp/ui-kit.git
374388
375389
git add .
376-
git commit -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
390+
git commit --author="$COMMIT_AUTHOR_NAME <$COMMIT_AUTHOR_EMAIL>" -m "$COMMIT_MESSAGE https://github.com/hydephp/develop/commit/${{ github.sha }}"
377391
378392
git push upstream master

‎composer.lock‎

Lines changed: 15 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/_data/partials/hyde-pages-api/hyde-kernel-string-methods.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<section id="hyde-kernel-string-methods">
22

33
<!-- Start generated docs for Hyde\Foundation\Concerns\ImplementsStringHelpers -->
4-
<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.07ms -->
4+
<!-- Generated by HydePHP DocGen script at 2024-12-22 09:14:25 in 0.07ms -->
55

66
#### `makeTitle()`
77

@@ -11,6 +11,14 @@ No description provided.
1111
Hyde::makeTitle(string $value): string
1212
```
1313

14+
#### `makeSlug()`
15+
16+
No description provided.
17+
18+
```php
19+
Hyde::makeSlug(string $value): string
20+
```
21+
1422
#### `normalizeNewlines()`
1523

1624
No description provided.

‎docs/architecture-concepts/the-hydekernel.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Hyde::routes(): Hyde\Foundation\Kernel\RouteCollection
140140
<section id="hyde-kernel-string-methods">
141141

142142
<!-- Start generated docs for Hyde\Foundation\Concerns\ImplementsStringHelpers -->
143-
<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.07ms -->
143+
<!-- Generated by HydePHP DocGen script at 2024-12-22 09:14:25 in 0.07ms -->
144144

145145
#### `makeTitle()`
146146

@@ -150,6 +150,14 @@ No description provided.
150150
Hyde::makeTitle(string $value): string
151151
```
152152

153+
#### `makeSlug()`
154+
155+
No description provided.
156+
157+
```php
158+
Hyde::makeSlug(string $value): string
159+
```
160+
153161
#### `normalizeNewlines()`
154162

155163
No description provided.

‎monorepo/HydeStan/HydeStan.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ final class HydeStan
1515
private const FILE_ANALYSERS = [
1616
NoFixMeAnalyser::class,
1717
UnImportedFunctionAnalyser::class,
18+
NoGlobBraceAnalyser::class,
1819
];
1920

2021
private const TEST_FILE_ANALYSERS = [
@@ -370,6 +371,27 @@ public function run(string $file, string $contents): void
370371
}
371372
}
372373

374+
class NoGlobBraceAnalyser extends FileAnalyser
375+
{
376+
public function run(string $file, string $contents): void
377+
{
378+
$lines = explode("\n", $contents);
379+
380+
foreach ($lines as $lineNumber => $line) {
381+
AnalysisStatisticsContainer::analysedExpression();
382+
383+
if (str_contains($line, 'GLOB_BRACE')) {
384+
$this->fail(sprintf('Usage of `GLOB_BRACE` found in %s at line %d. This feature is not supported on all systems and should be avoided.',
385+
realpath(BASE_PATH.'/'.$file),
386+
$lineNumber + 1
387+
));
388+
389+
HydeStan::addActionsMessage('error', $file, $lineNumber + 1, 'HydeStan: NoGlobBraceError', '`GLOB_BRACE` is not supported on all systems. Consider refactoring to avoid it.');
390+
}
391+
}
392+
}
393+
}
394+
373395
class NoTestReferenceAnalyser extends LineAnalyser
374396
{
375397
public function run(string $file, int $lineNumber, string $line): void

0 commit comments

Comments
 (0)