Skip to content

Commit 215c891

Browse files
Merge branch '2.3' into 2.7
* 2.3: Drop hirak/prestissimo bumped Symfony version to 2.3.42 updated VERSION for 2.3.41 update CONTRIBUTORS for 2.3.41 updated CHANGELOG for 2.3.41 Conflicts: appveyor.yml src/Symfony/Component/HttpKernel/Kernel.php
2 parents 7e59c71 + b3da5df commit 215c891

File tree

6 files changed

+14
-84
lines changed

6 files changed

+14
-84
lines changed

.composer/composer.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.composer/composer.lock

Lines changed: 0 additions & 70 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ before_install:
5252
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi
5353
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
5454
- if [[ ! $skip ]]; then composer self-update --stable; fi
55-
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
55+
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi
5656
- if [[ ! $skip ]]; then ./phpunit install; fi
57-
- if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi
5857
- if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi
5958

6059
install:

CHANGELOG-2.3.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.41 (2016-05-09)
11+
12+
* security #18733 limited the maximum length of a submitted username (fabpot)
13+
* bug #18709 [DependencyInjection] top-level anonymous services must be public (xabbuh)
14+
1015
* 2.3.40 (2016-04-29)
1116

1217
* bug #18246 [DependencyInjection] fix ambiguous services schema (backbone87)

CONTRIBUTORS.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Symfony is the result of the work of many people who made the code better
4040
- Alexandre Salomé (alexandresalome)
4141
- William Durand (couac)
4242
- ornicar
43+
- Jules Pietri (heah)
4344
- stealth35 ‏ (stealth35)
4445
- Alexander Mols (asm89)
45-
- Jules Pietri (heah)
4646
- Francis Besset (francisbesset)
4747
- Bulat Shakirzyanov (avalanche123)
4848
- Saša Stamenković (umpirsky)
@@ -129,6 +129,7 @@ Symfony is the result of the work of many people who made the code better
129129
- Arnaud Kleinpeter (nanocom)
130130
- Joel Wurtz (brouznouf)
131131
- Philipp Wahala (hifi)
132+
- Titouan Galopin (tgalopin)
132133
- Richard Shank (iampersistent)
133134
- Thomas Rabaix (rande)
134135
- Vincent AUBERT (vincent)
@@ -141,7 +142,6 @@ Symfony is the result of the work of many people who made the code better
141142
- Michał Pipa (michal.pipa)
142143
- Amal Raghav (kertz)
143144
- Jonathan Ingram (jonathaningram)
144-
- Titouan Galopin (tgalopin)
145145
- Artur Kotyrba
146146
- Rouven Weßling (realityking)
147147
- Warnar Boekkooi (boekkooi)
@@ -240,6 +240,7 @@ Symfony is the result of the work of many people who made the code better
240240
- Michael Holm (hollo)
241241
- Marc Weistroff (futurecat)
242242
- Hidde Wieringa (hiddewie)
243+
- Daniel Espendiller
243244
- Chris Smith (cs278)
244245
- Florian Klein (docteurklein)
245246
- Manuel Kiessling (manuelkiessling)
@@ -436,6 +437,7 @@ Symfony is the result of the work of many people who made the code better
436437
- Benjamin Leveque (benji07)
437438
- Nate (frickenate)
438439
- jhonnyL
440+
- Jhonny Lidfors (jhonne)
439441
- sasezaki
440442
- Dawid Pakuła (zulusx)
441443
- Florian Rey (nervo)
@@ -611,7 +613,6 @@ Symfony is the result of the work of many people who made the code better
611613
- Adrien Lucas (adrienlucas)
612614
- James Michael DuPont
613615
- Tom Klingenberg
614-
- Jhonny Lidfors (jhonne)
615616
- Christopher Hall (mythmakr)
616617
- Paul Kamer (pkamer)
617618
- Rafał Wrzeszcz (rafalwrzeszcz)
@@ -904,7 +905,6 @@ Symfony is the result of the work of many people who made the code better
904905
- Albin Kerouaton
905906
- Sébastien HOUZÉ
906907
- Jingyu Wang
907-
- Daniel Espendiller
908908
- steveYeah
909909
- Samy Dindane (dinduks)
910910
- Keri Henare (kerihenare)
@@ -945,6 +945,7 @@ Symfony is the result of the work of many people who made the code better
945945
- Tadcka
946946
- Beth Binkovitz
947947
- Romain Geissler
948+
- Oliver Hoff
948949
- Tomaz Ahlin
949950
- Benjamin Cremer (bcremer)
950951
- Marcus Stöhr (dafish)
@@ -1302,6 +1303,7 @@ Symfony is the result of the work of many people who made the code better
13021303
- znerol
13031304
- Christian Eikermann
13041305
- Antonio Angelino
1306+
- Shawn Iwinski
13051307
- Vladimir Sazhin
13061308
- lol768
13071309
- jamogon

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ init:
1818
install:
1919
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
2020
- cd c:\php
21-
- IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem
21+
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
2222
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.3.11-nts-Win32-VC9-x86.zip
2323
- IF %PHP%==1 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul
2424
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/ICU-51.2-dlls.zip
@@ -49,12 +49,11 @@ install:
4949
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
5050
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
5151
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
52-
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
52+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.3/composer.phar
5353
- copy /Y php.ini-max php.ini
5454
- cd c:\projects\symfony
5555
- mkdir %APPDATA%\Composer
5656
- copy /Y .composer\* %APPDATA%\Composer\
57-
- composer global install --no-progress --ansi
5857
- php phpunit install
5958
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
6059
- composer update --no-progress --ansi

0 commit comments

Comments
 (0)