wip

PrestaShop · Jul 27, 2023 · c42287d · c42287d
1 parent 05d6e00
commit c42287d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/install-dev/init.php b/install-dev/init.php
@@ -23,7 +23,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception as DBALException;
 
 ob_start();
 

diff --git a/src/Adapter/Cache/MemcacheServerManager.php b/src/Adapter/Cache/MemcacheServerManager.php
@@ -118,6 +118,6 @@ public function deleteServer($serverId)
      */
     public function getServers()
     {
-        return $this->connection->fetchAll('SELECT * FROM ' . $this->tableName, []);
+        return $this->connection->fetchAllAssociative('SELECT * FROM ' . $this->tableName, []);
     }
 }
diff --git a/src/Adapter/Import/ImportEntityDeleter.php b/src/Adapter/Import/ImportEntityDeleter.php
@@ -278,7 +278,7 @@ private function deleteCombinations()
      *
      * @param array $tables
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws \Doctrine\DBAL\Exception
      */
     private function truncateTables(array $tables)
     {
@@ -292,7 +292,7 @@ private function truncateTables(array $tables)
      *
      * @param array $tables
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws \Doctrine\DBAL\Exception
      */
     private function truncateTablesIfExist(array $tables)
     {

diff --git a/src/Adapter/Product/Combination/Update/CombinationImagesUpdater.php b/src/Adapter/Product/Combination/Update/CombinationImagesUpdater.php
@@ -29,7 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Combination\Update;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\CombinationId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;

diff --git a/src/Adapter/Product/FeatureValue/Update/ProductFeatureValueUpdater.php b/src/Adapter/Product/FeatureValue/Update/ProductFeatureValueUpdater.php
@@ -29,7 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use FeatureValue;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;

diff --git a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
@@ -102,7 +102,7 @@ public function execute(InputInterface $input, OutputInterface $output)
                 throw ($e);
             }
         }
-        if (!$connection->getWrappedConnection() instanceof PDO || $connection->getWrappedConnection()->inTransaction()) {
+        if (!$connection->getNativeConnection() instanceof PDO || $connection->getNativeConnection()->inTransaction()) {
             $connection->commit();
         }