From 57a150ef868a968e3c1014dd24a71f6a07526830 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander.schranz@sulu.io>
Date: Mon, 30 Apr 2018 13:18:54 +0200
Subject: [PATCH 1/4] Fix compatibility with utf8mb4 (#48)

* fix compatibility with utf8mb4

* add branch alias for 2.0

* set develop branch as 2.0 dev
---
 UPGRADE.md                                 | 9 +++++++++
 composer.json                              | 6 ++++++
 src/Resources/config/doctrine/Task.orm.xml | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 2a79fbb..200d6d5 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,10 +1,19 @@
 UPGRADE
 =======
 
+- [2.0.0](#2.0.0) 
 - [1.2.0](#1.2.0)
 - [1.1.0](#1.1.0)
 - [0.4.0](#0.4.0)
 
+### 2.0.0 (unreleased)
+
+For the utf8mb4 compatibility with mysql some fields need to be shorten:
+
+```bash
+bin/console doctrine:schema:update
+```
+
 ### 1.2.0
 
 In the database table `ta_task_executions` a new field was introduced. Run following
diff --git a/composer.json b/composer.json
index a856be7..7c2f1d3 100644
--- a/composer.json
+++ b/composer.json
@@ -36,5 +36,11 @@
         "psr-4": {
             "Task\\TaskBundle\\Tests\\": "tests"
         }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-aliases": {
+            "dev-develop": "2.0-dev"
+        }
     }
 }
diff --git a/src/Resources/config/doctrine/Task.orm.xml b/src/Resources/config/doctrine/Task.orm.xml
index 2c6ddca..93a6c12 100644
--- a/src/Resources/config/doctrine/Task.orm.xml
+++ b/src/Resources/config/doctrine/Task.orm.xml
@@ -17,7 +17,7 @@
         <field name="intervalExpression" type="string" length="255" nullable="true"/>
         <field name="firstExecution" type="datetime" nullable="true"/>
         <field name="lastExecution" type="datetime" nullable="true"/>
-        <field name="systemKey" type="string" nullable="true" unique="true"/>
+        <field name="systemKey" type="string" nullable="true" unique="true" length="191"/>
         <field name="workload" type="object"/>
 
     </entity>

From be8f0bbdfa3dc9dcaf0e01814166730a336eea07 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Tue, 12 Jun 2018 20:28:15 +0200
Subject: [PATCH 2/4] fix branch alias for 2.0 (#49)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7c2f1d3..bf9231f 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-aliases": {
+        "branch-alias": {
             "dev-develop": "2.0-dev"
         }
     }

From 6ad94be3f8b85abc22ecbdd916487ae894ce98b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Alcalde=20Gonz=C3=A1lez?=
 <josue.alcalde@medac.es>
Date: Thu, 20 Feb 2020 20:34:58 +0100
Subject: [PATCH 3/4] Add support for locking using symfony cache.

---
 composer.json                             |  3 +-
 src/Locking/CacheLockStorage.php          | 76 +++++++++++++++++++++++
 src/Resources/config/locking/storages.xml |  4 ++
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/Locking/CacheLockStorage.php

diff --git a/composer.json b/composer.json
index 0dc1ef1..dda6aa7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
         "symfony/config": "^2.8 || ^3.4 || ^4.0",
         "symfony/console": "^2.8 || ^3.4 || ^4.0",
         "symfony/process": "^2.8 || ^3.4 || ^4.0",
-        "doctrine/orm": "^2.5"
+        "doctrine/orm": "^2.5",
+        "symfony/cache": " ^2.8 || ^3.4 || ^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8 || ^5.0",
diff --git a/src/Locking/CacheLockStorage.php b/src/Locking/CacheLockStorage.php
new file mode 100644
index 0000000..07c81be
--- /dev/null
+++ b/src/Locking/CacheLockStorage.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of php-task library.
+ *
+ * (c) php-task
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Task\TaskBundle\Locking;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\InvalidArgumentException;
+use Symfony\Contracts\Cache\CacheInterface;
+use Task\Lock\LockStorageInterface;
+
+/**
+ * Save locks in Symfony Cache.
+ */
+class CacheLockStorage implements LockStorageInterface
+{
+
+    /**
+     * Avoid key collision with a key prefix.
+     */
+    const KEY_PREFIX = 'php_task_lock__';
+
+    /**
+     * @var CacheInterface
+     */
+    protected $cache;
+
+    /**
+     * @param CacheInterface $cache
+     */
+    public function __construct($cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save($key, $ttl)
+    {
+        /** @var CacheItemInterface $cacheItem */
+        $cacheItem = $this->cache->getItem(self::KEY_PREFIX . $key);
+        $cacheItem->expiresAfter($ttl);
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete($key)
+    {
+        try {
+            return $this->cache->delete(self::KEY_PREFIX . $key);
+        } catch (InvalidArgumentException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function exists($key)
+    {
+        /** @var CacheItemInterface $cacheItem */
+        $cacheItem = $this->cache->getItem(self::KEY_PREFIX . $key);
+        return $cacheItem->isHit();
+    }
+
+}
diff --git a/src/Resources/config/locking/storages.xml b/src/Resources/config/locking/storages.xml
index 47d0aac..8b297a7 100644
--- a/src/Resources/config/locking/storages.xml
+++ b/src/Resources/config/locking/storages.xml
@@ -8,5 +8,9 @@
 
             <tag name="task.lock.storage" alias="file"/>
         </service>
+        <service id="task.lock.storage.cache" class="Task\TaskBundle\Locking\CacheLockStorage" public="true">
+            <argument type="service" id="cache.app"></argument>
+            <tag name="task.lock.storage" alias="cache"/>
+        </service>
     </services>
 </container>

From 7cce0530c803eb9a49d22c04c42a1eaf50ff8c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Alcalde=20Gonz=C3=A1lez?=
 <josue.alcalde@medac.es>
Date: Thu, 11 Jun 2020 17:22:24 +0200
Subject: [PATCH 4/4] Fix: lock was not being created

---
 src/Locking/CacheLockStorage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Locking/CacheLockStorage.php b/src/Locking/CacheLockStorage.php
index 07c81be..773b2e3 100644
--- a/src/Locking/CacheLockStorage.php
+++ b/src/Locking/CacheLockStorage.php
@@ -47,7 +47,9 @@ public function save($key, $ttl)
     {
         /** @var CacheItemInterface $cacheItem */
         $cacheItem = $this->cache->getItem(self::KEY_PREFIX . $key);
+        $cacheItem->set('LOCK');
         $cacheItem->expiresAfter($ttl);
+        $this->cache->save($cacheItem);
         return true;
     }
 
@@ -57,7 +59,7 @@ public function save($key, $ttl)
     public function delete($key)
     {
         try {
-            return $this->cache->delete(self::KEY_PREFIX . $key);
+            return $this->cache->deleteItem(self::KEY_PREFIX . $key);
         } catch (InvalidArgumentException $e) {
             return false;
         }
@@ -74,3 +76,4 @@ public function exists($key)
     }
 
 }
+