Skip to content

Commit 13f5d0a

Browse files
authored
Merge pull request #99 from sunrise-php/release/v2.15.1
v2.15.1
2 parents f39e70c + 653adc9 commit 13f5d0a

File tree

6 files changed

+33
-14
lines changed

6 files changed

+33
-14
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ jobs:
1010
steps:
1111
- checkout
1212
- run: php -v
13-
- run: composer install --no-interaction --no-suggest --prefer-source
13+
- run: composer install --no-interaction
1414
- run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
1515
php72:
1616
docker:
1717
- image: circleci/php:7.2-cli-node-browsers
1818
steps:
1919
- checkout
2020
- run: php -v
21-
- run: composer install --no-interaction --no-suggest --prefer-source
21+
- run: composer install --no-interaction
2222
- run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
2323
php73:
2424
docker:
2525
- image: circleci/php:7.3-cli-node-browsers
2626
steps:
2727
- checkout
2828
- run: php -v
29-
- run: composer install --no-interaction --no-suggest --prefer-source
29+
- run: composer install --no-interaction
3030
- run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
3131
php74:
3232
docker:
3333
- image: circleci/php:7.4-cli-node-browsers
3434
steps:
3535
- checkout
3636
- run: php -v
37-
- run: composer install --no-interaction --no-suggest --prefer-source
37+
- run: composer install --no-interaction
3838
- run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
3939
php80:
4040
docker:
4141
- image: circleci/php:8.0-cli-node-browsers
4242
steps:
4343
- checkout
4444
- run: php -v
45-
- run: composer install --no-interaction --no-suggest --prefer-source
45+
- run: composer install --no-interaction
4646
- run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
4747
workflows:
4848
version: 2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
/phpbench.json
66
/phpcs.xml
77
/phpunit.xml
8+
/psalm.xml
89
/vendor/

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# HTTP router for PHP 7.1+ (incl. PHP 8 with attributes) based on PSR-7 and PSR-15 with support for annotations and OpenAPI (Swagger) Specification
1+
# HTTP router for PHP 7.1+ based on PSR-7 and PSR-15 with support for annotations/attributes and OpenAPI (Swagger) Specification
2+
3+
**psr router**, **router with annotations**, **router with attributes**, **php router**.
24

35
[![Build Status](https://circleci.com/gh/sunrise-php/http-router.svg?style=shield)](https://circleci.com/gh/sunrise-php/http-router)
46
[![Code Coverage](https://scrutinizer-ci.com/g/sunrise-php/http-router/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-router/?branch=master)
@@ -693,8 +695,6 @@ $router->setEventDispatcher($eventDispatcher);
693695
composer test
694696
```
695697

696-
---
697-
698698
## Useful links
699699

700700
* https://www.php-fig.org/psr/psr-7/

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sunrise/http-router",
33
"homepage": "https://github.com/sunrise-php/http-router",
4-
"description": "Sunrise // HTTP router for PHP 7.1+ (incl. PHP 8 with attributes) based on PSR-7 and PSR-15 with support for annotations and OpenApi Specification",
4+
"description": "Sunrise // HTTP router for PHP 7.1+ based on PSR-7 and PSR-15 with support for annotations/attributes and OpenAPI (Swagger) Specification",
55
"license": "MIT",
66
"keywords": [
77
"fenric",
@@ -22,8 +22,8 @@
2222
"authors": [
2323
{
2424
"name": "Anatoly Fenric",
25-
"email": "[email protected]",
26-
"homepage": "https://anatoly.fenric.ru/"
25+
"email": "[email protected]",
26+
"homepage": "https://github.com/fenric"
2727
}
2828
],
2929
"require": {
@@ -38,7 +38,7 @@
3838
"require-dev": {
3939
"phpunit/phpunit": "7.5.20|9.5.0",
4040
"sunrise/coding-standard": "1.0.0",
41-
"sunrise/http-factory": "1.1.0",
41+
"sunrise/http-factory": "2.0.0",
4242
"doctrine/annotations": "^1.6",
4343
"symfony/console": "^4.4",
4444
"symfony/event-dispatcher": "^4.4"
@@ -64,6 +64,7 @@
6464
"scripts": {
6565
"test": [
6666
"phpcs",
67+
"psalm",
6768
"XDEBUG_MODE=coverage phpunit --coverage-text --colors=always"
6869
],
6970
"build": [

phpunit.xml.dist

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?xml version="1.0"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
5+
>
36
<coverage>
47
<include>
58
<directory>./src</directory>
69
</include>
710
</coverage>
811
<testsuites>
9-
<testsuite name="sunrise.http.router.testSuite">
12+
<testsuite name="sunrise/http-router">
1013
<directory>./tests/</directory>
1114
</testsuite>
1215
</testsuites>

psalm.xml.dist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
errorLevel="3"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns="https://getpsalm.org/schema/config"
6+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
7+
>
8+
<projectFiles>
9+
<directory name="src" />
10+
<ignoreFiles>
11+
<directory name="vendor" />
12+
</ignoreFiles>
13+
</projectFiles>
14+
</psalm>

0 commit comments

Comments
 (0)