Skip to content

Commit 7c3a2bb

Browse files
authored
Merge branch 'main' into throw
2 parents 1f6c853 + 50a7866 commit 7c3a2bb

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

.github/workflows/code-style.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
- name: Run PHP CS Fixer
3838
run: composer cs-fix
3939

40+
# discard changes in unrelated files
41+
- run: git restore vendor/composer/installed.php
42+
4043
# commit and push fixed files
4144
- uses: stefanzweifel/git-auto-commit-action@v4
4245
with:

.github/workflows/rexstan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [ master, main ]
66
pull_request:
77
branches: [ master, main ]
8+
types: [opened, synchronize, reopened, ready_for_review]
89

910
permissions:
1011
contents: read

.tools/rexstan.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'../../../../redaxo/src/addons/rexstan/vendor/phpstan/phpstan-strict-rules/rules.neon',
2222
'../../../../redaxo/src/addons/rexstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon',
2323
'../../../../redaxo/src/addons/rexstan/config/phpstan-phpunit.neon',
24-
// '../../../../redaxo/src/addons/rexstan/config/phpstan-dba.neon',
24+
'../../../../redaxo/src/addons/rexstan/config/phpstan-dba.neon',
2525
// '../../../../redaxo/src/addons/rexstan/config/cognitive-complexity.neon',
2626
// '../../../../redaxo/src/addons/rexstan/config/code-complexity.neon',
2727
'../../../../redaxo/src/addons/rexstan/config/dead-code.neon'

lib/cronjob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function execute()
3333
$messages = [];
3434

3535
for ($i = 0; $i < $sql->getRows(); ++$i) {
36-
$Url = \FriendsOfRedaxo\DiffDetect\Url::get((int) $sql->getValue('id'));
36+
$Url = \FriendsOfRedaxo\DiffDetect\Url::get($sql->getValue('id'));
3737
try {
3838
if (Index::createSnapshot($Url)) {
3939
$messages[] = 'snapshot created for ' . $Url->getName() . ' [' . $Url->getId() . ']';

vendor/composer/installed.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php return array(
22
'root' => array(
33
'name' => '__root__',
4-
'pretty_version' => 'dev-main',
5-
'version' => 'dev-main',
6-
'reference' => '7ac1a5ff7ffb6102348b4f7d62b57290e5d88b1e',
4+
'pretty_version' => 'dev-d9664b7c3c6ddc85df14b9c266f0b190de422edb',
5+
'version' => 'dev-d9664b7c3c6ddc85df14b9c266f0b190de422edb',
6+
'reference' => 'd9664b7c3c6ddc85df14b9c266f0b190de422edb',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
1010
'dev' => true,
1111
),
1212
'versions' => array(
1313
'__root__' => array(
14-
'pretty_version' => 'dev-main',
15-
'version' => 'dev-main',
16-
'reference' => '7ac1a5ff7ffb6102348b4f7d62b57290e5d88b1e',
14+
'pretty_version' => 'dev-d9664b7c3c6ddc85df14b9c266f0b190de422edb',
15+
'version' => 'dev-d9664b7c3c6ddc85df14b9c266f0b190de422edb',
16+
'reference' => 'd9664b7c3c6ddc85df14b9c266f0b190de422edb',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),

0 commit comments

Comments
 (0)