Skip to content

Commit 634d3ad

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (21 commits) Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)" InvalidResourceException file name [Validators] Remove forgotten space in a translation key [nl] [Validators] Correct translation key and content [nl] bumped Symfony version to 2.6.9 updated VERSION for 2.6.8 updated CHANGELOG for 2.6.8 added missing CVE number bumped Symfony version to 2.3.30 updated VERSION for 2.3.29 update CONTRIBUTORS for 2.3.29 updated CHANGELOG for 2.3.29 [Validators] Missing translations for arabic language. Code style fixed C [HttpKernel][Bundle] Check extension implements ExtensionInterface [DebugBundle] Fix config XSD [CS] [Console] StreamOuput : fix loose comparison [Framework][router commands] fixed failing test. [HttpKernel] Do not call the FragmentListener if _controller is already defined ... Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
2 parents d883f72 + fd74fe8 commit 634d3ad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Normalizer/PropertyNormalizer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function normalize($object, $format = null, array $context = array())
5959
}
6060

6161
// Override visibility
62-
if (! $property->isPublic()) {
62+
if (!$property->isPublic()) {
6363
$property->setAccessible(true);
6464
}
6565

@@ -111,7 +111,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
111111
$property = $reflectionClass->getProperty($propertyName);
112112

113113
// Override visibility
114-
if (! $property->isPublic()) {
114+
if (!$property->isPublic()) {
115115
$property->setAccessible(true);
116116
}
117117

@@ -151,7 +151,7 @@ private function supports($class)
151151

152152
// We look for at least one non-static property
153153
foreach ($class->getProperties() as $property) {
154-
if (! $property->isStatic()) {
154+
if (!$property->isStatic()) {
155155
return true;
156156
}
157157
}

0 commit comments

Comments
 (0)