Skip to content
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

[pull] master from acmephp:master #5

Open
wants to merge 127 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
ee2119e
Cpanel certificate installation action
webii Sep 30, 2021
2299602
Update README.md
tgalopin Jan 5, 2022
7621356
Fix tests on PHP 8.0/8.1
Grendel7 Dec 1, 2021
22df0d1
feature #250 Fix tests on PHP 8.0/8.1 (HansAdema)
tgalopin May 31, 2022
2755d98
Add PHP 8.1 tests and fix deprecations
tgalopin May 31, 2022
2cfc866
Allow Symfony 6
tgalopin May 31, 2022
e23b888
Merge pull request #261 from acmephp/php81
tgalopin May 31, 2022
043fd6c
Allow Monolog version 2
tbickley-mediabowl Mar 10, 2021
c7fb74e
Merge pull request #233 from tbickley-mediabowl/issue/197_Monolog2
tgalopin May 31, 2022
d685b93
Fix badges in README
W0rma Jan 1, 2022
2ae3edf
Upgrade PHP-CS-Fixer
tgalopin May 31, 2022
182d539
Fix CS
tgalopin May 31, 2022
74b71f5
Merge pull request #254 from W0rma/fix-badges
tgalopin May 31, 2022
03d14b3
Remove unused swiftmailer dependency
W0rma Jan 1, 2022
8be2586
Merge pull request #262 from acmephp/upgrade-phpcs
tgalopin May 31, 2022
d345ffe
Allow for newer dependencies and fix a couple of issues in AcmePhp\Core.
mgriego Feb 24, 2022
09e4bea
Serialize embedded authorization challenges when serializing order ob…
mgriego Mar 10, 2022
371c905
Merge pull request #251 from W0rma/remove-swiftmailer
tgalopin May 31, 2022
7bac887
Merge pull request #257 from mgriego/core-deps-and-bug-fixes
tgalopin May 31, 2022
95c17a4
Add Core\AcmeClient::reloadOrder method
Grendel7 Dec 1, 2021
8a8a975
Merge pull request #263 from acmephp/core-get-order
tgalopin May 31, 2022
192a15c
Release of new version 2.1.0
tgalopin Jun 7, 2022
7e3ca0e
Merge pull request #245 from webii/feat/cpanel-installation
Blackbam Jun 10, 2023
112f660
Accept Json when expected
duobradovic Dec 15, 2023
bdac48f
Merge pull request #274 from duobradovic/Accept-Json-when-expected
Blackbam Dec 15, 2023
cb1a237
fix: allow psr/http-message v2
SamMousa Mar 15, 2024
2f0afa6
Merge pull request #275 from acmephp/fix-allow-psr-http-message-2
Blackbam Mar 15, 2024
16c2e03
Revert "fix: allow psr/http-message v2"
Blackbam Mar 15, 2024
e959a5e
Merge pull request #276 from acmephp/revert-275-fix-allow-psr-http-me…
Blackbam Mar 15, 2024
aa4e614
Add Tests\AcmePhp\Core\AcmeClientTest::testRequestAuthorizationAllows…
uphlewis Apr 12, 2024
9cd8f00
#280 Set domain name strings to lowercase in AcmeClient::requestOrder…
uphlewis Apr 12, 2024
b5ce7ec
Merge pull request #281 from uphlewis/master
Blackbam Apr 14, 2024
c47222e
Chain previous into re-thrown exceptions
uphlewis Apr 15, 2024
411a58d
Merge pull request #282 from uphlewis/master
Blackbam Apr 15, 2024
54df0f8
Fix CHANGELOG.md
lyrixx Aug 14, 2024
3281eb1
Remove '.rmt.yml'
lyrixx Aug 14, 2024
1e47624
Merge pull request #287 from lyrixx/changelog
Blackbam Aug 14, 2024
9ec2ae2
Make more robust setup.sh
lyrixx Aug 14, 2024
c1bc9e4
Make more robust test.sh
lyrixx Aug 14, 2024
f8b3293
Drop support for outdated version (SF, PHP) and fix tests
lyrixx Aug 14, 2024
6402759
Merge pull request #288 from lyrixx/drop-deprecated-version
Blackbam Aug 14, 2024
c791c3c
Update PHP-CS-Fixer to 3.62.0 and run it
lyrixx Aug 14, 2024
d3800f1
Sync all version in composer.json + update some lowest constrainsts
lyrixx Aug 14, 2024
bcf82e0
Merge pull request #290 from lyrixx/cs
Blackbam Aug 14, 2024
6300a08
Merge pull request #289 from lyrixx/fix-ci
Blackbam Aug 14, 2024
9db6e99
Update to flysystem v3
lyrixx Aug 14, 2024
a415227
Merge pull request #291 from lyrixx/flysistem-v3
Blackbam Aug 14, 2024
338b086
fix: update self-update command and phar generation config
SamMousa Mar 18, 2024
5c1c794
chore: fix cs
SamMousa Aug 14, 2024
9ab7e1b
Setup PHPStan
lyrixx Aug 14, 2024
ef358f1
Drop support for lcobucci/jwt < 4.1 + Add support for ^5.3
lyrixx Aug 14, 2024
0e659d4
fix: allow application to run without a git version set
SamMousa Aug 14, 2024
0c7b448
update monolog and psr/log
lyrixx Aug 14, 2024
bef542f
update guzzlehttp/psr7 to ^2.4.5
lyrixx Aug 14, 2024
cf7113d
Restore missing tests with PEBBLE_MODE=EAB
lyrixx Aug 14, 2024
a043367
Replace deprected webmozart/path-util with symfony/filesystem
W0rma Jan 1, 2022
f75cb60
chore(cs): manually fix cs issues
SamMousa Aug 15, 2024
8ac1a5b
chore: drop old php
SamMousa Aug 15, 2024
701f901
fix: remove rancher 1 push action
SamMousa Aug 15, 2024
f7505d1
chore: remove old php versions from ci
SamMousa Aug 15, 2024
90870e6
chore: clean changelog
SamMousa Aug 15, 2024
1deb706
chore: clean changelog correctly
SamMousa Aug 15, 2024
72a14de
Merge pull request #277 from acmephp/feat-update-self-updater
Blackbam Aug 15, 2024
45071b7
Merge pull request #292 from lyrixx/phpstan
Blackbam Aug 15, 2024
b342e0f
Merge pull request #252 from W0rma/path-util
SamMousa Aug 15, 2024
b77609a
chore: fix phpstan issues
SamMousa Aug 15, 2024
e38b4dd
chore(cs): fix cs
SamMousa Aug 15, 2024
3a138db
Merge pull request #302 from acmephp/fix-sa
SamMousa Aug 15, 2024
715d2dc
chore: merge branch 'master' into drop-php8.2
SamMousa Aug 15, 2024
554c024
Merge pull request #299 from acmephp/drop-php8.2
SamMousa Aug 15, 2024
160a613
Merge pull request #300 from acmephp/drop-rancher-action
SamMousa Aug 15, 2024
760f647
Merge pull request #297 from lyrixx/matrix-PEBBLE-MODE-eab
SamMousa Aug 15, 2024
4131ca1
chore: Merge branch 'master' into up-guzzlehttp-psr7
SamMousa Aug 15, 2024
ebf5df0
chore: dont use (string) cast if it can be avoided
SamMousa Aug 15, 2024
2ba32c9
chore(ci): use php 8.3 in test
SamMousa Aug 15, 2024
c6f54fb
Merge pull request #295 from lyrixx/up-guzzlehttp-psr7
SamMousa Aug 15, 2024
8c07ae9
Merge pull request #303 from acmephp/remove-ci-runs
SamMousa Aug 15, 2024
7942d90
chore: Merge branch 'master' into up-lcobucci-jwt
SamMousa Aug 15, 2024
632f747
fix: update to lcobucci/jwt ^5.3
SamMousa Aug 15, 2024
c33854f
Merge branch 'master' into up-lcobucci-jwt
SamMousa Aug 15, 2024
52564bb
chore(sa): regenerate baseline
SamMousa Aug 15, 2024
c4af5ac
Merge pull request #293 from lyrixx/up-lcobucci-jwt
SamMousa Aug 15, 2024
05caee7
merge: Merge branch 'master' into up-log
SamMousa Aug 15, 2024
1e29315
fix: also drop monolog 2 for better typing
SamMousa Aug 15, 2024
86a5615
fix: log level coloring using LogRecord checks
SamMousa Aug 15, 2024
507a60e
chore(cs): manually fix cs
SamMousa Aug 15, 2024
d5bda73
chore(cs): remove unused import
SamMousa Aug 15, 2024
cc72046
chore(cs): remove unused import
SamMousa Aug 15, 2024
32c2e96
feat: build docker container on every push to master and during tests
SamMousa Aug 15, 2024
3547c1f
fix: manually tag during ci so we can build the phar
SamMousa Aug 15, 2024
18b5cf5
chore: test the docker container after building it
SamMousa Aug 15, 2024
2efd925
chore: run container without tty
SamMousa Aug 15, 2024
a2b798b
chore: use fixed tag name
SamMousa Aug 15, 2024
cd3cce8
chore: use buildx load
SamMousa Aug 15, 2024
f41b7c6
chore: use git tag with valid number
SamMousa Aug 15, 2024
073a696
Merge pull request #305 from acmephp/feat-build-docker
SamMousa Aug 15, 2024
e4adb44
chore: try full checkout instead of manual tag
SamMousa Aug 15, 2024
bb0a1c6
Merge pull request #306 from acmephp/feat-build-docker
SamMousa Aug 15, 2024
74b4e47
fix(ci): dont run with tty
SamMousa Aug 15, 2024
2a78719
Merge pull request #307 from acmephp/feat-build-docker
SamMousa Aug 15, 2024
e3d4560
Rewrite Gandi soulver to support wildcard domains
aik099 Jan 10, 2023
6e0f24d
chore(ci): upload phar file artifact for testing
SamMousa Aug 16, 2024
88adf0a
chore(ci): put link in comment
SamMousa Aug 16, 2024
2c15112
chore(ci): clean up fix output name
SamMousa Aug 16, 2024
e5066b8
Merge pull request #309 from acmephp/phar-build-artifact
SamMousa Aug 16, 2024
949edf7
Merge pull request #268 from aik099/gandi-wildcard-domain-fix
Blackbam Aug 16, 2024
e0ad464
Merge pull request #296 from lyrixx/up-log
Blackbam Aug 16, 2024
7f4e640
Fix serializer
lyrixx Aug 21, 2024
97499df
Merge pull request #312 from lyrixx/fix-serializer
SamMousa Aug 21, 2024
c8f3198
Relax constraint on psr/http-message and psr/container
lyrixx Aug 21, 2024
e63ef39
Fixed type hinting
lyrixx Aug 21, 2024
423fe2f
chore(ci): allow pr comment from fork prs
SamMousa Aug 21, 2024
3f30579
Merge pull request #316 from acmephp/fix-ci-phar
SamMousa Aug 21, 2024
9c9fefc
Merge pull request #315 from lyrixx/fix-typo
SamMousa Aug 21, 2024
338f53a
Add support for symfony ^7.1
lyrixx Aug 21, 2024
0760101
Merge pull request #313 from lyrixx/up
SamMousa Aug 21, 2024
1cde9fd
Merge branch 'master' into up-symfony
SamMousa Aug 21, 2024
732d243
Merge pull request #314 from lyrixx/up-symfony
SamMousa Aug 21, 2024
26e64e5
Update the badge
stof Aug 21, 2024
69f210b
Sync all composer.json
lyrixx Aug 21, 2024
15a10ca
Merge pull request #317 from stof/patch-1
SamMousa Aug 21, 2024
68a052c
Merge pull request #318 from lyrixx/up
SamMousa Aug 21, 2024
d8b27b1
Reword a bit the changelog
lyrixx Aug 22, 2024
12aee9c
Merge pull request #320 from lyrixx/changelog
Blackbam Aug 26, 2024
70f3256
Add support for consolidation/self-update ^2.2 || ^3
lyrixx Nov 13, 2024
c352199
Lock phpstan/phpdoc-parser to v1 in test
lyrixx Nov 13, 2024
b7f4e70
Merge pull request #324 from lyrixx/consolidation-self-update
Blackbam Nov 15, 2024
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
42 changes: 42 additions & 0 deletions .github/workflows/build-docker-master.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Continuous integration (release)
on:
push:
branches:
- master
jobs:
build_container:
name: Build container
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
tools: box
- uses: ramsey/composer-install@v3
- name: Build PHAR
run: box compile
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/[email protected]
with:
context: build/
file: Dockerfile
push: true
load: true
tags: "ghcr.io/${{ github.repository }}/acmephp:master-${{ github.sha }}"
- name: Confirm that we can run ACME php via docker
run: docker run --rm ghcr.io/${{ github.repository }}/acmephp:master-${{ github.sha }}
permissions:
packages: write
contents: read
32 changes: 32 additions & 0 deletions .github/workflows/pr-phar.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Create phar
on:
pull_request_target:
jobs:
create_phar:
name: Create phar
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
tools: box
- uses: ramsey/composer-install@v3
- name: Build PHAR
run: box compile
- uses: actions/upload-artifact@v4
id: artifact-upload
with:
name: amcephp.phar
path: build/acmephp.phar
if-no-files-found: error
overwrite: true
- uses: mshick/add-pr-comment@v2
with:
message: |
We have created a phar file for testing, find it here: ${{ steps.artifact-upload.outputs.artifact-url }}
117 changes: 83 additions & 34 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,59 +8,108 @@ on:

