Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -34,9 +34,6 @@ before_script:
 
     phpenv config-add test/travis.php.ini ;
 
-    pear channel-discover pear.phpunit.de ;
-    pear install phpunit/PHPUnit_Selenium ;
-
     composer install --dev --no-interaction ;
 
     fi ;

build.xml

@@ -130,7 +130,7 @@
  </target>
 
  <target name="locales" description="Generate locales">
-   <exec executable="./scripts/generate-mo">
+   <exec executable="./scripts/generate-mo" failonerror="true">
      <arg line="--quiet" />
    </exec>
  </target>

composer.json

@@ -22,6 +22,8 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": ">=0.6"
+        "satooshi/php-coveralls": ">=0.6",
+        "phpunit/phpunit": ">=3.7",
+        "phpunit/phpunit-selenium": ">=1.2"
     }
 }