Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/update php fixer #72

Open
wants to merge 32 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7a30ac7
Psr7 + slim rewrite + Pagely namespace, since its not a dropin
jeichorn May 31, 2019
0957fcd
Update readme
jeichorn May 31, 2019
ee2373c
Update README.md
jeichorn May 31, 2019
af17479
Update README.md
jeichorn May 31, 2019
916d574
Update README.md
jeichorn Jun 3, 2019
b044206
fix for /request/last
jeichorn Jun 3, 2019
91ff74a
fix: namespace and styles
rgdevment Jan 30, 2020
6325cbe
Merge pull request #1 from MarioDevment/perf/minor-requirements-updates
Jan 30, 2020
6f62cc0
fix: poll wait and dependences
Feb 5, 2020
3facc5a
refactor: fix in data typing
Feb 5, 2020
ba8003a
Merge pull request #4 from MarioDevment/fix/poll-waits
rgdevment Feb 5, 2020
0aa80e0
fix: missing dependence and data typing
Feb 5, 2020
74797bd
Merge pull request #5 from MarioDevment/fix/data-typing
rgdevment Feb 6, 2020
bbc2401
fix: remove symfony dependencies
Feb 11, 2020
0dca2be
Merge pull request #6 from MarioDevment/fix/remove-symfony-dependencies
rgdevment Feb 11, 2020
8c60e77
fix: type data in response builder
Feb 13, 2020
8750ce0
Merge pull request #7 from MarioDevment/fix/type-data
rgdevment Feb 13, 2020
22e2919
fix: sanitize headers
Feb 14, 2020
f88e054
Merge pull request #8 from MarioDevment/fix/sanitize-headers
rgdevment Feb 14, 2020
79ad071
fix: PSR headers
Feb 19, 2020
4b15554
perf: added .lock
Feb 19, 2020
7e572f8
fix: undefined variable: key
Feb 19, 2020
8e15651
Merge pull request #9 from MarioDevment/fix/psr-serialize
rgdevment Feb 19, 2020
e8bbb27
tests: simulating the situation of PHP 7.4 stderr output
gabfr Feb 24, 2020
8400ebc
fix: patch to clean stderr output based on the keywords
gabfr Feb 24, 2020
3fc7190
chore: removing PHP 7.2 from travis and adding 7.4
gabfr Feb 24, 2020
3b717ac
refactor: making the cleanErrorOutput private
gabfr Feb 25, 2020
435f11a
chore: maintaining PHP 7.2 to support some legacy we still have
gabfr Feb 25, 2020
ed93802
Merge pull request #10 from gabfr/fix/php-74-cli-logs
gabfr Feb 25, 2020
364fcb7
chore: allow guzzle 7
ibritov Jun 9, 2022
3ffb06e
chore: update php-cs-fixer v2.16 => v3.4.0
ibritov Jun 13, 2022
236dda5
style: lint update
ibritov Jun 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
vendor/
composer.lock
.idea/
state/*-*
build/*
phpunit.xml
.php_cs.cache
.php_cs.result.cache
19 changes: 19 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests');

return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'combine_consecutive_unsets' => true,
'concat_space' => ['spacing' => 'one'],
'return_type_declaration' => ['space_before' => 'one'],
'no_unreachable_default_argument_value' => false,
'yoda_style' => false,
'ordered_imports' => ['sort_algorithm' => 'alpha'],
'increment_style' => ['style' => 'post']
])
->setFinder($finder);
19 changes: 19 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests');

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'combine_consecutive_unsets' => true,
'concat_space' => ['spacing' => 'one'],
'return_type_declaration' => ['space_before' => 'one'],
'no_unreachable_default_argument_value' => false,
'yoda_style' => false,
'ordered_imports' => ['sortAlgorithm' => 'alpha'],
'pre_increment' => false,
])
->setFinder($finder);
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
language: php

php:
- 7.1
- 7.2
- 7.3
- 7.4

before_script:
- composer install

sudo: false

script:
- ./vendor/bin/phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml ./src/
- composer lint:check
- ./vendor/bin/phpunit
51 changes: 40 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "internations/http-mock",
"description": "Mock HTTP requests on the server side in your PHP unit tests",
"description": "Mock HTTP requests on the server side in your PHP unit tests, PSR/7 Fork of internations version",
"license": "MIT",
"authors": [
{
Expand All @@ -10,25 +10,54 @@
{
"name": "Max Beutel",
"email": "[email protected]"
},
{
"name": "Joshua Eichorn",
"email": "[email protected]"
}
],
"require": {
"php": "~7.1",
"silex/silex": "~2.0",
"guzzle/guzzle": ">=3.8",
"symfony/process": "~3|~4",
"require": {
"php": "~7.2",
"ext-json": "*",
"symfony/process": "~3|~4|~5",
"jeremeamia/superclosure": "~2",
"lstrojny/hmmmath": ">=0.5.0"
"lstrojny/hmmmath": ">=0.5.0",
"guzzlehttp/guzzle": "^6.3|~7",
"slim/slim": "^3.12",
"friendsofphp/php-cs-fixer": "3.4.0"
},
"require-dev": {
"internations/kodierungsregelwerksammlung": "~0.23.0",
"internations/testing-component": "1.0.1",
"internations/testing-component": "1.3.0",
"phpunit/phpunit": "^7"
},
"autoload": {
"psr-4": {"InterNations\\Component\\HttpMock\\": "src/"}
"psr-4": {
"InterNations\\Component\\HttpMock\\": "src/"
}
},
"autoload-dev": {
"psr-4": {"InterNations\\Component\\HttpMock\\Tests\\": "tests/"}
"psr-4": {
"InterNations\\Component\\HttpMock\\Tests\\": "tests/"
}
},
"scripts": {
"auto-scripts": [
"@security-check"
],
"post-install-cmd": [
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts"
],
"lint": [
"php-cs-fixer fix --ansi --verbose --show-progress=dots"
],
"lint:check": [
"@lint --dry-run"
],
"security-check": [
"local-php-security-checker-installer && local-php-security-checker"
]
}
}
Loading