From 6947805b5c0ca2374f2ac8b0a89bc68c0db01b76 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Wed, 28 Nov 2018 20:43:44 +0100
Subject: [PATCH] Updated to zend-expressive-swoole 2.0.1 removing all
 workarounds

---
 composer.json                | 2 +-
 config/pipeline.php          | 6 ------
 config/routes.php            | 6 ------
 data/infra/swoole.Dockerfile | 5 +----
 4 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 config/pipeline.php
 delete mode 100644 config/routes.php

diff --git a/composer.json b/composer.json
index 898ce0ed..41f880f7 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "zendframework/zend-expressive-fastroute": "^3.0",
         "zendframework/zend-expressive-helpers": "^5.0",
         "zendframework/zend-expressive-platesrenderer": "^2.0",
-        "zendframework/zend-expressive-swoole": "^2.0",
+        "zendframework/zend-expressive-swoole": "^2.0.1",
         "zendframework/zend-i18n": "^2.7",
         "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-paginator": "^2.6",
diff --git a/config/pipeline.php b/config/pipeline.php
deleted file mode 100644
index 82d3aeea..00000000
--- a/config/pipeline.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-declare(strict_types=1);
-
-// FIXME Dummy file just to prevent expressive-swoole fail while loading
-return function () {
-};
diff --git a/config/routes.php b/config/routes.php
deleted file mode 100644
index 82d3aeea..00000000
--- a/config/routes.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-declare(strict_types=1);
-
-// FIXME Dummy file just to prevent expressive-swoole fail while loading
-return function () {
-};
diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile
index 40293eaa..07082220 100644
--- a/data/infra/swoole.Dockerfile
+++ b/data/infra/swoole.Dockerfile
@@ -92,7 +92,4 @@ WORKDIR /home/shlink
 # Expose swoole port
 EXPOSE 8080
 
-CMD /usr/local/bin/composer update && \
-    # When restarting the container, swoole might think it is already in execution
-    # This forces the app to be started every second until the exit code is 0
-    until php ./vendor/bin/zend-expressive-swoole start; do sleep 1 ; done
+CMD /usr/local/bin/composer update && ./vendor/bin/zend-expressive-swoole start