Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
1b6a4aa
Add first run of replacing Travis CI
nathangavin Feb 20, 2025
75060e4
Add composer update
nathangavin Feb 20, 2025
ef546ed
Clone config file and update environment
nathangavin Feb 20, 2025
41178cc
set up apache and php-fpm
nathangavin Feb 20, 2025
d5936dd
Replace obselete package
nathangavin Feb 20, 2025
4ce5eaf
Add name to step
nathangavin Feb 23, 2025
dc7538a
Replace method of retrieving php version
nathangavin Feb 24, 2025
6cb0846
Test env
nathangavin Feb 24, 2025
01bda5c
Test env
nathangavin Feb 24, 2025
50ae579
Updated with new env structure
nathangavin Feb 24, 2025
1c119c8
Test env
nathangavin Feb 24, 2025
4afa1d4
Test env
nathangavin Feb 24, 2025
d9a1068
Test env
nathangavin Feb 24, 2025
becd4e7
Test env
nathangavin Feb 24, 2025
b0c8000
remove default file config step
nathangavin Feb 24, 2025
6f2a167
remove test
nathangavin Feb 24, 2025
34f2361
add print debugging
nathangavin Feb 24, 2025
2fd344a
replace fastcgi with fcgid
nathangavin Feb 24, 2025
ac71c40
Fix test bug regarding URL path
nathangavin Feb 25, 2025
b80404a
Add print log to track URL
nathangavin Feb 25, 2025
4e729a8
Get PHPUnit version
nathangavin Feb 25, 2025
011b2cf
Update PHPUnit
nathangavin Feb 25, 2025
b1833d9
Add composer update flag
nathangavin Feb 25, 2025
5f9a83d
Revert phpunit change
nathangavin Feb 25, 2025
a1da689
Move apache restart
nathangavin Feb 25, 2025
b5b5f8e
See apache status
nathangavin Feb 25, 2025
face190
Add apache config
nathangavin Feb 25, 2025
94524f2
add pwd
nathangavin Feb 25, 2025
c27620e
ad pwd to travis
nathangavin Feb 25, 2025
d612a3c
only 5.6
nathangavin Feb 25, 2025
16af201
show error logs
nathangavin Feb 25, 2025
6acb270
add fastcgi back
nathangavin Feb 25, 2025
05e4355
add fastcgi back
nathangavin Feb 25, 2025
1003d99
replace everything
nathangavin Feb 25, 2025
c80e1e1
fix port
nathangavin Feb 25, 2025
078f261
fix path
nathangavin Feb 25, 2025
110cc12
github workspace
nathangavin Feb 25, 2025
d211d89
8080
nathangavin Feb 25, 2025
239ce11
8080 2
nathangavin Feb 25, 2025
679ceaf
remove ipv6 stuff
nathangavin Feb 25, 2025
e4456fb
added PHP versions
nathangavin Feb 25, 2025
ac22a49
remove var_dump
nathangavin Feb 25, 2025
de01d56
Fix broken test
nathangavin Feb 25, 2025
a8cbe38
removed some travis CI references
nathangavin Feb 25, 2025
035304a
fix broken test
nathangavin Feb 25, 2025
3c162c7
remove travis CI files
nathangavin Feb 25, 2025
4296df8
added PHP versions and phpcs
nathangavin Feb 26, 2025
ee4c47f
remove old php versions
nathangavin Feb 26, 2025
b9a120e
update composer version to greater than 7.2
nathangavin Feb 26, 2025
664b274
added needed command
nathangavin Feb 26, 2025
8f3a64d
add phpcs to composer
nathangavin Feb 26, 2025
8c7fd3c
add matomo styling dependency
nathangavin Feb 26, 2025
4d209a7
add required repo
nathangavin Feb 26, 2025
6db4123
add composer rule for allow plugins
nathangavin Feb 26, 2025
47f8027
exclude test file from PHPCS
nathangavin Feb 26, 2025
1b62268
Fix PHPCS
nathangavin Feb 26, 2025
a7e902e
fix PHPCS and exclude test files
nathangavin Feb 26, 2025
760662e
fix PHPCS
nathangavin Feb 26, 2025
91434d8
fix phpcs
nathangavin Feb 26, 2025
4583009
made minor changes, moved phpcs to separate action
nathangavin Feb 26, 2025
43f0c9f
fix phpcs action
nathangavin Feb 26, 2025
54877de
testing
nathangavin Feb 26, 2025
4982034
update client code to new version
nathangavin Feb 26, 2025
bcc92dc
test
nathangavin Feb 26, 2025
c0eff85
test
nathangavin Feb 26, 2025
b222836
test
nathangavin Feb 26, 2025
31d188e
updating tests
nathangavin Feb 26, 2025
18d719c
fix test bug
nathangavin Feb 27, 2025
9f9aa69
update tests
nathangavin Feb 27, 2025
7e84d4c
test config file
nathangavin Feb 27, 2025
75de0f9
testing theory
nathangavin Feb 27, 2025
8c71d7e
test
nathangavin Feb 27, 2025
f1a0cad
testing
nathangavin Feb 27, 2025
97b781e
fix config path
nathangavin Feb 27, 2025
8db5b15
update path
nathangavin Feb 27, 2025
5ff488a
revert path
nathangavin Feb 27, 2025
2471f15
update to new guzzle code
nathangavin Feb 27, 2025
6f5e046
Change assertion for file assertion
caddoo Feb 27, 2025
0942d6a
Change tests to not expect exceptions
caddoo Feb 27, 2025
7b77b90
Remove Vagrantfile
caddoo Feb 27, 2025
845dc47
Try run on PHP server
caddoo Feb 27, 2025
8ce8c31
Revert "Try run on PHP server"
caddoo Feb 27, 2025
d0b6979
Pin action to specific commit
caddoo Feb 27, 2025
7e729a9
remove test
nathangavin Feb 27, 2025
53971f8
fix phpunit version requirement
sgiehl Feb 27, 2025
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
9 changes: 9 additions & 0 deletions .github/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

