Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/composer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
attestations: write
steps:
- name: Check out the repo
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Log in to Docker Hub
uses: docker/login-action@v3
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Start docker containers
run: |
EP_VERSION=1.8.17 docker compose -f ./tests/e2e/docker/docker-compose.no_websocket.yml up -d --wait

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -82,15 +82,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Start docker containers
run: |
EP_VERSION=${{ matrix.versions.tag }} docker compose -f ./tests/e2e/docker/docker-compose.no_websocket.yml up -d --wait

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -123,15 +123,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Start docker containers
run: |
EP_VERSION=${{ matrix.versions.tag }} docker compose -f ./tests/e2e/docker/docker-compose.subpath.yml up -d --wait

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand All @@ -153,15 +153,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Start docker containers
run: |
EP_VERSION=1.9.7 docker compose -f ./tests/e2e/docker/docker-compose.reverse_proxy.yml up -d --wait

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand All @@ -183,12 +183,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone etherpad repository
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
repository: ether/etherpad-lite
path: etherpad
ref: 1.7.0
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: "8.9"
- uses: JarvusInnovations/background-action@v1
Expand All @@ -202,13 +202,13 @@ jobs:
working-directory: etherpad

- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
path: app

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand All @@ -231,13 +231,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone etherpad repository
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
repository: ether/etherpad-lite
path: etherpad
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: 20
node-version: 24
- uses: JarvusInnovations/background-action@v1
name: Start etherpad service
with:
Expand All @@ -253,13 +253,13 @@ jobs:
working-directory: etherpad

- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
path: app

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -290,11 +290,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -332,11 +332,11 @@ jobs:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -376,11 +376,11 @@ jobs:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
fail-fast: false
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
dependency-versions:
- "lowest"
- "highest"

steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Validate composer.json and composer.lock
run: composer validate --strict
Expand All @@ -42,3 +42,6 @@ jobs:

- name: Run PHPStan
run: vendor/bin/phpstan

- name: Run PHPUnit
run: vendor/bin/phpunit
4 changes: 2 additions & 2 deletions .github/workflows/test-file-hashes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
composer.phar
.phpunit.cache/

.idea/
vendor/
vendor/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-cli AS php-cli
FROM php:8.5-cli AS php-cli
WORKDIR /app

COPY --from=composer/composer:2-bin /composer /usr/bin/composer
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can try this tool out on the https://scanner.etherpad.org which is using thi

## Requirements

You need PHP 8.2 or higher to run this tool.
You need PHP 8.3 or higher to run this tool.

## Usage

Expand Down
10 changes: 8 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@
"Gared\\EtherScan\\": "src/"
}
},
"autoload-dev": {
"psr-4" : {
"Gared\\EtherScan\\Tests\\": "tests/"
}
},
"require": {
"php": ">=8.2",
"php": ">=8.3",
"ext-json": "*",
"guzzlehttp/guzzle": "^7.8",
"symfony/console": "^6.4|^7.0",
"elephantio/elephant.io": "^5.1"
},
"require-dev": {
"phpstan/phpstan": "^2.0"
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^12.5"
}
}
Loading