Skip to content

Commit f4aabbf

Browse files
authored
Merge pull request #231 from FriendsOfSymfony1/fix/update-composer
Rename package to `friendsofsymfony1/symfony1`
2 parents 25f818e + d8388cd commit f4aabbf

File tree

4 files changed

+28
-20
lines changed

4 files changed

+28
-20
lines changed

.travis.yml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
os: linux
2+
dist: xenial
13
language: php
24

35
php:
@@ -9,45 +11,35 @@ php:
911
- nightly
1012

1113
# run build against nightly but allow them to fail
12-
matrix:
14+
jobs:
1315
fast_finish: true
1416
allow_failures:
1517
- php: nightly
1618
include:
1719
- php: 5.3
1820
dist: precise
19-
sudo: required
2021
- php: 5.4
2122
dist: precise
22-
sudo: required
2323
- php: 5.5
2424
dist: trusty
25-
sudo: required
2625
- php: 5.6
2726
dist: trusty
28-
sudo: required
29-
30-
# faster builds on new travis setup not using sudo
31-
sudo: false
3227

3328
services:
3429
- memcached
3530

36-
# cache vendor dirs
3731
cache:
3832
directories:
39-
- lib/vendor/swiftmailer
4033
- $HOME/.composer/cache
4134

42-
install:
43-
- composer self-update
35+
before_install:
36+
- 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;'
37+
- 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;'
4438

45-
before_script:
39+
install:
4640
# by default, --remote is not used on travis
4741
- git submodule update --remote --force
48-
- 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;'
49-
- 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;'
50-
- composer install
42+
- composer install --prefer-dist --no-progress --no-suggest -o
5143

5244
script:
5345
- php data/bin/check_configuration.php

CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
CHANGELOG
22
=========
33

4+
xx/xx/xxxx: Version 1.5.13
5+
--------------------------
6+
7+
* Fix for `Warning: ini_set(): A session is active...` #229
8+
9+
=========
10+
11+
03/04/2020: Version 1.5.12
12+
--------------------------
13+
14+
* Move project from @LExpress to @FriendsOfSymfony1
15+
* Some doc & readme update
16+
* Fixes for PHP 7.3 & 7.4 (thanks @W0rma for the code and @alquerci for the review) #224
17+
* Backport fix for cve-2019-18888 by @adrienperonnet #218
18+
419
17/03/2018: Version 1.5.11
520
--------------------------
621

README.md

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

3434
Requirements
3535
------------

composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
2-
"name": "lexpress/symfony1",
2+
"name": "friendsofsymfony1/symfony1",
33
"description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
4+
"type": "library",
45
"license": "MIT",
56
"require": {
7+
"php" : ">=5.3.0",
68
"swiftmailer/swiftmailer": "~5.2"
79
},
810
"require-dev": {
911
"psr/log": "*"
1012
},
11-
"type": "library",
1213
"autoload": {
1314
"files": ["autoload.php"]
1415
},
1516
"suggest": {
16-
"lexpress/doctrine1": "Doctrine plugin",
17+
"friendsofsymfony1/doctrine1": "Doctrine plugin",
1718
"propel/sf-propel-o-r-m-plugin": "Propel plugin",
1819
"psr/log": "Psr logger"
1920
},

0 commit comments

Comments
 (0)