Merge branch '3.1'

* 3.1:
  [TwigBundle] Removed redundant return statement.
  enable property info
  [Cache] Fix default lifetime being ignored
  [DependencyInjection] Fixed deprecated default message template with XML
  Reference the actual location of the documentation
  [TwigBridge] Removed extra arguments in 2 places.
  [Cache] Fix incorrect timestamps generated by FilesystemAdapter
  [Process] Fix write access check for pipes on Windows
  [HttpKernel] Use flock() for HttpCache's lock files

Conflicts:
	src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php

Author: nicolas-grekas

src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Twig\Extension;
 
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Logout\LogoutUrlGenerator;
 
 /**
@@ -48,7 +47,7 @@ public function getFunctions()
      */
     public function getLogoutPath($key = null)
     {
-        return $this->generator->getLogoutPath($key, UrlGeneratorInterface::ABSOLUTE_PATH);
+        return $this->generator->getLogoutPath($key);
     }
 
     /**
@@ -60,7 +59,7 @@ public function getLogoutPath($key = null)
      */
     public function getLogoutUrl($key = null)
     {
-        return $this->generator->getLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL);
+        return $this->generator->getLogoutUrl($key);
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml

@@ -21,6 +21,7 @@
             <argument type="service" id="serializer.mapping.class_metadata_factory" />
             <argument>null</argument> <!-- name converter -->
             <argument type="service" id="serializer.property_accessor" />
+            <argument type="service" id="property_info" on-invalid="ignore" />
 
             <!-- Run after all custom serializers -->
             <tag name="serializer.normalizer" priority="-1000" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php

@@ -68,6 +68,7 @@
         'enable_annotations' => true,
         'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
     ),
+    'property_info' => true,
     'ide' => 'file%%link%%format',
     'request' => array(
         'formats' => array(

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -41,5 +41,6 @@
         <framework:validation enabled="true" cache="validator.mapping.cache.doctrine.apc" />
         <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
         <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" />
+        <framework:property-info />
     </framework:config>
 </container>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -53,6 +53,7 @@ framework:
          enabled:        true
          enable_annotations: true
          name_converter: serializer.name_converter.camel_case_to_snake_case
+    property_info: ~
     ide: file%%link%%format
     request:
         formats:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -469,6 +469,7 @@ public function testSerializerEnabled()
         $this->assertEquals('Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader', $argument[0]->getClass());
         $this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
+        $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
     }
 
     public function testRegisterSerializerExtractor()

src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php

@@ -48,7 +48,7 @@ public function testExists()
         ;
         $loader = new FilesystemLoader($locator, $parser);
 
-        return $this->assertTrue($loader->exists($template));
+        $this->assertTrue($loader->exists($template));
     }
 
     /**

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -56,7 +56,7 @@ function ($deferred, $namespace, &$expiredIds) {
 
                 foreach ($deferred as $key => $item) {
                     if (null === $item->expiry) {
-                        $byLifetime[0][$namespace.$key] = $item->value;
+                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$namespace.$key] = $item->value;
                     } elseif ($item->expiry > $now) {
                         $byLifetime[$item->expiry - $now][$namespace.$key] = $item->value;
                     } else {

src/Symfony/Component/Cache/Adapter/ArrayAdapter.php

@@ -151,6 +151,9 @@ public function save(CacheItemInterface $item)
                 return false;
             }
         }
+        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
+            $expiry = time() + $item["\0*\0defaultLifetime"];
+        }
 
         $this->values[$key] = $value;
         $this->expiries[$key] = null !== $expiry ? $expiry : PHP_INT_MAX;

src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php

@@ -71,7 +71,7 @@ protected function doHave($id)
     protected function doSave(array $values, $lifetime)
     {
         $ok = true;
-        $expiresAt = $lifetime ? time() + $lifetime : PHP_INT_MAX;
+        $expiresAt = time() + ($lifetime ?: 31557600); // 31557600s = 1 year
 
         foreach ($values as $id => $value) {
             $ok = $this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".serialize($value), $expiresAt) && $ok;