Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/TestCase.php
  • Loading branch information
natanfelles committed Oct 18, 2023
2 parents fe3c053 + 9c8bf2e commit bd92395
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{md, rst}]
[*.{md,rst}]
trim_trailing_whitespace = false

[*.yml]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: PHPStan
run:
vendor/bin/phpstan analyse --xdebug -vvv
vendor/bin/phpstan analyse -vvv

- name: PHPUnit
run: vendor/bin/phpunit --verbose
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test:php:
- composer normalize --dry-run --indent-size=4 --indent-style=space
- vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
- vendor/bin/phpmd public xml phpmd.xml
- vendor/bin/phpstan analyse --xdebug -vvv
- vendor/bin/phpstan analyse -vvv
- vendor/bin/phpunit --colors=never
- phpdoc
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"require-dev": {
"ext-xdebug": "*",
"aplus/coding-standard": "^1.12",
"aplus/coding-standard": "^2.0",
"ergebnis/composer-normalize": "^2.25",
"jetbrains/phpstorm-attributes": "^1.0",
"natanfelles/php-server": "^2.11",
Expand Down
2 changes: 1 addition & 1 deletion guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ The more you use it, the more you will learn.
.. note::
Did you find something wrong?
Be sure to let us know about it with an
`issue <https://gitlab.com/aplus-framework/projects/one/issues>`_.
`issue <https://github.com/aplus-framework/one/issues>`_.
Thank you!
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected function runOne(
if (\is_string($url) && \str_starts_with($url, '/')) {
$url = $this->baseUrl . \ltrim($url, '/');
}
if ( ! $url instanceof URL) {
if (!$url instanceof URL) {
$url = new URL($url);
}
if ($url->getScheme() === 'https') {
Expand Down

0 comments on commit bd92395

Please sign in to comment.