$MATOMO_URL = 'http://localhost:8080/tests/server/';

$PROXY_URL = 'http://proxy:8080/';

$TOKEN_AUTH = 'xyz';

$timeout = 5;
35 changes: 35 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: PHPUnit

on: pull_request

permissions:
contents: read

jobs:
build:
name: PHPUnit
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['7.2','7.3','7.4','8.0','8.1','8.4']
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
- name: Update package lists
run: sudo apt-get update
Comment on lines +22 to +23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this required for any specific reason? Just wondering if we could safe the time if it's not needed.

- name: Setup Apache
uses: thunder/apache-shiva-php-action@81bccd449b62dcf7dae2b33a21749fceeb2401e8
with:
php-version: '${{ matrix.php-version }}'
site-directory: ${{ github.workspace }}
http-port: 8080
- name: Copy config file
run: cp .github/config.php config.php
- name: Composer install
run: composer install
- name: PHPUnit / PHP ${{ matrix.php-version }}
run: composer test
38 changes: 38 additions & 0 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: PHPCS

on: pull_request

permissions:
actions: read
checks: read
contents: read
deployments: none
issues: read
packages: none
pull-requests: read
repository-projects: none
security-events: none
statuses: read

jobs:
phpcs:
name: PHPCS
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: false
persist-credentials: false
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
tools: cs2pr
- name: Install dependencies
run: composer install
- name: Check PHP code styles
id: phpcs
run: ./vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
- name: Show PHPCS results in PR
if: ${{ always() && steps.phpcs.outcome == 'failure' }}
run: cs2pr ./phpcs-report.xml
36 changes: 0 additions & 36 deletions .travis.yml

This file was deleted.

12 changes: 0 additions & 12 deletions Vagrantfile

This file was deleted.

18 changes: 15 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,30 @@
"homepage": "https://matomo.org/team/"
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/matomo-org/matomo-coding-standards.git"
}
],
"require": {
"php": ">=7.2"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36",
"guzzlehttp/guzzle": "^5.0"
"phpunit/phpunit": "^8.5 || ^9.3 || ^10.1",
"matomo-org/matomo-coding-standards": "dev-master",
"guzzlehttp/guzzle": "^6.5",
"squizlabs/php_codesniffer": "^3.9"
},
"scripts": {
"test": [
"phpunit tests/"
]
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
Loading