From 371233e67a795b5b4347e72ddc3da81dc89913b8 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Sat, 1 Oct 2022 16:27:45 +0200
Subject: [PATCH] Fix "Cannot redeclare img\util\ImageInfo::hashCode()"

---
 ChangeLog.md                              |  4 ++++
 src/main/php/img/util/ExifData.class.php  |  7 +++----
 src/main/php/img/util/ImageInfo.class.php | 19 +++---------------
 src/main/php/img/util/IptcData.class.php  | 24 +++++++++++------------
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 23db0d89..472145fc 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,10 @@ Imaging APIs for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 10.1.1 / 2022-10-01
+
+* Fixed "Cannot redeclare img\util\ImageInfo::hashCode()" - @thekid
+
 ## 10.1.0 / 2022-09-10
 
 * Merged PR #1: Add WebP support - @thekid
diff --git a/src/main/php/img/util/ExifData.class.php b/src/main/php/img/util/ExifData.class.php
index f9ce100f..430f46de 100755
--- a/src/main/php/img/util/ExifData.class.php
+++ b/src/main/php/img/util/ExifData.class.php
@@ -10,10 +10,9 @@
 /**
  * Reads the EXIF headers from JPEG or TIFF
  *
- * @test     xp://net.xp_framework.unittest.img.ExifDataTest
- * @see      php://exif_read_data
- * @ext      exif
- * @purpose  Utility
+ * @test  net.xp_framework.unittest.img.ExifDataTest
+ * @see   php://exif_read_data
+ * @ext   exif
  */
 class ExifData implements Value {
   public static $EMPTY= null;
diff --git a/src/main/php/img/util/ImageInfo.class.php b/src/main/php/img/util/ImageInfo.class.php
index e981f501..a8b1c456 100755
--- a/src/main/php/img/util/ImageInfo.class.php
+++ b/src/main/php/img/util/ImageInfo.class.php
@@ -1,15 +1,15 @@
 <?php namespace img\util;
  
 use img\ImagingException;
+use lang\Value;
 use util\Objects;
 
 /**
  * Image information
  *
- * @see      php://getimagesize
- * @purpose  Utility
+ * @see   php://getimagesize
  */
-class ImageInfo implements \lang\Value {
+class ImageInfo implements Value {
   public
     $width      = 0,
     $height     = 0,
@@ -45,19 +45,6 @@ public static function fromFile($file) {
     return $i;
   }
 
-  /** @return string */
-  public function hashCode() {
-    return Objects::hashOf([
-      $this->width,
-      $this->height,
-      $this->type,
-      $this->mime,
-      $this->bits,
-      $this->channels,
-      $this->segments
-    ]);
-  }
-
   /**
    * Creates a string representation of this object
    *
diff --git a/src/main/php/img/util/IptcData.class.php b/src/main/php/img/util/IptcData.class.php
index e6f3717b..909b2ba8 100755
--- a/src/main/php/img/util/IptcData.class.php
+++ b/src/main/php/img/util/IptcData.class.php
@@ -1,26 +1,26 @@
 <?php namespace img\util;
 
 use img\ImagingException;
-use lang\{ElementNotFoundException, FormatException};
+use lang\{ElementNotFoundException, FormatException, Value};
 use util\{Date, Objects};
 
 /**
  * Reads the IPTC headers from Photoshop-files JPEGs or TIFFs
  *
- * <code>
- *   uses('img.util.IptcData', 'io.File');
+ * ```php
+ * use img\util\IptcData;
+ * use io\File;
  *
- *   // Use empty iptc data as default value when no iptc data is found
- *   echo IptcData::fromFile(new File($filename), IptcData::$EMPTY)->toString();
- * </code>
+ * // Use empty iptc data as default value when no iptc data is found
+ * echo IptcData::fromFile(new File($filename), IptcData::$EMPTY)->toString();
+ * ```
  *
- * @test     xp://net.xp_framework.unittest.img.IptcDataTest
- * @purpose  Utility
- * @see      php://iptcparse
- * @see      http://photothumb.com/IPTCExt/
- * @see      http://www.controlledvocabulary.com/pdf/IPTC_mapped_fields.pdf
+ * @test  net.xp_framework.unittest.img.IptcDataTest
+ * @see   php://iptcparse
+ * @see   http://photothumb.com/IPTCExt/
+ * @see   http://www.controlledvocabulary.com/pdf/IPTC_mapped_fields.pdf
  */
-class IptcData implements \lang\Value {
+class IptcData implements Value {
   public static $EMPTY= null;
 
   public