From 384d94faf37d4fa79c43d47db85bd8c6da9e41f0 Mon Sep 17 00:00:00 2001
From: Siad Ardroumli <siad.ardroumli@googlemail.com>
Date: Mon, 29 Jan 2018 10:51:50 +0100
Subject: [PATCH] Fixed FileUtils::contentEquals (#859)

---
 classes/phing/util/FileUtils.php          |  4 +-
 test/classes/phing/util/FileUtilsTest.php | 57 +++++++++++++++++++++++
 test/etc/util/fileutils.xml               |  7 +++
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 test/classes/phing/util/FileUtilsTest.php
 create mode 100644 test/etc/util/fileutils.xml

diff --git a/classes/phing/util/FileUtils.php b/classes/phing/util/FileUtils.php
index 8dff50bfc1..f22bda643e 100644
--- a/classes/phing/util/FileUtils.php
+++ b/classes/phing/util/FileUtils.php
@@ -412,11 +412,11 @@ public function createTempFile($prefix, $suffix, PhingFile $parentDir, $deleteOn
      */
     public function contentEquals(PhingFile $file1, PhingFile $file2)
     {
-        if (!($file1->exists() || $file2->exists())) {
+        if (!($file1->exists() && $file2->exists())) {
             return false;
         }
 
-        if (!($file1->canRead() || $file2->canRead())) {
+        if (!($file1->canRead() && $file2->canRead())) {
             return false;
         }
 
diff --git a/test/classes/phing/util/FileUtilsTest.php b/test/classes/phing/util/FileUtilsTest.php
new file mode 100644
index 0000000000..4f02f6550d
--- /dev/null
+++ b/test/classes/phing/util/FileUtilsTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information please see
+ * <http://phing.info>.
+ *
+ * @package phing.util
+ */
+
+/**
+ * Testcases for phing.util.FileUtils
+ *
+ * @author  Siad Ardroumli |siad.ardroumli@gmail.com>
+ * @package phing.util
+ */
+class FileUtilsTest extends BuildFileTest
+{
+    /** @var FileUtils $fu */
+    private $fu;
+
+    public function setUp()
+    {
+        $this->fu = new FileUtils();
+        $this->configureProject(PHING_TEST_BASE . "/etc/util/fileutils.xml");
+        $this->executeTarget('dummy');
+    }
+
+    public function tearDown()
+    {
+        $this->fu = null;
+    }
+
+    /**
+     * @test
+     */
+    public function contentEquals()
+    {
+        $this->assertFalse($this->fu->contentEquals(new PhingFile(__FILE__), new PhingFile('does_not_exists')));
+        $this->assertFalse($this->fu->contentEquals(new PhingFile('does_not_exists'), new PhingFile(__FILE__)));
+        $this->assertFalse($this->fu->contentEquals(new PhingFile(__DIR__), new PhingFile(__DIR__)));
+        $this->assertFalse($this->fu->contentEquals(new PhingFile(__FILE__), new PhingFile(__DIR__)));
+        $this->assertFalse($this->fu->contentEquals(new PhingFile(__DIR__), new PhingFile(__FILE__)));
+        $this->assertTrue($this->fu->contentEquals(new PhingFile(__FILE__), new PhingFile(__FILE__)));
+    }
+}
diff --git a/test/etc/util/fileutils.xml b/test/etc/util/fileutils.xml
new file mode 100644
index 0000000000..797c83306d
--- /dev/null
+++ b/test/etc/util/fileutils.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<project name="fileutils-test" default="none">
+
+    <property name="tmp.dir" value="tmp"/>
+
+    <target name="dummy" />
+</project>
\ No newline at end of file