Merge pull request '[various] Update Composer dependencies ahead of release' (#1487...

[friendica-addons.git/.git] / advancedcontentfilter / vendor / symfony / cache / Adapter / PdoAdapter.php

diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
index 5903867..d118736 100644 (file)
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
@@ -27,6 +28,9 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * a Doctrine DBAL Connection or a DSN string that will be used to
      * lazy-connect to the database when the cache is actually used.
      *
+     * When a Doctrine DBAL Connection is passed, the cache table is created
+     * automatically when possible. Otherwise, use the createTable() method.
+     *
      * List of available options:
      *  * db_table: The name of the table [default: cache_items]
      *  * db_id_col: The column where to store the cache id [default: item_id]
@@ -37,17 +41,14 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      *  * db_password: The password when lazy-connect [default: '']
      *  * db_connection_options: An array of driver-specific connection options [default: []]
      *
-     * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
-     * @param string                 $namespace
-     * @param int                    $defaultLifetime
-     * @param array                  $options         An associative array of options
+     * @param \PDO|Connection|string $connOrDsn a \PDO or Connection instance or DSN string or null
      *
      * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = [])
+    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
     }
 }