Skip to content
Merged
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
24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@ jobs:
- php: "8.3"
alpine: "3.20"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "fpm"
steps:
- uses: actions/checkout@v2
- run: ./build-php.sh ${{ matrix.type }} ${{ matrix.php }} ${{ matrix.alpine }}
Expand Down Expand Up @@ -336,6 +342,12 @@ jobs:
- php: "8.3"
alpine: "3.20"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "fpm"
steps:
- uses: actions/checkout@v2
- name: Install clair-scanner
Expand Down Expand Up @@ -494,6 +506,12 @@ jobs:
- php: "8.3"
alpine: "3.20"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "fpm"
steps:
- uses: actions/checkout@v2
- name: Download Images
Expand Down Expand Up @@ -716,6 +734,12 @@ jobs:
- php: "8.3"
alpine: "3.20"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "cli"
- php: "8.4"
alpine: "3.22"
type: "fpm"
steps:
- uses: actions/checkout@v2
- name: Download Images
Expand Down
78 changes: 78 additions & 0 deletions src/gpg/0616E93D95AF471243E26761770426E17EBBB3DD.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

xsFNBGZLNvEBEADLRJ//ovPDl1oL8OUdCevYx12mazjaxcimm2ei5WxRxYlB1LSj
jFzWrzvSlwq8WXoxjyb7lLw+VHSXokO88Jx3zAUpepZNT2wQ3/YTGw4i6wq2uyyP
sgVPELe9qr0Y8mROPf2CHsDfEaFzoXYZZ31ucXzP7N1bIH0uvH3THYOMAQ3Ag637
py8exU5lehs9m8mLv0pQIDsWJUCsXsjiDptI0/8qRaBbuP10bo8gJlxCH+7UQI+A
dac0drMgbIWqfsVhm64nbvOIwxMz+wliNztXlkw1anmK5Q9ceUrpkkjiFuEvstyy
Blwqpr8a4sOfT7wxjs/2wg7IdJvcQZFVbVRw+WVZ3eVgSkoqoCGd2KrbaQjktCih
kmSxd6gTCJYUOVUl/Nxrz35AW7kIOUICsYrd6Zh7Xr+jyjfVcGs55bbxzl5QCsPc
DtHXdOQ2oAVC3zqkjWDDloFdGHIVW5W7flc9jvfg7otmmSlsCTABc97JCoOdlDoR
tp4wLg50RZXfQJ8FNpqebyFhFmGO4AGkbYuycGiupVq5rfdWM46V7K0yWftSZSKF
HiD+B2hq3docuk+o4g2AdZV0eEH3/UKRz0L1p5VCWk/yU+oF+tzDrhCwfGSy8PQL
4zfnkfttSFMmrlrgohyAF5QvBYZt99MWO1Hr8O2hPOkcZ6CLgsvrMaD2mQARAQAB
zStTYWtpIFRha2FtYWNoaSAoZm9yIHBocC5uZXQpIDxzYWtpQHBocC5uZXQ+wsGO
BBMBCAA4FiEEBhbpPZWvRxJD4mdhdwQm4X67s90FAmZLNvECGwMFCwkIBwIGFQoJ
CAsCBBYCAwECHgECF4AACgkQdwQm4X67s90g4Q/6A8hovyPm0qUadEJzXEWVLdLB
qwHf5Aagxu8TEQUhn7ku/VKWfx8UBaI/5hTpPEC+LexkeweaK3xjs6DeIyFeeY87
ZpujZ8U2pS1DgrYNH11lRPcJM9sh5X5p0EnsHZMAIAqNq+k5bv0jYNNKduf5v44C
ls1mg+I5CBhpgeZGRE+QLxRGb3YoQC3HwRnXHCYNsQNYbRhYgsUwfwxoHiGpM1Ej
eeX37mVhETDnJNnxKf/7r0nAVcQZqz1okJyhNBpM1Y/NgCxuTyG222TZmJOYuNby
ZIT2ZG6z0IbQZbst4rhWmJk1oEA8EV5chMMOwP0eUuKWBHqT/QCmrX9JyWKeTm7X
Jb1LBi416esrTNKicrPnhZopTkEEHFc60RvchO8XlZYepisiJprUjW2T2KY+FbKw
wQOFDQk99dVwYocd4CzzkdG/dKeda+Dj6oz/lIniEtPQREC/rZGlQNw+czkHhvk1
Vu49BrYMY+AfnJ3QZqQr5xAQaVehnpcxaUPM23pOmLiFm0lrtuU32yIXeCy+UEX+
0k2f6iODlr+3792cbpMcH7Bk0YNOm8b9SNYvqVPrunFGttg04TtnTMFpDaN3i8GW
oMXj+NmrFnQLBy/dpc3YvRD/hqtRXDwRXTNoIaCg1vttFWV4F86XHs0p5xoKeUfH
oHlV1320gZCBn8dm+a7CdQQQFgoAHRYhBJ1/maDLjwXIppWNYlapevdgCjmmBQJm
TKVDAAoJEFapevdgCjmmdHsA/1auMpX7Ubc1NKGTPjxlgTDG7D0EaE8oZII9jrIO
U9WzAQD1/Q+Y/8WbKnFTrZ35qI/x3bfRfQ00eV9C2BBEx48oB8LBcwQQAQgAHRYh
BK/YaR/a7fA7325GBWPxWptxU3bKBQJmTKm7AAoJEGPxWptxU3bKpbkQAOnrhV+9
5ZA734y0G4n1HRkQm9PuGjg6QnOQVRtLt8JwBlEquttQjCQcyui2gifpAAIuUFR3
GVMN7d9AblSn/0eVwIGIfFWhUi3eoZVQTu/30cHYPRjHIyN76oXSxcW/XE+9c0M5
f5c6Zuf8QiHpGPQCIt5ULeSWL4pepC2X3asHnqrc88ZtQerOX36xH+gD0hNGxe1R
NbifbxQaxVh66vwxpQ4SrNVAV8iGUKoYx0psAt9A754LQiYFvVsPWzfTn+jup+tw
vQQjf//3dhi8lIFqWIPCvVTyD8v6p69WkkveIoon5IYPDoWPkSKiTZXXor/gYknt
aFNLtzUWdaZ3B4CjPAH1834xERnf7IMY42q+ZpjecxcODVRTBvh9ivZuGacFaeBP
k728PwjEsvxWSwfsXGGAwATSd/flscWTQ9nqUQpdSP5kQSzZFkHzJ3Le85oI2ixq
XwzrxTnlOXtomxkF5b6CT62ptlXmsoGqjBoi0D95SeQSP2J+7Lad14X8VZwiNhuW
RMdQHkb5ej+DMvQYRV5bsKctwRvUZoJL/+ua7GqtpWrwNh9mdlTr2bMbNzYcT5sr
RtKGOR56P4rjTe64Po9NH/Q7Ofnvp5sOPqWDVzPz3cFyOp6uS5xfDP3CTAfkX9Q4
zoDVC3dGlF8KGielQKGL0EMSLxb6SDI3oggowsFzBBABCAAdFiEE5gkT5N8gmQfY
4w2WZZqXyc8qeVoFAmZf/+4ACgkQZZqXyc8qeVrLHQ//SSZzpLumVGKbyRSsA6d+
VXFjv/+GXml780SXyWYvk1xGp/Qc4RSsB4BWO0Ukz1tkQaHN8j0UcKCKB+5JJfzq
MHl6XRBpgfNQQH9+r0HeEvabAr57xXio54hsEpXrExfDSCUQVbU0A0om+E3y2FAu
eM/5JQEeVr5875/zrcUwhM1/LFte3DSchWOPVXxPF6xDz7lPdthl2/pDRJrh1v6w
XZM8ME7JmVlwbflP15JS3Nvu2hqY+rQeNsfcYfOlmeCN81iWx4Eu5YKBaNr9p8Fp
yScKVAYVhM+N69wWVX6JmelhtdmgIOK9TqLvpHDEUuMywFD6CZrHW6yqeHcYhpsq
2vuXinJ2NFUENowCeMpKihhwkCXNRY33xzOsGthiTfZJ1P4g5npzdjge7UO104NK
kt5T5gMQdcFNCF79FpPeKfAV1Dj8n4zQUkUlcGIryX4bEdHmII9ecEAbk8F7hqye
Pa+PHCVsIAu/03fCRrHbho0SkonzNwtepSPLC4JrSgwPK0PQDsK7AiC5jWNjqfxS
TNq8qMgoRKTodCCOMCRxpPE5Jk9eCYhSRbA2cLId6Zfa4trccJrX0igZHBXUOjrS
342LXOMr5umVAKA+/vwz0yUIGaQ9lIDXf6jbNfWo7E/nc4j7asHlzSJqkQYY+sDf
92rhVbFTrqloRB7A6A6Lc6/OwU0EZks28QEQANZ9UNHdyJJSGTqjLIPQQET+E11N
mpwbsLjLiQMFKZEmL0VPtqjh2qtLeKGSD9BQQNLHfEU48M3GiUNqH21UDWh6ObDC
GE2uPvL3U/C8w+2F4IABv8WD8FVaZkREX9MoRiPVd1HOEAOYsgP9Qwv60jVM+RED
Snk/0lUfbcvt/JIxNYoRnBLR2LEG2WV0GNnBFpkJ5+KzR/cdtZEoxodNJvE2QOeN
2BM7Rj4LTtwxh6sCI2Xd60Si7nNtHSn/C/1/+KA2igH/w1+buS3pJXkhtH+Z6/8k
BdUz7GgfIzRBfnJ78+H9PFjIPPa0/waRsaS1Sgk9FLNFXMrmjzg8v67qmhjgMrdP
cVGkW0S2WvK3pY1FiYf0iMlfW4kKwPJAKNM3x+x35Bsf2a6tIAQkZOjcidJppenA
X3tl9T0vpuCO4eaEKnP2Dyxgnpm8+Um9kwhapjhU0tJVx//vMzqovb6dG5zSiG1X
Zt5k0YpJMVEuuYpuwTnJCBkZz8nzb7+JQ12he0IT2mPsXgMlq2Ddj9OnuoCZpeM/
YkjxOGwVZfNvEJUUhbcH6Vu5gPnG3+5tXbwWnC1jeA45pKkq4BHYQnoBW03OAcav
KxUWud8Xh5E4FNAWJQ2VyrI1Bl1raXL7mvbDxRXMLGyaz2KDRRoKtpYCvjoBr6az
fIR1yjDTheJpAHGxABEBAAHCwXYEGAEIACAWIQQGFuk9la9HEkPiZ2F3BCbhfruz
3QUCZks28QIbDAAKCRB3BCbhfruz3b8ND/4mPooynDsIAXQ2ygvAXC/zpIKm1fc9
f81Ju3hC99vMBdTHjMD4miBxRrlUZNAWqpzORMJqMZFQy0BHvwphKDtRyhE+PPu9
pQHqcOe9weiCKu+MCTrlS0hUuzg7RBrzzOrf2GuQYS8SbHBqb1CrWQFnOJ0L5tGH
d0sRq7KPY9P3Wy9OPX1JX8eo637LgxKbWC5i4spd4qRpXYU1xaeoG8s353O8oTdN
CfHqxKI2G3lu3J9ojMNUxRbi0ATS3VOXGkLkhyvtDeXDwe+N+9cTRwMc8QEEYvBh
L9+B1NUMzRfC3GSQ+e9oDBVrvtEYs4pY+H56ETm56Dl2j8uiyCGHSsjjL48lDc1p
QXnlG9aQn/zANQFG6PdMsYYV+qN+Ktp3sd6a3LN83UaeGxfaOn3A+SsShQenAGKU
mGWiDNMJdeCrLwXvSFJO+qEFMrkEFnKb1lPCLkGer/5oM/KLyLZDzOy3+3/Wl0B0
nFZIlNw5VZB9OUC4PcR7ZPsFhb5QIxpQrq3o6g1eQXrxTrZVJzk/0K3Lm+U29jbm
GgQT4S31gnxwzXNKEkVFnMlCnAFHA3XR8l3W2tswMbPSSogcNS3GPro6LL3ImaCV
xmrI/w1QgGZrxP53PNSyH0MxH1kVTqTcxnGJL6BUt/pTdScHstABscsNO/h9K2rf
sNinuiQPA0QDZA==
=LArl
-----END PGP PUBLIC KEY BLOCK-----
37 changes: 37 additions & 0 deletions src/gpg/9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

