Skip to content

Prepare project to work only with PHP8 #107

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

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$finder = PhpCsFixer\Finder::create()
->exclude('vendor')
->in(__DIR__);
return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setUsingCache(true)
->setRules([
'@PSR2' => true,
Expand All @@ -14,7 +14,7 @@ return PhpCsFixer\Config::create()
'indentation_type' => true,
'blank_line_after_namespace' => true,
'line_ending' => true,
'lowercase_constants' => true,
//'lowercase_constants' => true,
'lowercase_keywords' => true,
'no_closing_tag' => true,
'single_line_after_imports' => true,
Expand All @@ -23,16 +23,16 @@ return PhpCsFixer\Config::create()
'whitespace_after_comma_in_array' => true,
'blank_line_after_opening_tag' => true,
'no_empty_statement' => true,
'no_extra_consecutive_blank_lines' => true,
// 'no_extra_consecutive_blank_lines' => true,
'function_typehint_space' => true,
'no_leading_namespace_whitespace' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'phpdoc_scalar' => true,
'phpdoc_types' => true,
'no_leading_import_slash' => true,
'no_extra_consecutive_blank_lines' => ['use'],
'blank_line_before_return' => true,
// 'no_extra_consecutive_blank_lines' => ['use'],
//'blank_line_before_return' => true,
'self_accessor' => false,
'no_short_bool_cast' => true,
'no_trailing_comma_in_singleline_array' => true,
Expand All @@ -48,5 +48,6 @@ return PhpCsFixer\Config::create()
'array_syntax' => ['syntax' => 'short'],
'declare_strict_types' => true,
'phpdoc_align' => true,
'php_unit_no_expectation_annotation' => true,
])
->setFinder($finder);
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ language: php
dist: trusty

php:
- 7.2
- 7.3
- 7.4
- nightly

matrix:
include:
- php: 7.2
- php: 7.4
env: COVERAGE=yes

cache:
Expand All @@ -17,6 +18,7 @@ cache:

before_script:
- composer self-update
- composer install --ignore-platform-reqs
- if [[ $COVERAGE == yes ]]; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; fi
- if [[ $COVERAGE == yes ]]; then chmod +x ./cc-test-reporter; fi
- if [[ $COVERAGE == yes ]]; then ./cc-test-reporter before-build; fi
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "widmogrod/php-functional",
"description": "Functors, Applicative and Monads are fascinating concept. Purpose of this library is to explore them in OOP PHP world.",
"require": {
"php": "^7.1|^8.0",
"php": "^7.3|^8.0",
"functional-php/fantasy-land": "^1"
},
"require-dev": {
"phpunit/phpunit": "^6",
"friendsofphp/php-cs-fixer": "^2",
"giorgiosironi/eris": "^0.9"
"phpunit/phpunit": "^9",
"friendsofphp/php-cs-fixer": "^3.0.x-dev",
"giorgiosironi/eris": "^0.11"
},
"license": "MIT",
"authors": [
Expand All @@ -17,7 +17,7 @@
"email": "widmogrod@gmail.com"
}
],
"prefer-stable": true,
"prefer-stable": false,
"scripts": {
"test": "phpunit --no-coverage",
"testc": "phpunit --coverage-clover ./clover.xml",
Expand Down
Loading