Skip to content

[FSSDK-9073] Update to support PHP 8.x #268

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

Merged
merged 28 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
41229da
[FSSDK-9022] Ignore .phpunit.result.cache
mikechu-optimizely Apr 3, 2023
3b926fe
[FSSDK-9022] Increment version of php to 8.0+
mikechu-optimizely Apr 4, 2023
1d2d06b
[FSSDK-9022] Update murmurhash version & use
mikechu-optimizely Apr 3, 2023
d6bcd80
[FSSDK-9022] Fixed tests' setUp() signatures
mikechu-optimizely Apr 3, 2023
a004bec
[FSSDK-9022]
mikechu-optimizely Mar 27, 2023
32abc14
[FSSDK-9022] Convert PHPUnit_Framework_TestCase to TestCase
mikechu-optimizely Apr 5, 2023
e959c93
[FSSDK-9022] Adjust deps
mikechu-optimizely Apr 5, 2023
27efe00
[FSSDK-9022] Adjust PHPUnit bootstrapping
mikechu-optimizely Apr 5, 2023
39de4f5
[FSSDK-9022] Rollback to older murmurhash lib
mikechu-optimizely Apr 5, 2023
f464dcb
[FSSDK-9022] Fix exception type check condition for PHP8
mikechu-optimizely Apr 6, 2023
ea92c7d
[FSSDK-9022] Expand the memory limit for running PHPUnit tests
mikechu-optimizely Apr 6, 2023
9e307fc
[FSSDK-9022] Update GitHub Actions workflow
mikechu-optimizely Apr 6, 2023
f1d8405
[FSSDK-9022] Remove @expectedException
mikechu-optimizely Apr 6, 2023
7ff3a8a
[FSSDK-9022] Try fix for no coverage file produced
mikechu-optimizely Apr 6, 2023
4142dc7
[FSSDK-9022] Try fixing clover.xml path
mikechu-optimizely Apr 6, 2023
3d1fe58
[FSSDK-9022] Add step to fail if clover.xml not created
mikechu-optimizely Apr 6, 2023
d38b388
[FSSDK-9022] Try using php-actions/phpunit@v3
mikechu-optimizely Apr 6, 2023
9681294
[FSSDK-9022] Adjust phpunit action
mikechu-optimizely Apr 6, 2023
18c279d
[FSSDK-9022] Set bootstrap: phpunit_bootstrap.php
mikechu-optimizely Apr 6, 2023
aa922c3
[FSSDK-9022] Rollback to script based run PHPUnit
mikechu-optimizely Apr 10, 2023
4270b27
[FSSDK-9022] Upgrade to minimum PHPUnit that outputs coverage for PHP8
mikechu-optimizely Apr 10, 2023
6960ced
Add composer.lock to repo
mikechu-optimizely May 17, 2023
cc552bf
Move Source Clear scan inside CI
mikechu-optimizely May 17, 2023
acb881d
Remove support for 8.0...
mikechu-optimizely May 17, 2023
647bb06
Fix php workflow to use master
mikechu-optimizely May 19, 2023
68562f7
Add missing property dec + refactors
mikechu-optimizely May 24, 2023
b2d8738
Add end of file line
mikechu-optimizely May 26, 2023
9b26123
Add missing Copyright years
mikechu-optimizely May 26, 2023
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
91 changes: 55 additions & 36 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,72 @@ on:

jobs:
linting:
name: Linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up PHP 7.0
uses: shivammathur/setup-php@v2
with:
php-version: '7.0'
- name: Install php code sniffer
run: composer require "squizlabs/php_codesniffer=*"
- name: Run linting
run: composer lint
- uses: actions/checkout@v3
- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
- name: Install php code sniffer
run: composer require "squizlabs/php_codesniffer=*"
- name: Run linting
run: composer lint

source_clear:
name: Source Clear Scan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Source clear scan
env:
SRCCLR_API_TOKEN: ${{ secrets.SRCCLR_API_TOKEN }}
run: curl -sSL https://download.sourceclear.com/ci.sh | bash -s – scan

integration_tests:
uses: optimizely/php-sdk/.github/workflows/integration_test.yml@uzair/test-with-fsc
name: Integration Tests
uses: optimizely/php-sdk/.github/workflows/integration_test.yml@master
secrets:
CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}

unit_tests:
name: Unit Tests ${{ matrix.php-versions }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: [ '5.5', '5.6', '7.0', '7.1', '7.2', '7.3' ]
php-versions: [ '8.1', '8.2' ]
steps:
- uses: actions/checkout@v3
- name: Set up PHP ${{ matrix.ruby }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install
- name: run tests
run: |
mkdir -p build/logs
./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
- name: Upload coverage results to Coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
composer global require php-coveralls/php-coveralls
php-coveralls --coverage_clover=build/logs/clover.xml -v
- uses: actions/checkout@v3
- name: Set up PHP v${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install
- name: Run tests
run: |
mkdir -p ./build/logs
./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
- name: Verify clover.xml created
run: |
if [ ! -f ./build/logs/clover.xml ]; then
echo "clover.xml was not created"
exit 1
fi
- name: Upload coverage results to Coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
composer global require php-coveralls/php-coveralls
php-coveralls --coverage_clover=./build/logs/clover.xml -v
16 changes: 0 additions & 16 deletions .github/workflows/source_clear_cron.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.idea/*
build/
vendor/
composer.lock
composer.phar
.phpunit.result.cache
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"beautify": "phpcbf"
},
"require": {
"php": ">=5.5",
"php": ">=8.1",
"justinrainbow/json-schema": "^1.6 || ^2.0 || ^4.0 || ^5.0",
"lastguest/murmurhash": "1.3.0",
"lastguest/murmurhash": "^1.3.0",
"guzzlehttp/guzzle": ">=6.2",
"monolog/monolog": ">=1.21"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
"php-coveralls/php-coveralls": "v2.3.0",
"squizlabs/php_codesniffer": "3.*",
"icecave/parity": "^1.0 || ^2.0"
"phpunit/phpunit": "^9.3",
"php-coveralls/php-coveralls": "v2.5.3",
"squizlabs/php_codesniffer": "3.7",
"icecave/parity": "^3.0.1"
},
"autoload": {
"psr-4": {
Expand Down
Loading