Skip to content

Update to upstream #6

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

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e8cbc9d
Add docker compose
alquerci Sep 11, 2021
6b82513
Merge pull request #262 from alquerci/add-docker-compose
thePanz Nov 25, 2022
32b2a4b
Use GitHub actions for Continuous Integration tests
thePanz Nov 25, 2022
21b7381
Fix test for /bin/ls file mimetype guessing, using application/x-pie-…
thePanz Nov 25, 2022
d0e631d
Merge pull request #268 from FriendsOfSymfony1/switch-to-github-actions
thePanz Nov 25, 2022
245c7cc
PHP 8.1 > internal_method_return_types
Tybaze May 19, 2022
6401fcc
PHP 8.1 > Serializable Phase Out
Tybaze May 19, 2022
029b0e7
PHP 8.0 & 8.1 > Deprecated of null to non-nullable internal function …
Tybaze May 23, 2022
dcb1ce3
PHP 8.1 > strftime deprecated.
Tybaze May 23, 2022
8450b13
PHP 8.1 > Unit Test
Tybaze Jun 9, 2022
9cb7fb4
Fix lime message: "An uncaught exception has been thrown" do not have…
Tybaze Jun 9, 2022
25a5e71
PHP 8.1 > uasort(): Returning bool from comparison function is deprec…
Tybaze Jun 9, 2022
09fc710
Fix ValueError: DOMDocument::loadHTML(): Argument #1 ($source) must n…
Tybaze Jun 9, 2022
df2ec65
PHP 8.0 > fread()/count() behavior
Tybaze Jun 9, 2022
42112ab
Fix Declaration of sfPearRestTest::downloadHttp($url, $lastmodified =…
Tybaze Jun 9, 2022
29ab2a7
PHP 8.0 > mktime update
Tybaze Jun 9, 2022
12f7b4c
Fix sfWebResponse->getContentType() return a string not an array
Tybaze Jun 10, 2022
cae793e
Fix sfDoctrineTester, string cannot be accessed as array
Tybaze Jun 10, 2022
7341b43
PHP 8.0 > Fix is_numeric behavior with trailing empty char
Tybaze Jun 10, 2022
b191cb8
PHP 8.0 > String to Number Comparison.
Tybaze Jun 10, 2022
956cb1a
PHP 8.1 > Change support to PHP 8.1
Tybaze May 23, 2022
b0cb92e
Fix UnitTest application/x-sharedlib
Tybaze Jun 10, 2022
bb22141
PHP 8.1 > mysqli_report revert to off
Tybaze Jun 10, 2022
d0d0d12
Refactor code and apply Coding Style fixes
Tybaze Jul 7, 2022
01fadb9
PHP 8.1 > Better MYSQLI_REPORT_OFF implementations for php8.1 compat
Tybaze Aug 2, 2022
3bb8339
PHP 8.1 > remove full_path from uploads added on PHP v8.1
mentalstring Aug 12, 2022
7798328
Fix use of null on string parameter on multiple classes
mentalstring Aug 12, 2022
1e9b188
Github Actions: enable testing on PHP v8.0 and v8.1 (for PRs too)
thePanz Nov 25, 2022
071b8bf
Merge pull request #266 from Tybaze/compat_php8.1
thePanz Nov 25, 2022
fa161a1
test environment for php 8.2
thirsch Dec 13, 2022
f6d779c
PHP 8.2 > Using ${var} in strings is deprecated, use {$var} instead.
thirsch Dec 13, 2022
d89618f
PHP 8.2 > Creation of dynamic property Class::$property is deprecated
thirsch Dec 13, 2022
89c24cf
PHP 8.0 > Uncaught ArgumentCountError: Too few arguments to function
thirsch Dec 13, 2022
754c940
PHP 8.0 > Trying to access array offset on value of type bool
thirsch Dec 13, 2022
13bfee2
PHP 8.0 > Passing null to parameter #1 ($haystack) of type string is …
thirsch Dec 13, 2022
6f50a31
Merge pull request #274 from vemaeg/feature/php-8.2-changes
thePanz Jan 9, 2023
5d94af7
set symfony version to 1.5.15-dev
thirsch Dec 13, 2022
7ad07e0
Update(version) Set symfony version to 1.5.15-dev
thePanz Jan 9, 2023
4820ada
PHP 8.0 > Class name must be a valid object or a string in case the c…
thirsch Dec 13, 2022
c55d53c
PHP 8.0 > Fix undefined array key
thirsch Dec 13, 2022
8b81a56
PHP 8.1 > Fix some more null on string parameter
thirsch Dec 13, 2022
9bba8c5
Merge pull request #272 from vemaeg/feature/more-php-8.1-fixes
thePanz Jan 10, 2023
e432434
Prepared release 1.5.15
thirsch Jan 10, 2023
a72247f
Merge pull request #275 from vemaeg/feature/release-preparations
thePanz Jan 12, 2023
9945f3f
Add(changelog) Add v1.5.15 release date to Changelog file
thePanz Jan 12, 2023
31d2c60
Add(versioning) Add v1.5.16-dev as next release
thePanz Jan 12, 2023
2c5a4d6
Fix(deprecations) Fix deprecations in sfMessageSource_Aggregate (#277)
thePanz Jan 13, 2023
ffbbce6
Add(linting) Add code linting to GitHub workflow, use php-cs-fixer
connorhu Jan 10, 2023
2cbd557
Fix(php-cs) Fix php-cs styles according to configuration
thePanz Feb 20, 2023
dc824de
Add(gitattributes) Add .gitattributes to repository
thePanz Feb 22, 2023
4a02b6a
Merge branch 'FriendsOfSymfony1-master'
MiguelAlcaino Aug 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 57 additions & 0 deletions .docker/php53/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
FROM buildpack-deps:jessie

ENV PHP_VERSION 5.3.29

# php 5.3 needs older autoconf
RUN set -eux; \
\
apt-get update; \
apt-get install -y \
curl \
autoconf2.13 \
; \
rm -r /var/lib/apt/lists/*; \
\
curl -sSLfO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb; \
curl -sSLfO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb; \
dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb; \
dpkg -i bison_2.7.1.dfsg-1_amd64.deb; \
rm *.deb; \
\
curl -sSLf "https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2; \
echo 'c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 php.tar.bz2' | sha256sum -cw --status; \
\
mkdir -p /usr/src/php; \
tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1; \
rm php.tar.bz2*; \
\
cd /usr/src/php; \
./buildconf --force; \
./configure --disable-cgi \
$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
--with-pdo-mysql \
--with-zlib \
--enable-mbstring \
; \
make -j"$(nproc)"; \
make install; \
\
dpkg -r \
bison \
libbison-dev \
; \
apt-get purge -y --auto-remove \
autoconf2.13 \
; \
rm -r /usr/src/php

# Install APC PHP extension
#
RUN set -eux; \
\
pecl install apc-3.1.13; \
echo 'extension=apc.so' >> /usr/local/lib/php.ini; \
\
rm -r /tmp/pear;

CMD ["php", "-a"]
34 changes: 34 additions & 0 deletions .docker/php54/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM php:5.4-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring

# Install APC PHP extension
#
RUN set -eux; \
pecl install apc-3.1.13; \
docker-php-ext-enable apc; \
rm -r /tmp/pear;

# Install memcache PHP extension
#
ARG MEMCACHE_VERSION
RUN set -eux; \
buildDeps=' \
libzip-dev \
'; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
$buildDeps \
; \
\
pecl install memcache-${MEMCACHE_VERSION}; \
docker-php-ext-enable memcache; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
$buildDeps \
; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
rm -r /tmp/pear
40 changes: 40 additions & 0 deletions .docker/php55_71/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ARG PHP_TAG
FROM php:${PHP_TAG}

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring

# Install APCu PHP extension
#
ARG APCU_VERSION
RUN set -eux; \
\
test x"" = x"${APCU_VERSION}" || { \
pecl install apcu-${APCU_VERSION}; \
docker-php-ext-enable apcu; \
\
rm -r /tmp/pear; \
}

# Install memcache PHP extension
#
ARG MEMCACHE_VERSION
RUN set -eux; \
buildDeps=' \
libzip-dev \
'; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
$buildDeps \
; \
\
pecl install memcache-${MEMCACHE_VERSION}; \
docker-php-ext-enable memcache; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
$buildDeps \
; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
rm -r /tmp/pear
56 changes: 56 additions & 0 deletions .docker/php72_73/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring

# Install APCu PHP extension
#
ARG APCU_VERSION
RUN set -eux; \
\
test x"" = x"${APCU_VERSION}" || { \
pecl install apcu-${APCU_VERSION}; \
docker-php-ext-enable apcu; \
\
rm -r /tmp/pear; \
}

# Install memcache PHP extension
#
ARG MEMCACHE_VERSION
RUN set -eux; \
buildDeps=' \
libzip-dev \
'; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
$buildDeps \
; \
\
pecl install memcache-${MEMCACHE_VERSION}; \
docker-php-ext-enable memcache; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
$buildDeps \
; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
rm -r /tmp/pear

# For consistent mime type file guesser
RUN set -eux; \
distFilePath=`which file`; \
\
mv ${distFilePath} ${distFilePath}.dist; \
{ \
echo '#! /bin/sh -eu'; \
echo ''; \
echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
} | tee ${distFilePath}; \
\
chmod +x ${distFilePath}; \
\
file /bin/ls --mime | grep application/x-executable; \
:;
68 changes: 68 additions & 0 deletions .docker/php74_82/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql

# Install mbstring PHP extension
#
RUN set -eux; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
libonig-dev \
; \
\
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
\
docker-php-ext-install mbstring

# Install APCu PHP extension
#
ARG APCU_VERSION
RUN set -eux; \
\
test x"" = x"${APCU_VERSION}" || { \
pecl install apcu-${APCU_VERSION}; \
docker-php-ext-enable apcu; \
\
rm -r /tmp/pear; \
}

# Install memcache PHP extension
#
ARG MEMCACHE_VERSION
RUN set -eux; \
buildDeps=' \
libzip-dev \
'; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
$buildDeps \
; \
\
pecl install memcache-${MEMCACHE_VERSION}; \
docker-php-ext-enable memcache; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
$buildDeps \
; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
rm -r /tmp/pear

# For consistent mime type file guesser
RUN set -eux; \
distFilePath=`which file`; \
\
mv ${distFilePath} ${distFilePath}.dist; \
{ \
echo '#! /bin/sh -eu'; \
echo ''; \
echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
} | tee ${distFilePath}; \
\
chmod +x ${distFilePath}; \
\
file /bin/ls --mime | grep application/x-executable; \
:;
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ root = true

[*]
indent_style = space
indent_size = 2
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
Expand Down
11 changes: 11 additions & 0 deletions .env.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# Environment variables used by docker-compose for test.
#
# Copy to `.env` in order to use it.
#

# APC test are disabled.
#
# To enable them in order to provide a fix, set to "on".
#
APC_ENABLE_CLI=off
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.docker/ export-ignore
.editorconfig export-ignore
.env.dist export-ignore
.gitattributes export-ignore
.github/ export-ignore
.gitignore export-ignore
.php-cs-fixer.dist.php export-ignore
docker-compose.yml export-ignore
phpstan.neon export-ignore
phpunit.xml export-ignore
tests/ export-ignore
49 changes: 49 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: "Continuous Integration"

on:
push:
branches:
- master
pull_request:

env:
fail-fast: true

jobs:
tests:
name: "Symfony1 Tests"
runs-on: "ubuntu-22.04"

strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
memcached-version:
- "1.6"

services:
memcached:
image: "memcached:${{ matrix.memcached-version }}"

steps:
- name: "Checkout"
uses: "actions/checkout@v3"
with:
submodules: "true"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-version }}"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"

- name: "Run Check configuration"
run: "php data/bin/check_configuration.php"

- name: "Run Tests"
run: "php data/bin/symfony symfony:test --trace"
31 changes: 31 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: "Code Linting"
on:
push:
branches:
- master
pull_request:

jobs:
php-cs-fixer:
name: 'PHP-CS-Fixer'
runs-on: 'ubuntu-latest'
steps:
- uses: 'actions/checkout@v3'

- name: 'Setup PHP'
uses: 'shivammathur/setup-php@v2'
with:
php-version: '8.1'
tools: php-cs-fixer, cs2pr

- uses: 'actions/cache@v3'
with:
path: '.php-cs-fixer.cache'
key: '${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}'
restore-keys: |
${{ github.repository }}-8.1-phpcsfixer-main
${{ github.repository }}-8.1-phpcsfixer-

- name: 'Run PHP-CS-Fixer'
# Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
/vendor
/composer.lock
.php-cs-fixer.cache
Loading