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

[PHP] Upgrade to 8.0 #3655

Merged
merged 35 commits into from
Sep 10, 2021
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0ef7fb1
Bump php from 7.4-fpm-alpine to 8.0.0-fpm-alpine in /php
dependabot[bot] Dec 13, 2020
23b5bae
update version in results
waghanza Dec 14, 2020
1644a83
do not use patch level in docker tags
waghanza Dec 14, 2020
8d3932b
no need to force php version check
waghanza Dec 14, 2020
233c375
add reviewer for sunrise
waghanza Dec 14, 2020
fc1319a
bump nano version for php8 compatibility
laylatichy Dec 15, 2020
52e5e29
namespace change
laylatichy Dec 15, 2020
d4ebdc4
Update config.yaml
laylatichy Dec 16, 2020
9ec8dc3
[PHP] Update sunrise Router to 2.5 (#3654)
fenric Dec 26, 2020
d122d87
[PHP] Upgrade containers to 8.0 (#3606)
waghanza Dec 26, 2020
438e854
use php8 annotations for ubiquity
waghanza Jan 11, 2021
7f4aa30
update ice to 1.7
waghanza Jan 11, 2021
587681b
remove restriction
waghanza Jan 11, 2021
b995c74
use pecl for php8
waghanza Jan 23, 2021
d1df87e
use new pecl packages
waghanza Jan 23, 2021
c31b2d3
no need to setup json module on php8 -> https://wiki.php.net/rfc/alwa…
waghanza Feb 1, 2021
ba15556
fix composer for one fpm
waghanza Feb 13, 2021
2ddcfc6
update ice version
waghanza Feb 17, 2021
7e34e34
remove temporary composer constraint for ice
waghanza Feb 17, 2021
8dc78d3
[PHP] Update ice to 1.8 (#3982)
mruz Feb 19, 2021
cb7cfc7
use pecl version for ice
waghanza Apr 25, 2021
85d143e
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Jul 17, 2021
acb2eab
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Jul 18, 2021
91f7b05
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Jul 20, 2021
ff24a64
wrong extension dirname
waghanza Jul 20, 2021
81d474b
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Jul 24, 2021
9f8df8f
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Aug 7, 2021
319eee8
try debian
waghanza Aug 7, 2021
c5f064d
use phalcon alpha4
waghanza Sep 6, 2021
3fe0822
conf.d to sites-enabled in containers
waghanza Sep 9, 2021
f8adcda
use phalcon last alpha
waghanza Sep 9, 2021
d5796a9
typo on container def
waghanza Sep 9, 2021
e443bba
Merge remote-tracking branch 'upstream/master' into php/upgrade/v8
waghanza Sep 9, 2021
86c9343
typos
waghanza Sep 9, 2021
52bfb41
wrong deps
waghanza Sep 9, 2021
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
15 changes: 15 additions & 0 deletions .semaphore/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2020,6 +2020,21 @@ blocks:
value: '64'
- name: ROUTES
value: GET:/
- name: prologue
commands:
- cd nim/prologue && make build -f .Makefile && cd -
- FRAMEWORK=nim/prologue bundle exec rspec .spec
- make -f nim/prologue/.Makefile collect
- bundle exec rake db:raw_export
env_vars:
- name: DATABASE_URL
value: postgresql://postgres@0.0.0.0/benchmark
- name: DURATION
value: '10'
- name: CONCURRENCIES
value: '64'
- name: ROUTES
value: GET:/
- name: rosencrantz
commands:
- cd nim/rosencrantz && make build -f .Makefile && cd -
Expand Down
15 changes: 15 additions & 0 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,21 @@ blocks:
value: '64'
- name: ROUTES
value: GET:/
- name: prologue
commands:
- cd nim/prologue && make build -f .Makefile && cd -
- FRAMEWORK=nim/prologue bundle exec rspec .spec
- make -f nim/prologue/.Makefile collect
- bundle exec rake db:raw_export
env_vars:
- name: DATABASE_URL
value: postgresql://postgres@0.0.0.0/benchmark
- name: DURATION
value: '10'
- name: CONCURRENCIES
value: '64'
- name: ROUTES
value: GET:/
- name: rosencrantz
commands:
- cd nim/rosencrantz && make build -f .Makefile && cd -
Expand Down
19 changes: 10 additions & 9 deletions php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
FROM php:7.4-fpm-alpine
FROM php:8.0-fpm-alpine

RUN apk add git zlib-dev libzip-dev build-base autoconf nginx openrc curl-dev icu-dev oniguruma-dev {{#deps}} {{{.}}} {{/deps}}
RUN apk add git zlib-dev libzip-dev build-base autoconf nginx openrc curl-dev icu-dev oniguruma-dev php8-pear {{#deps}} {{{.}}} {{/deps}}
RUN docker-php-ext-install zip opcache

WORKDIR /usr/src/app

RUN ln -sfv /usr/bin/pecl8 /usr/local/bin/pecl

{{#environment}}
ENV {{{.}}}
{{/environment}}
Expand All @@ -18,8 +20,9 @@ ENV {{{.}}}
{{/php_mod}}

{{#php_ext}}
RUN pecl install {{{name}}}
RUN docker-php-ext-enable {{{extension}}}
RUN mkdir -p /usr/src/php/ext/{{{name}}} && \
curl -fsSL https://pecl.php.net/get/{{{name}}} | tar xvz -C "/usr/src/php/ext/{{{name}}}" --strip 1
RUN docker-php-ext-install {{{extension}}}
{{/php_ext}}

{{#before_build}}
Expand All @@ -35,13 +38,11 @@ RUN if [[ -f "${EVENT_EXT_FILE}" ]] ; then \
mv /tmp/file /usr/local/etc/php/conf.d/docker-php-ext-event.ini ; fi

{{^standalone}}
RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN composer install --no-dev --prefer-dist --classmap-authoritative
RUN composer dumpautoload -o
RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN composer install --no-dev --prefer-dist --classmap-authoritative
RUN composer dumpautoload -o
{{/standalone}}



{{#before_command}}
RUN {{{.}}}
{{/before_command}}
Expand Down
2 changes: 1 addition & 1 deletion php/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
provider:
default:
language: 7.4
language: 8.0
1 change: 0 additions & 1 deletion php/ice/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"require": {
"php": ">=7.0",
"ext-ice": "~1.8.0"
}
}
2 changes: 1 addition & 1 deletion php/nano/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"require": {
"laylatichy/nano": "~0.0.9"
"laylatichy/nano": "~1.0.8"
}
}
2 changes: 1 addition & 1 deletion php/nano/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
framework:
gitlab: x.laylatichy.x/nano
version: 0.0.9
version: 1.0

php_mod:
- pcntl
Expand Down
2 changes: 1 addition & 1 deletion php/nano/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require_once 'vendor/autoload.php';

use laylatichy\nano\Nano;
use laylatichy\Nano;

$nano = new Nano();

Expand Down
3 changes: 1 addition & 2 deletions php/sw-fw-less/composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"require": {
"php": "^7.1",
"ext-json": "*",
"ext-swoole": "^4.4.0",
"ext-swoole": "*",
"luoxiaojun/sw-fw-less": "dev-master"
},
"suggest": {
Expand Down
3 changes: 1 addition & 2 deletions php/ubiquity/composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"require": {
"php": "^7.4",
"phpmv/ubiquity": "~2.4.0"
},
"require-dev": {
"phpmv/ubiquity-annotations": "*",
"phpmv/ubiquity-attributes": "*",
"phpmv/ubiquity-dev": "*",
"phpmv/ubiquity-devtools": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion pony/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
provider:
default:
language: '0.40'
language: "0.40"
6 changes: 6 additions & 0 deletions reviewers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ php:
- 48d90782
slim:
- l0gicgate
sunrise-router:
- fenric
sunrise-router-roadrunner:
- fenric
sunrise-router-annotations:
- fenric
phalcon:
- ruudboon
ice:
Expand Down
2 changes: 1 addition & 1 deletion scala/http4s/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "latest.integration")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "latest.integration")