Skip to content

Commit

Permalink
Merge pull request #15 from wp-oop/task/make-php-8-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
XedinUnknown authored Mar 10, 2021
2 parents 76b033b + fe5bfa8 commit ba275a6
Show file tree
Hide file tree
Showing 16 changed files with 1,107 additions and 395 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4

[*.js]
indent_size = 2

[*.json]
indent_size = 2

[*.yml]
indent_size = 2
5 changes: 2 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ DOCROOT_PATH=/var/www/html
BUILD_ROOT_PATH=/app/
PROJECT_NAME=me_plugin

PHP_BUILD_VERSION=7.1
PHP_BUILD_VERSION=7.2
PHP_TEST_VERSION=7.4

WORDPRESS_VERSION=5.6.0
WORDPRESS_VERSION=5.6

DB_ROOT_PASSWORD=root
DB_NAME=wordpress
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.1', '7.2', '7.3', '7.4']
php-versions: ['7.2', '7.3', '7.4', '8.0']

steps:
- uses: actions/checkout@v2
Expand All @@ -14,7 +14,6 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: composer:v1

- name: Analysing source code
run: find ./src/ ./inc/ ./tests/ -type f -name '*.php' -print0 | xargs -0 -L 1 -P 4 -- php -l
Expand All @@ -29,7 +28,7 @@ jobs:
run: ./vendor/bin/phpunit

- name: Psalm
run: ./vendor/bin/psalm --show-info=false --threads=8 --diff
run: ./vendor/bin/psalm --show-info --threads=8 --diff

- name: PHPCS
run: ./vendor/bin/phpcs -s --runtime-set ignore_warnings_on_exit 1
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
/.idea/inspectionProfiles/
/.idea/misc.xml
/.env

.phpunit.result.cache
6 changes: 6 additions & 0 deletions .idea/codestream.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

110 changes: 57 additions & 53 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ba275a6

Please sign in to comment.