Update composer deps

Don't fail on broken database download
Synchro · Jun 23, 2015 · 8b682da · 8b682da
1 parent 139e8ee
commit 8b682da
Show file tree

Hide file tree

Showing 3 changed files with 252 additions and 86 deletions.
diff --git a/Tests/UAS/ParserTest.php b/Tests/UAS/ParserTest.php
@@ -67,6 +67,9 @@ public function testExpires()
 
     public function testUpdateDatabase()
     {
+        $this->markTestIncomplete(
+            'The free UAS database download is no longer available.'
+        );
         $this->assertTrue(self::$uasparser->downloadData()); //Should cause a download
         $this->assertTrue(self::$uasparser->downloadData(true)); //Should also cause a download
         $this->assertTrue(self::$uasparser->downloadData()); //Should NOT cause a download
@@ -91,6 +94,9 @@ public function testChecksums()
         $this->resetURLs();
     }
 
+    /**
+     * @depends testUpdateDatabase
+     */
     public function testPermissions()
     {
         $path = self::$uasparser->getCacheDir() . DIRECTORY_SEPARATOR . 'uasdata.ini';

diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.3.*",
-        "mikey179/vfsStream": "1.4.*@dev",
+        "phpunit/phpunit": "~4.7",
+        "mikey179/vfsStream": "~1.5",
         "satooshi/php-coveralls": "dev-master",
         "phpunit/phpcov": "dev-master",
         "phpunit/phpunit-story": "*"