Merge changes from upstream branch

.travis.yml

@@ -1,3 +1,5 @@
+os: linux
+dist: xenial
 language: php
 
 php:
@@ -9,45 +11,35 @@ php:
     - nightly
 
 # run build against nightly but allow them to fail
-matrix:
+jobs:
     fast_finish: true
     allow_failures:
         - php: nightly
     include:
         - php: 5.3
           dist: precise
-          sudo: required
         - php: 5.4
           dist: precise
-          sudo: required
         - php: 5.5
           dist: trusty
-          sudo: required
         - php: 5.6
           dist: trusty
-          sudo: required
-
-# faster builds on new travis setup not using sudo
-sudo: false
 
 services:
     - memcached
 
-# cache vendor dirs
 cache:
     directories:
-        - lib/vendor/swiftmailer
         - $HOME/.composer/cache
 
-install:
-    - composer self-update
+before_install:
+    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
 
-before_script:
+install:
     # by default, --remote is not used on travis
     - git submodule update --remote --force
-    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - composer install
+    - composer install --prefer-dist --no-progress --no-suggest -o
 
 script:
     - php data/bin/check_configuration.php

CHANGELOG.md

@@ -1,6 +1,21 @@
 CHANGELOG
 =========
 
+xx/xx/xxxx: Version 1.5.13
+--------------------------
+
+* Fix for `Warning: ini_set(): A session is active...` #229
+
+=========
+
+03/04/2020: Version 1.5.12
+--------------------------
+
+* Move project from @LExpress to @FriendsOfSymfony1
+* Some doc & readme update
+* Fixes for PHP 7.3 & 7.4 (thanks @W0rma for the code and @alquerci for the review) #224
+* Backport fix for cve-2019-18888 by @adrienperonnet #218
+
 17/03/2018: Version 1.5.11
 --------------------------
 

README.md

@@ -29,7 +29,7 @@ The end result of these advantages means there is no need to reinvent the wheel
 Symfony was written entirely in PHP 5.
 It has been thoroughly tested in various real-world projects, and is actually in use for high-demand e-business websites.
 It is compatible with most of the available databases engines, including MySQL, PostgreSQL, Oracle, and Microsoft SQL Server.
-It runs on *nix and Windows platforms.
+It runs on *nix and Windows platforms*.
 
 Requirements
 ------------

composer.json

@@ -1,19 +1,20 @@
 {
-    "name": "lexpress/symfony1",
+    "name": "friendsofsymfony1/symfony1",
     "description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
+    "type": "library",
     "license": "MIT",
     "require": {
+        "php" : ">=5.3.0",
         "swiftmailer/swiftmailer": "~5.2"
     },
     "require-dev": {
         "psr/log": "*"
     },
-    "type": "library",
     "autoload": {
         "files": ["autoload.php"]
     },
     "suggest": {
-        "lexpress/doctrine1": "Doctrine plugin",
+        "friendsofsymfony1/doctrine1": "Doctrine plugin",
         "propel/sf-propel-o-r-m-plugin": "Propel plugin",
         "psr/log": "Psr logger"
     },