Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 7834c3253575 · 2018-04-29T18:05:59.000-07:00
* 3.4:
  PhpDoc: There is no attempt to create the directory
  Avoiding an error when an unused service has a missing base class
  Add an implementation just for php 7.0
  bumped Symfony version to 2.7.47
  Fix #27011: Session ini_set bug
  [Cache] TagAwareAdapterInterface::invalidateTags() should commit deferred items
  updated VERSION for 2.7.46
  update CONTRIBUTORS for 2.7.46
  updated CHANGELOG for 2.7.46
  bug #25844 [HttpKernel] Catch HttpExceptions when templating is not installed
diff --git a/Store/FlockStore.php b/Store/FlockStore.php
@@ -34,7 +34,7 @@ class FlockStore implements StoreInterface
     /**
      * @param string|null $lockPath the directory to store the lock, defaults to the system's temporary directory
      *
-     * @throws LockStorageException If the lock directory could not be created or is not writable
+     * @throws LockStorageException If the lock directory doesn’t exist or is not writable
      */
     public function __construct(string $lockPath = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class FlockStore implements StoreInterface`
`34`	`34`	`/**`
`35`	`35`	`* @param string\|null $lockPath the directory to store the lock, defaults to the system's temporary directory`
`36`	`36`	`*`
`37`		`- * @throws LockStorageException If the lock directory could not be created or is not writable`
	`37`	`+ * @throws LockStorageException If the lock directory doesn’t exist or is not writable`
`38`	`38`	`*/`
`39`	`39`	`public function __construct(string $lockPath = null)`
`40`	`40`	`{`