Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit 09ad321

Browse files
pylebecqpylebecq
committed
RELEASE_1_4_16 => v1.4.16 commit
1 parent c932b32 commit 09ad321

File tree

484 files changed

+25262
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

484 files changed

+25262
-14
lines changed

‎CHANGELOG‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
CHANGELOG
22
=========
33

4+
12/13/12: Version 1.4.16
5+
------------------------
6+
7+
* [33251] fixed sfChoiceFormat when a string to translate contains a valid range (closes #9973)
8+
* [33250] fixed saving i18n fields in subforms (closes #7626, patch from yoshy71)
9+
* [33249] fixed last modified date calculation in sfMessageSource_Aggregate (closes #9981, patch from jamiel)
10+
* [33226] fixed merging problem for the routing configuration (closes #8348)
11+
* [33214] fixed ob_start() behavior on CLI (closes #9970)
12+
* [33208] fixed ob_start usage (to avoid warning in PHP 5.4, closes #9970)
13+
414
10/27/11: Version 1.4.15
515
------------------------
616

‎lib/autoload/sfCoreAutoload.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* The current symfony version.
1313
*/
14-
define('SYMFONY_VERSION', '1.4.15');
14+
define('SYMFONY_VERSION', '1.4.16');
1515

1616
/**
1717
* sfCoreAutoload class.

‎lib/config/sfApplicationConfiguration.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage config
1616
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
17-
* @version SVN: $Id: sfApplicationConfiguration.class.php 29526 2010-05-19 13:06:40Z fabien $
17+
* @version SVN: $Id: sfApplicationConfiguration.class.php 33214 2011-11-19 13:47:24Z fabien $
1818
*/
1919
abstract class sfApplicationConfiguration extends ProjectConfiguration
2020
{
@@ -150,9 +150,9 @@ public function initConfiguration()
150150
$this->initializePlugins();
151151

152152
// compress output
153-
if (!self::$coreLoaded)
153+
if (!self::$coreLoaded && sfConfig::get('sf_compressed'))
154154
{
155-
ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
155+
ob_start('ob_gzhandler');
156156
}
157157

158158
self::$coreLoaded = true;

‎lib/config/sfFactoryConfigHandler.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @subpackage config
1818
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
1919
* @author Sean Kerr <sean@code-box.org>
20-
* @version SVN: $Id: sfFactoryConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
20+
* @version SVN: $Id: sfFactoryConfigHandler.class.php 33226 2011-11-23 17:29:18Z fabien $
2121
*/
2222
class sfFactoryConfigHandler extends sfYamlConfigHandler
2323
{
@@ -163,7 +163,7 @@ public function execute($configFiles)
163163

164164
$instances[] = sprintf(" \$class = sfConfig::get('sf_factory_routing', '%s');\n".
165165
" %s\n".
166-
"\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false, 'context' => \$this->factories['request']->getRequestContext()), sfConfig::get('sf_factory_routing_parameters', %s)));\n".
166+
"\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, sfToolkit::arrayDeepMerge(array('auto_shutdown' => false, 'context' => \$this->factories['request']->getRequestContext()), sfConfig::get('sf_factory_routing_parameters', %s)));\n".
167167
"if (\$parameters = \$this->factories['routing']->parse(\$this->factories['request']->getPathInfo()))\n".
168168
"{\n".
169169
" \$this->factories['request']->addRequestParameters(\$parameters);\n".

‎lib/exception/sfException.class.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @subpackage exception
1919
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
2020
* @author Sean Kerr <sean@code-box.org>
21-
* @version SVN: $Id: sfException.class.php 32641 2011-06-11 13:39:35Z fabien $
21+
* @version SVN: $Id: sfException.class.php 33214 2011-11-19 13:47:24Z fabien $
2222
*/
2323
class sfException extends Exception
2424
{
@@ -100,7 +100,9 @@ public function printStackTrace()
100100
}
101101
}
102102

103-
ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
103+
if (sfConfig::get('sf_compressed')) {
104+
ob_start('ob_gzhandler');
105+
}
104106

105107
header('HTTP/1.0 500 Internal Server Error');
106108
}

‎lib/form/addon/sfFormObject.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage form
1616
* @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
17-
* @version SVN: $Id: sfFormObject.class.php 22917 2009-10-10 13:44:53Z Kris.Wallsmith $
17+
* @version SVN: $Id: sfFormObject.class.php 33250 2011-12-12 16:02:15Z fabien $
1818
*/
1919
abstract class sfFormObject extends BaseForm
2020
{
@@ -241,8 +241,8 @@ public function saveEmbeddedForms($con = null, $forms = null)
241241
{
242242
if ($form instanceof sfFormObject)
243243
{
244-
$form->saveEmbeddedForms($con);
245244
$form->getObject()->save($con);
245+
$form->saveEmbeddedForms($con);
246246
}
247247
else
248248
{

‎lib/i18n/sfChoiceFormat.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* {@link http://prado.sourceforge.net/}
1414
*
1515
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
16-
* @version $Id: sfChoiceFormat.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
16+
* @version $Id: sfChoiceFormat.class.php 33251 2011-12-12 16:30:59Z fabien $
1717
* @package symfony
1818
* @subpackage i18n
1919
*/
@@ -65,7 +65,7 @@ class sfChoiceFormat
6565
/**
6666
* The pattern to parse the formatting string.
6767
*/
68-
protected $parse = '/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
68+
protected $parse = '/(?:^\s*|\s*\|)([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
6969

7070
/**
7171
* The value for positive infinity.

‎lib/i18n/sfMessageSource_Aggregate.class.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage i18n
1616
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
17-
* @version SVN: $Id: sfMessageSource_Aggregate.class.php 13401 2008-11-27 11:18:39Z fabien $
17+
* @version SVN: $Id: sfMessageSource_Aggregate.class.php 33249 2011-12-12 15:50:45Z fabien $
1818
*/
1919
class sfMessageSource_Aggregate extends sfMessageSource
2020
{
@@ -51,7 +51,10 @@ protected function getLastModified($sources)
5151
$lastModified = time();
5252
foreach ($sources as $source)
5353
{
54-
$lastModified = min($lastModified, $source[0]->getLastModified($source[1]));
54+
if (0 !== $sourceLastModified = $source[0]->getLastModified($source[1]))
55+
{
56+
$lastModified = min($lastModified, $sourceLastModified);
57+
}
5558
}
5659

5760
return $lastModified;

‎lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/doctrine/linked_schema.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../data/linked_schema.yml

‎package.xml.tmpl‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<package packagerversion="1.4.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
3+
<name>symfony</name>
4+
<channel>pear.symfony-project.com</channel>
5+
<summary>Symfony is a complete framework designed to optimize the development of web applications.</summary>
6+
<description>
7+
Symfony is a complete framework designed to optimize the development of web applications by way of several key features.
8+
For starters, it separates a web application's business rules, server logic, and presentation views.
9+
It contains numerous tools and classes aimed at shortening the development time of a complex web application.
10+
Additionally, it automates common tasks so that the developer can focus entirely on the specifics of an application.
11+
The end result of these advantages means there is no need to reinvent the wheel every time a new web application is built!
12+
</description>
13+
<lead>
14+
<name>Fabien POTENCIER</name>
15+
<user>fabpot</user>
16+
<email>fabien.potencier@symfony-project.com</email>
17+
<active>yes</active>
18+
</lead>
19+
<date>##CURRENT_DATE##</date>
20+
<version>
21+
<release>##SYMFONY_VERSION##</release>
22+
<api>1.4.0</api>
23+
</version>
24+
<stability>
25+
<release>##STABILITY##</release>
26+
<api>##STABILITY##</api>
27+
</stability>
28+
<license uri="http://www.symfony-project.org/license">MIT license</license>
29+
<notes>-</notes>
30+
31+
<contents>
32+
<dir name="/">
33+
34+
##CLASS_FILES##
35+
36+
<file role="script" baseinstalldir="/" install-as="symfony" name="data/bin/symfony">
37+
<tasks:replace type="pear-config" from="@DATA-DIR@" to="data_dir" />
38+
<tasks:replace type="pear-config" from="@PEAR-DIR@" to="php_dir" />
39+
</file>
40+
41+
<file role="script" baseinstalldir="/" name="data/bin/symfony.bat" />
42+
43+
<file role="doc" baseinstalldir="symfony" name="CHANGELOG" />
44+
<file role="doc" baseinstalldir="symfony" name="COPYRIGHT" />
45+
<file role="doc" baseinstalldir="symfony" name="LICENSE" />
46+
<file role="doc" baseinstalldir="symfony" name="README" />
47+
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.ICU" />
48+
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.lime" />
49+
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.prado" />
50+
<file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.swiftmailer" />
51+
</dir>
52+
</contents>
53+
54+
<dependencies>
55+
<required>
56+
<php>
57+
<min>5.2.4</min>
58+
</php>
59+
<pearinstaller>
60+
<min>1.4.1</min>
61+
</pearinstaller>
62+
<extension>
63+
<name>reflection</name>
64+
</extension>
65+
<extension>
66+
<name>ctype</name>
67+
</extension>
68+
<extension>
69+
<name>pcre</name>
70+
</extension>
71+
<extension>
72+
<name>simplexml</name>
73+
</extension>
74+
<extension>
75+
<name>xml</name>
76+
</extension>
77+
<extension>
78+
<name>dom</name>
79+
</extension>
80+
</required>
81+
</dependencies>
82+
83+
<phprelease>
84+
<installconditions>
85+
<os>
86+
<name>windows</name>
87+
</os>
88+
</installconditions>
89+
<filelist>
90+
<install as="symfony.bat" name="data/bin/symfony.bat" />
91+
</filelist>
92+
</phprelease>
93+
94+
<phprelease>
95+
<filelist>
96+
<ignore name="data/bin/symfony.bat" />
97+
</filelist>
98+
</phprelease>
99+
100+
<changelog>
101+
</changelog>
102+
</package>

0 commit comments

Comments
 (0)