Merge branch 'hotfix/1.0.5'

isotope · May 24, 2016 · a8ec937 · a8ec937
2 parents 85eb0a3 + 27bff9f
commit a8ec937
Show file tree

Hide file tree

Showing 9 changed files with 2,352 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
 
 before_script:
   - mysql -e 'create database isotope_migration_testsuite;'
-  - composer install --prefer-source --dev
+  - composer install
 
 script: phpunit --configuration phpunit.travis.xml --coverage-clover=coverage.clover
 

diff --git a/composer.json b/composer.json
@@ -14,16 +14,16 @@
     },
     "require": {
         "silex/silex": "~1.2",
-        "twig/twig": ">=1.8,<2.0-dev",
-        "symfony/translation": "~2.3 | ~3.0",
-        "symfony/config": "~2.3 | ~3.0",
-        "symfony/twig-bridge": "~2.3 | ~3.0",
+        "twig/twig": "~1.8",
+        "symfony/translation": "~2.3",
+        "symfony/config": "~2.3",
+        "symfony/twig-bridge": "~2.3",
         "doctrine/dbal": "~2.4"
     },
     "require-dev": {
         "phpunit/dbunit": "1.3.*",
-        "symfony/finder": "~2.4 | ~3.0",
+        "symfony/finder": "~2.4",
         "phine/phar": "1.*",
-        "symfony/browser-kit": "~2.5 | ~3.0"
+        "symfony/browser-kit": "~2.5"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/services/ProductCollectionMigrationService.php b/services/ProductCollectionMigrationService.php
@@ -56,7 +56,7 @@ public function getStatus()
         }
 
         // Nothing to do
-        if ($this->dbcheck->tableIsEmpty('tl_iso_orders')) {
+        if ($this->dbcheck->tableIsEmpty('tl_iso_orders') || 0 === count($this->getSurchargesByCollection())) {
             return MigrationServiceInterface::STATUS_READY;
         }