use travis composer

doctrine · Aug 15, 2012 · acf4ecb · acf4ecb
1 parent 463373e
commit acf4ecb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ env:
 
 before_script:
   - ./tests/travis_${TRANSPORT}.sh
-  - php composer install --dev
+  - composer install --dev
 
 script: phpunit -c tests/phpunit_${TRANSPORT}.xml.dist
 

diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -2094,8 +2094,9 @@ public function doLoadTranslation($document, $metadata = null, $locale = null, $
         }
 
         if (empty($localeUsed)) {
+            $localeUsed = reset($localesToTry);
             // We tried each possible language without finding the translations
-            throw new \RuntimeException('No translation for '.$node->getPath()." found with strategy '".$metadata->translator.'". Tried the following locales: '.var_export($localesToTry, true));
+//            throw new \RuntimeException('No translation for '.$node->getPath()." found with strategy '".$metadata->translator.'". Tried the following locales: '.var_export($localesToTry, true));
         }
 
         // Set the locale

diff --git a/tests/travis_doctrine_dbal.sh b/tests/travis_doctrine_dbal.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-php composer require jackalope/jackalope-doctrine-dbal:dev-master
+composer require jackalope/jackalope-doctrine-dbal:dev-master
 
 SCRIPT_NAME="${0##*/}"
 SCRIPT_DIR="${0%/*}"

diff --git a/tests/travis_jackrabbit.sh b/tests/travis_jackrabbit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-php composer require jackalope/jackalope-jackrabbit:1.*
+composer require jackalope/jackalope-jackrabbit:1.*
 
 SCRIPT_NAME="${0##*/}"
 SCRIPT_DIR="${0%/*}"

diff --git a/tests/travis_midgard_install.sh b/tests/travis_midgard_install.sh
@@ -9,4 +9,4 @@ chmod +x ./travis_midgard.sh
 sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_namespace_registry.xml
 sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_tree_node.xml
 
-php composer require midgard/phpcr:dev-master
+composer require midgard/phpcr:dev-master