Skip to content
Browse files

use travis composer

  • Loading branch information...
1 parent 463373e commit acf4ecbba3b718838f1c9e95fe5838815710ddce @lsmith77 lsmith77 committed Aug 15, 2012
View
2 .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
View
3 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
View
2 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%/*}"
View
2 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%/*}"
View
2 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

0 comments on commit acf4ecb

Please sign in to comment.
Something went wrong with that request. Please try again.