jobs:
php-cs:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
php-version: '8.3'

- uses: actions/checkout@master
- name: php-cs-fixer
run: |
wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -q
php php-cs-fixer.phar fix --dry-run --diff

tests-php72-deps-low-pebble-default:
- name: Install php-cs-fixer
run: wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.62.0/php-cs-fixer.phar -q

- name: Check coding style
run: php php-cs-fixer.phar fix --dry-run --diff

test_docker_build:
name: Build container
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
tools: box
- uses: ramsey/composer-install@v3
- name: Build PHAR
run: box compile
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/[email protected]
with:
context: build/
file: Dockerfile
push: false
load: true
tags: ghcr.io/${{ github.repository }}/acmephp:master-${{ github.sha }}
- name: Confirm that we can run ACME php via docker
run: docker run --rm ghcr.io/${{ github.repository }}/acmephp:master-${{ github.sha }}
phpstan:
name: PHPStan
runs-on: ubuntu-latest
steps:
- uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
- uses: actions/checkout@master
- name: Install dependencies
php-version: '8.3'

- uses: actions/checkout@v4

- name: Install Composer dependencies
run: |
composer require --dev "sebastian/comparator:^2.0"
composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable
- name: Preparing tests
run: ./tests/setup.sh
- name: Running tests
run: ./tests/run.sh
composer update --prefer-dist --no-interaction

