Skip to content

Commit 8ca43b0

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes [Debug] Fix case sensitivity checks [Debug] Fix handling of php7 throwables fix high deps tests [Process] remove dead code [WebProfilerBundle] Add missing use statement. [ClassLoader] Fix storing not-found classes in APC cache [Form] cs fixes in date types [phpunit] disable prophecy
2 parents b2a7fbf + 5083a35 commit 8ca43b0

File tree

15 files changed

+40
-40
lines changed

15 files changed

+40
-40
lines changed

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ install:
2121
- IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/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
24-
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip
24+
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/ICU-51.2-dlls.zip
2525
- IF %PHP%==1 7z x ICU-51.2-dlls.zip -y >nul
2626
- IF %PHP%==1 del /Q *.zip
2727
- IF %PHP%==1 cd ext
28-
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/php_intl-3.0.0-5.3-nts-vc9-x86.zip
28+
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/php_intl-3.0.0-5.3-nts-vc9-x86.zip
2929
- IF %PHP%==1 7z x php_intl-3.0.0-5.3-nts-vc9-x86.zip -y >nul
3030
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/apcu/4.0.10/php_apcu-4.0.10-5.3-nts-vc9-x86.zip
3131
- IF %PHP%==1 7z x php_apcu-4.0.10-5.3-nts-vc9-x86.zip -y >nul

phpunit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
5151
$zip->extractTo(getcwd());
5252
$zip->close();
5353
chdir("phpunit-$PHPUNIT_VERSION");
54+
passthru("$COMPOSER remove --no-update phpspec/prophecy");
5455
passthru("$COMPOSER remove --no-update symfony/yaml");
5556
passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.1@dev\"");
5657
passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);

src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
{%- if read_only %} readonly="readonly"{% endif -%}
323323
{%- if disabled %} disabled="disabled"{% endif -%}
324324
{%- if required %} required="required"{% endif -%}
325-
{%- for attrname, attrvalue in attr if 'readonly' != attrname -%}
325+
{%- for attrname, attrvalue in attr if 'readonly' != attrname or not read_only -%}
326326
{{- " " -}}
327327
{%- if attrname in ['placeholder', 'title'] -%}
328328
{{- attrname }}="{{ translation_domain is same as(false) ? attrvalue : attrvalue|trans({}, translation_domain) }}"

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php if ($disabled): ?> disabled="disabled"<?php endif ?>
33
<?php if ($required): ?> required="required"<?php endif ?>
44
<?php foreach ($attr as $k => $v): ?>
5-
<?php if ('readonly' === $k) { continue; } ?>
5+
<?php if ('readonly' === $k && $read_only): continue; endif ?>
66
<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
77
<?php printf(' %s="%s"', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
88
<?php elseif ($v === true): ?>

src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bundle\WebProfilerBundle\Controller;
1313

14+
use Symfony\Component\HttpFoundation\Request;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
1617
use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;

src/Symfony/Component/ClassLoader/ApcClassLoader.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@ public function loadClass($class)
122122
*/
123123
public function findFile($class)
124124
{
125-
if (false === $file = apcu_fetch($this->prefix.$class)) {
126-
apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));
125+
$file = apcu_fetch($this->prefix.$class, $success);
126+
127+
if (!$success) {
128+
apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null);
127129
}
128130

129131
return $file;

src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ public function __construct($prefix)
9292
*/
9393
public function findFile($class)
9494
{
95-
if (false === $file = apcu_fetch($this->prefix.$class)) {
96-
apcu_store($this->prefix.$class, $file = parent::findFile($class));
95+
$file = apcu_fetch($this->prefix.$class, $success);
96+
97+
if (!$success) {
98+
apcu_store($this->prefix.$class, $file = parent::findFile($class) ?: null);
9799
}
98100

99101
return $file;

src/Symfony/Component/ClassLoader/DebugClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function unregister()
8989
*/
9090
public function findFile($class)
9191
{
92-
return $this->classFinder->findFile($class);
92+
return $this->classFinder->findFile($class) ?: null;
9393
}
9494

9595
/**

src/Symfony/Component/ClassLoader/WinCacheClassLoader.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ public function loadClass($class)
123123
*/
124124
public function findFile($class)
125125
{
126-
if (false === $file = wincache_ucache_get($this->prefix.$class)) {
127-
wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);
126+
$file = wincache_ucache_get($this->prefix.$class, $success);
127+
128+
if (!$success) {
129+
wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null, 0);
128130
}
129131

130132
return $file;

src/Symfony/Component/ClassLoader/XcacheClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function findFile($class)
126126
if (xcache_isset($this->prefix.$class)) {
127127
$file = xcache_get($this->prefix.$class);
128128
} else {
129-
$file = $this->decorated->findFile($class);
129+
$file = $this->decorated->findFile($class) ?: null;
130130
xcache_set($this->prefix.$class, $file);
131131
}
132132

0 commit comments

Comments
 (0)