Skip to content

Commit bd92395

Browse files
committed
Merge branch 'development'
# Conflicts: # tests/TestCase.php
2 parents fe3c053 + 9c8bf2e commit bd92395

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ indent_style = space
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11-
[*.{md, rst}]
11+
[*.{md,rst}]
1212
trim_trailing_whitespace = false
1313

1414
[*.yml]

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: PHPStan
4747
run:
48-
vendor/bin/phpstan analyse --xdebug -vvv
48+
vendor/bin/phpstan analyse -vvv
4949

5050
- name: PHPUnit
5151
run: vendor/bin/phpunit --verbose

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test:php:
2121
- composer normalize --dry-run --indent-size=4 --indent-style=space
2222
- vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
2323
- vendor/bin/phpmd public xml phpmd.xml
24-
- vendor/bin/phpstan analyse --xdebug -vvv
24+
- vendor/bin/phpstan analyse -vvv
2525
- vendor/bin/phpunit --colors=never
2626
- phpdoc
2727
artifacts:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"require-dev": {
3030
"ext-xdebug": "*",
31-
"aplus/coding-standard": "^1.12",
31+
"aplus/coding-standard": "^2.0",
3232
"ergebnis/composer-normalize": "^2.25",
3333
"jetbrains/phpstorm-attributes": "^1.0",
3434
"natanfelles/php-server": "^2.11",

guide/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,5 @@ The more you use it, the more you will learn.
103103
.. note::
104104
Did you find something wrong?
105105
Be sure to let us know about it with an
106-
`issue <https://gitlab.com/aplus-framework/projects/one/issues>`_.
106+
`issue <https://github.com/aplus-framework/one/issues>`_.
107107
Thank you!

tests/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected function runOne(
4040
if (\is_string($url) && \str_starts_with($url, '/')) {
4141
$url = $this->baseUrl . \ltrim($url, '/');
4242
}
43-
if ( ! $url instanceof URL) {
43+
if (!$url instanceof URL) {
4444
$url = new URL($url);
4545
}
4646
if ($url->getScheme() === 'https') {

0 commit comments

Comments
 (0)