xjMEZiANXBYJKwYBBAHaRw8BAQdARP8nnoCEXdWhbte9/J1LeQZVMQ3vPM7ADToq
ZGNvXDfNJkNhbHZpbiBCdWNrbGV5IChQSFApIDxjYWx2aW5iQHBocC5uZXQ+wpME
ExYKADsWIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCZiANXAIbAwULCQgHAgIiAgYV
CgkICwIEFgIDAQIeBwIXgAAKCRBWqXr3YAo5ppvGAP9TWg8OSAuIZqsBwxd62k01
YbG08JClqfB8/aPeoEqPcQEA++VwjC5BppelKywM6CtYtxR0tM+zt3OjjKlN400A
wgbCwXMEEAEIAB0WIQSv2Gkf2u3wO99uRgVj8VqbcVN2ygUCZkrW7QAKCRBj8Vqb
cVN2ymZoEADAQ2fn8lpP4rw/LHaTCjKYQHmIlaBMPRAEZXWhnLfx3BIdNKEGQlbG
orUoeiCeLyVaWZ+D1zFAIEWZLPncZb8wJlz81clOteI/LsZUwjDpr3WuNxoEi9IJ
fDduGZd9S0jClkJnYKujY6nPqvSY1GPRoC603kD84tGDvda0LHzWBqd+2KcDL1MT
cHgFv7CccD84FvUlZ4iTthL9vVHphEw+NeC2Wn8Yji79av6mkd5keya9asD/crwA
dl6Rq5vK3HpOg4En9eyuTvope257Q13QJXQQ+2uxrBtM2xj/JCIaqUtPf7LIjESo
6u3jaUP4jEwDmCHivyPn5h5/KI1IBYCGFASlExtX8UN6EJDInmCSv9G5Fh5A9/89
Q+cczhbDwvywoURVnNqNB8HNKrfKJk97HOhwOl8mUsf0rQGZq63XNimGod7y6NzP
ud5eECIg/PUj786PoVHEIr9yD9N7DsbZcOA3OrLq5GmHUNqFwLDfBXWT/N8gzRZY
yu6rIbCtoZdEshA1nyFO5HP8PbltOh665fjQMTA4QozFBiiEBA73OzAwQjGoL3/y
4LEPdEcnva5Py/T4CP4E72KJN1uHjkBygK9vkSzBTce+JLkssl3TYewgb0hdlGbs
w+9yIOSoLMEFaxRy7gLGWI/3WDaJSya8h8BWrcYgLbtrKFEq/zrzAMLBcwQQAQgA
HRYhBOYJE+TfIJkH2OMNlmWal8nPKnlaBQJmX/+0AAoJEGWal8nPKnlaglsP/A4y
PonlYL7oJimwbgUrC1ZpkC1r9/T2Wux1bskGwS04NMbPYwmPMrNUWKkCLuZj194d
z+HFk1a7i+wimK6HAsoNq4Ap58pIfy0UFY1UXQWrQgapo2uwVfWp7BaJ6NHW9oOX
HBxdP+9+6o13ZbqHhB3o4j0JkNu3eb6r1To61CnIMdSq/OAVHJBBmpq0E+wd2VUd
Dh4NFN7bhEQMeJz7Pi5pIlfCGOZ+RNW7NFAx/56USAaZ7tqgHeESTm4ArZtOghXK
I5oe+9FgY0xVHJ50x7lVsjut9w7Wp5bema3JTQ4h8V9WF9kFF59ARawm/Ol6on1C
MGeKqsjonYxNr0x4Y40JzTnSxoFfRJJzbrEyiDe2z9yg0IsbjfXROO/xPLI9L/U2
dNp5fSKBIPIXkO/d0i0PeHjagwCGY1um/nfDBSqdidEzKYAA6D2K5fTGKfjCl7eY
GBCWK9eJyb6Jr1la2LxR5M/8qd0olk0mar2PtffbqHF+VNs8lol9wVPEd6qh94w7
VodXmPOzC2qfEili3ASJqbM/B5u+EBYx2HxvC5SCwCu7hTVNdyxcT+CvsGonzA02
059nBbAcOJ0sE3wibqmVF8foCy1EMljRebtkeSwaMwFa3IAH89qcFY0dWGnEiwqw
C9KXJ0Z7TLdjAFbpi7c6OV24FMo12jr0A4UBRERZzjgEZiANXBIKKwYBBAGXVQEF
AQEHQPkjqvdb94qwtcImUfZHrErbLpbCfpYhQtNaC7k/TocBAwEIB8J4BBgWCgAg
FiEEnX+ZoMuPBcimlY1iVql692AKOaYFAmYgDVwCGwwACgkQVql692AKOaZG2AD/
aKqJAuXwOclj3Yt31xhJeCuurZHmyDmuT25ttx54OD8BAKZcfBeklQ+7X7M6I6iQ
3+VuMOKtBdMJJz0gi4wrpXQE
=NHL2
-----END PGP PUBLIC KEY BLOCK-----
10 changes: 9 additions & 1 deletion test/container/php/test_config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import pytest
import re
from packaging import version

CONFIG_DIR = '/usr/local/etc/php'

Expand Down Expand Up @@ -47,7 +49,13 @@ def test_development_config_is_effective(host):

assert u'display_errors => STDOUT => STDOUT' in config
assert u'display_startup_errors => On => On' in config
assert u'error_reporting => 32767 => 32767' in config

php_version_string = (re.search(r'PHP Version => (\d+\.\d+\.\d+)', config)).group(1)
php_version = version.parse(php_version_string)
if php_version < version.parse("8.4.0"):
assert u'error_reporting => 32767 => 32767' in config
else:
assert u'error_reporting => 30719 => 30719' in config
Comment on lines +52 to +58
Copy link
Member

Choose a reason for hiding this comment

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

❤️


@pytest.mark.php_cli
def test_cli_configuration_is_effective(host):
Expand Down
Loading