Merge pull request #8694 from ThaDafinser/feature/windows

Fixing PhpUnit support for windows

2 files changed, 2 insertions, 2 deletions

diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index aba1d5d263..1359c8ac2e 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -268,7 +268,7 @@ class GeoIPAutoUpdater extends Task
             }
 
             $tempFile = GeoIp::getPathForGeoIpDatabase($tempFilename);
-            rename($existing = $tempFile, $newName = $oldDbFile);
+            rename($tempFile, $oldDbFile);
 
             // delete original archive
             if ($unlink) {
diff --git a/plugins/UserCountry/tests/Unit/UserCountryTest.php b/plugins/UserCountry/tests/Unit/UserCountryTest.php
index 9b62518e3e..dddbce6b9f 100644
--- a/plugins/UserCountry/tests/Unit/UserCountryTest.php
+++ b/plugins/UserCountry/tests/Unit/UserCountryTest.php
@@ -138,7 +138,7 @@ class UserCountryTest extends \PHPUnit_Framework_TestCase
         foreach ($filesToRemove as $name) {
             $path = $geoIpDirPath . '/' . $name;
             if (file_exists($path)) {
-                unlink($path);
+                @unlink($path);
             }
         }
     }