From 338cfab3c40cd1b55b6cad5c43cb587a0c6393e2 Mon Sep 17 00:00:00 2001
From: Xavier Perseguers <xavier@causal.ch>
Date: Wed, 20 Jan 2021 15:51:30 +0100
Subject: [PATCH] [TASK] Raise version to 2.0.0

---
 Documentation/.editorconfig => .editorconfig  |  0
 Classes/Service/AbstractService.php           |  2 +-
 Documentation/AdministratorManual/Install.rst |  6 ++---
 Documentation/Settings.cfg                    |  2 +-
 Documentation/Settings.yml                    |  2 +-
 README.rst                                    | 27 ++++++++++---------
 ext_emconf.php                                |  4 +--
 7 files changed, 23 insertions(+), 20 deletions(-)
 rename Documentation/.editorconfig => .editorconfig (100%)

diff --git a/Documentation/.editorconfig b/.editorconfig
similarity index 100%
rename from Documentation/.editorconfig
rename to .editorconfig
diff --git a/Classes/Service/AbstractService.php b/Classes/Service/AbstractService.php
index 49c7cd5..78425cb 100644
--- a/Classes/Service/AbstractService.php
+++ b/Classes/Service/AbstractService.php
@@ -53,7 +53,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher = null)
             ? (new \TYPO3\CMS\Core\Information\Typo3Version())->getBranch()
             : TYPO3_branch;
         if (version_compare($typo3Branch, '9.0', '<')) {
-            $this->settings = unsercialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['extractor'] ?? '') ?? [];
+            $this->settings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['extractor'] ?? '') ?? [];
         } else {
             $this->settings = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['extractor'] ?? [];
         }
diff --git a/Documentation/AdministratorManual/Install.rst b/Documentation/AdministratorManual/Install.rst
index 81e9a48..2934780 100644
--- a/Documentation/AdministratorManual/Install.rst
+++ b/Documentation/AdministratorManual/Install.rst
@@ -98,6 +98,6 @@ External Tools
 
 This extension is capable of using external tools to extract metadata:
 
-- `exiftool <http://www.sno.phy.queensu.ca/~phil/exiftool/>`__ for files
-  containing EXIF, IPTC / XMP metadata;
-- `pdfinfo <http://linuxcommand.org/man_pages/pdfinfo1.html>`__ for PDF.
+- `exiftool <https://exiftool.org/>`__ for files containing EXIF, IPTC / XMP
+   metadata;
+- `pdfinfo <https://www.xpdfreader.com/pdfinfo-man.html>`__ for PDF.
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 6f8f640..c9e9c77 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -2,7 +2,7 @@
 
 project     = Metadata and Content Analysis Service
 version     = 2.0
-release     = 2.0.0-dev
+release     = 2.0.0
 t3author    = Xavier Perseguers
 copyright   = 2014-2021
 
diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml
index e328c47..0cd7919 100644
--- a/Documentation/Settings.yml
+++ b/Documentation/Settings.yml
@@ -7,7 +7,7 @@ conf.py:
   copyright: 2014-2021
   project: Metadata and Content Analysis Service
   version: 2.0
-  release: 2.0.0-dev
+  release: 2.0.0
   latex_documents:
   - - Index
     - extractor.tex
diff --git a/README.rst b/README.rst
index 5d2927f..f36b1d0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,26 +1,29 @@
 Metadata and content analysis service
 =====================================
 
-This extension detects and extracts metadata (EXIF / IPTC / XMP / ...) from potentially thousand different file types
-(such as MS Word/Powerpoint/Excel documents, PDF and images) and bring them automatically and natively to TYPO3 when
-uploading assets. Works with built-in PHP functions but takes advantage of Apache Tika and other external tools for
-enhanced metadata extraction.
+This extension detects and extracts metadata (EXIF / IPTC / XMP / ...) from
+potentially thousand different file types (such as MS Word/Powerpoint/Excel
+documents, PDF and images) and bring them automatically and natively to TYPO3
+when uploading assets. Works with built-in PHP functions but takes advantage of
+Apache Tika and other external tools for enhanced metadata extraction.
 
 .. image:: Documentation/Images/metadata.png
-    :alt: Metadata for a document
+   :alt: Metadata for a document
 
 
 Requirements
 ------------
 
-For best results, `Apache Tika <https://tika.apache.org/download.html>`__ is required (either as standalone JAR or
-running as server).
+For best results, `Apache Tika <https://tika.apache.org/download.html>`__ is
+required (either as standalone JAR or running as server).
 
-Extraction of metadata from common image files (jpg, tiff, ...) is often quicker using external tool
-`exiftool <http://www.sno.phy.queensu.ca/~phil/exiftool/>`__ and if not available, it will fall back to PHP's built-in
-EXIF and IPTC library.
+Extraction of metadata from common image files (jpg, tiff, ...) is often quicker
+using external tool `exiftool <https://exiftool.org/>`__ and if not available,
+it will fall back to PHP's built-in EXIF and IPTC library.
 
-For PDF, external tool `pdfinfo <http://linuxcommand.org/man_pages/pdfinfo1.html>`__ will be used.
+For PDF, external tool
+`pdfinfo <https://www.xpdfreader.com/pdfinfo-man.html>`__ will be used.
 
 
-Read more in the `manual <https://docs.typo3.org/typo3cms/extensions/extractor/>`__.
+Read more in the
+`manual <https://docs.typo3.org/p/causal/extractor/master/en-us/>`__.
diff --git a/ext_emconf.php b/ext_emconf.php
index c739e3d..62583cf 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -21,11 +21,11 @@
     'uploadfolder' => 0,
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '2.0.0-dev',
+    'version' => '2.0.0',
     'constraints' => [
         'depends' => [
             'php' => '7.2.0-7.4.99',
-            'typo3' => '8.7.0-11.0.99',
+            'typo3' => '8.7.0-11.5.99',
             'filemetadata' => '',
         ],
         'conflicts' => [],