tests-php73-deps-lock-pebble-default:
runs-on: ubuntu-latest
steps:
- uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
- uses: actions/checkout@master
- name: Install dependencies
run: composer install
- name: Preparing tests
run: ./tests/setup.sh
- name: Running tests
run: ./tests/run.sh
- name: Run PHPStan
run: vendor/bin/phpstan analyse

tests-php74-deps-high-pebble-eab:
ci:
name: Test PHP ${{ matrix.php-version }} ${{ matrix.pebble_mode }} ${{ matrix.name }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-version: ["8.3"]
composer-flags: [""]
name: [""]
pebble_mode: [""]
include:
- php-version: 8.3
composer-flags: "--prefer-lowest"
name: "(prefer lowest dependencies)"
- php-version: 8.3
composer-flags: "--prefer-lowest"
name: "(prefer lowest dependencies - EAB)"
pebble_mode: eab
- php-version: 8.3
name: "(EAB)"
pebble_mode: eab
env:
PEBBLE_MODE: eab
PEBBLE_MODE: "${{ matrix.pebble_mode }}"

steps:
- uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
- uses: actions/checkout@master
- name: Install dependencies
run: composer update --no-interaction --no-progress --ansi --prefer-stable
php-version: ${{ matrix.php-version }}

- uses: actions/checkout@v4

- name: Install Composer dependencies
run: |
composer update --prefer-dist --no-interaction ${{ matrix.composer-flags }}

- name: Preparing tests
run: ./tests/setup.sh

- name: Running tests
run: ./tests/run.sh
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/box.json
composer.lock
vendor/
.php_cs.cache
.php-cs-fixer.cache
doc/.couscous
.subsplit
.phpunit.result.cache
26 changes: 26 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

$header = <<<'EOF'
This file is part of the Acme PHP project.

(c) Titouan Galopin <[email protected]>

For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
EOF;

$finder = PhpCsFixer\Finder::create()
->in(__DIR__.'/bin')
->in(__DIR__.'/src')
->in(__DIR__.'/tests')
;

return (new PhpCsFixer\Config())
->setFinder($finder)
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'phpdoc_annotation_without_dot' => false,
'header_comment' => ['header' => $header],
])
;
40 changes: 0 additions & 40 deletions .php_cs

This file was deleted.

23 changes: 0 additions & 23 deletions .rmt.yml

This file was deleted.

Loading