aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-09-11 15:53:16 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-09-11 15:53:16 +0200
commit58fadbc9df3f8b735c04995919b6cf913ca6a977 (patch)
treebab121477c81ee68c1b0300464c2532407290222 /src/Wallabag/ImportBundle
parent04d5c60216eb4577fbf9846d10862a332d7656fd (diff)
downloadwallabag-58fadbc9df3f8b735c04995919b6cf913ca6a977.tar.gz
wallabag-58fadbc9df3f8b735c04995919b6cf913ca6a977.tar.zst
wallabag-58fadbc9df3f8b735c04995919b6cf913ca6a977.zip
Fix error on EntityManager clear
Introduced in the recent 2.5.5 release. Also updated deps.
Diffstat (limited to 'src/Wallabag/ImportBundle')
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php5
-rw-r--r--src/Wallabag/ImportBundle/Import/ReadabilityImport.php5
-rw-r--r--src/Wallabag/ImportBundle/Import/WallabagImport.php5
3 files changed, 12 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 798cfdae..841f829d 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -255,7 +255,10 @@ class PocketImport extends AbstractImport
255 // flush every 20 entries 255 // flush every 20 entries
256 if (($i % 20) === 0) { 256 if (($i % 20) === 0) {
257 $this->em->flush(); 257 $this->em->flush();
258 $this->em->clear($entry); 258
259 // clear only affected entities
260 $this->em->clear(Entry::class);
261 $this->em->clear(Tag::class);
259 } 262 }
260 ++$i; 263 ++$i;
261 } 264 }
diff --git a/src/Wallabag/ImportBundle/Import/ReadabilityImport.php b/src/Wallabag/ImportBundle/Import/ReadabilityImport.php
index 37b160c5..7bae647d 100644
--- a/src/Wallabag/ImportBundle/Import/ReadabilityImport.php
+++ b/src/Wallabag/ImportBundle/Import/ReadabilityImport.php
@@ -169,7 +169,10 @@ class ReadabilityImport extends AbstractImport
169 // flush every 20 entries 169 // flush every 20 entries
170 if (($i % 20) === 0) { 170 if (($i % 20) === 0) {
171 $this->em->flush(); 171 $this->em->flush();
172 $this->em->clear($entry); 172
173 // clear only affected entities
174 $this->em->clear(Entry::class);
175 $this->em->clear(Tag::class);
173 } 176 }
174 ++$i; 177 ++$i;
175 } 178 }
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php
index a1cc085b..9cd3dcb8 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagImport.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php
@@ -172,7 +172,10 @@ abstract class WallabagImport extends AbstractImport
172 // flush every 20 entries 172 // flush every 20 entries
173 if (($i % 20) === 0) { 173 if (($i % 20) === 0) {
174 $this->em->flush(); 174 $this->em->flush();
175 $this->em->clear($entry); 175
176 // clear only affected entities
177 $this->em->clear(Entry::class);
178 $this->em->clear(Tag::class);
176 } 179 }
177 ++$i; 180 ++$i;
178 } 181 }